From 1346f6898707e6a4d95abee07c3d1608fc056998 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 12 Oct 2014 17:50:49 -0500
Subject: Bring stop, lock, exit, and run icons into XDG compliance

---
 kdesktop/krootwm.cc         | 8 ++++----
 kdesktop/lock/autologout.cc | 2 +-
 kdesktop/lock/lockdlg.cc    | 2 +-
 kdesktop/minicli.cpp        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kdesktop')

diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 02f073136..e200366f7 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -131,7 +131,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
 
   if (kapp->authorize("run_command"))
   {
-     new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+     new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
      new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
 	m_actionCollection, "open_terminal" );
   }
@@ -188,12 +188,12 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
   // Icons in sync with kicker
   if (kapp->authorize("lock_screen"))
   {
-      new TDEAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
+      new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ),
                   m_actionCollection, "lock" );
   }
   if (kapp->authorize("logout"))
   {
-      new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
+      new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
                   this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
   }
 
@@ -203,7 +203,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
                   TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
       if (kapp->authorize("lock_screen"))
       {
-          new TDEAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
+          new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
                       TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
       }
   }
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 0861eaef0..7d6bf6ff1 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -49,7 +49,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
     frame->setLineWidth(2);
 
     TQLabel *pixLabel = new TQLabel( frame, "pixlabel" );
-    pixLabel->setPixmap(DesktopIcon("exit"));
+    pixLabel->setPixmap(DesktopIcon("system-log-out"));
 
     TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame);
     TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index bfa727678..7b53484d2 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -119,7 +119,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
     TQLabel *pixLabel = NULL;
     if (!trinity_desktop_lock_use_system_modal_dialogs) {
         pixLabel = new TQLabel( frame, "pixlabel" );
-        pixLabel->setPixmap(DesktopIcon("lock"));
+        pixLabel->setPixmap(DesktopIcon("system-lock-screen"));
     }
 
     KUser user;
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index dc1fa94a2..c8149ad91 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -80,7 +80,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
          m_autoCheckedRunInTerm(false), m_pURLCompletion(NULL), m_pEXECompletion(NULL)
 {
   setPlainCaption( i18n("Run Command") );
-  KWin::setIcons( winId(), DesktopIcon("run"), SmallIcon("run") );
+  KWin::setIcons( winId(), DesktopIcon("system-run"), SmallIcon("system-run") );
 
   TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   m_dlg = new MinicliDlgUI (this);
-- 
cgit v1.2.1