From dad5e41ca9b1532bb44cac78887b86a51cf0800c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jun 2018 19:08:59 +0200 Subject: [PATCH] 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 --- src/libs/utils/images/filtericon.png | Bin 127 -> 164 bytes src/libs/utils/images/filtericon@2x.png | Bin 170 -> 193 bytes .../utils/images/toolbuttonexpandarrow.png | Bin 0 -> 110 bytes .../utils/images/toolbuttonexpandarrow@2x.png | Bin 0 -> 128 bytes src/libs/utils/utils.qrc | 2 ++ src/libs/utils/utilsicons.cpp | 3 +- src/plugins/autotest/gtest/gtesttreeitem.cpp | 7 +++-- src/tools/icons/qtcreatoricons.svg | 26 ++++++++++++++---- 8 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 src/libs/utils/images/toolbuttonexpandarrow.png create mode 100644 src/libs/utils/images/toolbuttonexpandarrow@2x.png diff --git a/src/libs/utils/images/filtericon.png b/src/libs/utils/images/filtericon.png index 0ced0c1ebe6819985e67849de3692f792177ac18..1afcb471b0dcd09e71bb5e2babf9832e9b3a916c 100644 GIT binary patch delta 147 zcmb3l7 zOH>_u?D=@k{65$<-|&c2so@{>GZ_tr`;xbdFf4J)5L}=(fp;nc0|SGntDnm{r-UW| D`CmBS delta 109 zcmZ3&SU*7`or8gafx&9Vg1rn33~rt-jv*3LlYjKHNpuJ%G%&|7aqm=&IXBb5c-`x! zA5zl=+UmTM6FUAjC2=z|PtrZYUBcj-*T7j~(9p@&a{0C65ynL}>!Y0 delta 154 zcmX@exQcOtL_G%s0|P^tpsEG~14E&wi(`nz>Es{&3s>28Nlm}7_opszq}?~}X$1}u%?5I&3lgp=NcM|O63Cv=dz>RH;tJz z>@jkoj_h~3_-5Ed&3e%3}F;j`CK|(@8f|FPQ8`p{j8HNm64uS=2S`MZm e6Timages/lightbulb@2x.png images/lightbulbcap.png images/lightbulbcap@2x.png + images/toolbuttonexpandarrow.png + images/toolbuttonexpandarrow@2x.png 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({ diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp index 8f7c56dab97..e1976771ab0 100644 --- a/src/plugins/autotest/gtest/gtesttreeitem.cpp +++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp @@ -33,8 +33,9 @@ #include #include #include +#include #include -#include +#include #include @@ -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 e71331e4ee6..66fa8dfc87f 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" /> - + + + +