Branch: master

d69c3a21 2014-10-12 17:50:35 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kdat/KDatMainWindow.cpp
M knetworkconf/knetworkconf/knetworkconf.cpp
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 2ef0f76..86a4fef 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -143,7 +143,7 @@
     _fileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQT_SLOT( fileDeleteBackupProfile() ) );
     _fileMenu->insertItem( i18n( "Format Tape..." )       , this, TQT_SLOT( fileFormatTape() ) );
     _fileMenu->insertSeparator();
-    _fileMenu->insertItem( SmallIcon("exit"), i18n( "&Quit" )                , this, TQT_SLOT( fileQuit() ), CTRL + Key_Q );
+    _fileMenu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" )                , this, TQT_SLOT( fileQuit() ), CTRL + Key_Q );
 
     _editMenu = new TQPopupMenu;
     _editMenu->insertItem( SmallIcon("configure"), i18n( "Configure KDat..." )       , this, TQT_SLOT( editPreferences() ) );
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index 1f9b808..0ef9461 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -126,7 +126,7 @@
             item->setPixmap(0,inactiveWirelessDeviceImg);
 
           item->setText(3,i18n("Disabled"));
-          item->setPixmap(3,SmallIcon("stop"));
+          item->setPixmap(3,SmallIcon("process-stop"));
           if (device->getBootProto().lower() == "dhcp")
             item->setText(1,"");
         }
@@ -768,7 +768,7 @@
           item->setPixmap(0,inactiveWirelessDeviceImg);
 
         item->setText(3,i18n("Disabled"));
-        item->setPixmap(3,SmallIcon("stop"));
+        item->setPixmap(3,SmallIcon("process-stop"));
         if (dev->getBootProto().lower() == "dhcp")
           item->setText(1,"");
       }
9ff88abf 2014-10-12 17:56:29 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeadmin
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c