Branch: master

a34ba89c 2014-10-12 17:49:31 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M tderadio3/plugins/gui-docking-menu/docking.cpp
M tderadio3/plugins/gui-standard-display/radioview.cpp
diff --git a/tderadio3/plugins/gui-docking-menu/docking.cpp b/tderadio3/plugins/gui-docking-menu/docking.cpp
index a766360..aae4f3f 100644
--- a/tderadio3/plugins/gui-docking-menu/docking.cpp
+++ b/tderadio3/plugins/gui-docking-menu/docking.cpp
@@ -253,7 +253,7 @@
     }
 
     m_menu->insertSeparator();
-    m_menu->insertItem( SmallIcon("exit"), i18n("&Quit" ), kapp, TQT_SLOT(quit()) );
+    m_menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit" ), kapp, TQT_SLOT(quit()) );
 
 
     noticeStationChanged(queryCurrentStation(), -1);
diff --git a/tderadio3/plugins/gui-standard-display/radioview.cpp b/tderadio3/plugins/gui-standard-display/radioview.cpp
index ae5fb88..dc828ab 100644
--- a/tderadio3/plugins/gui-standard-display/radioview.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview.cpp
@@ -158,7 +158,7 @@
     btnPower->setIconSet(SmallIconSet("tderadio_muteon"));
     btnRecording->setIconSet(SmallIconSet("tderadio_record"));
     btnConfigure->setIconSet(SmallIconSet("configure"));
-    btnQuit->setIconSet(SmallIconSet("exit"));
+    btnQuit->setIconSet(SmallIconSet("system-log-out"));
     btnSnooze->setIconSet(SmallIconSet("tderadio_zzz"));
     btnPlugins->setIconSet(SmallIconSet("tderadio_plugins"));
 
a5cd9d71 2014-10-12 17:55:18 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tderadio
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c