From e42dd1eb70ff33205e3e963df16a543303966f8f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 25 Apr 2016 17:50:35 +0200 Subject: [PATCH] Move "Clear/Clean" icon from ProjectExplorer to Core And use it in the menu entry for "Window->Output Panes->Clear" Change-Id: Iff8c011fde8a21fd10bf52b35163eb3f63659153 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/coreicons.cpp | 4 +++- src/plugins/coreplugin/coreicons.h | 3 ++- src/plugins/coreplugin/outputpanemanager.cpp | 3 ++- src/plugins/cppeditor/cppinsertvirtualmethods.cpp | 2 +- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- src/plugins/projectexplorer/projectexplorericons.h | 2 -- src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 1a7c76e7e8d..831e0e05700 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -95,7 +95,9 @@ const Icon PREV_TOOLBAR({ {QLatin1String(":/core/images/prev.png"), Theme::IconsNavigationArrowsColor}}); const Icon MAGNIFIER({ {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint); -const Icon CLEAN_PANE({ +const Icon CLEAN({ + {QLatin1String(":/core/images/clean_pane_small.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); +const Icon CLEAN_TOOLBAR({ {QLatin1String(":/core/images/clean_pane_small.png"), Theme::IconsBaseColor}}); const Icon RELOAD({ {QLatin1String(":/core/images/reload_gray.png"), Theme::IconsBaseColor}}); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 3861200654f..cff021968d5 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -65,7 +65,8 @@ CORE_EXPORT extern const Utils::Icon NEXT_TOOLBAR; CORE_EXPORT extern const Utils::Icon PREV; CORE_EXPORT extern const Utils::Icon PREV_TOOLBAR; CORE_EXPORT extern const Utils::Icon MAGNIFIER; -CORE_EXPORT extern const Utils::Icon CLEAN_PANE; +CORE_EXPORT extern const Utils::Icon CLEAN; +CORE_EXPORT extern const Utils::Icon CLEAN_TOOLBAR; CORE_EXPORT extern const Utils::Icon RELOAD; CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR; CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR_TOOLBAR; diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 0041ef63e53..06dde54466d 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -140,7 +140,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : m_titleLabel->setContentsMargins(5, 0, 5, 0); m_clearAction = new QAction(this); - m_clearAction->setIcon(Icons::CLEAN_PANE.icon()); + m_clearAction->setIcon(Icons::CLEAN.icon()); m_clearAction->setText(tr("Clear")); connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage); @@ -227,6 +227,7 @@ void OutputPaneManager::init() cmd = ActionManager::registerAction(m_clearAction, "Coreplugin.OutputPane.clear"); m_clearButton->setDefaultAction(cmd->action()); + m_clearButton->setIcon(Icons::CLEAN_TOOLBAR.icon()); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup"); cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem"); diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index a044b3b42e3..56e7f76d6d2 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -1023,7 +1023,7 @@ void InsertVirtualMethodsDialog::initGui() m_overrideReplacementComboBox, &QComboBox::setEnabled); QAction *clearUserAddedReplacements = new QAction(this); - clearUserAddedReplacements->setIcon(Core::Icons::CLEAN_PANE.icon()); + clearUserAddedReplacements->setIcon(Core::Icons::CLEAN_TOOLBAR.icon()); clearUserAddedReplacements->setText(tr("Clear Added \"override\" Equivalents")); connect(clearUserAddedReplacements, &QAction::triggered, [this]() { m_availableOverrideReplacements = defaultOverrideReplacements(); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index c522df17068..2d813cd2099 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -841,7 +841,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); // clean session - dd->m_cleanSessionAction = new QAction(Icons::CLEAN.icon(), tr("Clean All"), this); + dd->m_cleanSessionAction = new QAction(Core::Icons::CLEAN.icon(), tr("Clean All"), this); cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION); mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 23e665ac4d5..72cbda74d6d 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -37,8 +37,6 @@ const Utils::Icon BUILD_FLAT({ {QLatin1String(":/projectexplorer/images/build_hammerhead_mask.png"), Utils::Theme::IconsBuildHammerHeadColor}}); const Utils::Icon BUILD_SMALL( QLatin1String(":/projectexplorer/images/build_small.png")); -const Utils::Icon CLEAN({ - {QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); const Utils::Icon REBUILD({ {QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor}, {QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 729083aafa5..084fa2cb0bf 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -205,7 +205,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent) setRecording(d->m_profilerState->clientRecording()); d->m_clearButton = new QToolButton; - d->m_clearButton->setIcon(Core::Icons::CLEAN_PANE.icon()); + d->m_clearButton->setIcon(Core::Icons::CLEAN_TOOLBAR.icon()); d->m_clearButton->setToolTip(tr("Discard data")); connect(d->m_clearButton, &QAbstractButton::clicked, [this](){