Utils: Separate the filter icon from the expand arrow

...so that the filter funnel can be used stand-alone

Change-Id: Ic8675954edd4234f84de8caffedd1a67b67b2edd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

8 files changed, 29 insertions, 9 deletions

diff --git a/src/libs/utils/images/filtericon.png b/src/libs/utils/images/filtericon.png
index 0ced0c1ebe..1afcb471b0 100644
--- a/src/libs/utils/images/filtericon.png
+++ b/src/libs/utils/images/filtericon.png
diff --git a/src/libs/utils/images/filtericon@2x.png b/src/libs/utils/images/filtericon@2x.png
index caa4c03081..5f38943399 100644
--- a/src/libs/utils/images/filtericon@2x.png
+++ b/src/libs/utils/images/filtericon@2x.png
diff --git a/src/libs/utils/images/toolbuttonexpandarrow.png b/src/libs/utils/images/toolbuttonexpandarrow.png
new file mode 100644
index 0000000000..cf0fac9065
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow.png
diff --git a/src/libs/utils/images/toolbuttonexpandarrow@2x.png b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
new file mode 100644
index 0000000000..8f53c0cd36
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index c3537648e3..032ca917c0 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -207,5 +207,7 @@
         <file>images/lightbulb@2x.png</file>
         <file>images/lightbulbcap.png</file>
         <file>images/lightbulbcap@2x.png</file>
+        <file>images/toolbuttonexpandarrow.png</file>
+        <file>images/toolbuttonexpandarrow@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp
index 66798a9449..62f8743706 100644
--- a/src/libs/utils/utilsicons.cpp
+++ b/src/libs/utils/utilsicons.cpp
@@ -176,7 +176,8 @@ const Icon CLOSE_SPLIT_LEFT({
 const Icon CLOSE_SPLIT_RIGHT({
         {QLatin1String(":/utils/images/splitbutton_closeright.png"), Theme::IconsBaseColor}});
 const Icon FILTER({
-        {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}});
+        {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor},
+        {QLatin1String(":/utils/images/toolbuttonexpandarrow.png"), Theme::IconsBaseColor}});
 const Icon LINK({
         {QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
 const Icon LINK_TOOLBAR({
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index 8f7c56dab9..e1976771ab 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -33,8 +33,9 @@
 #include <cpptools/cppmodelmanager.h>
 #include <projectexplorer/session.h>
 #include <utils/algorithm.h>
+#include <utils/icon.h>
 #include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
+#include <utils/theme/theme.h>
 
 #include <QRegExp>
 
@@ -112,7 +113,9 @@ QVariant GTestTreeItem::data(int column, int role) const
     case Qt::DecorationRole:
         if (type() == GroupNode
                 && GTestFramework::groupMode() == GTest::Constants::GTestFilter) {
-            return Utils::Icons::FILTER.icon(); // TODO replace by an 'inked' filter w/o arrow
+            static const QIcon filterIcon = Utils::Icon({{":/utils/images/filtericon.png",
+                                                          Utils::Theme::PanelTextColorMid}}).icon();
+            return filterIcon;
         }
         break;
     case Qt::ToolTipRole:
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e71331e4ee..66fa8dfc87 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3376,12 +3376,6 @@
          width="16"
          id="rect3817-2-9-1-9-6-2"
          style="fill:#ffffff" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4784"
-         d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
-         style="fill:#000000;fill-opacity:1;stroke:none" />
       <polygon
          transform="translate(93.999999,334)"
          id="polygon4959-9"
@@ -6012,6 +6006,26 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccccccccccccccc" />
     </g>
+    <g
+       id="src/libs/utils/images/toolbuttonexpandarrow"
+       style="display:inline"
+       clip-path="url(#clipPath4845-7)"
+       transform="translate(-131,-32)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect"
+         id="use5933-0-9"
+         width="100%"
+         height="100%"
+         transform="translate(211,148)" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4784-17"
+         d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"