From 06946be2559615d4b91574f51ba48063d7cdcf7e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 24 Nov 2015 17:41:44 +0100 Subject: [PATCH] PluginView: Refresh icons HighDPI Change-Id: If84b5f1642317d2cbc900cb1122f81e4790b0e39 Reviewed-by: Eike Ziller --- src/libs/extensionsystem/images/error.png | Bin 111 -> 137 bytes src/libs/extensionsystem/images/error@2x.png | Bin 0 -> 263 bytes src/libs/extensionsystem/images/notloaded.png | Bin 98 -> 94 bytes .../extensionsystem/images/notloaded@2x.png | Bin 0 -> 96 bytes src/libs/extensionsystem/images/ok.png | Bin 103 -> 165 bytes src/libs/extensionsystem/images/ok@2x.png | Bin 0 -> 221 bytes src/libs/extensionsystem/pluginview.cpp | 31 +++++++-- src/libs/extensionsystem/pluginview.qrc | 3 + src/tools/icons/qtcreatoricons.svg | 60 ++++++++++++++++++ 9 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 src/libs/extensionsystem/images/error@2x.png create mode 100644 src/libs/extensionsystem/images/notloaded@2x.png create mode 100644 src/libs/extensionsystem/images/ok@2x.png diff --git a/src/libs/extensionsystem/images/error.png b/src/libs/extensionsystem/images/error.png index e2f85d98eb6be75eab124bb15dc9cfd549bdd900..3afb9548f6d8a91c581f64620a51e28c4f674ed2 100644 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq1bDhQhDc0J{?X4S(IN7K zNnL^ItJL{_|Ld1V^9lc0ba=t%PpT7sFa>|~n(i1n+3~UEp`P$rJUm+G|1ajWaprK? oYI8U@gZ;#w@Ljw+WZh;xXJ~zQJD~Yc&K-~)p00i_>zopr0Bb}sp8x;= literal 111 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4%sgEjLnNlQ_B--17;qe# zReNW7`Szoh#+H&T3>;D(jg3vuPb_Lb?UKI3_36&6vhMsN5k<3hGFs*aE%oEHIm^Jn Oz~JfX=d#Wzp$Py`A|lHG diff --git a/src/libs/extensionsystem/images/error@2x.png b/src/libs/extensionsystem/images/error@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..af6c94483e85cc63c5b2a945a930a70e556566d2 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT81_3@Ht_%zeOiWD7%*-q- zEam0p_4V})4GkR~9g7z)Ub1A#iWMtXty;Bu_3F!)FJHNG<^TWxv-FmBFfcGo@^ojAzYvnr^>jRWSc!n9!X4ldtT_!#5>z~JfX=d#Wzp$Pyv-Duqa literal 0 HcmV?d00001 diff --git a/src/libs/extensionsystem/images/notloaded.png b/src/libs/extensionsystem/images/notloaded.png index 6c081a0a4548dc06aafb09f2e79042ce4b324ae2..16de272cae98f2c1b52809baf721bbb181912158 100644 GIT binary patch literal 94 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_HR|W=#|Ns9ly*d9b w0|SGwr;B3FVdQ&MBb@0KMZFhyVZp literal 98 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4G(BA$LnJOICmdjpGZ38c zhkwa`al?v7hZR`=e@t8?@?bmDQAd{8URDN%rWQ}bM_O;rFfcGMc)I$ztaD0e0syD` B9S#5h diff --git a/src/libs/extensionsystem/images/notloaded@2x.png b/src/libs/extensionsystem/images/notloaded@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..902bf624cd9e2b487dceb67ef69b3e5ffd00005b GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f w85kHuJzX3_IA$jQ;Ai2PBFw`xgT>T`jUm>%yz|22PjU<(t*(A9>zopr04b0efdBvi literal 0 HcmV?d00001 diff --git a/src/libs/extensionsystem/images/ok.png b/src/libs/extensionsystem/images/ok.png index 15cd35d27ba6e3dd4f0572d640482b69ee77c36f..13d8dfaae2fa345bf4389d9df0586012c4500aa3 100644 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdte8d_r6q7#NtCm^3srbaZrd zb#=qS!lq80I&IptD_5>OfByXC%a^ZSz54(EKZ~j9ZUzPhOHUWa5RT|%3uacH7Kzgf zdxF_41&)a=vs7@qs>!T9;fmq2v}dLY$26H4wL8`wRbUi&93pZ^<_`~prGL!zpR>D; RGB7YOc)I$ztaD0e0s!x|H&Orq literal 103 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4^gLZ0LnNjqCmdjpGx&R4 z|L1(hcBUCmxR?E(acqHyk%7U20t1zctcEIuQr=C|8B&<^8UqDZ`7H$6>t_%ze%*@OzEG*^a z<@NRTix)3mvSi7M6)RS)TD5xh>dTieU%7JS|NsBoMg6B47#IpYT^vI+&L>+mvq`YU zCGgKWz?o{&sKzEO()gH*CrX3Km#4?_1e3am#E}PSbJ!j!u`QF@(U8m&!x-^^qgmq& zOUD5vwq-@EY^5#Ujbd7kz74Yij~rkKW)Ni1YSe7ll`M3HYsUf4qcSG%r}Hn%U|?oY Y$u8-<(ICEofq{X+)78&qol`;+042>y;s5{u literal 0 HcmV?d00001 diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 817bfd36c5e..33a4f108062 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -88,14 +89,30 @@ enum IconIndex { OkIcon, ErrorIcon, NotLoadedIcon }; static const int SortRole = Qt::UserRole + 1; -static const QIcon &icon(int num) +static const QIcon &icon(IconIndex icon) { - static QIcon icons[] = { - QIcon(QLatin1String(":/extensionsystem/images/ok.png")), - QIcon(QLatin1String(":/extensionsystem/images/error.png")), - QIcon(QLatin1String(":/extensionsystem/images/notloaded.png")), - }; - return icons[num]; + using namespace Utils; + switch (icon) { + case OkIcon: { + static const QIcon ok = + Icon({{QLatin1String(":/extensionsystem/images/ok.png"), + Theme::IconsRunColor}}, Icon::Style::Tinted).icon(); + return ok; + } + case ErrorIcon: { + static const QIcon error = + Icon({{QLatin1String(":/extensionsystem/images/error.png"), + Theme::IconsErrorColor}}, Icon::Style::Tinted).icon(); + return error; + } + default: + case NotLoadedIcon: { + static const QIcon notLoaded = + Icon({{QLatin1String(":/extensionsystem/images/notloaded.png"), + Theme::IconsErrorColor}}, Icon::Style::Tinted).icon(); + return notLoaded; + } + } } class PluginItem : public TreeItem diff --git a/src/libs/extensionsystem/pluginview.qrc b/src/libs/extensionsystem/pluginview.qrc index aa772f9547c..da218976eb7 100644 --- a/src/libs/extensionsystem/pluginview.qrc +++ b/src/libs/extensionsystem/pluginview.qrc @@ -1,7 +1,10 @@ images/ok.png + images/ok@2x.png images/error.png + images/error@2x.png images/notloaded.png + images/notloaded@2x.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 6b3645aba52..be39a7746d3 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1509,6 +1509,66 @@ d="m 322.76517,465.96966 -17.45581,2.61872 5.9902,-17.11022" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + + + + + + +