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 <christian.stenger@qt.io>

src/plugins/autotest/autotest.qrc

@@ -1,10 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>images/autotest.png</file>
-        <file>images/expand.png</file>
-        <file>images/expand@2x.png</file>
-        <file>images/collapse.png</file>
-        <file>images/collapse@2x.png</file>
         <file>images/sort.png</file>
         <file>images/sort@2x.png</file>
         <file>images/leafsort.png</file>

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({

src/plugins/autotest/testnavigationwidget.cpp

@@ -202,11 +202,11 @@ QList<QToolButton *> 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);

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);

src/plugins/coreplugin/core.qrc

@@ -108,5 +108,9 @@
         <file>images/desktopdevicesmall.png</file>
         <file>images/desktopdevicesmall@2x.png</file>
         <file>images/reset@2x.png</file>
+        <file>images/collapse.png</file>
+        <file>images/collapse@2x.png</file>
+        <file>images/expand.png</file>
+        <file>images/expand@2x.png</file>
     </qresource>
 </RCC>

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"));

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;

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());

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_expandIcon(Core::Icons::EXPAND.icon()),
-    m_collapseIcon(QLatin1String(":/qmljstools/images/collapse.png")),
+    m_collapseIcon(Core::Icons::COLLAPSE.icon()),
     m_prompt(QLatin1String(":/qmljstools/images/prompt.png")),
     m_cachedHeight(0)
 {

src/plugins/qmljstools/qmljstools.qrc

@@ -2,8 +2,6 @@
     <qresource prefix="/qmljstools">
         <file>images/category_qml.png</file>
         <file>images/prompt.png</file>
-        <file>images/collapse.png</file>
-        <file>images/expand.png</file>
         <file>QmlJSTools.mimetypes.xml</file>
     </qresource>
 </RCC>

src/tools/icons/qtcreatoricons.svg

@@ -3046,7 +3046,7 @@
     </g>
     <g
        style="display:inline"
-       id="src/plugins/autotest/images/expand"
+       id="src/plugins/coreplugin/images/expand"
        transform="translate(48,0)">
       <rect
          y="568"
@@ -3075,7 +3075,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="src/plugins/autotest/images/collapse"
+       id="src/plugins/coreplugin/images/collapse"
        transform="translate(16,0)">
       <rect
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"