| d06bb8b5 | 2014-10-12 17:52:16 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M languages/ada/problemreporter.cpp M languages/cpp/debugger/debuggerpart.cpp M languages/cpp/problemreporter.cpp M languages/java/problemreporter.cpp M languages/pascal/problemreporter.cpp M languages/php/phperrorview.cpp M languages/ruby/debugger/debuggerpart.cpp M lib/widgets/kdevhtmlpart.cpp M parts/filelist/filelist_item.cpp M src/mainwindowshare.cpp M src/simplemainwindow.cpp |
||
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 6bac025..1e97ad7 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -266,7 +266,7 @@
if( !iface )
return;
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
void ProblemReporter::slotPartRemoved( KParts::Part* part )
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 3cae376..380e7ac 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -111,7 +111,7 @@
"breakpoint item allows you to change "
"the breakpoint and will take you "
"to the source in the editor window."));
- gdbBreakpointWidget->setIcon( SmallIcon("stop") );
+ gdbBreakpointWidget->setIcon( SmallIcon("process-stop") );
mainWindow()->embedOutputView(gdbBreakpointWidget, i18n("Breakpoints"), i18n("Debugger breakpoints"));
variableWidget = new VariableWidget( controller,
@@ -207,7 +207,7 @@
action->setEnabled(false);
- action = new TDEAction(i18n("Sto&p"), "stop", 0,
+ action = new TDEAction(i18n("Sto&p"), "process-stop", 0,
this, TQT_SLOT(slotStop()),
actionCollection(), "debug_stop");
action->setToolTip( i18n("Stop debugger") );
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index eed7a5b..c4143d0 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -162,7 +162,7 @@
{
if ( KTextEditor::MarkInterfaceExtension* iface = dynamic_cast<KTextEditor::MarkInterfaceExtension*>( it.current() ) )
{
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
++it;
}
@@ -404,7 +404,7 @@
if( !iface )
return;
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
TQString ProblemReporter::levelToString( int level ) const
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 4d4f47a..e1fc417 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -250,7 +250,7 @@
if( !iface )
return;
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
void ProblemReporter::slotPartRemoved( KParts::Part* part )
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 2b47706..d0aaf01 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -273,7 +273,7 @@
if( !iface )
return;
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
void ProblemReporter::slotPartRemoved( KParts::Part* part )
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 9af14b0..2ee5bbf 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -356,7 +356,7 @@
if ( !iface )
return;
- iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("stop") );
+ iface->setPixmap( KTextEditor::MarkInterface::markType07, SmallIcon("process-stop") );
}
void PHPErrorView::slotPartRemoved( KParts::Part* part )
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 35e6a2d..b3f91d7 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -115,7 +115,7 @@
"breakpoint item allows you to change "
"the breakpoint and will take you "
"to the source in the editor window."));
- rdbBreakpointWidget->setIcon( SmallIcon("stop") );
+ rdbBreakpointWidget->setIcon( SmallIcon("process-stop") );
mainWindow()->embedOutputView(rdbBreakpointWidget, i18n("Breakpoints"), i18n("Debugger breakpoints"));
framestackWidget = new FramestackWidget( 0, "rdbFramestackWidget" );
@@ -170,7 +170,7 @@
"while it is running, in order to get information "
"about variables, frame stack, and so on.") );
- action = new TDEAction(i18n("Sto&p"), "stop", 0,
+ action = new TDEAction(i18n("Sto&p"), "process-stop", 0,
this, TQT_SLOT(slotStop()),
actionCollection(), "debug_stop");
action->setToolTip( i18n("Stop debugger") );
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 76697cf..8d5ebd7 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -35,7 +35,7 @@
reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0,
this, TQT_SLOT( slotReload() ), actions, "doc_reload" );
reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document."));
- stopAction = new TDEAction( i18n( "Stop" ), "stop", 0,
+ stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0,
this, TQT_SLOT( slotStop() ), actions, "doc_stop" );
stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document."));
duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window_new", 0,
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index 16ab77b..68eda40 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -57,7 +57,7 @@
setPixmap( 0, SmallIcon("revert") );
break;
case DirtyAndModified:
- setPixmap( 0, SmallIcon("stop") );
+ setPixmap( 0, SmallIcon("process-stop") );
break;
}
}
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index a06dba1..619b3ab 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -109,7 +109,7 @@
TDEAction* action;
- m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "stop",
+ m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "process-stop",
Key_Escape, this, TQT_SLOT(slotStopButtonPressed()),
m_pMainWnd->actionCollection(), "stop_processes" );
m_stopProcesses->setToolTip(i18n("Stop"));
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 6ca92ef..b252bf0 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -578,7 +578,7 @@
widget->setIcon(SmallIcon("revert", isize));
break;
case DirtyAndModified:
- widget->setIcon(SmallIcon("stop", isize));
+ widget->setIcon(SmallIcon("process-stop", isize));
break;
}
}
|
||
| 355c1149 | 2014-10-12 17:57:10 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||