Branch: master

a6ac7e8c 2014-10-12 17:49:05 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/electronics/components/piccomponent.cpp
M src/ktechlab.cpp
M src/textview.cpp
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 9ee429d..30f946f 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -84,7 +84,7 @@
 	
 	addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", TDEIcon::Small ) );
 	addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", TDEIcon::Small ) );
-	addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "stop", TDEIcon::Small ) );
+	addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ) );
 	addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) );
 	
 	if ( icnDocument->ktechlab() )
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index a5c3531..0e66f42 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -558,7 +558,7 @@
 	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", TDEIcon::Small ), i18n("&Insert Into"), 0 );
 	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", TDEIcon::Small ), i18n("&Copy Into"), 1 );
 	dropMenu.insertSeparator();
-	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "stop", TDEIcon::Small ), i18n("C&ancel"), 2 );
+	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ), i18n("C&ancel"), 2 );
 	
 	connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) );
 // 	dropMenu.exec(e->pos() + widget->pos() );
diff --git a/src/textview.cpp b/src/textview.cpp
index 96c0095..396382f 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -74,7 +74,7 @@
 	new TDEAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
 	new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
 	new TDEAction( i18n("Interrupt"), "player_pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
-	new TDEAction( i18n("Stop"), "stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
+	new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
 	new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" );
 	new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" );
 	new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQT_SLOT(debugStepOut()), ac, "debug_step_out" );
d1ab2fcc 2014-10-12 17:54:35 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/ktechlab
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c