Bring stop, lock, exit, and run icons into XDG compliance

kshutdown/actions.cpp

@@ -227,9 +227,9 @@ TQString Action::getIconName(const Type action) const
 {
 	switch (action)
 	{
-		case ShutDown: return "exit";
+		case ShutDown: return "system-log-out";
 		case Reboot: return "reload";
-		case LockScreen: return "lock";
+		case LockScreen: return "system-lock-screen";
 		case Logout: return "undo";
 		case Extras: return "bookmark";
 		case Nothing:

kshutdown/links.cpp

@@ -66,7 +66,7 @@ Links::Links(TQWidget *parent)
 	cb_type->insertItem(kapp->miniIcon(), "KShutDown");
 
 	// NOTE: slotAddRemoveLink()
-	cb_type->insertItem(SmallIcon("exit"), i18n("Standard Logout Dialog"));
+	cb_type->insertItem(SmallIcon("system-log-out"), i18n("Standard Logout Dialog"));
 
 	cb_type->insertItem(ks_actions->getIcon(Action::ShutDown), ks_actions->getName(Action::ShutDown));
 	cb_type->insertItem(ks_actions->getIcon(Action::Reboot), ks_actions->getName(Action::Reboot));
@@ -166,11 +166,11 @@ TQString Links::getCurrentTypeIcon() const
 	switch (cb_type->currentItem())
 	{
 		case 0: return "kshutdown";
-		case 1: return "exit";
+		case 1: return "system-log-out";
 		// sync. with Action::getIcon
-		case 2: return "exit";
+		case 2: return "system-log-out";
 		case 3: return "reload";
-		case 4: return "lock";
+		case 4: return "system-lock-screen";
 		case 5: return "undo";
 		default: return TQString::null;
 	}

kshutdown/msystemtray.cpp

@@ -134,7 +134,7 @@ MSystemTray::MSystemTray()
 	_flashCount(0),
 	_saveIcon(0)
 {
-	setPixmap(SmallIcon("exit", TDEIcon::SizeSmallMedium)); // 22x22
+	setPixmap(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium)); // 22x22
 
 // TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?)
 
@@ -147,7 +147,7 @@ MSystemTray::MSystemTray()
 	connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
 
 	// init icons
-	KPixmap pm(SmallIcon("exit", TDEIcon::SizeSmallMedium));
+	KPixmap pm(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium));
 	_flashIcon = new KPixmap(KPixmapEffect::fade(pm, 0.7f, white));
 
 	show();
@@ -194,7 +194,7 @@ void MSystemTray::slotFade()
 			_fadeValue = 0.0f;
 		}
 	}
-	KPixmap p(SmallIcon("exit", TDEIcon::SizeSmallMedium));
+	KPixmap p(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium));
 	setPixmap(KPixmapEffect::fade(p, _fadeValue, KS_TRAY_FADE_COLOR));
 }
 

kshutdownlockout/lockout.cpp

@@ -95,7 +95,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 	TQToolButton *button = new TQToolButton(this);
 	button->setAutoRaise(true);
 	button->setBackgroundMode(X11ParentRelative);
-	button->setPixmap(SmallIcon("exit"));
+	button->setPixmap(SmallIcon("system-log-out"));
 	button->setPopupDelay(100);
 	button->setMinimumSize(button->pixmap()->size());
 	button->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
@@ -162,7 +162,7 @@ void Lockout::initActions() {
 	TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this);
 
 	_lockScreenAction = new TDEAction(
-		i18n("Lock Screen"), "lock", TDEShortcut(),
+		i18n("Lock Screen"), "system-lock-screen", TDEShortcut(),
 		this, SLOT(slotLockScreen()),
 		ac_shutDown, "kshutdown_lockscreen"
 	);
@@ -180,7 +180,7 @@ void Lockout::initActions() {
 	);
 
 	_shutDownAction = new TDEAction(
-		i18n("Turn Off Computer"), "exit", TDEShortcut(),
+		i18n("Turn Off Computer"), "system-log-out", TDEShortcut(),
 		this, SLOT(slotShutDown()),
 		ac_shutDown, "kshutdown_shutdown"
 	);
@@ -212,7 +212,7 @@ void Lockout::slotConfigureKShutDown() {
 
 void Lockout::slotIconChanged() {
 // FIXME: 2.0: update action icons
-	setIcon(SmallIcon("exit"));
+	setIcon(SmallIcon("system-log-out"));
 }
 
 void Lockout::slotLockScreen() {