Branch: master

4c4fed8e 2014-10-12 17:47:41 Timothy Pearson 
Bring stop, lock, exit, and run icons into XDG compliance
M src/dolphin.cpp
 
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 2e85ea3..8d3874e 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -129,7 +129,7 @@
         popup.insertItem(SmallIcon("editcopy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel(KKey::CTRL), 1);
         popup.insertItem(i18n("&Link Here") + "\t" + KKey::modFlagLabel((KKey::ModFlag)(KKey::CTRL|KKey::SHIFT)), 2);
         popup.insertSeparator();
-        popup.insertItem(SmallIcon("stop"), i18n("Cancel"), 3);
+        popup.insertItem(SmallIcon("process-stop"), i18n("Cancel"), 3);
         popup.setAccel(i18n("Escape"), 3);
 
         selectedIndex = popup.exec(TQCursor::pos());
@@ -1293,7 +1293,7 @@
     TDEAction* stopAction = new TDEAction(i18n("Stop"), 0,
                                       TQT_TQOBJECT(this), TQT_SLOT(stopLoading()),
                                       actionCollection(), "stop");
-    stopAction->setIcon("stop");
+    stopAction->setIcon("process-stop");
 
     new TDEAction(i18n("Edit Location"), "Ctrl+L",
                 TQT_TQOBJECT(this), TQT_SLOT(editLocation()),
eaf7f461 2014-10-12 17:52:39 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/dolphin
M cmake
 
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c