From 03c07b80fd4b409a0417ea73a3a334d08a26022f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 30 Nov 2015 18:12:49 +0100 Subject: [PATCH] Core: Unify the close icons Use the same image file and recolor it as needed, Change-Id: I914819a53ca05d83ca5b88adf44706b460b48ac0 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 9 +-- src/plugins/coreplugin/coreicons.h | 16 ++-- src/plugins/coreplugin/editortoolbar.cpp | 2 +- src/plugins/coreplugin/find/findtoolbar.cpp | 4 +- src/plugins/coreplugin/images/clear.png | Bin 117 -> 0 bytes src/plugins/coreplugin/images/clear@2x.png | Bin 222 -> 0 bytes .../images/{button_close.png => close.png} | Bin .../{button_close@2x.png => close@2x.png} | Bin src/plugins/coreplugin/images/closebutton.png | Bin 288 -> 0 bytes .../coreplugin/images/darkclosebutton.png | Bin 170 -> 0 bytes .../coreplugin/images/darkclosebutton@2x.png | Bin 216 -> 0 bytes src/plugins/coreplugin/infobar.cpp | 2 +- src/plugins/coreplugin/manhattanstyle.cpp | 2 +- .../coreplugin/opendocumentstreeview.cpp | 4 +- src/plugins/diffeditor/diffeditor.cpp | 2 +- src/plugins/help/helpwidget.cpp | 2 +- src/plugins/help/searchwidget.cpp | 2 +- .../components/importmanager/importlabel.cpp | 4 +- src/plugins/valgrind/callgrindtool.cpp | 2 +- src/tools/icons/qtcreatoricons.svg | 71 +----------------- 20 files changed, 23 insertions(+), 99 deletions(-) delete mode 100644 src/plugins/coreplugin/images/clear.png delete mode 100644 src/plugins/coreplugin/images/clear@2x.png rename src/plugins/coreplugin/images/{button_close.png => close.png} (100%) rename src/plugins/coreplugin/images/{button_close@2x.png => close@2x.png} (100%) delete mode 100644 src/plugins/coreplugin/images/closebutton.png delete mode 100644 src/plugins/coreplugin/images/darkclosebutton.png delete mode 100644 src/plugins/coreplugin/images/darkclosebutton@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 88f39fe78a6..720770958aa 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -2,9 +2,6 @@ images/clean_pane_small.png images/clean_pane_small@2x.png - images/clear.png - images/clear@2x.png - images/closebutton.png images/compile_error_taskbar.png images/compile_error_taskbar@2x.png images/dir.png @@ -21,6 +18,8 @@ images/inputfield@2x.png images/inputfield_disabled.png images/inputfield_disabled@2x.png + images/close.png + images/close@2x.png images/linkicon.png images/linkicon@2x.png images/locked.png @@ -62,8 +61,6 @@ images/unlocked@2x.png images/extension.png images/extension@2x.png - images/darkclosebutton.png - images/darkclosebutton@2x.png images/category_core.png images/category_texteditor.png images/category_design.png @@ -91,8 +88,6 @@ images/category_locator.png images/filtericon.png images/filtericon@2x.png - images/button_close.png - images/button_close@2x.png images/splitbutton_closebottom.png images/splitbutton_closebottom@2x.png images/splitbutton_closeleft.png diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 0e7922521d8..00075275303 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 900d8082930..222c06352c8 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 a3d951d5b56..e056ce91c16 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 8ffce20c5e64173ac718a3e7a8b6396599c75f56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0y~yVBi5^4i*LmhCek^au^sGY&=~YLnJOIf5`su`~CF; z4J-?k93I(k5{Z!Dc*xTs!o`2kF|QuK)l5 diff --git a/src/plugins/coreplugin/images/clear@2x.png b/src/plugins/coreplugin/images/clear@2x.png deleted file mode 100644 index 459418c04d7d74f654d6b837b66ccfa2fda3cf44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8NU@ms@4B_D5xc$)o0RsaA zPk>K|D+2?A9}K8R*@`eQFtC&a`2{nym;aZVnyt*hz`$AH5n0T@z%2~Ij105pfDDfG zba4!+xV3dsAm0H64rlH=|Ig`l=Ulk(W2ya(eG8Nr8Z2*l{(JaZG%Q-e|yQz{EjrrIztFdXu9aSW-rmGtNTe|u)thR#MOhf?MgPKi}5icDP0 z8q-)GZFPuYIpX8-$Uuhih;-u(kw}@F+m1WbNOZ_H?qE2pD(E1?d*ph<4<$YE0|kr% z`EEs?EK~0D9m#p|Dssb*Vx}o&Y)P&PVGNJ79b)*8?7tvt{K%7Ccwyr=!H(dDAMBbJ zB^a;%k?i={Xu&-_N=;_g;)Un@7#{7lU=qt#c*JG!rJ?n;M=Xq okZ4bn*ybjlEc4+Ghd=^@L4nA*quKgS3=9kmp00i_>zopr0QrY!g8%>k diff --git a/src/plugins/coreplugin/images/darkclosebutton.png b/src/plugins/coreplugin/images/darkclosebutton.png deleted file mode 100644 index 147a954bea1b8f787341a145861ac200bbb23f2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+6neTihG?8m&PX`GFS%lw z!?s3FS0~QU#+<{q+LTmO1$m{VeFA+oGH&pM3o)i_H{Y;uH{&uESE;KL6;vk&F1=W5 zD5$Y_Nh9-gbH_G)=OXS|Of&AXuJF3B^kVH12JUIS8h*^08(mEgO5A+vkm0-c1QWx& Yidi{gwm*(AFfcH9y85}Sb4q9e0E?$MH~;_u diff --git a/src/plugins/coreplugin/images/darkclosebutton@2x.png b/src/plugins/coreplugin/images/darkclosebutton@2x.png deleted file mode 100644 index 921d3a7fb7423f344dd8820d33f78a8ad8506fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGn2Vh}LpV4%Za?&Yz`(%3 z6W|l#%D}+T00Vy~cx5v%FtC&a`2{n?hir~GQ(DNtz`$AH5n0T@z%2~Ij105pNH8!k z1bezThE&{2PLS|ynApiMf96b1d3luvou*?)1r90oD|Lj*c}ld~#4s(l3E}FuabdNq zT*0Nr_DNJ=Q_}=x&dSLF4uV`+P7_@Xc5$jnGsetAutoRaise(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 548f4734f60..f3f409c38fd 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 4cc3032e825..e82eb31fa48 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 f01be54dec1..908d542022e 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 6ecaa9c362b..fc75ab3dda7 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 c69935b803f..81cd4693e4d 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -313,7 +313,7 @@ SearchSideBarItem::SearchSideBarItem() QList 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 76240d3cec3..40aec72dde9 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 daeb465e5e9..bcfd04e8ae8 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); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 8fea88b91e1..0c4b25eff0f 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -888,75 +888,6 @@ inkscape:groupmode="layer" id="layer1" style="display:inline"> - - - - - - - - - - - - - - - -