Commit 9373f76b authored by Alessandro Portale's avatar Alessandro Portale

Icons: Move Run/Stop/Interrupt from projectexplorer to core

Change-Id: Iba65c2ede538049c9b203fd4c2f99ef552019862
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent a792f37c
......@@ -29,8 +29,9 @@
#include "androidrunconfiguration.h"
#include "androidrunner.h"
#include <coreplugin/coreicons.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
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()
......
......@@ -41,7 +41,6 @@
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorericons.h>
#include <texteditor/texteditor.h>
......@@ -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);
......
......@@ -103,5 +103,11 @@
<file>images/Desktop.png</file>
<file>images/zoom.png</file>
<file>images/zoom@2x.png</file>
<file>images/interrupt_small.png</file>
<file>images/interrupt_small@2x.png</file>
<file>images/run_small.png</file>
<file>images/run_small@2x.png</file>
<file>images/stop_small.png</file>
<file>images/stop_small@2x.png</file>
</qresource>
</RCC>
......@@ -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"));
......
......@@ -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;
......
......@@ -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"));
......
......@@ -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"));
......
......@@ -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;
}
......
......@@ -28,8 +28,9 @@
#include "iosrunconfiguration.h"
#include "iosrunner.h"
#include <coreplugin/coreicons.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
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()
......
......@@ -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);
......
......@@ -28,10 +28,11 @@
#include "environmentaspect.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h>
#include <coreplugin/coreicons.h>
#include <utils/qtcassert.h>
#include <QDir>
......@@ -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<void(RunControl::*)(const QString &, Utils::OutputFormat)>(&RunControl::appendMessage));
connect(&m_applicationLauncher, &ApplicationLauncher::processStarted,
......
......@@ -105,6 +105,7 @@
#include <coreplugin/idocumentfactory.h>
#include <coreplugin/idocument.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/imode.h>
#include <coreplugin/modemanager.h>
......@@ -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);
......
......@@ -20,8 +20,6 @@
<file>images/run@2x.png</file>
<file>images/run_mask.png</file>
<file>images/run_mask@2x.png</file>
<file>images/run_small.png</file>
<file>images/run_small@2x.png</file>
<file>images/debugger_overlay_small.png</file>
<file>images/debugger_overlay_small@2x.png</file>
<file>images/session.png</file>
......@@ -50,10 +48,6 @@
<file>images/targetpanel_bottom.png</file>
<file>images/targetpanel_gradient.png</file>
<file>images/window.png</file>
<file>images/stop_small.png</file>
<file>images/stop_small@2x.png</file>
<file>images/interrupt_small.png</file>
<file>images/interrupt_small@2x.png</file>
<file>images/continue_1_small.png</file>
<file>images/continue_1_small@2x.png</file>
<file>images/continue_2_small.png</file>
......
......@@ -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
......@@ -30,6 +30,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/fileiconprovider.h>
#include <coreplugin/id.h>
......@@ -47,7 +48,6 @@
#include <projectexplorer/target.h>
#include <projectexplorer/iprojectmanager.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/projectexplorericons.h>
#include <texteditor/texteditorconstants.h>
......@@ -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();
......
......@@ -25,8 +25,9 @@
#include "remotelinuxruncontrol.h"
#include <coreplugin/coreicons.h>
#include <projectexplorer/devicesupport/deviceapplicationrunner.h>
#include <projectexplorer/projectexplorericons.h>
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;
......
......@@ -71,7 +71,6 @@
#include <utils/qtcassert.h>
#include <utils/styledbar.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projecttree.h>
......@@ -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);
......
......@@ -29,6 +29,7 @@
#include "winrtrunconfiguration.h"
#include "winrtrunnerhelper.h"
#include <coreplugin/coreicons.h>
#include <coreplugin/idocument.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/buildconfiguration.h>
......@@ -36,7 +37,6 @@
#include <projectexplorer/target.h>
#include <projectexplorer/project.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorericons.h>
#include <qtsupport/qtkitinformation.h>
#include <QTimer>
......@@ -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()
......
......@@ -2155,7 +2155,7 @@
style="fill:#000000;fill-opacity:1;stroke:none" />
</g>
<g
id="src/plugins/projectexplorer/images/run_small"
id="src/plugins/coreplugin/images/run_small"
transform="translate(112,0)">
<rect
id="rect4901-1"
......@@ -2171,7 +2171,7 @@
style="fill:#000000;fill-opacity:1;stroke:none" />
</g>
<g
id="src/plugins/projectexplorer/images/stop_small"
id="src/plugins/coreplugin/images/stop_small"
transform="translate(112,0)">
<rect
id="rect4907-4"
......@@ -2190,7 +2190,7 @@
</g>
<g
transform="translate(128,0)"
id="src/plugins/projectexplorer/images/interrupt_small">
id="src/plugins/coreplugin/images/interrupt_small">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
x="265"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment