Branch: master

ed23a2a9 2014-10-12 17:47:49 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/k3bjobprogressdialog.cpp
M src/misc/k3bcdimagewritingdialog.cpp
M src/misc/k3bisoimagewritingdialog.cpp
M src/option/k3bcddboptiontab.cpp
M src/projects/k3bvcdtrackdialog.cpp
M src/rip/k3bvideocdview.cpp
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 77e0b76..fb5fb5c 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -332,7 +332,7 @@
   // set the icon
   switch( type ) {
   case K3bJob::ERROR:
-    currentInfoItem->setPixmap( 0, SmallIcon( "stop" ) );
+    currentInfoItem->setPixmap( 0, SmallIcon( "process-stop" ) );
     break;
   case K3bJob::WARNING:
     currentInfoItem->setPixmap( 0, SmallIcon( "yellowinfo" ) );
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 6ea61c2..28da8d3 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -569,14 +569,14 @@
       K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
 						   i18n("Seems not to be a usable image") );
       item->setForegroundColor( 0, TQt::red );
-      item->setPixmap( 0, SmallIcon( "stop") );
+      item->setPixmap( 0, SmallIcon( "process-stop") );
     }
   }
   else {
     K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
 						 i18n("File not found") );
     item->setForegroundColor( 0, TQt::red );
-    item->setPixmap( 0, SmallIcon( "stop") );
+    item->setPixmap( 0, SmallIcon( "process-stop") );
   }
 
   slotToggleAll();
@@ -871,7 +871,7 @@
       d->md5SumItem->setText( 1, i18n("Calculation cancelled") );
     else
       d->md5SumItem->setText( 1, i18n("Calculation failed") );
-    d->md5SumItem->setPixmap( 0, SmallIcon( "stop") );
+    d->md5SumItem->setPixmap( 0, SmallIcon( "process-stop") );
     d->lastCheckedFile.truncate(0);
   }
 
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 915e300..03db6cf 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -381,7 +381,7 @@
       K3bListViewItem* item = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
 				  i18n("Not an Iso9660 image") );
       item->setForegroundColor( 0, TQt::red );
-      item->setPixmap( 0, SmallIcon( "stop") );
+      item->setPixmap( 0, SmallIcon( "process-stop") );
     }
 
     calculateMd5Sum( path );
@@ -473,7 +473,7 @@
       d->md5SumItem->setText( 1, i18n("Calculation cancelled") );
     else
       d->md5SumItem->setText( 1, i18n("Calculation failed") );
-    d->md5SumItem->setPixmap( 0, SmallIcon( "stop") );
+    d->md5SumItem->setPixmap( 0, SmallIcon( "process-stop") );
     d->lastCheckedFile.truncate(0);
   }
 
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index e527481..2411ba0 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -88,11 +88,11 @@
 
   // set icons for the buttons
   m_buttonAddLocalDir->setPixmap( SmallIcon("ok") );
-  m_buttonRemoveLocalDir->setPixmap( SmallIcon("stop") );
+  m_buttonRemoveLocalDir->setPixmap( SmallIcon("process-stop") );
   m_buttonLocalDirUp->setPixmap( SmallIcon("up") );
   m_buttonLocalDirDown->setPixmap( SmallIcon("down") );
   m_buttonAddCddbServer->setPixmap( SmallIcon("ok") );
-  m_buttonRemoveCddbServer->setPixmap( SmallIcon("stop") );
+  m_buttonRemoveCddbServer->setPixmap( SmallIcon("process-stop") );
   m_buttonCddbServerUp->setPixmap( SmallIcon("up") );
   m_buttonCddbServerDown->setPixmap( SmallIcon("down") );
 
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 4b4c72a..db97767 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -296,7 +296,7 @@
     }
 
     // add Event Disabled
-    TQPixmap pmDisabled = SmallIcon( "stop" );
+    TQPixmap pmDisabled = SmallIcon( "process-stop" );
     TQString txtDisabled = i18n( "Event Disabled" );
     m_pbc_previous->insertItem( pmDisabled, txtDisabled );
     m_pbc_next->insertItem( pmDisabled, txtDisabled );
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 523b91f..52549e6 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -334,7 +334,7 @@
                                            TQT_SLOT( slotDeselect() ), actionCollection(),
                                            "deselect_track" );
 
-    TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "run", 0, TQT_TQOBJECT(this),
+    TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, TQT_TQOBJECT(this),
                                            TQT_SLOT( startRip() ), actionCollection(), "start_rip" );
 
     // TODO: set the actions tooltips and whatsthis infos
4ef10a24 2014-10-12 17:52:53 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/k3b
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c