ProjectExplorer: Cleanup buildstep icons

Replacing differently themed icons sets by a single one which
gets themed at run-time.

Change-Id: I66b5e2972419e41b3f101ee0301da30409bb975c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

29 files changed, 55 insertions, 126 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 720770958a..8a03f97f91 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -69,18 +69,6 @@
         <file>images/help.png</file>
         <file>images/editclear.png</file>
         <file>images/editclear@2x.png</file>
-        <file>images/darkarrowdown.png</file>
-        <file>images/darkarrowdown@2x.png</file>
-        <file>images/darkarrowup.png</file>
-        <file>images/darkarrowup@2x.png</file>
-        <file>images/darkclose.png</file>
-        <file>images/darkclose@2x.png</file>
-        <file>images/lightarrowdown.png</file>
-        <file>images/lightarrowdown@2x.png</file>
-        <file>images/lightarrowup.png</file>
-        <file>images/lightarrowup@2x.png</file>
-        <file>images/lightclose.png</file>
-        <file>images/lightclose@2x.png</file>
         <file>images/arrowdown.png</file>
         <file>images/arrowdown@2x.png</file>
         <file>images/arrowup.png</file>
diff --git a/src/plugins/coreplugin/images/darkarrowdown.png b/src/plugins/coreplugin/images/darkarrowdown.png
deleted file mode 100644
index a47a55d43b..0000000000
--- a/src/plugins/coreplugin/images/darkarrowdown.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkarrowdown@2x.png b/src/plugins/coreplugin/images/darkarrowdown@2x.png
deleted file mode 100644
index 3bbe95c5d0..0000000000
--- a/src/plugins/coreplugin/images/darkarrowdown@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkarrowup.png b/src/plugins/coreplugin/images/darkarrowup.png
deleted file mode 100644
index d3786d1927..0000000000
--- a/src/plugins/coreplugin/images/darkarrowup.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkarrowup@2x.png b/src/plugins/coreplugin/images/darkarrowup@2x.png
deleted file mode 100644
index 1465cdfe9d..0000000000
--- a/src/plugins/coreplugin/images/darkarrowup@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkclose.png b/src/plugins/coreplugin/images/darkclose.png
deleted file mode 100644
index 365fdb8ed7..0000000000
--- a/src/plugins/coreplugin/images/darkclose.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/darkclose@2x.png b/src/plugins/coreplugin/images/darkclose@2x.png
deleted file mode 100644
index 5c6b007c11..0000000000
--- a/src/plugins/coreplugin/images/darkclose@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightarrowdown.png b/src/plugins/coreplugin/images/lightarrowdown.png
deleted file mode 100644
index ccb04c2fdc..0000000000
--- a/src/plugins/coreplugin/images/lightarrowdown.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightarrowdown@2x.png b/src/plugins/coreplugin/images/lightarrowdown@2x.png
deleted file mode 100644
index 171e0a64a4..0000000000
--- a/src/plugins/coreplugin/images/lightarrowdown@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightarrowup.png b/src/plugins/coreplugin/images/lightarrowup.png
deleted file mode 100644
index ba7a70ed26..0000000000
--- a/src/plugins/coreplugin/images/lightarrowup.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightarrowup@2x.png b/src/plugins/coreplugin/images/lightarrowup@2x.png
deleted file mode 100644
index b2561589c4..0000000000
--- a/src/plugins/coreplugin/images/lightarrowup@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightclose.png b/src/plugins/coreplugin/images/lightclose.png
deleted file mode 100644
index 1c507592c6..0000000000
--- a/src/plugins/coreplugin/images/lightclose.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/lightclose@2x.png b/src/plugins/coreplugin/images/lightclose@2x.png
deleted file mode 100644
index f95b569a78..0000000000
--- a/src/plugins/coreplugin/images/lightclose@2x.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 2a90abdc55..3079f82218 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -33,6 +33,7 @@
 #include "buildconfiguration.h"
 #include "buildsteplist.h"
 #include "projectexplorerconstants.h"
+#include "projectexplorericons.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreicons.h>
@@ -75,8 +76,7 @@ ToolWidget::ToolWidget(QWidget *parent)
     m_disableButton->setAutoRaise(true);
     m_disableButton->setToolTip(BuildStepListWidget::tr("Disable"));
     m_disableButton->setFixedSize(buttonSize);
-    m_disableButton->setIcon(QIcon(creatorTheme()->imageFile(Theme::BuildStepDisable,
-            QLatin1String(":/projectexplorer/images/disabledbuildstep.png"))));
+    m_disableButton->setIcon(Icons::BUILDSTEP_DISABLE.icon());
     m_disableButton->setCheckable(true);
     hbox->addWidget(m_disableButton);
     layout->addWidget(m_firstWidget);
@@ -92,24 +92,21 @@ ToolWidget::ToolWidget(QWidget *parent)
     m_upButton->setAutoRaise(true);
     m_upButton->setToolTip(BuildStepListWidget::tr("Move Up"));
     m_upButton->setFixedSize(buttonSize);
-    m_upButton->setIcon(QIcon(creatorTheme()->imageFile(Theme::BuildStepMoveUp,
-            QLatin1String(":/core/images/darkarrowup.png"))));
+    m_upButton->setIcon(Icons::BUILDSTEP_MOVEUP.icon());
     hbox->addWidget(m_upButton);
 
     m_downButton = new QToolButton(m_secondWidget);
     m_downButton->setAutoRaise(true);
     m_downButton->setToolTip(BuildStepListWidget::tr("Move Down"));
     m_downButton->setFixedSize(buttonSize);
-    m_downButton->setIcon(QIcon(creatorTheme()->imageFile(Theme::BuildStepMoveDown,
-            QLatin1String(":/core/images/darkarrowdown.png"))));
+    m_downButton->setIcon(Icons::BUILDSTEP_MOVEDOWN.icon());
     hbox->addWidget(m_downButton);
 
     m_removeButton  = new QToolButton(m_secondWidget);
     m_removeButton->setAutoRaise(true);
     m_removeButton->setToolTip(BuildStepListWidget::tr("Remove Item"));
     m_removeButton->setFixedSize(buttonSize);
-    m_removeButton->setIcon(QIcon(creatorTheme()->imageFile(Theme::BuildStepRemove,
-            Core::Icons::DARK_CLOSE.imageFileName())));
+    m_removeButton->setIcon(Icons::BUILDSTEP_REMOVE.icon());
     hbox->addWidget(m_removeButton);
 
     layout->addWidget(m_secondWidget);
diff --git a/src/plugins/projectexplorer/images/buildstepdisable.png b/src/plugins/projectexplorer/images/buildstepdisable.png
new file mode 100644
index 0000000000..2c715aa254
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepdisable.png
diff --git a/src/plugins/projectexplorer/images/buildstepdisable@2x.png b/src/plugins/projectexplorer/images/buildstepdisable@2x.png
new file mode 100644
index 0000000000..3eae8612fd
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepdisable@2x.png
diff --git a/src/plugins/projectexplorer/images/buildstepmovedown.png b/src/plugins/projectexplorer/images/buildstepmovedown.png
new file mode 100644
index 0000000000..0cc3e5333d
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepmovedown.png
diff --git a/src/plugins/projectexplorer/images/buildstepmovedown@2x.png b/src/plugins/projectexplorer/images/buildstepmovedown@2x.png
new file mode 100644
index 0000000000..f02e6e0994
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepmovedown@2x.png
diff --git a/src/plugins/projectexplorer/images/buildstepmoveup.png b/src/plugins/projectexplorer/images/buildstepmoveup.png
new file mode 100644
index 0000000000..aa5d05422a
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepmoveup.png
diff --git a/src/plugins/projectexplorer/images/buildstepmoveup@2x.png b/src/plugins/projectexplorer/images/buildstepmoveup@2x.png
new file mode 100644
index 0000000000..fee08e052d
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepmoveup@2x.png
diff --git a/src/plugins/projectexplorer/images/buildstepremove.png b/src/plugins/projectexplorer/images/buildstepremove.png
new file mode 100644
index 0000000000..9f2bf5808d
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepremove.png
diff --git a/src/plugins/projectexplorer/images/buildstepremove@2x.png b/src/plugins/projectexplorer/images/buildstepremove@2x.png
new file mode 100644
index 0000000000..07b47199a4
--- /dev/null
+++ b/src/plugins/projectexplorer/images/buildstepremove@2x.png
diff --git a/src/plugins/projectexplorer/images/disabledbuildstep.png b/src/plugins/projectexplorer/images/disabledbuildstep.png
deleted file mode 100644
index a0e784cecb..0000000000
--- a/src/plugins/projectexplorer/images/disabledbuildstep.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/disabledbuildstep@2x.png b/src/plugins/projectexplorer/images/disabledbuildstep@2x.png
deleted file mode 100644
index 1e1608e425..0000000000
--- a/src/plugins/projectexplorer/images/disabledbuildstep@2x.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/lightdisabledbuildstep.png b/src/plugins/projectexplorer/images/lightdisabledbuildstep.png
deleted file mode 100644
index 476bebe32c..0000000000
--- a/src/plugins/projectexplorer/images/lightdisabledbuildstep.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/lightdisabledbuildstep@2x.png b/src/plugins/projectexplorer/images/lightdisabledbuildstep@2x.png
deleted file mode 100644
index 2bacc03ed3..0000000000
--- a/src/plugins/projectexplorer/images/lightdisabledbuildstep@2x.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index bc3caae0db..1994331835 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -54,10 +54,14 @@
         <file>images/stop_small@2x.png</file>
         <file>images/interrupt_small.png</file>
         <file>images/interrupt_small@2x.png</file>
-        <file>images/disabledbuildstep.png</file>
-        <file>images/disabledbuildstep@2x.png</file>
-        <file>images/lightdisabledbuildstep.png</file>
-        <file>images/lightdisabledbuildstep@2x.png</file>
+        <file>images/buildstepdisable.png</file>
+        <file>images/buildstepdisable@2x.png</file>
+        <file>images/buildstepmovedown.png</file>
+        <file>images/buildstepmovedown@2x.png</file>
+        <file>images/buildstepmoveup.png</file>
+        <file>images/buildstepmoveup@2x.png</file>
+        <file>images/buildstepremove.png</file>
+        <file>images/buildstepremove@2x.png</file>
         <file>images/unconfigured.png</file>
         <file>images/targetrightbutton.png</file>
         <file>images/targetrightbutton@2x.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h
index 4554844c7e..96e8baaa13 100644
--- a/src/plugins/projectexplorer/projectexplorericons.h
+++ b/src/plugins/projectexplorer/projectexplorericons.h
@@ -63,6 +63,16 @@ const Utils::Icon DEBUG_START(
 const Utils::Icon DEBUG_START_FLAT({
         {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor},
         {QLatin1String(":/projectexplorer/images/debugger_run_mask.png"), Utils::Theme::IconsRunColor}});
+
+const Utils::Icon BUILDSTEP_MOVEUP({
+        {QLatin1String(":/projectexplorer/images/buildstepmoveup.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Style::Tinted);
+const Utils::Icon BUILDSTEP_MOVEDOWN({
+        {QLatin1String(":/projectexplorer/images/buildstepmovedown.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Style::Tinted);
+const Utils::Icon BUILDSTEP_DISABLE({
+        {QLatin1String(":/projectexplorer/images/buildstepdisable.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Style::Tinted);
+const Utils::Icon BUILDSTEP_REMOVE({
+        {QLatin1String(":/projectexplorer/images/buildstepremove.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Style::Tinted);
+
 const Utils::Icon RUN_SMALL({
         {QLatin1String(":/projectexplorer/images/run_small.png"), Utils::Theme::IconsRunColor}});
 const Utils::Icon STOP_SMALL({
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index b7bb3ec4ce..7f0d7b680b 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -518,37 +518,6 @@
          x="329"
          y="536" />
     </clipPath>
-    <filter
-       id="lightenUp"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:label="lighten up"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Increase or decrease lightness and contrast"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood3736"
-         result="result1"
-         flood-opacity="0.65000000000000002"
-         flood-color="rgb(255,255,255)" />
-      <feBlend
-         id="feBlend3738"
-         in2="SourceGraphic"
-         mode="normal"
-         result="result2" />
-      <feComposite
-         id="feComposite3740"
-         in2="SourceGraphic"
-         k2="1"
-         operator="arithmetic"
-         result="result3" />
-      <feComposite
-         id="feComposite3742"
-         in2="SourceGraphic"
-         operator="in" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4115-6"
@@ -659,18 +628,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="453.11431"
-     inkscape:cy="22.83542"
+     inkscape:zoom="8"
+     inkscape:cx="93.473168"
+     inkscape:cy="23.946208"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer3"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="751"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-width="2880"
+     inkscape:window-height="1503"
+     inkscape:window-x="-13"
+     inkscape:window-y="527"
      inkscape:window-maximized="1"
      inkscape:snap-grids="true">
     <inkscape:grid
@@ -2916,7 +2885,7 @@
      id="layer3"
      inkscape:label="Build steps widget icons">
     <g
-       id="src/plugins/coreplugin/images/darkarrowdown"
+       id="src/plugins/projectexplorer/images/buildstepmovedown"
        transform="translate(-92,-32)">
       <rect
          y="584"
@@ -2924,16 +2893,16 @@
          height="16"
          width="16"
          id="rect3817-2"
-         style="fill:none" />
+         style="fill:#ffffff;fill-opacity:1;" />
       <path
-         style="fill:none;stroke:#434343;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1.0;stroke-dasharray:none"
          d="m 94.5,590.50006 5.5,5.5 5.5,-5.5"
          id="path3970-7"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccc" />
     </g>
     <g
-       id="src/plugins/coreplugin/images/darkarrowup"
+       id="src/plugins/projectexplorer/images/buildstepmoveup"
        transform="translate(-92,-32)">
       <rect
          y="584"
@@ -2941,95 +2910,56 @@
          height="16"
          width="16"
          id="rect3817-2-9"
-         style="fill:none" />
+         style="fill:#ffffff;fill-opacity:1" />
       <path
-         style="fill:none;stroke:#434343;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1.0;stroke-dasharray:none"
          d="m 110.5,596.5 5.5,-5.5 5.5,5.5"
          id="path3970-7-3"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccc" />
     </g>
     <g
-       id="src/plugins/coreplugin/images/darkclose"
+       id="src/plugins/projectexplorer/images/buildstepremove"
        transform="translate(-92,-32)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1"
+         id="rect3817-2-9-1"
+         width="16"
+         height="16"
+         x="124"
+         y="584" />
       <path
          inkscape:connector-curvature="0"
          id="path4122"
          d="m 127,587 10,10"
-         style="fill:none;stroke:#505050;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4124"
          d="m 127,597 10,-10"
-         style="fill:none;stroke:#505050;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:none"
-         id="rect3817-2-9-1"
-         width="16"
-         height="16"
-         x="124"
-         y="584" />
+         style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="src/plugins/projectexplorer/images/disabledbuildstep">
+       id="src/plugins/projectexplorer/images/buildstepdisable">
       <rect
-         style="fill:none"
+         style="fill:#ffffff;fill-opacity:1"
          id="rect4230"
          width="16"
          height="16"
          x="48"
          y="552" />
-      <path
-         d="M 61.2929,560 A 5.2929001,5.2929001 0 0 1 56,565.2929 5.2929001,5.2929001 0 0 1 50.7071,560 5.2929001,5.2929001 0 0 1 56,554.7071 5.2929001,5.2929001 0 0 1 61.2929,560 Z"
-         sodipodi:ry="5.2929"
-         sodipodi:rx="5.2929"
-         sodipodi:cy="560"
-         sodipodi:cx="56"
+      <circle
          id="path4226"
-         style="fill:#ffffff;fill-opacity:0;stroke:#505050;stroke-width:1.42;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.41999996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="56"
+         cy="560"
+         r="5.2929001" />
       <path
          inkscape:connector-curvature="0"
          id="path4228"
          d="m 52,564 c 8,-8 8,-8 8,-8"
-         style="fill:none;stroke:#505050;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:1.42;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1.0;stroke-dasharray:none" />
     </g>
-    <use
-       x="0"
-       y="0"
-       xlink:href="#src/plugins/coreplugin/images/darkarrowdown"
-       id="src/plugins/coreplugin/images/lightarrowdown"
-       transform="translate(64,0)"
-       width="800"
-       height="600"
-       style="filter:url(#lightenUp)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#src/plugins/coreplugin/images/darkarrowup"
-       id="src/plugins/coreplugin/images/lightarrowup"
-       transform="translate(64,0)"
-       width="800"
-       height="600"
-       style="filter:url(#lightenUp)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#src/plugins/coreplugin/images/darkclose"
-       id="src/plugins/coreplugin/images/lightclose"
-       transform="translate(64,0)"
-       width="800"
-       height="600"
-       style="filter:url(#lightenUp)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#src/plugins/projectexplorer/images/disabledbuildstep"
-       id="src/plugins/projectexplorer/images/lightdisabledbuildstep"
-       transform="translate(64,0)"
-       width="800"
-       height="600"
-       style="filter:url(#lightenUp)" />
   </g>
   <g
      inkscape:groupmode="layer"