Branch: master

31bd189b 2014-10-12 17:48:15 Timothy Pearson 
Bring stop, lock, exit, and run icons into XDG compliance
M kftpgrabber/src/widgets/browser/actions.cpp
 
diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp
index bb7c260..390507a 100644
--- a/kftpgrabber/src/widgets/browser/actions.cpp
+++ b/kftpgrabber/src/widgets/browser/actions.cpp
@@ -101,7 +101,7 @@
   m_reloadAction->setText(i18n("&Reload"));
   m_reloadAction->setShortcut(TDEShortcut(TQt::Key_F5));
   
-  m_abortAction = new TDEAction(i18n("&Abort"), "stop", TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort");
+  m_abortAction = new TDEAction(i18n("&Abort"), "process-stop", TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort");
   m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view");
   m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter");
42cb4143 2014-10-12 17:53:33 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kftpgrabber
M cmake
 
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c