diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp index 62d28a3f5ff..244fcf25ab8 100644 --- a/src/plugins/android/androidruncontrol.cpp +++ b/src/plugins/android/androidruncontrol.cpp @@ -29,8 +29,9 @@ #include "androidrunconfiguration.h" #include "androidrunner.h" +#include + #include -#include using namespace ProjectExplorer; @@ -43,7 +44,7 @@ AndroidRunControl::AndroidRunControl(AndroidRunConfiguration *rc) , m_running(false) { setRunnable(m_runner->runnable()); - setIcon(Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); } AndroidRunControl::~AndroidRunControl() diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 9559ce5be70..7209e1fdefb 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -41,7 +41,6 @@ #include #include -#include #include @@ -159,13 +158,13 @@ void TestResultsPane::createToolButtons() }); m_runAll = new QToolButton(m_treeView); - m_runAll->setIcon(ProjectExplorer::Icons::RUN_SMALL.icon()); + m_runAll->setIcon(Core::Icons::RUN_SMALL.icon()); m_runAll->setToolTip(tr("Run All Tests")); m_runAll->setEnabled(false); connect(m_runAll, &QToolButton::clicked, this, &TestResultsPane::onRunAllTriggered); m_runSelected = new QToolButton(m_treeView); - Utils::Icon runSelectedIcon = ProjectExplorer::Icons::RUN_SMALL; + Utils::Icon runSelectedIcon = Core::Icons::RUN_SMALL; foreach (const Utils::IconMaskAndColor &maskAndColor, Icons::RUN_SELECTED_OVERLAY) runSelectedIcon.append(maskAndColor); m_runSelected->setIcon(runSelectedIcon.icon()); @@ -174,7 +173,7 @@ void TestResultsPane::createToolButtons() connect(m_runSelected, &QToolButton::clicked, this, &TestResultsPane::onRunSelectedTriggered); m_stopTestRun = new QToolButton(m_treeView); - m_stopTestRun->setIcon(ProjectExplorer::Icons::STOP_SMALL.icon()); + m_stopTestRun->setIcon(Core::Icons::STOP_SMALL.icon()); m_stopTestRun->setToolTip(tr("Stop Test Run")); m_stopTestRun->setEnabled(false); connect(m_stopTestRun, &QToolButton::clicked, TestRunner::instance(), &TestRunner::requestStopTestRun); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 291038d870f..a6a223c0238 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -103,5 +103,11 @@ images/Desktop.png images/zoom.png images/zoom@2x.png + images/interrupt_small.png + images/interrupt_small@2x.png + images/run_small.png + images/run_small@2x.png + images/stop_small.png + images/stop_small@2x.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 5f64bf30fcc..9fa70f9ac33 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -140,6 +140,12 @@ const Icon ZOOM_TOOLBAR({ {QLatin1String(":/core/images/zoom.png"), Theme::IconsBaseColor}}); const Icon TOOLBAR_EXTENSION({ {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}}); +const Utils::Icon RUN_SMALL({ + {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}}); +const Utils::Icon STOP_SMALL({ + {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}}); +const Utils::Icon INTERRUPT_SMALL({ + {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}); const Icon MODE_EDIT_CLASSIC( QLatin1String(":/fancyactionbar/images/mode_Edit.png")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 1a9b3d2b84d..1a9a57ed1a4 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -87,6 +87,9 @@ CORE_EXPORT extern const Utils::Icon EXPAND; CORE_EXPORT extern const Utils::Icon ZOOM; CORE_EXPORT extern const Utils::Icon ZOOM_TOOLBAR; CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION; +CORE_EXPORT extern const Utils::Icon RUN_SMALL; +CORE_EXPORT extern const Utils::Icon STOP_SMALL; +CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL; CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT; diff --git a/src/plugins/projectexplorer/images/interrupt_small.png b/src/plugins/coreplugin/images/interrupt_small.png similarity index 100% rename from src/plugins/projectexplorer/images/interrupt_small.png rename to src/plugins/coreplugin/images/interrupt_small.png diff --git a/src/plugins/projectexplorer/images/interrupt_small@2x.png b/src/plugins/coreplugin/images/interrupt_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/interrupt_small@2x.png rename to src/plugins/coreplugin/images/interrupt_small@2x.png diff --git a/src/plugins/projectexplorer/images/run_small.png b/src/plugins/coreplugin/images/run_small.png similarity index 100% rename from src/plugins/projectexplorer/images/run_small.png rename to src/plugins/coreplugin/images/run_small.png diff --git a/src/plugins/projectexplorer/images/run_small@2x.png b/src/plugins/coreplugin/images/run_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/run_small@2x.png rename to src/plugins/coreplugin/images/run_small@2x.png diff --git a/src/plugins/projectexplorer/images/stop_small.png b/src/plugins/coreplugin/images/stop_small.png similarity index 100% rename from src/plugins/projectexplorer/images/stop_small.png rename to src/plugins/coreplugin/images/stop_small.png diff --git a/src/plugins/projectexplorer/images/stop_small@2x.png b/src/plugins/coreplugin/images/stop_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/stop_small@2x.png rename to src/plugins/coreplugin/images/stop_small@2x.png diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h index 30b333e4ecf..c12014220f1 100644 --- a/src/plugins/debugger/analyzer/analyzericons.h +++ b/src/plugins/debugger/analyzer/analyzericons.h @@ -32,7 +32,7 @@ namespace Debugger { namespace Icons { const Utils::Icon ANALYZER_CONTROL_START({ - {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}, {QLatin1String(":/images/analyzer_overlay_small.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_ANALYZE_CLASSIC( QLatin1String(":/images/mode_analyze.png")); diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 8a1b2699a83..3c94306ccc3 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -59,10 +59,10 @@ const Utils::Icon INTERRUPT_FLAT({ {QLatin1String(":/debugger/images/debugger_interrupt_mask.png"), Utils::Theme::IconsInterruptColor}, {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_INTERRUPT_SMALL({ - {QLatin1String(":/projectexplorer/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}, + {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}, {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_EXIT_SMALL({ - {QLatin1String(":/projectexplorer/images/stop_small.png"), Utils::Theme::IconsStopColor}, + {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}, {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon LOCATION( QLatin1String(":/debugger/images/location_16.png")); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index f90e71868e9..9f6e7917b34 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3539,7 +3539,7 @@ QAction *createStartAction() QAction *createStopAction() { auto action = new QAction(DebuggerMainWindow::tr("Stop"), DebuggerPlugin::instance()); - action->setIcon(ProjectExplorer::Icons::STOP_SMALL.icon()); + action->setIcon(Core::Icons::STOP_SMALL.icon()); action->setEnabled(true); return action; } diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp index 47e019a6e6b..237790fff3d 100644 --- a/src/plugins/ios/iosruncontrol.cpp +++ b/src/plugins/ios/iosruncontrol.cpp @@ -28,8 +28,9 @@ #include "iosrunconfiguration.h" #include "iosrunner.h" +#include + #include -#include using namespace ProjectExplorer; @@ -41,7 +42,7 @@ IosRunControl::IosRunControl(IosRunConfiguration *rc) , m_runner(new IosRunner(this, rc, false, QmlDebug::NoQmlDebugServices)) , m_running(false) { - setIcon(Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); } IosRunControl::~IosRunControl() diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 4084290281b..8346697f6c7 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -158,7 +158,7 @@ AppOutputPane::AppOutputPane() : setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine // Rerun - m_reRunButton->setIcon(Icons::RUN_SMALL.icon()); + m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon()); m_reRunButton->setToolTip(tr("Re-run this run-configuration")); m_reRunButton->setAutoRaise(true); m_reRunButton->setEnabled(false); @@ -166,7 +166,7 @@ AppOutputPane::AppOutputPane() : this, &AppOutputPane::reRunRunControl); // Stop - m_stopAction->setIcon(Icons::STOP_SMALL.icon()); + m_stopAction->setIcon(Core::Icons::STOP_SMALL.icon()); m_stopAction->setToolTip(tr("Stop")); m_stopAction->setEnabled(false); @@ -644,7 +644,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning m_zoomOutButton->setEnabled(true); } else { m_reRunButton->setEnabled(false); - m_reRunButton->setIcon(Icons::RUN_SMALL.icon()); + m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon()); m_attachButton->setEnabled(false); m_attachButton->setToolTip(msgAttachDebuggerTooltip()); m_stopAction->setEnabled(false); diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp index 879e543134b..2e99c51b18b 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -28,10 +28,11 @@ #include "environmentaspect.h" #include -#include #include #include +#include + #include #include @@ -62,7 +63,7 @@ LocalApplicationRunControl::LocalApplicationRunControl(RunConfiguration *rc, Cor : RunControl(rc, mode) { setRunnable(rc->runnable()); - setIcon(Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); connect(&m_applicationLauncher, &ApplicationLauncher::appendMessage, this, static_cast(&RunControl::appendMessage)); connect(&m_applicationLauncher, &ApplicationLauncher::processStarted, diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 7644bf03f04..7f16707f066 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -105,6 +105,7 @@ #include #include #include +#include #include #include #include @@ -698,7 +699,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ActionContainer *runMenu = ActionManager::createMenu(Constants::RUNMENUCONTEXTMENU); runMenu->setOnAllDisabledBehavior(ActionContainer::Hide); QIcon runIcon = Utils::Icon::sideBarIcon(Icons::RUN, Icons::RUN_FLAT); - runIcon.addPixmap(Icons::RUN_SMALL.pixmap()); + runIcon.addPixmap(Core::Icons::RUN_SMALL.pixmap()); runMenu->menu()->setIcon(runIcon); runMenu->menu()->setTitle(tr("Run")); msubProjectContextMenu->addMenu(runMenu, ProjectExplorer::Constants::G_PROJECT_RUN); @@ -896,7 +897,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); // cancel build action - dd->m_cancelBuildAction = new QAction(Icons::STOP_SMALL.icon(), tr("Cancel Build"), this); + dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL.icon(), tr("Cancel Build"), this); cmd = ActionManager::registerAction(dd->m_cancelBuildAction, Constants::CANCELBUILD); mbuild->addAction(cmd, Constants::G_BUILD_CANCEL); diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 7338b5ce784..6d9310c46fc 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -20,8 +20,6 @@ images/run@2x.png images/run_mask.png images/run_mask@2x.png - images/run_small.png - images/run_small@2x.png images/debugger_overlay_small.png images/debugger_overlay_small@2x.png images/session.png @@ -50,10 +48,6 @@ images/targetpanel_bottom.png images/targetpanel_gradient.png images/window.png - images/stop_small.png - images/stop_small@2x.png - images/interrupt_small.png - images/interrupt_small@2x.png images/continue_1_small.png images/continue_1_small@2x.png images/continue_2_small.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 2d1284cad5c..384be59100f 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -55,7 +55,7 @@ const Utils::Icon DEBUG_START_FLAT({ {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunColor}, {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon DEBUG_START_SMALL({ - {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}, + {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}, {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}}); const Utils::Icon BUILDSTEP_MOVEUP({ @@ -72,18 +72,12 @@ const Utils::Icon DESKTOP_DEVICE({ const Utils::Icon DESKTOP_DEVICE_SMALL({ {QLatin1String(":/projectexplorer/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); -const Utils::Icon RUN_SMALL({ - {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}}); -const Utils::Icon STOP_SMALL({ - {QLatin1String(":/projectexplorer/images/stop_small.png"), Utils::Theme::IconsStopColor}}); const Utils::Icon MODE_PROJECT_CLASSIC( QLatin1String(":/projectexplorer/images/mode_project.png")); const Utils::Icon MODE_PROJECT_FLAT({ {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_PROJECT_FLAT_ACTIVE({ {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsModeProjetcsActiveColor}}); -const Utils::Icon INTERRUPT_SMALL({ - {QLatin1String(":/projectexplorer/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}); } // namespace Icons } // namespace ProjectExplorer diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 92648cdad3a..efa90579972 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -47,7 +48,6 @@ #include #include #include -#include #include @@ -1061,7 +1061,7 @@ RunControl *PythonRunControlFactory::create(RunConfiguration *runConfiguration, PythonRunControl::PythonRunControl(PythonRunConfiguration *rc, Core::Id mode) : RunControl(rc, mode), m_running(false) { - setIcon(ProjectExplorer::Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); m_interpreter = rc->interpreter(); m_mainScript = rc->mainScript(); diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp index 63d4012679a..9108b8597d2 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp @@ -25,8 +25,9 @@ #include "remotelinuxruncontrol.h" +#include + #include -#include using namespace ProjectExplorer; @@ -42,7 +43,7 @@ public: RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc) : RunControl(rc, ProjectExplorer::Constants::NORMAL_RUN_MODE), d(new RemoteLinuxRunControlPrivate) { - setIcon(ProjectExplorer::Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); setRunnable(rc->runnable()); d->running = false; diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 0caf1cad0ec..182106f7e38 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -71,7 +71,6 @@ #include #include -#include #include #include #include @@ -371,7 +370,7 @@ CallgrindTool::CallgrindTool(QObject *parent) // pause action m_pauseAction = action = new QAction(this); action->setCheckable(true); - action->setIcon(ProjectExplorer::Icons::INTERRUPT_SMALL.icon()); + action->setIcon(Core::Icons::INTERRUPT_SMALL.icon()); //action->setText(tr("Ignore")); action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling.")); connect(action, &QAction::toggled, this, &CallgrindTool::pauseToggled); diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp index 9fad1e879f2..d8be5885ea4 100644 --- a/src/plugins/winrt/winrtruncontrol.cpp +++ b/src/plugins/winrt/winrtruncontrol.cpp @@ -29,6 +29,7 @@ #include "winrtrunconfiguration.h" #include "winrtrunnerhelper.h" +#include #include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include #include @@ -56,7 +56,7 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, Core:: , m_state(StoppedState) , m_runner(0) { - setIcon(ProjectExplorer::Icons::RUN_SMALL); + setIcon(Core::Icons::RUN_SMALL); } void WinRtRunControl::start() diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 263f02d7480..e2d680e5c68 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2155,7 +2155,7 @@ style="fill:#000000;fill-opacity:1;stroke:none" /> + id="src/plugins/coreplugin/images/interrupt_small">