Branch: master

34c74aed 2014-10-12 17:51:08 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kenolaba/AbTop.cpp
M kjumpingcube/kjumpingcube.cpp
M kmahjongg/Editor.cpp
M ksokoban/MainWindow.cpp
M lskat/lskat/lskat.cpp
diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index 0e808e0..51a5453 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -135,7 +135,7 @@
   newAction = KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection() );
   KStdGameAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
 
-  stopAction = new TDEAction( i18n("&Stop Search"), "stop", Key_S, TQT_TQOBJECT(this),
+  stopAction = new TDEAction( i18n("&Stop Search"), "process-stop", Key_S, TQT_TQOBJECT(this),
                             TQT_SLOT(stopSearch()), actionCollection(), "move_stop");
 
   backAction = new TDEAction( i18n("Take &Back"), "back",
diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp
index 8813d01..6981b44 100644
--- a/kjumpingcube/kjumpingcube.cpp
+++ b/kjumpingcube/kjumpingcube.cpp
@@ -83,7 +83,7 @@
   KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
   hintAction = KStdGameAction::hint(TQT_TQOBJECT(view), TQT_SLOT(getHint()), actionCollection());
-  stopAction = new TDEAction(i18n("Stop &Thinking"), "stop",
+  stopAction = new TDEAction(i18n("Stop &Thinking"), "process-stop",
   TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "game_stop");
   stopAction->setEnabled(false);
   undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index b344710..844eb74 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -164,7 +164,7 @@
             ID_TOOL_RIGHT, true, i18n("Shift right"));
 
     topToolbar->insertSeparator();
-    topToolbar->insertButton(loader->loadIcon("exit", TDEIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("system-log-out", TDEIcon::Toolbar),
             ID_META_EXIT, true, i18n("Exit"));
 
     // status in the toolbar for now (ick)
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 8ebef3f..df963cc 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -106,7 +106,7 @@
   pixmap = SmallIcon("redo");
   game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQT_SLOT(redo()), TQKeySequence( (TDEStdAccel::redo()).toString()));
   game_->insertSeparator();
-  pixmap = SmallIcon("exit");
+  pixmap = SmallIcon("system-log-out");
   game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (TDEStdAccel::quit()).toString()));
   menu_->insertItem(i18n("&Game"), game_);
 
diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index dab5612..4774855 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -161,7 +161,7 @@
   (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection(), "new_game");
   ACTION("new_game")->setStatusText(i18n("Starting a new game..."));
   ACTION("new_game")->setWhatsThis(i18n("Starting a new game..."));
-  (void)new TDEAction(i18n("&End Game"),"stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileEnd()),
+  (void)new TDEAction(i18n("&End Game"),"process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileEnd()),
                       actionCollection(), "end_game");
   ACTION("end_game")->setStatusText(i18n("Ending the current game..."));
   ACTION("end_game")->setWhatsThis(i18n("Aborts a currently played game. No winner will be declared."));
a3cffca6 2014-10-12 17:56:47 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegames
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c