Branch: master

da2bf89b 2014-10-12 17:48:50 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/kpicosim.cpp
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index e5de4ef..a5d7d64 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -133,7 +133,7 @@
 	m_debugBar = new TDEToolBar( this ) ;
 	addDockWindow( m_debugBar ) ;
 	m_debugBar->insertButton( UserIcon( "rebuild" ), COMPILE_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( compile() ), true, "Compile" ) ;
-	m_debugBar->insertButton( "run", START_SIM_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startSim() ), true, "Start/Stop Debug" ) ;
+	m_debugBar->insertButton( "system-run", START_SIM_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startSim() ), true, "Start/Stop Debug" ) ;
 	m_debugBar->insertSeparator() ;
 	m_debugBar->insertButton( UserIcon( "continue" ), RUN_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startStop() ), false, "Continue" ) ;
 
@@ -211,7 +211,7 @@
 	m_debugMenu = new TDEPopupMenu( this ) ;
 	m_debugMenu->insertSeparator() ;
 	m_debugMenu->insertItem( ldr->loadIcon( "rebuild", TDEIcon::Small ), "Compile", TQT_TQOBJECT(this), TQT_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ;
-	m_debugMenu->insertItem( ldr->loadIcon( "run", TDEIcon::Small ), "Start Debug", TQT_TQOBJECT(this), TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ;
+	m_debugMenu->insertItem( ldr->loadIcon( "system-run", TDEIcon::Small ), "Start Debug", TQT_TQOBJECT(this), TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ;
 
 	m_debugMenu->insertSeparator() ;
 	m_debugMenu->insertItem( "Continue", TQT_TQOBJECT(this), TQT_SLOT( startStop() ), TQKeySequence( "F10" ) , RUN_ID ) ;
@@ -538,7 +538,7 @@
 	if ( !m_simulationMode ) {
 		if ( compile() ) {
 			setCaption( m_editor->getFilename() + " [Debugging]" ) ;
-			m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "stop", TDEIcon::Small ), "Stop Debug" ) ;
+			m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "process-stop", TDEIcon::Small ), "Stop Debug" ) ;
 			m_debugBar->setButton( START_SIM_ID, true ) ;
 
 			m_simulator->reset() ;
@@ -548,20 +548,20 @@
 	} else {
 		if ( m_simulator->isRunning() )
 			startStop() ;
-			
+
 		setCaption( m_editor->getFilename() ) ;
-		m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "run", TDEIcon::Small ), "Start Debug" ) ;
+		m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "system-run", TDEIcon::Small ), "Start Debug" ) ;
 		m_debugBar->setButton( START_SIM_ID, false ) ;
 		m_editor->clearExecutionMarker() ;
 		m_simulationMode = FALSE ;
 	}
-	
+
 	if ( m_simulationMode ) {
 		statusBar()->changeItem( TQString( "Mode: Debug" ), 0 ) ;
 	} else {
 		statusBar()->changeItem( TQString( "Mode: Edit" ), 0 ) ;
 	}
-	
+
 	m_debugMenu->setItemEnabled( RUN_ID, m_simulationMode ) ;
 	m_debugMenu->setItemEnabled( NEXT_ID, m_simulationMode ) ;
 	m_debugMenu->setItemEnabled( INTERRUPT_ID, m_simulationMode ) ;
a87e819d 2014-10-12 17:54:11 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kpicosim
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c