Branch: master

d98f61c9 2014-10-12 17:49:15 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/libgui/likeback.cpp
M src/libgui/toplevel.cpp
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index af74e4b..a92a360 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -95,7 +95,7 @@
         configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) );
         TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small);
         configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQT_SLOT(askEMail()) );
-//        TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("stop", TDEIcon::Small);
+//        TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("process-stop", TDEIcon::Small);
 //        configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQT_SLOT(doNotHelpAnymore()) );
         m_configureButton->setPopup(configureMenu);
         connect( m_configureButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(openConfigurePopup()) );
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index a4dc4dc..9d9183a 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -249,7 +249,7 @@
                       TQT_TQOBJECT(this), TQT_SLOT(compileFile()), actionCollection(), "build_compile_file");
     (void)new TDEAction(i18n("Clean"), "trashcan_empty", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(cleanBuild()), actionCollection(), "build_clean");
-    (void)new TDEAction(i18n("Stop"), "stop", 0,
+    (void)new TDEAction(i18n("Stop"), "process-stop", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(stopBuild()), actionCollection(), "build_stop");
 
     // programmer actions
01f81b6d 2014-10-12 17:54:48 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/piklab
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c