Branch: master

6bb78ce0 2014-10-12 17:51:38 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kaudiocreator/kaudiocreator.cpp
M kscd/kscd.cpp
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 1c2cd02..4fc6f89 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -61,7 +61,7 @@
     ripper  = new Ripper ( TQT_TQOBJECT(frame), "Rip" );
     encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" );
 
-    frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "run", 32 ) );
+    frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "system-run", 32 ) );
     jobQue = new JobQueImp( frame, "Que" );
 
     resize(500, 440);
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index dd3c096..8b8463e 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -337,7 +337,7 @@
   prevPB->setIconSet(SmallIconSet("player_start"));
   nextPB->setIconSet(SmallIconSet("player_end"));
   cddbPB->setIconSet(SmallIconSet("view_text"));
-  infoPB->setIconSet(SmallIconSet("run"));
+  infoPB->setIconSet(SmallIconSet("system-run"));
 }
 
 void KSCD::setupPopups()
fa4f1a75 2014-10-12 17:56:57 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdemultimedia
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c