Branch: master

75cfc55a 2014-10-12 17:51:05 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kig/kig/kig_part.cpp
M klatin/klatin/klatin.cpp
M kpercentage/kpercentage/kpercentage.cpp
M kturtle/src/kturtle.cpp
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 3d830a7..393ccfb 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -233,7 +233,7 @@
   aDeleteObjects->setToolTip(i18n("Delete the selected objects"));
 
   aCancelConstruction = new TDEAction(
-      i18n("Cancel Construction"), "stop", Key_Escape, this,
+      i18n("Cancel Construction"), "process-stop", Key_Escape, this,
       TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction");
   aCancelConstruction->setToolTip(
       i18n("Cancel the construction of the object being constructed"));
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 7788ade..dc393c4 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -184,7 +184,7 @@
 	// various options that are available to choose
 	// and setCentralWidget it.
 	klatinchoose = new KLatinChoose(this);
-	klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("exit", TDEIcon::Small));
+	klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("system-log-out", TDEIcon::Small));
 	klatinchoose->show();
 	setCentralWidget(klatinchoose);
 
diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp
index 1ca0419..0a61aff 100644
--- a/kpercentage/kpercentage/kpercentage.cpp
+++ b/kpercentage/kpercentage/kpercentage.cpp
@@ -89,7 +89,7 @@
 	KHelpMenu *help_menu = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), true );
 	button_help->setPopup( ( TQPopupMenu* ) ( help_menu->menu() ) );
     KPushButton *button_close = new KPushButton( i18n( "E&xit" ), this );
-    button_close->setIconSet( TQIconSet( icon_loader.loadIcon( "exit", TDEIcon::NoGroup, 32 ) ) );
+    button_close->setIconSet( TQIconSet( icon_loader.loadIcon( "system-log-out", TDEIcon::NoGroup, 32 ) ) );
 
     combo_box_level = new KComboBox( this );
     combo_box_level->insertItem( i18n( "Easy" ) );
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index e2080af..7170c74 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -138,7 +138,7 @@
 	pause = new TDEToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause");
 	pause->setChecked(false);
 	pause->setEnabled(false);
-	stop = new TDEAction(i18n("Stop E&xecution"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop");
+	stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop");
 	stop->setEnabled(false);
 	KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), ac);
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
210e566c 2014-10-12 17:56:44 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeedu
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c