From 40c5213fddaf80268536118afa40fe2bfc25ab20 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 5 Jul 2016 15:41:41 +0200 Subject: [PATCH] Core: Move expand and collapse icons from autotest to core ...and replaced the duplicates of them in the debugger console. Change-Id: If545800c47f3560e1f91d87bdd117abaf04dbd89 Reviewed-by: Christian Stenger --- src/plugins/autotest/autotest.qrc | 4 ---- src/plugins/autotest/autotesticons.h | 4 ---- src/plugins/autotest/testnavigationwidget.cpp | 4 ++-- src/plugins/autotest/testresultspane.cpp | 2 +- src/plugins/coreplugin/core.qrc | 4 ++++ src/plugins/coreplugin/coreicons.cpp | 10 +++++++++- src/plugins/coreplugin/coreicons.h | 6 +++++- .../coreplugin/find/searchresultwindow.cpp | 2 +- .../{autotest => coreplugin}/images/collapse.png | Bin .../images/collapse@2x.png | Bin .../{autotest => coreplugin}/images/expand.png | Bin .../{autotest => coreplugin}/images/expand@2x.png | Bin .../debugger/console/consoleitemdelegate.cpp | 4 ++-- src/plugins/qmljstools/images/collapse.png | Bin 986 -> 0 bytes src/plugins/qmljstools/images/expand.png | Bin 997 -> 0 bytes src/plugins/qmljstools/qmljstools.qrc | 2 -- src/tools/icons/qtcreatoricons.svg | 4 ++-- 17 files changed, 26 insertions(+), 20 deletions(-) rename src/plugins/{autotest => coreplugin}/images/collapse.png (100%) rename src/plugins/{autotest => coreplugin}/images/collapse@2x.png (100%) rename src/plugins/{autotest => coreplugin}/images/expand.png (100%) rename src/plugins/{autotest => coreplugin}/images/expand@2x.png (100%) delete mode 100644 src/plugins/qmljstools/images/collapse.png delete mode 100644 src/plugins/qmljstools/images/expand.png diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc index 7c8539f4b2c..f92f835e599 100644 --- a/src/plugins/autotest/autotest.qrc +++ b/src/plugins/autotest/autotest.qrc @@ -1,10 +1,6 @@ images/autotest.png - images/expand.png - images/expand@2x.png - images/collapse.png - images/collapse@2x.png images/sort.png images/sort@2x.png images/leafsort.png diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h index 35a9614a5fe..f7845b071f8 100644 --- a/src/plugins/autotest/autotesticons.h +++ b/src/plugins/autotest/autotesticons.h @@ -30,10 +30,6 @@ namespace Autotest { namespace Icons { -const Utils::Icon EXPAND({ - {QLatin1String(":/images/expand.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon COLLAPSE({ - {QLatin1String(":/images/collapse.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon SORT_ALPHABETICALLY({ {QLatin1String(":/images/sort.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon SORT_NATURALLY({ diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 39f616b1c2d..6f91f4b1220 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -202,11 +202,11 @@ QList TestNavigationWidget::createToolButtons() m_sort->setToolTip(tr("Sort Naturally")); QToolButton *expand = new QToolButton(this); - expand->setIcon(Icons::EXPAND.icon()); + expand->setIcon(Core::Icons::EXPAND_TOOLBAR.icon()); expand->setToolTip(tr("Expand All")); QToolButton *collapse = new QToolButton(this); - collapse->setIcon(Icons::COLLAPSE.icon()); + collapse->setIcon(Core::Icons::COLLAPSE_TOOLBAR.icon()); collapse->setToolTip(tr("Collapse All")); connect(expand, &QToolButton::clicked, m_view, &TestTreeView::expandAll); diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index caefcb1115d..d1737de3a71 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -146,7 +146,7 @@ TestResultsPane::TestResultsPane(QObject *parent) : void TestResultsPane::createToolButtons() { m_expandCollapse = new QToolButton(m_treeView); - m_expandCollapse->setIcon(Core::Icons::EXPAND.icon()); + m_expandCollapse->setIcon(Core::Icons::EXPAND_ALL_TOOLBAR.icon()); m_expandCollapse->setToolTip(tr("Expand All")); m_expandCollapse->setCheckable(true); m_expandCollapse->setChecked(false); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a8c2c0a76c9..e88ca8c6740 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -108,5 +108,9 @@ images/desktopdevicesmall.png images/desktopdevicesmall@2x.png images/reset@2x.png + images/collapse.png + images/collapse@2x.png + images/expand.png + images/expand@2x.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 213492bcb04..5727821c713 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -130,7 +130,7 @@ const Icon INFO({ {QLatin1String(":/core/images/info.png"), Theme::IconsInfoColor}}, Icon::Tint); const Icon INFO_TOOLBAR({ {QLatin1String(":/core/images/info.png"), Theme::IconsInfoToolBarColor}}); -const Icon EXPAND({ +const Icon EXPAND_ALL_TOOLBAR({ {QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}}); const Icon TOOLBAR_EXTENSION({ {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}}); @@ -155,6 +155,14 @@ const Icon EYE_CLOSED_TOOLBAR({ const Icon REPLACE({ {QLatin1String(":/core/images/replace_a.png"), Theme::PanelTextColorMid}, {QLatin1String(":/core/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint); +const Icon EXPAND({ + {QLatin1String(":/core/images/expand.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); +const Icon EXPAND_TOOLBAR({ + {QLatin1String(":/core/images/expand.png"), Theme::IconsBaseColor}}); +const Icon COLLAPSE({ + {QLatin1String(":/core/images/collapse.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); +const Icon COLLAPSE_TOOLBAR({ + {QLatin1String(":/core/images/collapse.png"), Theme::IconsBaseColor}}); const Icon MODE_EDIT_CLASSIC( QLatin1String(":/fancyactionbar/images/mode_Edit.png")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index c2837cb8ec6..7882edf5e4e 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -81,7 +81,7 @@ CORE_EXPORT extern const Utils::Icon ERROR_TOOLBAR; CORE_EXPORT extern const Utils::Icon ERROR_TASKBAR; 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 EXPAND_ALL_TOOLBAR; CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION; CORE_EXPORT extern const Utils::Icon RUN_SMALL; CORE_EXPORT extern const Utils::Icon RUN_SMALL_TOOLBAR; @@ -93,6 +93,10 @@ CORE_EXPORT extern const Utils::Icon BOUNDING_RECT; CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR; CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR; CORE_EXPORT extern const Utils::Icon REPLACE; +CORE_EXPORT extern const Utils::Icon EXPAND; +CORE_EXPORT extern const Utils::Icon EXPAND_TOOLBAR; +CORE_EXPORT extern const Utils::Icon COLLAPSE; +CORE_EXPORT extern const Utils::Icon COLLAPSE_TOOLBAR; CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT; diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 0031e5466a6..a961bf4f25a 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -136,7 +136,7 @@ namespace Internal { m_expandCollapseButton->setAutoRaise(true); m_expandCollapseAction->setCheckable(true); - m_expandCollapseAction->setIcon(Core::Icons::EXPAND.icon()); + m_expandCollapseAction->setIcon(Core::Icons::EXPAND_ALL_TOOLBAR.icon()); Command *cmd = ActionManager::registerAction(m_expandCollapseAction, "Find.ExpandAll"); cmd->setAttribute(Command::CA_UpdateText); m_expandCollapseButton->setDefaultAction(cmd->action()); diff --git a/src/plugins/autotest/images/collapse.png b/src/plugins/coreplugin/images/collapse.png similarity index 100% rename from src/plugins/autotest/images/collapse.png rename to src/plugins/coreplugin/images/collapse.png diff --git a/src/plugins/autotest/images/collapse@2x.png b/src/plugins/coreplugin/images/collapse@2x.png similarity index 100% rename from src/plugins/autotest/images/collapse@2x.png rename to src/plugins/coreplugin/images/collapse@2x.png diff --git a/src/plugins/autotest/images/expand.png b/src/plugins/coreplugin/images/expand.png similarity index 100% rename from src/plugins/autotest/images/expand.png rename to src/plugins/coreplugin/images/expand.png diff --git a/src/plugins/autotest/images/expand@2x.png b/src/plugins/coreplugin/images/expand@2x.png similarity index 100% rename from src/plugins/autotest/images/expand@2x.png rename to src/plugins/coreplugin/images/expand@2x.png diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp index 12646fddab6..b2a2f188b77 100644 --- a/src/plugins/debugger/console/consoleitemdelegate.cpp +++ b/src/plugins/debugger/console/consoleitemdelegate.cpp @@ -69,8 +69,8 @@ ConsoleItemDelegate::ConsoleItemDelegate(ConsoleItemModel *model, QObject *paren m_logIcon(Core::Icons::INFO.icon()), m_warningIcon(Core::Icons::WARNING.icon()), m_errorIcon(Core::Icons::ERROR.icon()), - m_expandIcon(QLatin1String(":/qmljstools/images/expand.png")), - m_collapseIcon(QLatin1String(":/qmljstools/images/collapse.png")), + m_expandIcon(Core::Icons::EXPAND.icon()), + m_collapseIcon(Core::Icons::COLLAPSE.icon()), m_prompt(QLatin1String(":/qmljstools/images/prompt.png")), m_cachedHeight(0) { diff --git a/src/plugins/qmljstools/images/collapse.png b/src/plugins/qmljstools/images/collapse.png deleted file mode 100644 index 64ae3720c11752f092c2110bdd53cd3b6b3ef7b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 986 zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4mJh`h6fYb1Q-|?BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFso#SM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9IbD3=a&{Grv{~_DTCZpVC7ttnpl!w6q28x0}I7~jQo=P;*9(P z1?ON>JwpZG#N^C8kO)|ZudkJ7UU5lcUUI6Zi>*>cZh>BAW{Q=Iv6G9Dql>wTnVGYp zp{t>#vzv>Pp|i7_v4NARfw3t}uSMv>2~2MaLazl*y`aPZ3J@!o)S}F?)D*X( z{9FaFr>!!vxW&!f(Zs~iz{teR%n`d=AbL}9yTuHrTlDP|Z1h151)kN3|5t$H8+La z*klxpw4T`uGYd9wwws=KV9&j2t7+G8QhXCk?{(JaZG%Q-e|yQz{EjrrIztFso#SM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&vz zGto0NF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7B|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9IbD3=a&{Grv{~_DTCZpVC7ttnpl!w6q28x0}I7~jQo=P;*9(P z1?ON>JwpZG#N^C8kO)|ZudkJ7UU5lcUUI6Zi>*>cZh>BAW{Q=Yxuc1Rp@D&knVF-Z zp{t>#vzv>Pp|i7_v4NARfw3t}uSMv>2~2MaLa!lCy`aPZ3J@!o)S}F?)D*X( z{9FaFr>!z^xy8WE6{mSny(zfdV&LY6Q?I_Af{i{XYLTKECKTl224aF!B`Ag3DIk)5 zYF>)1QjwCqo%zbpjSLJ7;hrvzAr-fhIy-vO7@GbE^zcbI&R|v9S#wj!jZH?uNb8xs zu$iNRn_%*xL|&sG=bLhvHnE&AnPL2(D}hPj=!?9Rre6&52}cSn%;q<(Np9K2o^HX& aBEit(C+GgSzyp-;7(8A5T-G@yGywqTpES?_ diff --git a/src/plugins/qmljstools/qmljstools.qrc b/src/plugins/qmljstools/qmljstools.qrc index 45c345ece6f..a7f44837497 100644 --- a/src/plugins/qmljstools/qmljstools.qrc +++ b/src/plugins/qmljstools/qmljstools.qrc @@ -2,8 +2,6 @@ images/category_qml.png images/prompt.png - images/collapse.png - images/expand.png QmlJSTools.mimetypes.xml diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index c8d9ee940d0..74c58ce6e25 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3046,7 +3046,7 @@