Core: Unify the close icons

Use the same image file and recolor it as needed,

Change-Id: I914819a53ca05d83ca5b88adf44706b460b48ac0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

19 files changed, 22 insertions, 29 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 88f39fe78a..720770958a 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -2,9 +2,6 @@
     <qresource prefix="/core">
         <file>images/clean_pane_small.png</file>
         <file>images/clean_pane_small@2x.png</file>
-        <file>images/clear.png</file>
-        <file>images/clear@2x.png</file>
-        <file>images/closebutton.png</file>
         <file>images/compile_error_taskbar.png</file>
         <file>images/compile_error_taskbar@2x.png</file>
         <file>images/dir.png</file>
@@ -21,6 +18,8 @@
         <file>images/inputfield@2x.png</file>
         <file>images/inputfield_disabled.png</file>
         <file>images/inputfield_disabled@2x.png</file>
+        <file>images/close.png</file>
+        <file>images/close@2x.png</file>
         <file>images/linkicon.png</file>
         <file>images/linkicon@2x.png</file>
         <file>images/locked.png</file>
@@ -62,8 +61,6 @@
         <file>images/unlocked@2x.png</file>
         <file>images/extension.png</file>
         <file>images/extension@2x.png</file>
-        <file>images/darkclosebutton.png</file>
-        <file>images/darkclosebutton@2x.png</file>
         <file>images/category_core.png</file>
         <file>images/category_texteditor.png</file>
         <file>images/category_design.png</file>
@@ -91,8 +88,6 @@
         <file>images/category_locator.png</file>
         <file>images/filtericon.png</file>
         <file>images/filtericon@2x.png</file>
-        <file>images/button_close.png</file>
-        <file>images/button_close@2x.png</file>
         <file>images/splitbutton_closebottom.png</file>
         <file>images/splitbutton_closebottom@2x.png</file>
         <file>images/splitbutton_closeleft.png</file>
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index 0e7922521d..0007527530 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -54,14 +54,8 @@ const Utils::Icon CUT(
         QLatin1String(":/core/images/editcut.png"));
 const Utils::Icon DIR(
         QLatin1String(":/core/images/dir.png"));
-const Utils::Icon CLEAR(
-        QLatin1String(":/core/images/clear.png"));
 const Utils::Icon RESET(
         QLatin1String(":/core/images/reset.png"));
-const Utils::Icon CLOSE_BUTTON(
-        QLatin1String(":/core/images/closebutton.png"));
-const Utils::Icon DARK_CLOSE_BUTTON(
-        QLatin1String(":/core/images/darkclosebutton.png"));
 const Utils::Icon DARK_CLOSE(
         QLatin1String(":/core/images/darkclose.png"));
 const Utils::Icon LOCKED(
@@ -99,12 +93,16 @@ const Utils::Icon MAGNIFIER({
         {QLatin1String(":/core/images/magnifier.png"), Utils::Theme::BackgroundColorHover}}, Utils::Icon::Style::Tinted);
 const Utils::Icon CLEAN_PANE({
         {QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon RELOAD_GRAY({
+const Utils::Icon RELOAD({
         {QLatin1String(":/core/images/reload_gray.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon TOGGLE_SIDEBAR({
         {QLatin1String(":/core/images/sidebaricon.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon BUTTON_CLOSE({
-        {QLatin1String(":/core/images/button_close.png"), Utils::Theme::IconsBaseColor}});
+const Utils::Icon CLOSE_TOOLBAR({
+        {QLatin1String(":/core/images/close.png"), Utils::Theme::IconsBaseColor}});
+const Utils::Icon CLOSE_FOREGROUND({
+        {QLatin1String(":/core/images/close.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Style::Tinted);
+const Utils::Icon CLOSE_BACKGROUND({
+        {QLatin1String(":/core/images/close.png"), Utils::Theme::PanelTextColorLight}}, Utils::Icon::Style::Tinted);
 const Utils::Icon SPLIT_HORIZONTAL({
         {QLatin1String(":/core/images/splitbutton_horizontal.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon SPLIT_VERTICAL({
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 900d808293..222c06352c 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -152,7 +152,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
     d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu);
 
     d->m_closeEditorButton->setAutoRaise(true);
-    d->m_closeEditorButton->setIcon(Icons::BUTTON_CLOSE.icon());
+    d->m_closeEditorButton->setIcon(Icons::CLOSE_TOOLBAR.icon());
     d->m_closeEditorButton->setEnabled(false);
     d->m_closeEditorButton->setProperty("showborder", true);
 
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index a3d951d5b5..e056ce91c1 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -967,13 +967,13 @@ void FindToolBar::setLightColoredIcon(bool lightColored)
         m_ui.findNextButton->setArrowType(Qt::RightArrow);
         m_ui.findPreviousButton->setIcon(QIcon());
         m_ui.findPreviousButton->setArrowType(Qt::LeftArrow);
-        m_ui.close->setIcon(Icons::DARK_CLOSE.icon());
+        m_ui.close->setIcon(Icons::CLOSE_FOREGROUND.icon());
     } else {
         m_ui.findNextButton->setIcon(Icons::NEXT.icon());
         m_ui.findNextButton->setArrowType(Qt::NoArrow);
         m_ui.findPreviousButton->setIcon(Icons::PREV.icon());
         m_ui.findPreviousButton->setArrowType(Qt::NoArrow);
-        m_ui.close->setIcon(Icons::BUTTON_CLOSE.icon());
+        m_ui.close->setIcon(Icons::CLOSE_TOOLBAR.icon());
     }
 }
 
diff --git a/src/plugins/coreplugin/images/clear.png b/src/plugins/coreplugin/images/clear.png
deleted file mode 100644
index 8ffce20c5e..0000000000
--- a/src/plugins/coreplugin/images/clear.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/clear@2x.png b/src/plugins/coreplugin/images/clear@2x.png
deleted file mode 100644
index 459418c04d..0000000000
--- a/src/plugins/coreplugin/images/clear@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/button_close.png b/src/plugins/coreplugin/images/close.png
index dfe3144d14..dfe3144d14 100644
--- a/src/plugins/coreplugin/images/button_close.png
+++ b/src/plugins/coreplugin/images/close.png
diff --git a/src/plugins/coreplugin/images/button_close@2x.png b/src/plugins/coreplugin/images/close@2x.png
index 3e2f1a706a..3e2f1a706a 100644
--- a/src/plugins/coreplugin/images/button_close@2x.png
+++ b/src/plugins/coreplugin/images/close@2x.png
diff --git a/src/plugins/coreplugin/images/closebutton.png b/src/plugins/coreplugin/images/closebutton.png
deleted file mode 100644
index c978cf51aa..0000000000
--- a/src/plugins/coreplugin/images/closebutton.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkclosebutton.png b/src/plugins/coreplugin/images/darkclosebutton.png
deleted file mode 100644
index 147a954bea..0000000000
--- a/src/plugins/coreplugin/images/darkclosebutton.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkclosebutton@2x.png b/src/plugins/coreplugin/images/darkclosebutton@2x.png
deleted file mode 100644
index 921d3a7fb7..0000000000
--- a/src/plugins/coreplugin/images/darkclosebutton@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp
index 8980ff4ebe..4cb2743122 100644
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -251,7 +251,7 @@ void InfoBarDisplay::update()
 
         if (info.cancelButtonText.isEmpty()) {
             infoWidgetCloseButton->setAutoRaise(true);
-            infoWidgetCloseButton->setIcon(Icons::CLEAR.icon());
+            infoWidgetCloseButton->setIcon(Icons::CLOSE_FOREGROUND.icon());
             infoWidgetCloseButton->setToolTip(tr("Close"));
             if (infoWidgetSuppressButton)
                 hbox->addWidget(infoWidgetSuppressButton);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 548f4734f6..f3f409c38f 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -139,7 +139,7 @@ ManhattanStylePrivate::ManhattanStylePrivate() :
     lineeditImage(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield.png"))),
     lineeditImage_disabled(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield_disabled.png"))),
     extButtonPixmap(Core::Icons::TOOLBAR_EXTENSION.pixmap()),
-    closeButtonPixmap(Core::Icons::CLOSE_BUTTON.pixmap())
+    closeButtonPixmap(Core::Icons::CLOSE_FOREGROUND.pixmap())
 {
 }
 
diff --git a/src/plugins/coreplugin/opendocumentstreeview.cpp b/src/plugins/coreplugin/opendocumentstreeview.cpp
index 4cc3032e82..e82eb31fa4 100644
--- a/src/plugins/coreplugin/opendocumentstreeview.cpp
+++ b/src/plugins/coreplugin/opendocumentstreeview.cpp
@@ -88,8 +88,8 @@ void OpenDocumentsDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 
     if (closeButtonVisible && index.column() == 1 && option.state & QStyle::State_MouseOver) {
         const QIcon icon = (option.state & QStyle::State_Selected) ?
-                    Icons::CLOSE_BUTTON.icon()
-                  : Icons::DARK_CLOSE_BUTTON.icon();
+                    Icons::CLOSE_BACKGROUND.icon()
+                  : Icons::CLOSE_FOREGROUND.icon();
 
         QRect iconRect(option.rect.right() - option.rect.height(),
                        option.rect.top(),
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index f01be54dec..908d542022 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -287,7 +287,7 @@ DiffEditor::DiffEditor()
     m_toggleDescriptionAction = m_toolBar->addAction(Icons::TOP_BAR.icon(), QString());
     m_toggleDescriptionAction->setCheckable(true);
 
-    m_reloadAction = m_toolBar->addAction(Core::Icons::RELOAD_GRAY.icon(), tr("Reload Diff"));
+    m_reloadAction = m_toolBar->addAction(Core::Icons::RELOAD.icon(), tr("Reload Diff"));
     m_reloadAction->setToolTip(tr("Reload Diff"));
 
     m_toggleSyncAction = m_toolBar->addAction(Core::Icons::LINK.icon(), QString());
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 6ecaa9c362..fc75ab3dda 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -250,7 +250,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     }
 
     if (style != ExternalWindow) {
-        m_closeAction = new QAction(Core::Icons::BUTTON_CLOSE.icon(), QString(), toolBar);
+        m_closeAction = new QAction(Core::Icons::CLOSE_TOOLBAR.icon(), QString(), toolBar);
         connect(m_closeAction, SIGNAL(triggered()), this, SIGNAL(closeButtonClicked()));
         button = new QToolButton;
         button->setDefaultAction(m_closeAction);
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index c69935b803..81cd4693e4 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -313,7 +313,7 @@ SearchSideBarItem::SearchSideBarItem()
 QList<QToolButton *> SearchSideBarItem::createToolBarWidgets()
 {
     QToolButton *reindexButton = new QToolButton;
-    reindexButton->setIcon(Core::Icons::RELOAD_GRAY.icon());
+    reindexButton->setIcon(Core::Icons::RELOAD.icon());
     reindexButton->setToolTip(tr("Regenerate Index"));
     connect(reindexButton, SIGNAL(clicked()),
             widget(), SLOT(reindexDocumentation()));
diff --git a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp
index 76240d3cec..40aec72dde 100644
--- a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp
@@ -40,7 +40,7 @@ ImportLabel::ImportLabel(QWidget *parent) :
 
 
     m_removeButton = new QPushButton(this);
-    m_removeButton->setIcon(Core::Icons::BUTTON_CLOSE.icon());
+    m_removeButton->setIcon(Core::Icons::CLOSE_TOOLBAR.icon());
     m_removeButton->setFlat(true);
     m_removeButton->setMaximumWidth(20);
     m_removeButton->setMaximumHeight(20);
@@ -72,7 +72,7 @@ void ImportLabel::setReadOnly(bool readOnly) const
 {
     m_removeButton->setDisabled(readOnly);
     m_removeButton->setIcon(readOnly ? QIcon()
-                                     : Core::Icons::BUTTON_CLOSE.icon());
+                                     : Core::Icons::CLOSE_TOOLBAR.icon());
 }
 
 void ImportLabel::emitRemoveImport()
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index daeb465e5e..bcfd04e8ae 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -675,7 +675,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
     // reset action
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::CLEAR.icon());
+    action->setIcon(Core::Icons::RELOAD.icon());
     //action->setText(tr("Reset"));
     action->setToolTip(tr("Reset all event counters."));
     connect(action, &QAction::triggered, this, &CallgrindToolPrivate::resetRequested);