aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-06-26 19:08:59 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2018-06-27 11:41:46 +0000
commitdad5e41ca9b1532bb44cac78887b86a51cf0800c (patch)
tree855e04675b2fafe03fbd8079b99104aecba854a8 /src/libs/utils
parentafe0a73f91ed3ee1977991c7c5d32b253cc89789 (diff)
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>
Diffstat (limited to 'src/libs/utils')
-rw-r--r--src/libs/utils/images/filtericon.pngbin127 -> 164 bytes
-rw-r--r--src/libs/utils/images/filtericon@2x.pngbin170 -> 193 bytes
-rw-r--r--src/libs/utils/images/toolbuttonexpandarrow.pngbin0 -> 110 bytes
-rw-r--r--src/libs/utils/images/toolbuttonexpandarrow@2x.pngbin0 -> 128 bytes
-rw-r--r--src/libs/utils/utils.qrc2
-rw-r--r--src/libs/utils/utilsicons.cpp3
6 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/utils/images/filtericon.png b/src/libs/utils/images/filtericon.png
index 0ced0c1ebe6..1afcb471b0d 100644
--- a/src/libs/utils/images/filtericon.png
+++ b/src/libs/utils/images/filtericon.png
Binary files differ
diff --git a/src/libs/utils/images/filtericon@2x.png b/src/libs/utils/images/filtericon@2x.png
index caa4c030817..5f389433992 100644
--- a/src/libs/utils/images/filtericon@2x.png
+++ b/src/libs/utils/images/filtericon@2x.png
Binary files differ
diff --git a/src/libs/utils/images/toolbuttonexpandarrow.png b/src/libs/utils/images/toolbuttonexpandarrow.png
new file mode 100644
index 00000000000..cf0fac90654
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow.png
Binary files differ
diff --git a/src/libs/utils/images/toolbuttonexpandarrow@2x.png b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
new file mode 100644
index 00000000000..8f53c0cd36d
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
Binary files differ
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index c3537648e37..032ca917c0d 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 66798a9449d..62f87437064 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({