From 63cbcbc729fa21b32159ecc4fb741f8ae9def6d9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 7 Apr 2016 10:20:23 +0200 Subject: [PATCH] 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 --- src/plugins/coreplugin/coreicons.cpp | 2 ++ src/plugins/coreplugin/coreicons.h | 1 + src/plugins/coreplugin/coreplugin.qbs | 3 --- src/plugins/coreplugin/locator/images/locator.png | Bin 767 -> 0 bytes src/plugins/coreplugin/locator/images/reload.png | Bin 735 -> 0 bytes src/plugins/coreplugin/locator/locator.pri | 3 --- src/plugins/coreplugin/locator/locator.qrc | 6 ------ src/plugins/coreplugin/locator/locatorwidget.cpp | 2 +- src/plugins/debugger/debuggerplugin.cpp | 2 +- src/plugins/imageviewer/imageviewer.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 +- 11 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 src/plugins/coreplugin/locator/images/locator.png delete mode 100644 src/plugins/coreplugin/locator/images/reload.png delete mode 100644 src/plugins/coreplugin/locator/locator.qrc diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 827caa16a65..5f64bf30fcc 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 1aa28d0244f..1a9b3d2b84d 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 a0695767c6c..a2fcb520c40 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 000ee1c01857ba49d57a5cf353caddc9068c62f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 767 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^y|-MHc(VZ^|| zAX(xXQ4*Y=R#Ki=l*-_klAn~S;F+74o*I;zm{M7IGS!BGfoY~W7mSO?3&5{&*9Ac9qaDJ-o0ymxu-{Iw&U4{hrbtD-cLMdY3!ic`d{_K ziT3jSsXvZC-TyxKzTcAFJ!^BOu8NFPZuxcN{g-=ePx<%SsoD0J_ZU3ZOP-R+M7YVEU&^f9^?kt2Sqg~P6e zPq`7WCV+bt?`*+Zf#);wIX?>@ySa7#$9K~{`!0JlDQV8xltu-nxM)p_J$y@8o)qgG zZ)@EdKO>)`_;s00?L^a)|JM9m`sn*_MWLTel^XIUp3L_r8Yy%Ip8h0L!#v~F+}VP^ zrfR!gTDEV3)zvE(SA2_>JAB}Fc|dqLw-mSJNdcR%W{zcYC)J)lZnpB<{*q1gN^GQP z!^Vq-EAlNEMc;85Y~G-3Jx4ExeS^Z;dn@MJ6!fgTacxV=)UdB>m+W4=Q+Vb?$xjOz zd~^)Br|%RH4Hv(7^hlBPJ#*G|itDCLxTK+7QS<0G%i5)-0bHpG!VekLBQ~(E>JMk0 z*ej(YbwgR|g!_$C?kiTDYM=Qra#hON1)FZ|yy*COL5B?6(SQY~iy1c_7I|=o&FJrr z;Nw<%E=-?v?9wx(DFXZovIl?PWUNYkA(Y9xeZuSS>jGP6Ei1}@6ep=RKStAc@lI>y z?R!t}pXU4dzL>^UPp;Gixz|Bcd=9+u()pKM-fVx$LCqwmG@^QO^F_H$Y}qAUb@zTu zd9wVDfJ)ho|EK=c&Z}BDH>URCq}e(rPg`hdr0@92`e<*OM~C{q+>PSx6{bvwP8jg) fI{ziQfsvtNyPnE|ABD{f3=9mOu6{1-oD!M(6otnF}MA<|)hQG7Qtch=7;)Euax!g*MpX7qt|J_*?T>3)5rL@!L zit7{s;gh;|lL`$}kH&uQ|DB(f{_OSaiK45-?ZXFEQpqAK$CIH>f7kylNl0zz zOLKqu;haIQp3BPLJ7-TSbXsiARGzc<@D2WVGVbniy$aJ$J5EwL^0-iCvS)!zdx1qy zfGK zx6-+7+rAY3ST5q~c>Sr~0*)=R-;OD@?FyN>T4C}@1p$r?^AE&%?*A*FF>6_}usDPD zh98^nW-M8zxAbymdhibhYnz39XKZFN#%&Pq-Fj|Uf9|=UZP)k6eN_D!_~N0p#qoV} zcQAh|Gr1qK$M?>;pSh8fI`12-+2H+PQoMZr{h~?i72O8r(@w7V+swB{>ZXm2k%Nzz zsj%my58L*It-7LTHZQXv$UW_U-dy3z#(v3N_jEVuYXwZ1dG)T-*T64T4>pHwwyKxc z{yIOyw)5%Hda8_YerjXXY8k`tMX(- uE7mPIvF@q!rq>7W{5{*c>s>zsGs6}O36{4~-WCiD3=E#GelF{r5}E+YuTjhZ diff --git a/src/plugins/coreplugin/locator/locator.pri b/src/plugins/coreplugin/locator/locator.pri index c697437d693..e80765bfc5f 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 4cd5df4f13d..00000000000 --- a/src/plugins/coreplugin/locator/locator.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - images/reload.png - images/locator.png - - diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 44917a54a40..1299d1133b9 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 ccec9cb7682..f90e71868e9 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 44f86c44b90..9a02cb88c85 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 66dfa693768..a351f65a242 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);