Branch: master

95db8380 2014-10-12 17:50:31 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kmag/kmag.cpp
M kttsd/kttsjobmgr/kttsjobmgr.cpp
M kttsd/kttsmgr/kttsmgr.cpp
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 1c413c0..0c0e483 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -130,7 +130,7 @@
                               TQT_SLOT(slotFileNewWindow()), actionCollection(),"new_window");
   fileNewWindow->setToolTip(i18n("Open a new KMagnifier window"));
 
-  refreshSwitch = new TDEAction(i18n("&Stop"), "stop", TDEStdAccel::reload(), TQT_TQOBJECT(this),
+  refreshSwitch = new TDEAction(i18n("&Stop"), "process-stop", TDEStdAccel::reload(), TQT_TQOBJECT(this),
                               TQT_SLOT(slotToggleRefresh()), actionCollection(), "start_stop_refresh");
   refreshSwitch->setToolTip(i18n("Click to stop window refresh"));
   refreshSwitch->setWhatsThis(i18n("Clicking on this icon will <b>start</b> / <b>stop</b>\
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 98e22d7..19b41e2 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -172,7 +172,7 @@
 
     TQPushButton* btn;
     TQString wt;
-    btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("stop", TDEIcon::Small, 0, true),
+    btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("process-stop", TDEIcon::Small, 0, true),
                           i18n("Hold"), hbox1, "job_hold");
     wt = i18n(
             "<p>Changes a job to Paused state.  If currently speaking, the job stops speaking.  "
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 3473968..ee24e57 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -180,7 +180,7 @@
 
     id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("klipper", TDEIcon::Small),
         i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected()));
-    id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("stop", TDEIcon::Small),
+    id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("process-stop", TDEIcon::Small),
         i18n("&Hold"), this, TQT_SLOT(holdSelected()));
     id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::Small),
         i18n("Resume"), this, TQT_SLOT(resumeSelected()));
089812df 2014-10-12 17:56:24 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeaccessibility
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c