From 4317e350f5d51bfefbf08bc2c6f44c7821f1d382 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 23 Apr 2018 19:06:13 +0200 Subject: [PATCH] Update Options dialog icons A new set of scalable and themable icons with unified look as provided by Diana. Task-number: QTCREATORBUG-20325 Change-Id: I68498b034e9e43fbb61511a38d9c7fc0003ab076 Reviewed-by: hjk --- src/plugins/autotest/autotest.qrc | 3 +- src/plugins/autotest/images/autotest.png | Bin 683 -> 0 bytes .../images/settingscategory_autotest.png | Bin 0 -> 180 bytes .../images/settingscategory_autotest@2x.png | Bin 0 -> 312 bytes src/plugins/autotest/testsettingspage.cpp | 3 +- src/plugins/beautifier/beautifier.qrc | 4 +- src/plugins/beautifier/generaloptionspage.cpp | 3 +- src/plugins/beautifier/images/beautifier.png | Bin 1037 -> 0 bytes .../beautifier/images/beautifier@2x.png | Bin 2197 -> 0 bytes .../images/settingscategory_beautifier.png | Bin 0 -> 273 bytes .../images/settingscategory_beautifier@2x.png | Bin 0 -> 602 bytes src/plugins/clangtools/clangtoolsplugin.cpp | 4 +- src/plugins/coreplugin/core.qrc | 7 +- src/plugins/coreplugin/generalsettings.cpp | 3 +- .../coreplugin/images/category_design.png | Bin 1541 -> 0 bytes .../coreplugin/images/category_texteditor.png | Bin 573 -> 0 bytes .../images/settingscategory_core.png | Bin 0 -> 173 bytes .../images/settingscategory_core@2x.png | Bin 0 -> 195 bytes .../images/settingscategory_design.png | Bin 0 -> 176 bytes .../images/settingscategory_design@2x.png | Bin 0 -> 243 bytes src/plugins/cpaster/cpaster.qrc | 3 +- .../cpaster/images/category_cpaster.png | Bin 1442 -> 0 bytes .../images/settingscategory_cpaster.png | Bin 0 -> 123 bytes .../images/settingscategory_cpaster@2x.png | Bin 0 -> 134 bytes src/plugins/cpaster/settingspage.cpp | 3 +- .../cpptools/cppcodemodelsettingspage.cpp | 3 +- src/plugins/cpptools/cpptools.qrc | 3 +- src/plugins/cpptools/images/category_cpp.png | Bin 967 -> 0 bytes .../cpptools/images/settingscategory_cpp.png | Bin 0 -> 159 bytes .../images/settingscategory_cpp@2x.png | Bin 0 -> 278 bytes src/plugins/debugger/analyzer/analyzer.pri | 1 + .../debugger/analyzer/analyzerbase.qrc | 3 +- src/plugins/debugger/analyzer/analyzericons.h | 37 ++ .../analyzer/images/analyzer_category.png | Bin 957 -> 0 bytes .../images/settingscategory_analyzer.png | Bin 0 -> 110 bytes .../images/settingscategory_analyzer@2x.png | Bin 0 -> 118 bytes src/plugins/debugger/commonoptionspage.cpp | 3 +- src/plugins/debugger/debugger.qbs | 1 + src/plugins/debugger/debugger.qrc | 3 +- .../debugger/images/category_debug.png | Bin 1283 -> 0 bytes .../images/settingscategory_debugger.png | Bin 0 -> 226 bytes .../images/settingscategory_debugger@2x.png | Bin 0 -> 410 bytes src/plugins/designer/settingspage.cpp | 3 +- src/plugins/fakevim/fakevim.qrc | 3 +- src/plugins/fakevim/fakevimplugin.cpp | 3 +- .../fakevim/images/category_fakevim.png | Bin 1212 -> 0 bytes .../images/settingscategory_fakevim.png | Bin 0 -> 253 bytes .../images/settingscategory_fakevim@2x.png | Bin 0 -> 448 bytes src/plugins/help/generalsettingspage.cpp | 3 +- src/plugins/help/help.qrc | 3 +- src/plugins/help/images/category_help.png | Bin 1381 -> 0 bytes .../help/images/settingscategory_help.png | Bin 0 -> 228 bytes .../help/images/settingscategory_help@2x.png | Bin 0 -> 429 bytes src/plugins/nim/images/nim.png | Bin 1511 -> 0 bytes .../nim/images/settingscategory_nim.png | Bin 0 -> 245 bytes .../nim/images/settingscategory_nim@2x.png | Bin 0 -> 511 bytes src/plugins/nim/nim.qrc | 3 +- src/plugins/nim/nimconstants.h | 1 - src/plugins/nim/nimplugin.cpp | 3 +- .../nim/settings/nimcodestylesettingspage.cpp | 3 +- .../devicesupport/devicesettingspage.cpp | 3 +- .../images/category_buildrun.png | Bin 1153 -> 0 bytes .../images/settingscategory_buildrun.png | Bin 0 -> 187 bytes .../images/settingscategory_buildrun@2x.png | Bin 0 -> 232 bytes .../images/settingscategory_devices.png | Bin 0 -> 122 bytes .../images/settingscategory_devices@2x.png | Bin 0 -> 127 bytes .../images/settingscategory_kits.png | Bin 0 -> 161 bytes .../images/settingscategory_kits@2x.png | Bin 0 -> 253 bytes .../projectexplorer/kitoptionspage.cpp | 6 +- .../projectexplorer/projectexplorer.qrc | 7 +- .../projectexplorersettingspage.cpp | 3 +- .../qmljstools/images/category_qml.png | Bin 876 -> 0 bytes .../images/settingscategory_qml.png | Bin 0 -> 232 bytes .../images/settingscategory_qml@2x.png | Bin 0 -> 416 bytes .../qmljstools/qmljscodestylesettingspage.cpp | 3 +- src/plugins/qmljstools/qmljstools.qrc | 3 +- .../qmlprofiler/qmlprofileroptionspage.cpp | 4 +- .../images/settingscategory_texteditor.png | Bin 0 -> 107 bytes .../images/settingscategory_texteditor@2x.png | Bin 0 -> 113 bytes src/plugins/texteditor/texteditor.qrc | 2 + .../texteditor/texteditoroptionspage.cpp | 3 +- .../todo/images/settingscategory_todo.png | Bin 0 -> 96 bytes .../todo/images/settingscategory_todo@2x.png | Bin 0 -> 100 bytes src/plugins/todo/images/todo.png | Bin 165 -> 0 bytes src/plugins/todo/optionspage.cpp | 3 +- src/plugins/todo/todoplugin.qrc | 3 +- src/plugins/valgrind/valgrindplugin.cpp | 3 +- src/plugins/vcsbase/images/category_vcs.png | Bin 1014 -> 0 bytes .../vcsbase/images/settingscategory_vcs.png | Bin 0 -> 158 bytes .../images/settingscategory_vcs@2x.png | Bin 0 -> 195 bytes src/plugins/vcsbase/vcsbase.qrc | 3 +- src/plugins/vcsbase/vcsbaseoptionspage.cpp | 3 +- src/tools/icons/qtcreatoricons.svg | 527 ++++++++++++++++++ 93 files changed, 646 insertions(+), 42 deletions(-) delete mode 100644 src/plugins/autotest/images/autotest.png create mode 100644 src/plugins/autotest/images/settingscategory_autotest.png create mode 100644 src/plugins/autotest/images/settingscategory_autotest@2x.png delete mode 100644 src/plugins/beautifier/images/beautifier.png delete mode 100644 src/plugins/beautifier/images/beautifier@2x.png create mode 100644 src/plugins/beautifier/images/settingscategory_beautifier.png create mode 100644 src/plugins/beautifier/images/settingscategory_beautifier@2x.png delete mode 100644 src/plugins/coreplugin/images/category_design.png delete mode 100644 src/plugins/coreplugin/images/category_texteditor.png create mode 100644 src/plugins/coreplugin/images/settingscategory_core.png create mode 100644 src/plugins/coreplugin/images/settingscategory_core@2x.png create mode 100644 src/plugins/coreplugin/images/settingscategory_design.png create mode 100644 src/plugins/coreplugin/images/settingscategory_design@2x.png delete mode 100644 src/plugins/cpaster/images/category_cpaster.png create mode 100644 src/plugins/cpaster/images/settingscategory_cpaster.png create mode 100644 src/plugins/cpaster/images/settingscategory_cpaster@2x.png delete mode 100644 src/plugins/cpptools/images/category_cpp.png create mode 100644 src/plugins/cpptools/images/settingscategory_cpp.png create mode 100644 src/plugins/cpptools/images/settingscategory_cpp@2x.png create mode 100644 src/plugins/debugger/analyzer/analyzericons.h delete mode 100644 src/plugins/debugger/analyzer/images/analyzer_category.png create mode 100644 src/plugins/debugger/analyzer/images/settingscategory_analyzer.png create mode 100644 src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png delete mode 100644 src/plugins/debugger/images/category_debug.png create mode 100644 src/plugins/debugger/images/settingscategory_debugger.png create mode 100644 src/plugins/debugger/images/settingscategory_debugger@2x.png delete mode 100644 src/plugins/fakevim/images/category_fakevim.png create mode 100644 src/plugins/fakevim/images/settingscategory_fakevim.png create mode 100644 src/plugins/fakevim/images/settingscategory_fakevim@2x.png delete mode 100644 src/plugins/help/images/category_help.png create mode 100644 src/plugins/help/images/settingscategory_help.png create mode 100644 src/plugins/help/images/settingscategory_help@2x.png delete mode 100644 src/plugins/nim/images/nim.png create mode 100644 src/plugins/nim/images/settingscategory_nim.png create mode 100644 src/plugins/nim/images/settingscategory_nim@2x.png delete mode 100644 src/plugins/projectexplorer/images/category_buildrun.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_buildrun.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_buildrun@2x.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_devices.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_devices@2x.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_kits.png create mode 100644 src/plugins/projectexplorer/images/settingscategory_kits@2x.png delete mode 100644 src/plugins/qmljstools/images/category_qml.png create mode 100644 src/plugins/qmljstools/images/settingscategory_qml.png create mode 100644 src/plugins/qmljstools/images/settingscategory_qml@2x.png create mode 100644 src/plugins/texteditor/images/settingscategory_texteditor.png create mode 100644 src/plugins/texteditor/images/settingscategory_texteditor@2x.png create mode 100644 src/plugins/todo/images/settingscategory_todo.png create mode 100644 src/plugins/todo/images/settingscategory_todo@2x.png delete mode 100644 src/plugins/todo/images/todo.png delete mode 100644 src/plugins/vcsbase/images/category_vcs.png create mode 100644 src/plugins/vcsbase/images/settingscategory_vcs.png create mode 100644 src/plugins/vcsbase/images/settingscategory_vcs@2x.png diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc index 580958b1f6e..f4f6892d47d 100644 --- a/src/plugins/autotest/autotest.qrc +++ b/src/plugins/autotest/autotest.qrc @@ -1,6 +1,7 @@ - images/autotest.png + images/settingscategory_autotest.png + images/settingscategory_autotest@2x.png images/sort.png images/sort@2x.png images/leafsort.png diff --git a/src/plugins/autotest/images/autotest.png b/src/plugins/autotest/images/autotest.png deleted file mode 100644 index 3f52e9bf08f153f408bdcf60bbf382d649796f87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 683 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8N3<&TEasB`QKLY~;Ljwat z0s})l7$tz&V3IMBktvahIf z<*UkT*VQ&`XlU8g(!Qm=b8Bb!_U`_j{S$Ugn7C`=q}`Jy@0mPx@6;LlXUyC`bMB$J z^AFEobac_u<4c#FShnKiiZ!R#tUtSc!?_I`&u!d(Y5R`LJN91Nd*H@_W4Di;ynFK8 zgL4-jUA*!9#@$zU@4vqP@Xf<#@1MQ+_~OmyH*deZegF0Shi@M~egE|N$LB9UzI^@p z_4}{yKY#!H_2<{`zrX+f`}^UtIM4p3*Lt5C8sKn_DL8&fi(P?%SDd zI{mUggm1@Z{Y>e(zUgd2G@~&Kmq3=Tv15kr>B~JTnJ+EBa+fjAm@abWLqK4Qo}Jrm z@rv9DN>4h(6pwZ-F+R35RP3hCAx%L~VIA-Ce$$)37jT=Gct}0)Nc>jn)6X5=qRP8@ zxnLUE3b5`eW`z-^I1?3dAj83}BtcMk+r-CK_>?7V2j(F<`nJRQf`E=?hZU6s&zxFRl=SB8BNBHJ8 z=zaA5XL6(NXMBcG_Z-D#*1B$!FWl!V-Dv03^#7UfzyC`7idJ%63My%yUgv(@KhMai g-B%aoqHD&$kYs-I6910v6G6`LboFyt=akR{0AKn(hX4Qo literal 0 HcmV?d00001 diff --git a/src/plugins/autotest/images/settingscategory_autotest@2x.png b/src/plugins/autotest/images/settingscategory_autotest@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..df6c13c715988018fc15ddf3aa5bada72be14adf GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_a>|2&Rd@#^-o}BqN&f}EG5&3112+smM7{f zE&49F^kDNs) &settings) setDisplayName(tr("General")); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("AutoTest", Constants::AUTOTEST_SETTINGS_TR)); - setCategoryIcon(Utils::Icon(":/autotest/images/autotest.png")); + setCategoryIcon(Utils::Icon({{":/autotest/images/settingscategory_autotest.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } TestSettingsPage::~TestSettingsPage() diff --git a/src/plugins/beautifier/beautifier.qrc b/src/plugins/beautifier/beautifier.qrc index cab6cb4740d..6a5621d4c5d 100644 --- a/src/plugins/beautifier/beautifier.qrc +++ b/src/plugins/beautifier/beautifier.qrc @@ -1,6 +1,6 @@ - images/beautifier.png - images/beautifier@2x.png + images/settingscategory_beautifier.png + images/settingscategory_beautifier@2x.png diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index d431a290573..c2bec707404 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -83,7 +83,8 @@ GeneralOptionsPage::GeneralOptionsPage(const QSharedPointer &se setDisplayName(tr("General")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", "Beautifier")); - setCategoryIcon(Utils::Icon(":/beautifier/images/beautifier.png")); + setCategoryIcon(Utils::Icon({{":/beautifier/images/settingscategory_beautifier.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *GeneralOptionsPage::widget() diff --git a/src/plugins/beautifier/images/beautifier.png b/src/plugins/beautifier/images/beautifier.png deleted file mode 100644 index 69b25dd6b964f4f3ba0be7b26077f90e23bac2a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1037 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bes~DuXa%kz@Hi1_lQ95>H=O_IvDnLKcSa|7>SwU|^o*>EamTaeV94=nR=s zkz@P+pILV^c5;rnZ}H778*fBpHcxbVwDbb^7Lx@@ft*_cdagw5nYt&_mCG^UcaVGw z+Y&92T7jurU6V3aw+eL{PRiYyeP-LqXKAxfueQ`pXnN?YD zDVlNV;={leb7n^Su07iqt~b9jtMcE`!>8F2jQ{G)c+X&XZCz|{giYtZ`TBd(_7@cV z|D>@YRlh^=$cmL(?YmF(ZajVYh5i5EyT2Kqx2-zO;2NXs!eDH|_%246rCUKpHvHkk zPXEpRTXT1svK~=YVC!H^yRvp2i*|$S1#6MQ{+O9>jppZMNBj~IoUg^u@vwAvV00j# zP(#Frzw4X#X&Z0MPrbkIl`3P&xqWAja0)2CcdgCkm0%KTJlV32yIJ&d;bQNos6E}^ z7i|9g=;FnX*L`PSniRb8(sS3VT|pZ-B3LxFyY&z4H;vhQPJP;zjP%JX`{(z?aNRbG z{26A-(!5{}SDV7LlMhxe?ACqxO#PNP?~h;Y@7*4kg;@*8N+u*R8D{-m%2BbmPux=V zVhYpU#TU1~ncHu_N5etS&+q29zi%f`w(S#dIhIg*uzSy}3vbq3v$g!Tb7SrIbFPdL zp7snqDQAT?zO?ArSm(;nJ9TP;1(ydy(}MJ>Q>8^EOJ4W?E|c*$wGAl^X1M!|^La|> z3`K7F25;c2sm^- zncNwe0&F#^mG4uT4)VL`*SY*71lGQ(CFAte2<8%YEj%V|V4`O9UH^Mutt4WN`1| z318kd&+yqS9>!ygx~vTIF3;y}{JBMB+nj(kCONzIikxla%F*OZSbUt_HvWbtAH!+} z8B^OY-GSRH=bFX$^)OD-Q0cHgu|4yjtH3_R=OXie?<_sFwD!fU=|L7uOGO#-rs?ZG z6Y=Ppm_7Nj-t(OW|ECKiG)HChon022@9;!az&TGxXVZb(MjI3yj_q^G#;m2HM zTlOFA9vqKl(hK`^kF=)0id`30YJ9sQDf#g-muY>Ku6ILMe|c22bf(%76V}LR6T3N+d1!v0UQkfm}2+3Rv!rdl+3`uz~JfX=d#Wzp$Py~h1Mzn diff --git a/src/plugins/beautifier/images/beautifier@2x.png b/src/plugins/beautifier/images/beautifier@2x.png deleted file mode 100644 index d44edef21d0f97676258e682753aaa62fd85b130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2197 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F-?HE{-7?_wGh!=7e0A zwEe!<-1yjUBLj)sHxg#w%@o=0&=PFf*ut@O3)@UB-$0LmsbPg;GnXhW5?ZWeYCp+q z<)yAAua>P?sdT47qj2pO&BESL=j77?8xC^I^@~5MxSv*;e{Xkueb4eV}v@(QiOK$L#(Bs+WxMz3c@0&MDkK|E zIkc2Y7ai=pP`H}=ZtULbpI^S@PutJhAHVSJN(Cm9M;SYcc!Py6t6vq5ugt3ydax&meck)3X4*oN9yv0I zxVrw`KU?wir|Ny;adkD3f(w$5uW{KTf9Jj3FEu3*u_wQNHWlA{U;f*FfJg8_Q8s%Od;9)%vz}&I)mS9H z-A>i^q3B&MbD0WyjdS@Xkr(+$mn#XRgp?wW=w~ME>p=2(M@YJH_Y&L z{P3ZE$qFgEomI?}^Umj8RSyZQ+_~e2(zO+*IcB&=G%%isPiCIaxL#P1LC)3D_cL#W z=+o#~692ymWi-?^N-*(lb*o!;_Pv|pgVO0zpDR9Wf4%lYVcbF)t51tvRTcienqJSe z{PM#*;Z>YUPF{bwA|_8_dSE%x@dmSS@DKNFX@@_u@jo9P7uz~Tpxrob=Cv)_9KCKL zEbDiNB|cl_5On#o(~1rG{XL7;ecr~x8+z}ry+(uy)0$K3{w&%2_=@jz>jmswzByGU zQK_v5A~*`V1ioF>XS;Ca{(L=yy2fwz)3;n;VG3Nla`)=R`i5I`s*{>jLq#Sx@yXv& zV(IbQZSbn>=hH?3+m?*Q=`}Li!jIOj)NbKjeki%sREGok1vRit@W$w;Xod2jxY-*UAio*R_ zi63fX`D>P4QDEp=_AsZ~dRgs0^O|aYn_U_#S$eTjObhS1Px-m$vZc|o74I?vGt=|< zBq9uyBwKtNALR#4{21uou95wxr@Z`T8>>3Q|F?5l8D?I-CI8Lxz0b;7w=-D#M7mj{ zbF`TcsV>^k!BT%odBOdsPFpwMKE)FA<(=h@x`&)Iepvq9+Wxs|@n2iN^~aQTHri@) z3ndGB_MUIx-zC1VG>1ptdiQ3Qb^k8^J^TKNjz**Z>(|u`*Ou7twz&W2apS)8j!Rn2 zY(7qEnR_#m@u3@swT_i(f8T;#>(%{J{w#Vuk$EP!8v}#H;?oPyJFhb1@XK#Aw>i4) z>Iq*zKF;NCAL@dt{<{3ANs$o$Rn2Yj-9&TuH(URsN0+fGIvj~QRB}VSAl2?as>Q{Yy{q9@o_GRk-S6HY=J;}HEXxnA9 zdapi{ovTTd!vPV78RzEz6mj7d+^ML?*Urs7F>9Ly!)x6Pml<<6hV8%JYyYMEv9J5@ zW7k%8@=tC57BgA?&fmM1!YguD$+8)UJPK}nsQ0`=IqLUJt(hNv>J&c-O+GY9O7d_{ z%W6TkS|hz49tIaz7OUsAA1=DRXI|=m&z$l9jaj#v_#K(1$wsd_cv5ohUmpQio4M2b zoh>UpjA!#!Dhi|>Zt-O>@=2SLp3?N?lk4K7f>j^$YM&T?pEgOhTv?#_l}}G^L&+Z# z*#}A6i|-4w-&0;RpWTU9a=DbW@Z^d6?F6^09e-G`^Fe|CL+?no#t9l;9#d3QIF-U? zJ_-;J@Bg!-!hQln^k1DRTrH>X`Kmsjp*Ckj$(6f%(wP)`+PB#1J??)|Zs%7fFw<~y zXYaKS@_Td*S#JwXVvOQ-eLP`CJ&(|@y&d;IZP2>0|CGm*-%ov2-)B!MF#6{f`+kic zOM=pm?Y!m!3HA2o9E&!$&F;T=_T}v}GX!gU!}+W|w8(!@ys!7QE0j@OZqj`s0n$OdHB=W_$bHz02go5#iwDIg{i6jgpV+ zOCLNjX?U{$9hd=)Hc^=>@&NKj{0qHLGP?&&YheM_|F)rJY@_84A3&pWRLs5s)%voo*ue zbykms!S^c1tQhXg-p6ImUYB^5DH|U>MQv8=_s^^^Ki<8>)!obKCbU_{TyU4Ct9bZB z1yR0t_m3=i!WFcE4adS($@bW-?sKV`d|5%f5#1hmEsa@ SI~W)k7(8A5T-G@yGywqJAOjHq diff --git a/src/plugins/beautifier/images/settingscategory_beautifier.png b/src/plugins/beautifier/images/settingscategory_beautifier.png new file mode 100644 index 0000000000000000000000000000000000000000..0cc3a76328f25365caf9f0d87775b62e0e7dab91 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^H#}V&Lp07O|LA8n2#9^8 zD9$WWVCyuIBll1K_OJi{pXK}i`tU?mzSFg}r+~?dRDxrn&w5|K31YZ{fiPCXEHHtf0c z`MsR5z~O@X_WQk5!vAi2`$N0<>Hq)Pm+Ein)G7Xcyz$AxORxU_*VgXywsqv4l)LHo z)Bk^iZ)oq9wOylSQ_3fMp?LiY(O4n@O1TaS?83{1OS`2flB}Y literal 0 HcmV?d00001 diff --git a/src/plugins/beautifier/images/settingscategory_beautifier@2x.png b/src/plugins/beautifier/images/settingscategory_beautifier@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..77ff6cf7880eec6b0b4205ec7975b5ff1e8491db GIT binary patch literal 602 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_bsik>cxAs)xyUh?*sk|=WQ zW4hY&O-0KJ1@HD;>=25Y5+x`osH-&l%u6RnN0%#yR$TB{xS%5{)mL&WM~p~Fi-yWY zwG|T#<_InEy|!Y@>s86(rzGe8+%BQsVDyc7HzbzV`m%%A+dYmlIw&7H#wi zopy#%@6;l_+s*xUwk@}BO~}0dQqCseVRiI|c*TV2g=v$&G0ZNx!1u-CZhk_}vZR@I z%MM5!u{pQG)MI@h^M{C3w@n^%9rlJT*FC6v_7~Tcl?Odul`{P>i!NVt;Jf9nnU>#X z3ff*3Y7jg7H<3{)bRyF)5ef4}AC>m925Fa^;$ho!F0X<6mUZF(JXeN!);5O1E5gok z&34c*zmdgs*zqc(N%rR>lg(aP9S{_)H{`$jwrmUY{1{gGe>GE?uBR_J{P5MLTh5dJ zG&@XPC*|pK^}ue2Z~sr_}G!TS^cCy%9>4J85oFTSsote&tg@M%WYyj=`druL>$ z|E@ErIoPaNEEBGKK+!a4HLLRzCYQTeuR|3WJC*ikO?|GqlTq*|`?OWex3;diZ@y7D zdII0-M{CNQBA!prw*Jq0#9L(E!(RUCIng0jlh_}$y6bJdGr@bF+$YAEiCgN{F3Env zenZW2?j^oYtRICuqbw$wFSxFKnlXnleMzwoTYzX%(SdEt4o+#ff31Br57R`yWuQdk M>FVdQ&MBb@03A{hxc~qF literal 0 HcmV?d00001 diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index 604981a839b..9ce1af6de64 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -36,6 +36,8 @@ #include "clangstaticanalyzerunittests.h" #endif +#include + #include #include @@ -74,7 +76,7 @@ public: "Clang Static Analyzer")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *widget() diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index cfbbc2e85e4..5bd3d568832 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -2,8 +2,9 @@ images/logo/128/QtProject-qtcreator.png images/logo/256/QtProject-qtcreator.png - images/category_core.png - images/category_design.png - images/category_texteditor.png + images/settingscategory_core.png + images/settingscategory_core@2x.png + images/settingscategory_design.png + images/settingscategory_design@2x.png diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 8d2623b13c5..b4eedbb0d9c 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -54,7 +54,8 @@ GeneralSettings::GeneralSettings() setDisplayName(tr("Interface")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", "Environment")); - setCategoryIcon(Utils::Icon(":/core/images/category_core.png")); + setCategoryIcon(Utils::Icon({{":/core/images/settingscategory_core.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) diff --git a/src/plugins/coreplugin/images/category_design.png b/src/plugins/coreplugin/images/category_design.png deleted file mode 100644 index 5a4111a3457d3f748c1e48252ccae1fc646d9c85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIzturBv>aSW-rwPk9xPjI=&asPbp%!N%)gW{C(Gb>jq zq&671u*fsd-EpR~%j$W}yQvGi4GTL9z2|gxT8VG={dqV?D|$}%Y=cxM!I@nfUWRnp za8KEGUgVmOC<>j5OJ9$$7<>TL$&#TW{PFG#W)BaI8BU+{*T#=1`@ja8@ z?yP^>H?Q$iPhx-eqq1v%$+si_Y-eB7(+%e1z0J0syK3eI_O^P>eRJo?O*UYY5Vx<( z_`dANiw!3EdhPbLQ3dnP9^3J2-N&c@S(*+pdGg2V^7Ly;`bMuwa{swTM%cb8;W}Gk zOv<|zms#i9{{8Ux=lhPS+FnL;^~CS$J}$H6XF2-#&Na34v?l=vHSb)rE-%}BIO)># zb%-VSwo$3WRY8nqGG9FA4bX;O^+v)a#{WsHtb_e`n z4mx2S8L_YJ^oPX{9zULM{Z;vxXx!$S_PY#!pZ=0wrFyh@vej;OrY0Asgw335j&PRk zX08(Tvgj|{yQ!vAB*vlKyvlwZOY6@U->*Ns{O8`R@O^@BTI6NyiX?WGK70I!D{$&> z^PK%gTN_u;a*WN}u`niNhVILEvI@;i|642s7D-)m^eR$1a=b-&=F85TRa?533-YI& zs4IH-f4z&_#MYmy&6|%VwHqJrYw$@md?^0zjc+nTxp<;mRZB+ww7Vgq;wg$L6GSEk zH~I=ZFn48OikJWJEs421L2%;3gT?8`*q)twy=uFwJGtL2>jYi)v5 z>)si)XLr>0KR*z=O}gl5R`;rmxMfRr`+KtOQhetnVUR=51Q!9Udn zi+c4$IGn#9S-Nb~E&aJnx0W35D`H%lz92A{-A$pXOZK;7@GQ>4i;fdywz{{ZKEW1M~j=x!JbSKG161|iS=^Xcmj zzp+2YP;T)y%^=DxvEoMBC*jJ{nD7g`O{SDiJ!!pk>(aHcQ%%)9jVw%jxc)9@XcT^b z`1!#JZCU?59O!h`2=5k)jC}n5iA-)_*r{@)@SpHr3@4y>1Q_!BS#`S|8(f3EiNDLe#?9MvbglP&C$E*Yno2n7rO7ZP<2KjOIN3%PuS|MGnc(I z<~ba4bf5I2iZE?^sdY{6^R8EQ^)trkiT|1ZoS%`6;qQ}2r%#6Rxic^@FnGH9xvX{(JaZG%Q-e|yQz{EjrrIztFy8lcaSW-rmGtNTe|zVus$cbNTFo?atW6bbzM{$4(;a*kL;%QvGM$4`v>27mh3YdHn78_Pu6pHXTOYv6GfcfZEd z6%w)IahE&~cgfz{2lZ^XZ4$`8&~RgcN@tFukKB4zar5bqeKiftPCQkRPndjM(nW!j zdB5Hq&DQqrxep&)lG$)N@u8mvXY!8+e~tyM(Q`kya>1Dv{nCfMDJjgdNz06Cetr`^ z%07Gf@x%zPE&LZQfBbheQlo2s{r__xo}ZWB(ucKG@Ec*%dpf0QF`yqz)E=LXZ4n4N`LIycyV zbmhkM9gY?|*u^;iizQF|{>4!T&YnEBAuWmLo>g;#z(KB!TPG)dY%{zm_UG^K>5Z+e ztq1L^6%Sv}SCIeHp2Ts(N|`Y~*4KdV#*G^XzHE!sl$e#6H$6>t_%ze($dm0GBUEV zvJMUoTefW3x^?TeZQJ(m-+$=Pp(96*96fsU|NsA9Ew*177#JKqT^vIsrY2i7vq*G2 zV=-!Il$x=aS1^v}*#`#;_7|rvHWjEfTY3s?pXnT1+tj#_{avdv5071eA2TyEd*(ei b28QQmr()6t8@(AA7#KWV{an^LB{Ts5&IviB literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/settingscategory_core@2x.png b/src/plugins/coreplugin/images/settingscategory_core@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d378517d83855ce3747d992630bac9de0e5728ae GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_a>U7jwEAs)xyUfIptV8Fw2 zVK(Ec6she87;2_{)%&Ipuuy^3y^m$?`ri2|;+AvfIyTfduHkgMq-HvSv6m;PQM5ZM z`$f-QCeAE4jn#^2N<5%7j-`g(tF3UGVQw! xH4Ufr-Y|tQR5I9~Pi0@Au5kV0S(YEHF%y5i-16Ay$wZLrJYD@<);T3K0RX_PNnQW| literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/settingscategory_design.png b/src/plugins/coreplugin/images/settingscategory_design.png new file mode 100644 index 0000000000000000000000000000000000000000..fc6e2b969b8accfefdf0e0e70bf0b33874133dc4 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|7G?$p2BAoW(+ms@(g8jpt_%zep`oGW<>mGD z^$iUT`}glZaNxj|D_8#i|KE9C>>&dKLx87?V~E7m@fSa^I#R1CzP7Zc0#%Bjq4#>=4>A1`{nW1o2qL6~$V#}R& dM;|aSMD_OwoHYN*$iTqB;OXk;vd$@?2>>h^IVk`D literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/settingscategory_design@2x.png b/src/plugins/coreplugin/images/settingscategory_design@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7fd6504b9387ddbd66e0c64a23cc20fe50cb20ee GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-7G?$phNU`BwlFX-$OZU>xH2#>XlZGMhK81x zm)FpPtN;K1|Eev>$-uxc!PCVt#Nzbba|bya40u`}cI@c%uF$^H z-1p$D;2x{CfGK&alcFv^+1aqO?$5)(KNi1qfADi$Nh}C)=5X;}l(;{kX?r)gKa;S(jHWu<5UOz$%(@!I4c?#lVqC*g!@t wfkQ3fhR=ZwGa3$tI=5U{C&;|x{$b9yHkG;$blO%hFfcH9y85}Sb4q9e0K0Ks&j0`b literal 0 HcmV?d00001 diff --git a/src/plugins/cpaster/cpaster.qrc b/src/plugins/cpaster/cpaster.qrc index f73d6bb204d..92a7f67322b 100644 --- a/src/plugins/cpaster/cpaster.qrc +++ b/src/plugins/cpaster/cpaster.qrc @@ -1,5 +1,6 @@ - images/category_cpaster.png + images/settingscategory_cpaster.png + images/settingscategory_cpaster@2x.png diff --git a/src/plugins/cpaster/images/category_cpaster.png b/src/plugins/cpaster/images/category_cpaster.png deleted file mode 100644 index eef221c830a861853cde023325ddd5cf2a05a94c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1442 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztu)27IuvCnVl+97Znv1rLkpcY^1k);RQd5 z#Od$2CT{fEtSePFLu00WM`x$;O@7}W%KuHgujpLP+>;Y1+-pB=hpTcG*Rj-;-`F(Q@|*mYxzSG>Bgw*^xoN`&fr}X; z>i+XwRD>G6mO9ne+V;s>x6L*$|7feMtQ^pK-f{h&@ZbNI|2Miii!aN3cZtQv#e(^J zLYw#O*>jY)YOkEHukYzgea9cKSh3>4>qU!{YU)-o=gUbQchcNAjd@9s(6;Hn3ZHd9 z=4dnixMfMGdO+TMmmm+@ee6AxJUOe)DmUJK+N$DtgrWA?(?k7VW}R$NP@LzX`{Ko( z26YR8rN^a`YaXS47v8LS+qstW(~fHe3OcTzS0rxp)0MHT{be%Uro&WYZTbNLSHa%i zUT;1Y$0(C+mmF`!-8vA(cgc#4!BHSAeZm7t502wcUVMCVz5$zTUjZn_sDFGJX`UCU&+9@{mz`687q%n zoY4^Bq;NvDqFzL@NaW`A^Zq&aSRSekz@jVxRY`|7Dz2CivYZ*`~R`7FH-oGteA)WKwpSJIN7L#O5!eaMK8S}$BBp|e(_*eYX_YRZY!8~cv3 zMmyS-Tv@#AaeBaxdkpP|4{m(_v0{g^S<0G&V%@2l%-@<`?78W_edP&h%??kWioZL) zxtq_b-^({Oh_BVDuR_OB@R@>8Z{jQ--Y<6^xJekZ+uGWGsM`DCXHEC761Mw)%67gL z&Tizqx?8(&K^nW>*1xR1YLgedc(!5g44#1ch|8*5wv{g0w~j6D{Mw_|%XjUnip-ST zyZXsOU2*4AH?!y7pZ~XY(Y~{W`I~30*m&hZh0wir##zr)o;^Fna(4BLxBsNm=APis z&Ir3S#KLR}_PP(bg%YS*X@7KDYZ>3{v zw=SA-YgLHWmMdGab;j&`2YX^(wp<| zGB7Y0c)B=-a6~8n`2XLYnJex8`47&F9g_cy|NLV=%Kt<0$IohwyZlSfFTP+e@k8>$ c8D<9O9Bbixi)mjO7#J8lUHx3vIVCg!00crSQUCw| literal 0 HcmV?d00001 diff --git a/src/plugins/cpaster/images/settingscategory_cpaster@2x.png b/src/plugins/cpaster/images/settingscategory_cpaster@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5f6954374a17ee069b43a8d4b795e9b00112574c GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6w*aCb)Tp1V`{{R2K^yd7# z3=9m`o-U3d5>u0Z@U!ux1n_+GxWXvMmeR#I)9U|!{=8TG0la>v{_z{Ns+BX$bejCT m!ADS=y+lvQHEst3LrL|E`3Y9SD;XFV7(8A5T-G@yGywpO6DX &settings, QObject *pa setDisplayName(tr("General")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CodePaster", "Code Pasting")); - setCategoryIcon(Utils::Icon(":/cpaster/images/category_cpaster.png")); + setCategoryIcon(Utils::Icon({{":/cpaster/images/settingscategory_cpaster.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } SettingsPage::~SettingsPage() diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index 8bf57668ab1..df0a0f924c2 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -165,7 +165,8 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer - images/category_cpp.png + images/settingscategory_cpp.png + images/settingscategory_cpp@2x.png diff --git a/src/plugins/cpptools/images/category_cpp.png b/src/plugins/cpptools/images/category_cpp.png deleted file mode 100644 index 2a3408dae374647c6764163ef1ee995f2185c9ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 967 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFlTzYIEGZ*+7cG)F*#Ah?p^V+;+>bKepZkD_f0t| zVwRPTd*qDLiHn?OwxwiTb4?Jxs}iJeGjv8$c&b3`4Ohk3jEqH-q80^98oTlnItpUZveVvD}ChQ%5`{@i@=W{C^ykKa{IH$quDHCb6^oX%m#xiUCblwuJy5PZ~rZYM6^8PET!kL3F?@vq#asS3O*;bS@ zJn#8W`A;3Rc zI`q=y`(L4o{~P!5Nk`;p|5_FP|3S`ncc(Ke4R!`-OzGX$)zV?!UZ$%op6c@G?9aXj zA3dKZE&Ng`s`E0O>*C6d%h@?ryuZq`?AhHtTzX2+EB4k|maja&y3OmzCLQ+2lZ_7) z$*kIVkmpUnwMa2Ffo^A?Luq${j+OqhThD)3IqL1NUsX;;NitiulzJOBYgrpt6uu9e zwP)i};e96MHnV2O@99r{C-lL7hTfkkHF-Jg>C-YmyY9y1-ZOob?HY396u(?zG&n1s7ktK>Z@>5{zcJ8|c6B}Uu*kA;n|&T33Nv9nH+iT`(q(nK*woEa(Jo%6%6v58|Elfh_=<(sKFTf4&59|phzW3O{_d#BA;DhpV@J{D6E$Hq z;t@K}_1~(LtoXHHr|;I%SGn^u)YL^jJKIie6Zp?ETl&|PfL-se?x|0dX8gPLhVM`9 b0}KIQ_hjvsKe&W}fq}u()z4*}Q$iB}aoV+3 diff --git a/src/plugins/cpptools/images/settingscategory_cpp.png b/src/plugins/cpptools/images/settingscategory_cpp.png new file mode 100644 index 0000000000000000000000000000000000000000..fe39d2663c5573523003f04b992dc3ab152b070e GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^X`U{QAsXkCfAljO@UV4O zzl%}mI{jB}R*V1Vbb+rsZ?gL~eP?d@cc5GAWB*Hesb)rB#TaduN5Xe97NpLfpd#VI zcUXn5(?G$q#_ih2nG)6oySbLzC-nVndHDJFyE_V9xBvc2=x}6UncRgJkLp+YZo#M#XWFX*L zFU)(SHIDHeOWp^q4XYZhOAi{d^eueZIBt4yxVb!9%&u5$(f|zd1 zvpR0s9Pzzu<%_g+FP_cL6}6vpLn`U>$+x=y94!AXI_|)+$Le_5mDqzbRvvPkX4kA^ hyS0A8TI~ - images/analyzer_category.png + images/settingscategory_analyzer.png + images/settingscategory_analyzer@2x.png diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h new file mode 100644 index 00000000000..0720f44db54 --- /dev/null +++ b/src/plugins/debugger/analyzer/analyzericons.h @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#pragma once + +#include + +namespace Analyzer { +namespace Icons { + +const Utils::Icon SETTINGSCATEGORY_ANALYZER({ + {":/images/settingscategory_analyzer.png", Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); + +} // namespace Icons +} // namespace Analyzer diff --git a/src/plugins/debugger/analyzer/images/analyzer_category.png b/src/plugins/debugger/analyzer/images/analyzer_category.png deleted file mode 100644 index fdfe8ed231911ee227ddf2a6922f226ffd06bf7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 957 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuL8TRdGHLp;3ShI(d;1Pc7C znmJFk`&@>QYLW_@Nb>_t@q-O3I2KiWnO6PbT|dVQMG2lG&G%GiVrRcg9Vl=={%XR=w==R%(jVUGehz`_QZ5r?2NX{Qty$v2OD}@xV`uMNE8~CG*mj zEnmK#pPzre*V3RO4Y#um38gN4Yxk<MXe|Hfu`dgWoUiOgnacPjACL z%Qn}28Czpq89vzf&&y>wa!^Rb#MQs~-s3IH);zG{%{f^j?BH`Lm0|v&8Eu@GO%||9 zH7PXsFW4XEz@S(4jX$Z{%2`xpNz>iq=N0~cQ7rN{vnv1I9ecmixWaz+RMYf3JT-4D z3&qyw-Cyv)SHw%TV%=`R1K*iV#Ox1p$IMu%!lT`{^?CotcTc$spDZjo+ui@}(ANDP ztaEh3|JCVr-+IpfK@4@rRxB^GxFE6hw1QL-tBu39hdP!!f_x=XPCuW+qkib5 z+a|v>x89k{zRWX@iv7vuY_5{sJSQq$%{F;cn(3ic5)u1?{)Ks%uRTyIlXHJJfAr<( zPESvrYcgNtt$UXq|E`jp$-Hst>koxD{L@rBypL=+k$-&RbK%W=*CJUl!LV)UBdsfuv1X0$4;($==$xWf2m zDhvR*wj zdvYsh!OKUkF+0jclarGrWM!xFDeT#%JWKD)nKNsQK3%yYa!o^;?ZaXHsos4i9GMcD z;Wep6Lfdkalaicj#KpwkDWv3mQ9peBe&VI(CHF7?wvJSpt9gTe~DWM4f!L77< diff --git a/src/plugins/debugger/analyzer/images/settingscategory_analyzer.png b/src/plugins/debugger/analyzer/images/settingscategory_analyzer.png new file mode 100644 index 0000000000000000000000000000000000000000..8fb04dc416692c91ee8dd7fe4cd271ae1a6a7953 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|MrH;EhFd$=?`B|NU<>dGab;j&`2YX^(wp<| zGB7YGd%8G=a6~8n`2XLY+3Md}h5iExc0z0)XHNW3&+(5jr2D82!wPRJ!FeWH;tUK7 N44$rjF6*2UngEGBB2oYV literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png b/src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4f28cfc1fd86ee5d797fcbc817435d2a7b9cad91 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6w*aCb)Tp1V`{{R2K^yd7# z3=9m~o-U3d5>u0Z@U!tu33@ImF{5+I0;vbTI+kAe@=@4(;Vb8bd=7J1maY&KVvt setDisplayName(QCoreApplication::translate("Debugger", "General")); setCategory(DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", "Debugger")); - setCategoryIcon(Icon(":/debugger/images/category_debug.png")); + setCategoryIcon(Utils::Icon({{":/debugger/images/settingscategory_debugger.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } void CommonOptionsPage::apply() diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 9a69fb289af..4f53499ee7f 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -230,6 +230,7 @@ Project { files: [ "analyzerbase.qrc", "analyzerconstants.h", + "analyzericons.h", "analyzermanager.h", "analyzerrunconfigwidget.cpp", "analyzerrunconfigwidget.h", diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 0031175a1cb..33577e6d237 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -1,6 +1,7 @@ - images/category_debug.png + images/settingscategory_debugger.png + images/settingscategory_debugger@2x.png images/debugger_breakpoints.png images/debugger_continue.png images/debugger_continue@2x.png diff --git a/src/plugins/debugger/images/category_debug.png b/src/plugins/debugger/images/category_debug.png deleted file mode 100644 index 5e74d867c0a62eece4fd0986d950572814551e16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztuq^d-aSW-rwIwt1w!swr^+&c)d>>VIy$Cgj~83KN0pU|6A`A+2a{p-E|jRo%CX-ddo zoMqcvaO5_dP+&u{UQ{Ygany<(I9m zPrcj_p&RhN$Wdh%+wGGkH)Q!HbaHhqYCL|Kr`I>{^55T^pZ8|RCI=AF!)!d#j z>(|Ev8yPbSt~(4rEJ`M`=9v^5IJKy@O`*+bv;Ux~` z`ljFJGBa3MAC`7Fvf;$0Md@8Jn|xL=Xg;X(5;&M)(r`7a`RUZFTFrCTu|23r)^9r* zsJA7lV~UemxIy&V8qLbp5rya8c!^xOdxPb2u<(X|34Ghk!W@M@Kgi@ia9B@VI(DXg z+wpbN8B+{*%k&@5wmmDhA|!U<<{g`UH?IA`cBU`h^|i`|C>@9Bb6@V-HyB?FsMT9$ zwxw#n3_K{!=Wj9FP`n;7zA~JKsstaQE zGiE+L(>FcxT+HJ&*({>`t5>nj;(@Q&kEb8+V(*lGxqL!(i0i+Q8-1>ZomDC`uYBAisk=o?_j=i04)*^| zy*HG?b})U-bVp2L?RkfO9RRTxnsXsGr z#s#Y#KVI{PkvG66PiL?Hk{X7e1y^2v`^?sTJfn_d@=>;xPt2mczcjNob89TQ=WZCghoF zA>6!DLct|(@!Z*BshNLzO&(P!E-Vi%t@t~8ubhn+f8q@lEt9>6R2W;{3tC9_pUHXr zOXY1!+ogw$-;)m??0hYsRMq?7@15d#-p9V%&Ya4mwd1EgfAEw%W#2Hpx~>17iG~%I xTV?lrzi{hEqyDW#`(HXTpDaom>RBWh9C$COSTt_Az`(%3;OXk;vd$@?2>{$oR>uGU diff --git a/src/plugins/debugger/images/settingscategory_debugger.png b/src/plugins/debugger/images/settingscategory_debugger.png new file mode 100644 index 0000000000000000000000000000000000000000..38f1d87ea0df66689d31a09ae861811a98b4ca99 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^D?MEtLp07O|LA8nxZv?f zx2!Y!+9tE>8$E1 z>lr%5wg3N(UBeQzZp)AN`={zRIEA0um~C<5K-B-|OZl2lHvZqA#`UT6&yV^;vmF1v z+|T)jr+QiWpCn%9hX+YZw|505Qtd~NQ>`&@EEX2On!SY~Ff15bk2 zF>-86yuLwpx%|6?>jmQF8ifg$5By^p|bE6#EJdMe(#g!fr}UZx>SV(F#ZQ~3Y?kALcV^+5UG|Nr?l z^FN9(RqvQ+`r(agOjeAELx#Z~4 SettingsPageProvider::pages() const diff --git a/src/plugins/fakevim/fakevim.qrc b/src/plugins/fakevim/fakevim.qrc index 73813881986..c3d5b93360b 100644 --- a/src/plugins/fakevim/fakevim.qrc +++ b/src/plugins/fakevim/fakevim.qrc @@ -1,5 +1,6 @@ - images/category_fakevim.png + images/settingscategory_fakevim.png + images/settingscategory_fakevim@2x.png diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 8e6e4713ba1..5c267e2b8b7 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -364,7 +364,8 @@ public: setDisplayName(Tr::tr("General")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(Utils::Icon(":/fakevim/images/category_fakevim.png")); + setCategoryIcon(Utils::Icon({{":/fakevim/images/settingscategory_fakevim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *widget(); diff --git a/src/plugins/fakevim/images/category_fakevim.png b/src/plugins/fakevim/images/category_fakevim.png deleted file mode 100644 index eb72cfebc9cb57104d979d958e3641e756d22e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1212 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuKTnmt_{Lp+Wz4UP1P36-$( zSKG&NRm0RH%R_$4Hq|LvqR%HSOPX;ZA}UB`TcczeTU+8}-)#?qSFgO7;o)q&QO`Ad z)shJ!0#3^sq%xS;IF&MHPpQ5CeeU_s^B?*=Q(7tI|LN@B^q>3R-#;gN?1zVskIvHr ziwpF;ZkIm1_4z{G51DyYy;EoDEIa@2WLw3}bqsQ*Wo2b82Y)Z-(kpI>`Pg_h>*%*{ z+qj~mqqQcSz0cB-qkm$?xfybHe6J5P?=V@?vD5nIvuDe=q@|^`7$+)uZWG^N*%Uv+=*sr`R*10tA z+GVw7?b^h=Jif`3Cr3m?ICy(^cXZ9?PpD>}=;6dvspeSy@NLY4b?RT{Tb&FK4>z>8 z@BjF*@L_Fsw)UjSlLckhbEp31RZ=wibV}Amg+<0+;hS*piT9^Yb$ys~g7fUzvmTzF z2X8hBFKV^433*cUP+_9LOqPir7vjzwm%4K0N{5Z`&l@)++}zz;pKq!E*gbv1&+euL z-)pWYx%hFHbevcrtkTirP<{34)rgoF5ry^cZf+Ou-P0?o+xEm@iWl2kemRfb%N;a} zgcnXXx3^I7P+6#=6!3A?s#QlO7ugvaHa>iqSW;5bv8AQ%3lr06Nv8eJcbpXndd&FR zpDRwkplic})9n-fuKxT;pp#{yXMh)ni=Bl<$GUZTDJdxmUrq_m`8Dm~)Y&}x^@j^y ziLr}Y2ft+WZf-hYBX8i_XnrrVnCr~Bb6xY)1QgGzYUnaEGiPLHHy=!BI4IUTIo_D% zPJ+cp(dPft|IB?BWAI~}xX>%nIX?AbO0HF_`P>!@T3T8%O}YN)QIevI`4opIckkZq z=-<1FP=7xyK({33PO&|3KX;uwV&&x|kJzj)yOHg7%l@2?moj~+X^W6=T* zj-5Mqo;Y>NsjABAkda@vvB@G|t2xFk3W|!3E=#Y!F0}iko1xF5>{MQOFvraQ^Okra zCY$BoPj>8Dv}lo2jG9upg-lbA-ks2D&P|&)$1+`#+{He3?%YG1tAtHG($dtry1G`Z zyR60d-ErRKtIKZ*NG|QNa_5?0?Ca~h$nw#nM=nyjV%$Dz!fkDBM=Y;j58=9?RO$Jo zva&MCuiWvU{|@&H*RQK*3H{8Q5iwcb=ee!l*sNt4W0ww|1JJ>h6*%DguF6CF-D85s_dkuw!mt=hNQO-XdB zXwwwwoh+9wT}s$~`{9n)H}v%N#Z4cddwW9U^P~QqEEXTRBtJd3;$J;WIezt3JKyYg z99mz3&&FT>g8k4dlvD_6yCHoDYNO9&i{X3(X~&t>haMZ d|K0wH^Tn6^H;X&v!oa}5;OXk;vd$@?2>`d;H0%HX diff --git a/src/plugins/fakevim/images/settingscategory_fakevim.png b/src/plugins/fakevim/images/settingscategory_fakevim.png new file mode 100644 index 0000000000000000000000000000000000000000..13dcee6cfceccb6416a4bed8ab97e5ed3222b838 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^M?75|Lp07O|LA8nxZw8a zqA3q2o57BqKTT(>bHBv+Xus{gpJ}!ertR)lD=hxpX|=9UMcwOXX9XlT9GN@&#G~2yNYhAW_%@)h zgXPA?)AQ!5)m#g4^CMO3$^tJh61ozpsfikBPHg{3|RW(K4~* z&;R}H!3}@8n?0Uid9nU~po-s#V&lIl6$k&{>uqjq3+!fM_?ELf?77KT9gx2~UHx3v IIVCg!05s=vT>t<8 literal 0 HcmV?d00001 diff --git a/src/plugins/fakevim/images/settingscategory_fakevim@2x.png b/src/plugins/fakevim/images/settingscategory_fakevim@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..97862cd8287daaef7cc8c64c2bdb34aa57ac5fc0 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_cX?Vc`>zUB zW4oYXP&-dkNr8aNA4V%H4!<&yIV^vrWB#zel3(!P(Tiu74!(Txpx^1>QCkHWF|Ck; zPV5)EBLe4_xBKdy-K!>B@@n>}r@uYpZZUncG+_A8`6G9JgQ1fIL(fD9uFne037HB? zRjQmDZdl&*XVgj$Z(RDG@r^BS$2^u0f5uJf4LA4SO=WPC4|%kIr>w;H^&5WdKf++c zk{Exb*2ksc_&=^=e;+d~vSVCyPe5^nYQs(Ac`+-mvA)^+^OEVA3%B=Qle1+#VaK;) z-u<`}iEnnT?ss^8Z%%&x+ z^V^g6#C%mVo1bwZ=zQU+exVa}8!Okz$0&qNvaPeZ^ZsDl1c$FX7U}O`37BtJxs~NI z*MS&e!{z!G*QS1nIkV!x<%Ejw+_4-dreB-PUY;mc#3kbPKw$dA1t0HlzhFPGBIERA zBb|qyTh_?_untZxdcMu7vbFHYrK)?<{}dFx^Nej+GpJYD@<);T3K F0RUUG$^ZZW literal 0 HcmV?d00001 diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index a87b098a30a..fc8fa3d3215 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -55,7 +55,8 @@ GeneralSettingsPage::GeneralSettingsPage() setDisplayName(tr("General")); setCategory(Help::Constants::HELP_CATEGORY); setDisplayCategory(QCoreApplication::translate("Help", "Help")); - setCategoryIcon(Utils::Icon(":/help/images/category_help.png")); + setCategoryIcon(Utils::Icon({{":/help/images/settingscategory_help.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *GeneralSettingsPage::widget() diff --git a/src/plugins/help/help.qrc b/src/plugins/help/help.qrc index 228b15689c1..78909bb8b34 100644 --- a/src/plugins/help/help.qrc +++ b/src/plugins/help/help.qrc @@ -1,6 +1,7 @@ - images/category_help.png + images/settingscategory_help.png + images/settingscategory_help@2x.png images/mode_help.png images/mode_help@2x.png images/mode_help_mask.png diff --git a/src/plugins/help/images/category_help.png b/src/plugins/help/images/category_help.png deleted file mode 100644 index 7736b0a32d6976e7c5801fe3947f5d4591fa9b74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1381 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztu(Er)IEGZ*+7g=W6CEn^e`>hql#6}g3j>x-33NMC z;j<;D$LCFpui*^K$wyW7ykicj_gp-ozF1N3<5V5PwD>cVCQ6u8t7u85-E23M<*5{p zY&4R~t@K@B!~OJL^#A7t`I?-w=i8j!|9oEc|L5O-+n*17S~I0@IdAUwPOe$2Ji0t5 zdHATvP0E}kH)*!YS#8$sNA7;J-dCddNb`Vt=Bo2I^Us|>eYd}-M0v|Ci5DdwBch_r z^z_$Ds4rjE{ifdfoP7}w|Ac?bU5awebwXFLFOhJ){C(P-H=nOPQi{;IX+8C&_@)Pk zEseUiwab{Ve?g#9WtJTp4h$!*&g687=dY5~p&)##lY9=QIFpZns~%VsMrCTZ!} z348P>x2G;uo#4XQ*wFGR*}cO!AvgDR&XT$L?-UfS1+y3FF3;KaDYrmsb$0fTho?g4 ztlPHm+o9+i!pl`RFie{kezD?jdCkA0*H={jmwEL4NMUlEruNZOr=q6rl}7TPk?3|*$UTofxyVJ^EeEFq&U4`-fwfcrt zrxs`IDi-AK_I?s8bAoM&6wisJpQ=qPj-2`}rM%+QDWhU;i4SFSSrSZ^75D#}IosLS zm-nec*BX(6zsGz_Zp&6|G~hqkSv5~xS8{QW&gahxOgSDe-TQS1dSJy_fyVuf4a;RxmAOJap!bPR~kD zk=Gu7Zq>-!@|oux*REL8yf8F(zCzr4C41Kj`3ZME?}(ifIw5=J^({KDU)ymtb};M} zXPG$beEW|ISs|fGsj|1+6_bpkjeAb6)NHHuSKMJ~W~F34{m5#^%vq)T=Rexsc|?Vo zZSLcYA1}pz$@V82NNn$&$Sag$)MjXA#`ROfU1IB(xt{&m2}wCU+FnKz>yw*P=B|JI z=+VTD=bIW6`7ar5s=VsqxOzKpQtF#o1&Nm)zf0WF#hz31rr<{8ww;fjJySD#5veFW zU*hPoS338qkGD0{%PF6GxZrD0L+2J(4@DU%sf3DBFDpyNji$c4j_-fP z6C7*o_bd+VnMU%XIATV`|r;wG~%b!q0avbKBA?>Lq5OHEUCt;W#_ ze1Gq`tT2^&#msA_X})i3Xx5%eAOGDPH_qz)-*sWbpXW>cPpxU=U--M_?a4DKQ)>z& zJ$Y38J=8p`JnIsF9yV_4x*PES`H%1hMuzyWyYhdmZ+ybQz`)??>gTe~DWM4fA+(YQ diff --git a/src/plugins/help/images/settingscategory_help.png b/src/plugins/help/images/settingscategory_help.png new file mode 100644 index 0000000000000000000000000000000000000000..2786148f6ff64c78d1870aada0f6946f9777d079 GIT binary patch literal 228 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 diff --git a/src/plugins/nim/images/settingscategory_nim.png b/src/plugins/nim/images/settingscategory_nim.png new file mode 100644 index 0000000000000000000000000000000000000000..016c570eb4929657a77882d1b19d154bc342de86 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^dpunnLp07O|LA8nxDcLn z%tuG4QTU%sa=Pu8{6vjaN9x$vf<4*TJcHTV{(1;aWS5b6aNwbXO3b15#>Vv(_y4Ys zfB#sD5tlvbD^lmy9v|oF)o=UX?9R`o{>lSUQ4Yqk&b&M zp2jw=J5D9!t=MpeZ-Uyx4LjL9&dp8!FP?Th{{^dm>70+y_fyA>|-a$Kc23BF6*2UngAF$WUv4L literal 0 HcmV?d00001 diff --git a/src/plugins/nim/images/settingscategory_nim@2x.png b/src/plugins/nim/images/settingscategory_nim@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4fb9c101887058e14cda2b5219cb20b16ddbed9f GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_cX$2?seLp+Wr|L|8zkhp3v z$K=cm&slBBZ`QPTT-tE|xn4(=-q`~RA6bsH~52AY|-px??ZEL?jKfil<`!lsu2V7non&dQjMCAVJesgdC>@^CHW*eB;uyPjr z{c4x%_^(#jlrk@=ZITKz^Yy$O!|Dms8y&g4H~ca%a5->9&ZVQ%)u!R&A;}4Ud9E{j zF+Cl~@p&4{2~nZ#3(Phw_#wG2(Kw*@1E;|2&1TKFA0N--xi#N$53`L!r*4D^L+#u1 z2WHiOlMd00xV?Sz&ow-q8g*_eysmABTYY#qjyuR4I}lPe#ZfRjN-NRhN4=r*T;X@I z3$9yUHP-*BuSAMDS1kTzj=r@sIGe#T`77I>=5*ZuwV z;mHz(gk9aW{tISUJ~`fU!pf(vy;Ebl+_`SkDNi3wGVPlEzhKJ_`Ku1zybL_fd!`CI R&io9DSx;9#mvv4FO#seB=tlqm literal 0 HcmV?d00001 diff --git a/src/plugins/nim/nim.qrc b/src/plugins/nim/nim.qrc index edbdcd0058f..c8f3ad2359a 100644 --- a/src/plugins/nim/nim.qrc +++ b/src/plugins/nim/nim.qrc @@ -1,5 +1,6 @@ - images/nim.png + images/settingscategory_nim.png + images/settingscategory_nim@2x.png diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index 985a676786b..c56217b0516 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -34,7 +34,6 @@ namespace Constants { const char C_NIMPROJECT_ID[] = "Nim.NimProject"; const char C_NIMEDITOR_ID[] = "Nim.NimEditor"; const char C_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Nim Editor"); -const char C_NIM_ICON_PATH[] = ":/nim/images/nim.png"; // NimToolChain const char C_NIMTOOLCHAIN_TYPEID[] = "Nim.NimToolChain"; diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index 24e13dfe346..9421cdc1ac9 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -91,7 +91,8 @@ bool NimPlugin::initialize(const QStringList &arguments, QString *errorMessage) void NimPlugin::extensionsInitialized() { // Add MIME overlay icons (these icons displayed at Project dock panel) - const QIcon icon((QLatin1String(Constants::C_NIM_ICON_PATH))); + const QIcon icon = Utils::Icon({{":/nim/images/settingscategory_nim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint).icon(); if (!icon.isNull()) { Core::FileIconProvider::registerIconOverlayForMimeType(icon, Constants::C_NIM_MIMETYPE); Core::FileIconProvider::registerIconOverlayForMimeType(icon, Constants::C_NIM_SCRIPT_MIMETYPE); diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 78247c8e421..0c3d6dd0f21 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -51,7 +51,8 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); setDisplayCategory(tr("Nim")); - setCategoryIcon(Utils::Icon(Nim::Constants::C_NIM_ICON_PATH)); + setCategoryIcon(Utils::Icon({{":/nim/images/settingscategory_nim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } NimCodeStyleSettingsPage::~NimCodeStyleSettingsPage() diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 3958b9d3857..26d3f968e71 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -42,7 +42,8 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) setDisplayName(tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); - setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png")); + setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_devices.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *DeviceSettingsPage::widget() diff --git a/src/plugins/projectexplorer/images/category_buildrun.png b/src/plugins/projectexplorer/images/category_buildrun.png deleted file mode 100644 index 8401b4195160dfe237c47bc9b98c2d4ae60e60fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1153 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuKTJUm?-Lp*rrhUNN5r^@_~ zjefCJBxCD^zMX5OrAt-zrT{ zOi_9CtWAP9$5?~s@Uf(2tqKN}yDuGFu}Ag-Q?BOMd8^Asil)B&{P17?{{Qd4-?5+m z-15}>@69@|u3UCyTm0*T_Q_*cO0A+!FOA^Z@XIl>QT4V^N?6p!3|+6aNk7}%YXV#v ztmeis*st)L>Hl^s{XH&?AFFHAz2~n=;)qZy zkvR0U>399wY0}^9PW3Zsh^RHXhzJNB{HA}cx6jdB@z|#%aw;qN zAkXU$k3W9Ca6wS%OwtJ#-}9C_KVnwomp^Fk5&qC>dBN_UQc{!bN%I+Hl^;vny;bHH z`ahbxI{kz8WzM}>wwuhJe3sE=4!*HpSNh_^UkT?#_bqYwenO`!_*=Ji{u^`~%#l5n^HcjFR=>od69g}!r0eA)1QgQi>W!jFoE+izD0 zJhfE+IfLWbOz$I68F_Abo-J6SGx5jQ3wU z#+2~9?>~3*$Sxl}=a<=>D^~CAV(n)a)@0SIz9c=dwYAmCv$0~Y)O73FE=?+b^R|5T zTcn^m`~1$@&oAcxWajxjp?|r)`GcKDd}`*bJuE&y^w2q;)mx=@t=zcrqE=YNEyWXkor7w*~U6m@e0D|G4~er>><{ z%>KIOO}F2EuC1-joW#`f^zIkliuYx#%bw3Yu{GtRQ_AyPW!@dHcQn4}FbJu-b7MvV zL-l|0E$97`m7aSZu`hY_?76+qnVz$`Pv1#}6}h-LoRqzh`f2ID7cVd6e^?iQAvLJf-!I^D;Vx0UQO<-E$aqZg8hc`jnT}TXANriDyG`

NT>taW9_iS6 U=GbN_1_lNOPgg&ebxsLQ0M^_qV*mgE diff --git a/src/plugins/projectexplorer/images/settingscategory_buildrun.png b/src/plugins/projectexplorer/images/settingscategory_buildrun.png new file mode 100644 index 0000000000000000000000000000000000000000..52a5d2d9a11976c1aaa2e166826bafae40aa223d GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|7G?$p2BAoW(+ms@asfUet_%ze_V)G;4i4qz z<@NRT4Gj$)9Uc4k?>}(h!2kdMb8gxnWME*3@N{tukqDoAawBhpf(Y9~<3|ByTlyT1 zb8PEN$mV!>|Jt*U3rym^KfNHbe_~>JNQCS*9)1>g7Cq-gN%cuZMj}nKcqXbya?O^h p?a1VK`9xwxEr;iKp7+XezfVkib?Hjrdl$V#+*Vi{R zG<0-y{Qv*|y?60?1_p+So-U3d7N?(HKFHgkz|;D0m2rjoxdr8E3OoL5ac#Nr?IBCS z#}A*c9&_1M&*v+mG<9?G2~(Zsz_u3&9hE!P)H0H;haPGBASf&psNT}>qR8>UGk4Jf zqYH{xPj6(Db=o^eI$&YL*IK!MlUZiIbDC6IQ?P)Yzv_bn69XrMg~Ee|1+9!3ipmcH k1sU3T9In|u`<*TSI>YaA>jPyQ1_lNOPgg&ebxsLQ00!qk literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/settingscategory_devices.png b/src/plugins/projectexplorer/images/settingscategory_devices.png new file mode 100644 index 0000000000000000000000000000000000000000..25fb2d5064b4d94a370c31d99f11f78ae9fed361 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|MrH;EhFd$=?`B|NU<>dGab;j&`2YX^(wp<| zGB7acd%8G=aL6YAIe*|lN1r{%2jjZuKN`9u&r0s!oa1;u0Z@U!tu3F2{RSn%fm|NqW%r48&et?Jukx*8k*Gc^7B|Nl>A$}0x@ fysl3Z7#OzKeE(mz^zTUq1_lOCS3j3^P61#y literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/settingscategory_kits.png b/src/plugins/projectexplorer/images/settingscategory_kits.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba898f7b6a98016892274c18fbea997295a68a1 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4h9AWhNCh`Dhvz^8J;eVAsXkCfAljO1Vle- z)wgCA+30U`NqS^li}9*A+xgjr|}JyfB(0;Z=IIH$!20;p^_o8TYjUE4r* Nd%F6$taD0e0suECJ!}8~ literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/settingscategory_kits@2x.png b/src/plugins/projectexplorer/images/settingscategory_kits@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7e9de202a4ece6886c13ab6bb369d4070a16a9 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_a>M?75|Lp+YZy}PIWue^m{0&xuZLD0g>bJEeHMTr$Y)xTw)Bkq+$ARqG zS4+z{*sa%ehTZsm@L9F@A~jdf5C^;31-IERN^0ER#-Jzn;G1K~n`4(PUVL{fd3)^k zk>#;_f4tFOzV6AZ>Um6=|2Ww4`WCGJ)2YxDATWy~jWK_V&cqoLnlG#e`ODMQ&t;uc GLK6V - images/category_buildrun.png images/closetab.png images/debugger_start.png images/debugger_start@2x.png @@ -78,5 +77,11 @@ images/fileoverlay_unknown@2x.png images/cancelbuild_overlay.png images/cancelbuild_overlay@2x.png + images/settingscategory_buildrun.png + images/settingscategory_buildrun@2x.png + images/settingscategory_devices.png + images/settingscategory_devices@2x.png + images/settingscategory_kits.png + images/settingscategory_kits@2x.png diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 5a8f2bc1cab..cd7e6db4808 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -191,7 +191,8 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setDisplayName(tr("General")); setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Build & Run")); - setCategoryIcon(Utils::Icon(":/projectexplorer/images/category_buildrun.png")); + setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_buildrun.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *ProjectExplorerSettingsPage::widget() diff --git a/src/plugins/qmljstools/images/category_qml.png b/src/plugins/qmljstools/images/category_qml.png deleted file mode 100644 index 131a4b381e9c53c6d08a8348fb7fe8fd74e820cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 876 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztF!Oo3IEGZ*+7jxW9qcGFuex})S^q3MpX}=7`I%Bq z%w{izH*XSI^2kY}V;xJkws=qg%fjezy(3dy1w=vwSn3_co47Sg7rxeuniQ0IX-VcU zk6#~t^X*(Jrg>3~xjp}#&ok@iHP3zAUe~?|ek!*;CRpyk=I=YhgR59iv@_gKoc!n7 zX`g=*A5v>-_FRrKKIQU;bcYap+xq(WN(%}Wl$Di*-=8s`uCsDp{{q5!|S$(4-+GA-@O~!>g4$B%6)^L`so};$_@lyHd!9%bM^9N9)v|x&zl86bx+5%$EJB+b@u6B&ir58!LME`?qf{ za#rhBt(s)@Qgy=pCr4ktf8T#B$?$2}?$(6b+Sn83=H{-yfBmXDd93JwEzkBsu8qte zm?qufWozz=b;_-@nCat{xbpX>Pn)u`vnTh=Xk3;VGN=aayL3PrdD|TjFnR`NK zN8iN+k&}z3utb$r?TzcynCj)Z#MIPOiC=bt!Tj^yTV9q#xhe@}dTJ+$-MqB_#xl9Z z8Yg8VvNAI}zcGKd(edF;Ov}!G&HBxjKlt|4siLhutxtB?9Ph4v!q9(6M{V=+ZCOdL zR5{)~T<>@yf<0~XjvX4$K30SzCqI@?@7jJd`ju~8LlfUZQ+>mvZ-4IGk+FUy{cWDQ zP^V}6;ljl`cSdgAvgJf$60gtNE9$~Q-&CAM~v`caK z_HCc1pP%~VL3*O1pfi@Lp07O|LA8nxDfIv zMJKE?dtuMK2o jOg8FRQ}5TmqLqPRYVzZ+Y$e7rATM~j`njxgN@xNA%@kS^ literal 0 HcmV?d00001 diff --git a/src/plugins/qmljstools/images/settingscategory_qml@2x.png b/src/plugins/qmljstools/images/settingscategory_qml@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3e30bf7bd571e7538402be677073243066eb428f GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4h9AWhN8@6(F_cX>7Fi*As)w*fA}jUNL)2& zkn%e=Y01MVjm7GmQgX`-jSWJC);=t?WM>vwqY!j>IiDSy!4AhMZR=&51fKHTsqeh- zA$yq!Gf#vN-?ja#LnH(gCNF5a%f@pefsK*Z{mlX{)jbMdIQK~T{dAaWd`#{UoAHeO zk1iJ2P7z!cm-$^>m&04QJgRESF{aRSlfFN#XPP40>CJ2s<>>JK%K!hL6X)=~k+M6y zXli5Q=6}!s{}11hct`ezNzGgZHh$OJuN@d?us1wlHRJ70{t}^hiD~oyMi!w5uT%?C z7t9wIo4TWm-Ilrdnew8u%`;@$KQIKP9azkGlG$S>V}BdVlPM+59K5m~uLNf@&X=E1 z5+S6QW@hvE|9-i3ip?9^Uas<=_-2M<#Ni+|Qx#ctj_ey}8kR6?8b7#FAh1I3mHicY zDVHg0pG!zAnSbDr)+7$za)}E4L(bcqIe6F4Fjst(%q}QZ=i|2F_5A*@uI2z{hIc&^ U7?+)FKM4wYPgg&ebxsLQ0Djn}0ssI2 literal 0 HcmV?d00001 diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 38ea19451d2..c6d66a9ebd1 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -132,7 +132,8 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer - images/category_qml.png + images/settingscategory_qml.png + images/settingscategory_qml@2x.png diff --git a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp index 0d638740379..9bc52867c0c 100644 --- a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp +++ b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp @@ -28,6 +28,8 @@ #include "qmlprofilerplugin.h" #include "qmlprofilerconstants.h" +#include + namespace QmlProfiler { namespace Internal { @@ -37,7 +39,7 @@ QmlProfilerOptionsPage::QmlProfilerOptionsPage() setDisplayName(tr("QML Profiler")); setCategory("T.Analyzer"); setDisplayCategory(tr("Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *QmlProfilerOptionsPage::widget() diff --git a/src/plugins/texteditor/images/settingscategory_texteditor.png b/src/plugins/texteditor/images/settingscategory_texteditor.png new file mode 100644 index 0000000000000000000000000000000000000000..20fafdb375ae775c82aa553d41606d61a0f57f1c GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|MrH;EhFd$=?`B|NU<>dGab;j&`2YX^(wp<| zGB7YGc)B=-a6~8nIe*|lM_+xxiRO>~+gMkatX2xM<4HE;X0XwfcD&V@rozC$z~JfX K=d#Wzp$PyG0U&Dt literal 0 HcmV?d00001 diff --git a/src/plugins/texteditor/images/settingscategory_texteditor@2x.png b/src/plugins/texteditor/images/settingscategory_texteditor@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef22788760397cac6ee197315264bed8be98474 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6w*aCb)Tp1V`{{R2K^yd7# z3=9lvo-U3d5>u0Z@U!tu31XL!m{Azm{-0TJj*{y;ej!)c+8-KOEi4R images/finddocuments.png images/snippet.png + images/settingscategory_texteditor.png + images/settingscategory_texteditor@2x.png diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index a028593e9ab..05a10ec8a13 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -36,5 +36,6 @@ TextEditorOptionsPage::TextEditorOptionsPage(QObject *parent) : { setCategory(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); - setCategoryIcon(Utils::Icon(":/core/images/category_texteditor.png")); + setCategoryIcon(Utils::Icon({{":/texteditor/images/settingscategory_texteditor.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } diff --git a/src/plugins/todo/images/settingscategory_todo.png b/src/plugins/todo/images/settingscategory_todo.png new file mode 100644 index 0000000000000000000000000000000000000000..e0eeab33c801c0a335d131ce707d902de19aef7e GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|MrH;EhFd$=?`B|NU<>dGab;j&`2YX^(wp<| zGB7ZRdb&7K6^XjvE+ZflKl3n=i;Q4w61_lOCS3j3^P6E4G literal 0 HcmV?d00001 diff --git a/src/plugins/todo/images/settingscategory_todo@2x.png b/src/plugins/todo/images/settingscategory_todo@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..69e02ac8f7f2a29582daaf7a3505a35d740ad8f1 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6w*aCb)Tp1V`{{R2K^yd7# z3=9mCo-U3d65+`|_}O@-1hw-U7$~oJxL}eE7em)ZwvdMYxe^Qv3=E#GelF{r5}E+2 CfE!H! literal 0 HcmV?d00001 diff --git a/src/plugins/todo/images/todo.png b/src/plugins/todo/images/todo.png deleted file mode 100644 index 80b4257017ff14d3958fd58d372abe7e702540d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-MrH;EhTJpRM;I6wI14-?iy0WWg+Z8+Vb&Z8 z1_lQ95>H=O_B%|x?1ubB`XApjFfhnwhD4M&=jZ08=9MsjfOAo5Vo7R>LV0FMhJw4N zZ$OG(Dmw!M19N~+h--X&JX>z$N(Kf79#0p?5DCd-3Dyu+2F3se#w*#MGeP=2UHx3v IIVCg!0OBtt3jhEB diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp index adce5dc44e0..ff3c0ed83a7 100644 --- a/src/plugins/todo/optionspage.cpp +++ b/src/plugins/todo/optionspage.cpp @@ -49,7 +49,8 @@ OptionsPage::OptionsPage(const Settings &settings, QObject *parent) : setDisplayName(tr("To-Do")); setCategory("To-Do"); setDisplayCategory(tr("To-Do")); - setCategoryIcon(Utils::Icon(":/todoplugin/images/todo.png")); + setCategoryIcon(Utils::Icon({{":/todoplugin/images/settingscategory_todo.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } void OptionsPage::setSettings(const Settings &settings) diff --git a/src/plugins/todo/todoplugin.qrc b/src/plugins/todo/todoplugin.qrc index b9e44626664..73d941d4a9d 100644 --- a/src/plugins/todo/todoplugin.qrc +++ b/src/plugins/todo/todoplugin.qrc @@ -1,6 +1,7 @@ - images/todo.png + images/settingscategory_todo.png + images/settingscategory_todo@2x.png images/tasklist@2x.png images/tasklist.png images/bug@2x.png diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index d43c26f1f43..e739ceccbc7 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include @@ -64,7 +65,7 @@ public: setDisplayName(QCoreApplication::translate("Valgrind::Internal::ValgrindOptionsPage", "Valgrind")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *widget() diff --git a/src/plugins/vcsbase/images/category_vcs.png b/src/plugins/vcsbase/images/category_vcs.png deleted file mode 100644 index 2b04fa747d04b5ee2883147a95531b4e1c0468a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFwgLGaSW-rH7C^DJ2X%v?so;xQ5MgPfW%AQUaA*m zt|(+o68XZQxn#-oMh-_`Ce6j3rdk|aT`NqcI=C2YcD%44aZJL|X|LJ-J>)th&||o3+p=db=C0p< z|H<_~UhG@16+HV-i%u&&NuBpCKRnxAKFN ze{$}q*dcGVed{uYR)q$OK1VN3>shlDc$gX$E;sW!yW8Gc(8C*@$r|Lz7oBCDo<8#dw<`0@bQj>PTkKrmqZj@6`3aZ^IW>a^VZ|~_x$_MESQ!~jAmIVd+qTZhN#W# z^$Qnnd&etqM9^kdEnoBTa|h4$M&JDHzIbu!%v6TXdrx^^izqOwG|0CyCB$5~a*t#G zVX+E}&mwG9euqygyU%Fcqv60&v46vcCI+dM3s~n$mhE{Rqr&pRSfk;a$&sLgzvl98 z(7wgzf3N58-Gj4tb||t&M2Dx>^nUby7POYhV^Qa!8O0wS{abDH>XQY3=fe_(hGWJ) zf~u1kZX^hXG8Bp|K9_7^U2wtmrOlE%nhoKXmL-A$@ldoOGLca$hB31FG?^w_B@8y42^>6A_g zSaP$&$84g`$AFeA7ZL*I?md6S?S13Z*jdcGY|d{M*=T68PR6xFp-)A9n~74iu%&=% z#H?K{R?Mvn8VPP-}uch!k2oz@L6OIsr& zAaUO<;8H1Tm44*R&aMpwCq4^I)>^6+d{J#`I+II%qRMksR*zdYjXT25l{#2zuqd9s z^h9Xo>1};$_*%BI)s>dc;tuj-niLe`aNhI%PZlvr-OICIJl`pk;2rVx>f(2=G?YA( z_+s>fysYnvOP}7}*TQrD#Un_7#?_Yc>9O_)74#$ezj-f aVR&*U;a`+@%4Y@!1_n=8KbLh*2~7aqJIuoX diff --git a/src/plugins/vcsbase/images/settingscategory_vcs.png b/src/plugins/vcsbase/images/settingscategory_vcs.png new file mode 100644 index 0000000000000000000000000000000000000000..1523948dbad97712ef59c8094310715cff9d37b1 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|7G?$p2BAoW(+ms@q5(c3t_%zes;a8x<>j57 zoxQ!iPo6ya|NsBo-SOWT7#LhUT^vIsrY3thGx4Yt2uVmtxIC0mDB^K`w4|fS(!n(+ zi!-yWfKPZrL$Smahpa>yH5I-iA{^`-Cmt%iVKn9}@Ze)+kdg{ZzcqzPlYxPO!PC{x JWt~$(69522Edc-k literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/settingscategory_vcs@2x.png b/src/plugins/vcsbase/images/settingscategory_vcs@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b597ac883aacddd0fd37b977b4724f9baf398d84 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-7G?$phNU`BwlFX-hz9tCxH2#>FfuZhmzPhP zG->M8sk3Iy`v3ob*1q}83=9mJo-U3d7XEinALMN?;BgK#mtOF0f}ljBwROXH`9^16 zp(PU^u>Enq`t4+b&_1q=t30Pf7R)X7O^`ii7ciM))(cLC1(O%3sT&AA31T{MTem5d z!Tz6Kg5&|?4SFknZ+NZm@PlDR9K&2YHfiA}-gjSX{-4Icz`)??>gTe~DWM4f2xCTV literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc index 101764d9f21..450f8d6e6cc 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -1,6 +1,7 @@ - images/category_vcs.png + images/settingscategory_vcs.png + images/settingscategory_vcs@2x.png images/diff_arrows.png images/diff_arrows@2x.png images/diff_documents.png diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index 6ca261c9ee8..ce0b67ed424 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -48,7 +48,8 @@ VcsBaseOptionsPage::VcsBaseOptionsPage(QObject *parent) : Core::IOptionsPage(par { setCategory(Constants::VCS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("VcsBase", "Version Control")); - setCategoryIcon(Utils::Icon(":/vcsbase/images/category_vcs.png")); + setCategoryIcon(Utils::Icon({{":/vcsbase/images/settingscategory_vcs.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } VcsBaseOptionsPage::~VcsBaseOptionsPage() = default; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index d41141c4306..5a52b06fcf7 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -654,6 +654,14 @@ width="16" id="backgroundRect" style="display:inline;fill:#ffffff" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +