From 03c07b80fd4b409a0417ea73a3a334d08a26022f Mon Sep 17 00:00:00 2001 From: Alessandro Portale <alessandro.portale@theqtcompany.com> 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 <alessandro.portale@theqtcompany.com> --- 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 @@ <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 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!ia0vp^JRr=$0wn*`OvwRKHl8kyArhC9KV*OS{r>ua29^a% z4v*|Ni9|?nJml#R;o?8&7}}!Knx?Z#q|3R$^ML_Z`%{a#-S?X#nphYXJjrG~J*Vz5 P&>RL&S3j3^P6<r_vFs+V 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!ia0vp^5+KaM3?#3wJbMaAF&8^|hH!9j+<xf)0LbMD@Ck7R z(ta?Y9%U;6<g=6n`2{nym;aZVnyn1va~60+7Bet#3xhBt!>l<VgCjj%978H@ZJiXz zcR+!|nfuQFb9&u57cTr*YJX$j0wsn9%UfQ#g1t-Xl9X58k2taXyV{<gs!Qisb4>O7 z=YK=}kZW(9;uG(L=h|Nuw;BDpwEv~s$!o6?1s-o^_*TlCc%OO0exM}`p00i_>zopr E0J&RCY5)KL diff --git a/src/plugins/coreplugin/images/button_close.png b/src/plugins/coreplugin/images/close.png similarity index 100% rename from src/plugins/coreplugin/images/button_close.png rename to 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 similarity index 100% rename from src/plugins/coreplugin/images/button_close@2x.png rename to 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 c978cf51aaaf35cf4bf3939f3ba84eabce4837e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X4tcsbhE&{2`t$$4J+o><XQPutDRT;^#HtoWCN5@;X{?X7 zI>fLX@$q<MAj5b>y77icq|D82#~o@UI%FGnFq~Btbdcdaa=qb)lAid10!D#+w<1rL zDfjt~<h*zlx#34K)08r{Bv*wnhDX{CG5kmNUl28Z<jF3)u<@H<M{vUrcFl_tj933i zcKmF#;GQ0(CNpdC!gGEMkM>$HiDfH1;xhQs(E8f(+8UPL^fe26Q#y3@m>q6Nw5LgI ja}!UN`EZ9rAc4W4K;+!fY<(x7Zx}pX{an^LB{Ts5`G;qN 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!ia0vp^0wB!60wlNoGJgf63O!vMLp07OXCxfpmt3*TVOt}o zs}pBvW6t4QZAvPtg1pkwK7qa(88>*sg&0$|n{QaSn{gS7tJKwr3aXO>mtL$j6x7(e zq>*{LxnrBYa}oC}rWtoxS9o0j${b<fp4O}3$E>;0)%2jm&8H3-zI#tFG0dx&l_O^R R;|S1l22WQ%mvv4FO#q9hI5+?R 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!ia0vp^3LwnE3?yBabR7dy%*9TgAsieWw;%dH0CIT(d_r7- zbOQ|ho#2%X<g=6n`2{n?hir~GQ(6e*a~60+7Bet#3xhBt!>l<HK*3;77srr_TgeF$ zo(&T_8RpNN$tf?d(xB6H?5MyYrGBN3P&rSDcAFTc<u)N){WdPFc9ko*)Yv|W3T$ec wpv+l0Ilw`XE6Zu3tHCZ#HHjwAya~(<Qk{%5FPkvl0~*iZ>FVdQ&MBb@03aMYhX4Qo diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index 8980ff4ebec..4cb2743122c 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 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<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 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"> - <g - id="src/plugins/coreplugin/images/clear"> - <rect - id="rect3855-7" - width="12" - height="12" - x="48" - y="588" - style="fill:none" /> - <path - style="fill:none;stroke:#4e4e4e;stroke-width:2.82999992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 49,589 10,10" - id="path3979" - inkscape:connector-curvature="0" /> - <path - style="fill:#4e4e4e;fill-opacity:1;stroke:#4e4e4e;stroke-width:2.82999992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 59,589 49,599" - id="path3981" - inkscape:connector-curvature="0" /> - </g> - <rect - style="fill:#4e4e4e;fill-opacity:0.95074218;stroke:none" - id="rect3956" - width="16" - height="16" - x="60" - y="584" /> - <g - id="src/plugins/coreplugin/images/closebutton" - style="opacity:0.8"> - <path - inkscape:connector-curvature="0" - id="path3998" - d="m 63,588 9,9" - style="fill:none;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - inkscape:connector-curvature="0" - id="path4000" - d="m 63,597 9,-9" - style="fill:none;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <rect - y="584" - x="60" - height="16" - width="16" - id="rect4006" - style="fill:none;stroke:none" /> - </g> - <g - id="src/plugins/coreplugin/images/darkclosebutton" - style="opacity:0.60100002;fill:#ffffff;fill-opacity:0"> - <path - inkscape:connector-curvature="0" - id="path4171" - d="m 143,588 9,9" - style="fill:#ffffff;fill-opacity:0;stroke:#505050;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path4173" - d="m 152,588 -9,9" - style="fill:#000000;fill-opacity:0.8;stroke:#505050;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <rect - y="584" - x="140" - height="16" - width="16" - id="rect3817-2-9-1-9" - style="fill:#ffffff;fill-opacity:0" /> - </g> <g id="src/plugins/coreplugin/images/dir"> <path @@ -1577,7 +1508,7 @@ style="display:inline"> <g style="display:inline" - id="src/plugins/coreplugin/images/button_close" + id="src/plugins/coreplugin/images/close" inkscape:export-filename="c:\Users\aportale\dev\qt-creator\src\plugins\coreplugin\images\button_close.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" -- GitLab