Locator: Remove old "Locator" menu icon. Re-use the "search" icon.

This patch removes the locator.png icon and replaces it with a
menu-friendly variation of the zoom icon.

The current ZOOM icon becomes ZOOM_TOOLBAR.

Change-Id: I8817c5c420801351db659caa4c4190a9074be720
Reviewed-by: hjk <hjk@theqtcompany.com>

11 files changed, 7 insertions, 16 deletions

diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index 827caa16a6..5f64bf30fc 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -135,6 +135,8 @@ const Icon INFO_TOOLBAR({
 const Icon EXPAND({
         {QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}});
 const Icon ZOOM({
+        {QLatin1String(":/core/images/zoom.png"), Theme::PanelTextColorMid}}, Icon::Tint);
+const Icon ZOOM_TOOLBAR({
         {QLatin1String(":/core/images/zoom.png"), Theme::IconsBaseColor}});
 const Icon TOOLBAR_EXTENSION({
         {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}});
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index 1aa28d0244..1a9b3d2b84 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -85,6 +85,7 @@ CORE_EXPORT extern const Utils::Icon INFO;
 CORE_EXPORT extern const Utils::Icon INFO_TOOLBAR;
 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 MODE_EDIT_CLASSIC;
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index a0695767c6..a2fcb520c4 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -268,7 +268,6 @@ QtcPlugin {
             "filesystemfilter.ui",
             "ilocatorfilter.cpp",
             "ilocatorfilter.h",
-            "locator.qrc",
             "locatorconstants.h",
             "locatorfiltersfilter.cpp",
             "locatorfiltersfilter.h",
@@ -285,8 +284,6 @@ QtcPlugin {
             "locatorsettingspage.cpp",
             "locatorsettingspage.h",
             "locatorsettingspage.ui",
-            "images/locator.png",
-            "images/reload.png",
         ]
     }
 
diff --git a/src/plugins/coreplugin/locator/images/locator.png b/src/plugins/coreplugin/locator/images/locator.png
deleted file mode 100644
index 000ee1c018..0000000000
--- a/src/plugins/coreplugin/locator/images/locator.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/locator/images/reload.png b/src/plugins/coreplugin/locator/images/reload.png
deleted file mode 100644
index b5afefb32b..0000000000
--- a/src/plugins/coreplugin/locator/images/reload.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/locator/locator.pri b/src/plugins/coreplugin/locator/locator.pri
index c697437d69..e80765bfc5 100644
--- a/src/plugins/coreplugin/locator/locator.pri
+++ b/src/plugins/coreplugin/locator/locator.pri
@@ -36,9 +36,6 @@ FORMS += \
     $$PWD/directoryfilter.ui \
     $$PWD/locatorsettingspage.ui
 
-RESOURCES += \
-    $$PWD/locator.qrc
-
 equals(TEST, 1) {
     HEADERS += $$PWD/locatorfiltertest.h
     SOURCES += \
diff --git a/src/plugins/coreplugin/locator/locator.qrc b/src/plugins/coreplugin/locator/locator.qrc
deleted file mode 100644
index 4cd5df4f13..0000000000
--- a/src/plugins/coreplugin/locator/locator.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/locator">
-        <file>images/reload.png</file>
-        <file>images/locator.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 44917a54a4..1299d1133b 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -248,7 +248,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     layout->setMargin(0);
     layout->addWidget(m_fileLineEdit);
 
-    setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png")));
+    setWindowIcon(Icons::ZOOM.icon());
     const QPixmap pixmap = Icons::MAGNIFIER.pixmap();
     m_fileLineEdit->setFiltering(true);
     m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index ccec9cb768..f90e71868e 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1689,7 +1689,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
 
     auto qmlZoomDummyAction = new QAction(tr("Zoom"), this);
     qmlZoomDummyAction->setCheckable(true);
-    qmlZoomDummyAction->setIcon(Core::Icons::ZOOM.icon());
+    qmlZoomDummyAction->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
     qmlZoomDummyAction->setEnabled(false);
     cmd = ActionManager::registerAction(qmlZoomDummyAction, Constants::QML_ZOOMTOOL);
     debugMenu->addAction(cmd);
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 44f86c44b9..9a02cb88c8 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -104,7 +104,7 @@ void ImageViewer::ctor()
                                                                   Core::Icons::SAVEFILE.icon()));
     d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
     d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
-    d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM.icon());
+    d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
     // icons update - try to use system theme
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out"));
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 66dfa69376..a351f65a24 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -213,7 +213,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     });
 
     d->m_searchButton = new QToolButton;
-    d->m_searchButton->setIcon(Icons::ZOOM.icon());
+    d->m_searchButton->setIcon(Icons::ZOOM_TOOLBAR.icon());
     d->m_searchButton->setToolTip(tr("Search timeline event notes."));
 
     connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch);