Branch: master

ea6411c3 2014-10-12 17:52:04 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M amor/amor.cpp
M kodo/kodometer.cpp
M kteatime/toplevel.cpp
diff --git a/amor/amor.cpp b/amor/amor.cpp
index d98cbd1..2580794 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -613,7 +613,7 @@
         mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure()));
         mMenu->insertSeparator();
         mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
-        mMenu->insertItem(SmallIcon("exit"), i18n("&Quit"), kapp, TQT_SLOT(quit()));
+        mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQT_SLOT(quit()));
     }
 
     mMenu->exec(pos);
diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp
index 43a5794..8468190 100644
--- a/kodo/kodometer.cpp
+++ b/kodo/kodometer.cpp
@@ -99,7 +99,7 @@
 
 	menu->insertItem(SmallIconSet("help"), i18n("&Help"), helpMnu);
 
-	menu->insertItem(SmallIconSet("exit"), i18n("&Quit"), this, TQT_SLOT(quit()));
+	menu->insertItem(SmallIconSet("system-log-out"), i18n("&Quit"), this, TQT_SLOT(quit()));
 	menu->setCheckable(true);
 
 	menu->setItemChecked(enabledID, Enabled);
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 1980eb3..468f615 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -152,7 +152,7 @@
 	menu->insertSeparator();
 	confAct->plug(menu);
 	menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
-	menu->insertItem(SmallIcon("exit"), i18n("Quit"), kapp, TQT_SLOT(quit()));
+	menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQT_SLOT(quit()));
 //	quitAct->plug(menu);    // FIXME: this doesn't seem to work with above definition of quitAct?
 	                        //        (need special 'quit'-method?)
 
db1cdf99 2014-10-12 17:57:06 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdetoys
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c