From 63eae6bd85eebd7f0ba6e0eda01b9fe2523f2551 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 14 Jul 2016 16:22:54 +0200 Subject: [PATCH] QmlDesigner: Theming of property editor checkbox and "tr" button Change-Id: I599cd52c1b2b2e24952a9738f07eed0826802d4c Reviewed-by: Thomas Hartmann --- .../HelperWidgets/CustomCheckBoxStyle.qml | 21 +- .../HelperWidgets/LineEdit.qml | 28 ++- .../images/checkbox_checked.png | Bin 240 -> 0 bytes .../images/checkbox_checked@2x.png | Bin 644 -> 0 bytes .../images/checkbox_checked_pressed.png | Bin 360 -> 0 bytes .../images/checkbox_checked_pressed@2x.png | Bin 623 -> 0 bytes .../images/checkbox_indicator.png | Bin 0 -> 163 bytes .../images/checkbox_indicator@2x.png | Bin 0 -> 282 bytes .../images/checkbox_tr_checked.png | Bin 178 -> 0 bytes .../images/checkbox_tr_checked@2x.png | Bin 319 -> 0 bytes .../images/checkbox_tr_checked_pressed.png | Bin 173 -> 0 bytes .../images/checkbox_tr_checked_pressed@2x.png | Bin 316 -> 0 bytes .../images/checkbox_tr_unchecked.png | Bin 170 -> 0 bytes .../images/checkbox_tr_unchecked@2x.png | Bin 283 -> 0 bytes .../images/checkbox_tr_unchecked_pressed.png | Bin 170 -> 0 bytes .../checkbox_tr_unchecked_pressed@2x.png | Bin 288 -> 0 bytes .../images/checkbox_unchecked.png | Bin 108 -> 0 bytes .../images/checkbox_unchecked@2x.png | Bin 111 -> 0 bytes .../images/checkbox_unchecked_pressed.png | Bin 121 -> 0 bytes .../images/checkbox_unchecked_pressed@2x.png | Bin 100 -> 0 bytes src/libs/qmleditorwidgets/images/tr.png | Bin 0 -> 142 bytes src/libs/qmleditorwidgets/images/tr@2x.png | Bin 0 -> 262 bytes src/libs/qmleditorwidgets/resources.qrc | 20 +- .../componentcore/qmldesignericonprovider.cpp | 43 ++-- src/tools/icons/qtcreatoricons.svg | 224 ++---------------- 25 files changed, 83 insertions(+), 253 deletions(-) delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_checked.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_checked@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png create mode 100644 src/libs/qmleditorwidgets/images/checkbox_indicator.png create mode 100644 src/libs/qmleditorwidgets/images/checkbox_indicator@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_checked.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_unchecked.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png delete mode 100644 src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png create mode 100644 src/libs/qmleditorwidgets/images/tr.png create mode 100644 src/libs/qmleditorwidgets/images/tr@2x.png diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml index b7b807b5f7a..054c807ec4f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml @@ -30,11 +30,24 @@ import QtQuick.Controls.Styles 1.1 CheckBoxStyle { spacing: 24 label: Controls.Label { text: control.text ; color: checkBox.textColor } - indicator: Item { + indicator: Item { implicitWidth: 16 implicitHeight: 16 - Image { source: "qrc:qmldesigner/images/checkbox_" + - (control.checked ? "checked": "unchecked") + - (control.pressed ? "_pressed": "") + ".png" } + Rectangle { + anchors.fill: parent + color: control.pressed + ? creatorTheme.FancyToolButtonHoverColor + : creatorTheme.FancyToolButtonSelectedColor + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + anchors.margins: 1 + } + Image { + x: 2 + y: 2 + width: 14 + height: 13 + source: "image://icons/checkbox-indicator" + visible: control.checked + } } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 66c6ae46913..56c651859bc 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -165,16 +165,28 @@ Controls.TextField { style: CheckBoxStyle { spacing: 8 - indicator: Item { - implicitWidth: 16 - implicitHeight: 16 + indicator: Item { + implicitWidth: 15 + implicitHeight: 15 x: 7 y: 1 - Image { source: "qrc:qmldesigner/images/checkbox_tr_" + - (control.checked ? "checked": "unchecked") + - (control.pressed ? "_pressed": "") + ".png" } + Rectangle { + anchors.fill: parent + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: control.pressed + ? creatorTheme.QmlDesignerBackgroundColorLighter + : creatorTheme.FancyToolButtonHoverColor + opacity: control.hovered || control.pressed ? 1 : 0.75 + } + Image { + x: 1 + y: 1 + width: 13 + height: 13 + source: "image://icons/tr" + opacity: control.checked ? 1 : 0.3; + } } - } //control.pressed ? "qrc:qmldesigner/images/checkbox_unchecked_pressed.png" : - + } } } diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked.png b/src/libs/qmleditorwidgets/images/checkbox_checked.png deleted file mode 100644 index 519914fc1915012205f03abb27c172a570c6426f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0y~yVBiC>IanAN7>ut@|H8n)u-((eF+@U=_25P=mI4{} z5Bz_3`NW)ClEbF9`|GJB3!8(!I%50@U!>AMa(PYEu4Hg+^Y&CcohxQ}fB*UAVbTl? z7YcWWeqm&|aQXAMm?I(#8!{hUc)6y7p@G*~`M$;?#)P{Qz2g^jL~Kr85^3<|VU)PY z**VGHaXqpTWr@ogmFjxm-u#+!d$+rx+S&d$!>-rm8%!O_vt$;rvt z+1bU##nsi-&CSi--QB~(!_(8#%gf8#+uO&-$Jf`_&(F`_-#;KAATTg6C@3g6I5;FE zBs4TMEG#TMJUk*IA~G^EDk>^EIyxpMCN?%UE-o%UK0YBKAu%yAB_$;zBO^02GdDLk zKR>^?xVWUGq@tptwzjsRp`o?4wXd(QzrTONgbCB8O`9=e#=?aQmn~biV#SJ;D_5>w zy?X81wd>cf->_lB#*G^{Z{ECZ+qNA$cI@1_bMM~02M!!Kc<|t%Lx&C@K78cJk&`D+ zo;r2v^y$-Q&YU@S?%etF=PzEoc;(8KYuBz_zkdDZ&6|)gk&HT!#lXP8RubeF%)r7c zU_R{+qt8wT21a&I7sn8d;L=Nu-b{fKZVxZZ&Q=oqy~t(h6ro_ljyvBL-`<{ceb=3g zrxSQ51`C9B+&ptVX~Ue4RonRAzcYPz%IDaIRda-;GHzteo9n(SX{M%ZY@0+tt*^M8 z*m|WTpKyzl{7i2m^3vPa-`IHPmIQm2yJcCu+_JKm{M?7Urj5_G2qXvpc#+98*Kg^& z6|1hTesEUkMTys&EumM}9yq;MPidx1z*;9|?(+v86+L3iX5Y1w|Dc1g_tksC8=_b5 z{ID!D#GZ+(+TgYR;|uIvw+&|LE&g?+b``6N zcSpychkFbsziT+kbEdzzy1ejn{o*T=vQ=;DUw!5FApFuST?PgQ22WQ%mvv4FO#s>7 BCzJpH diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png deleted file mode 100644 index ace0d06520c6a3b34433203fa5de0d85be9c5662..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmeAS@N?(olHy`uVBq!ia0y~yVBiC>IhYw37}hbZ_hn#Um>=L1;>y6luz&yld-v{1 zNlD4b$jHgb$;-c zx$D=j-?C-P)~#E&ZQHhI&z@t)j-5Dh;?${AXU?2Cd-m-4^XIQzxpMvb^_w?u-oAZ% z-@iWs3=9m+B|(0{3@mz1XLv*z7#K=DT^vI=WPJ~w=4xUPaX47qKfz^!NL2T)|Le2v zD;XZXqH(fC&LsJhdgvqd+r5vjZ?ouobbOh`{fQOP;-$<&6W{ihT%FFC6qK^_=N{(? z3sj?Zc3UyI==VqF$#X3_uU*V0>hjhtZ!gy(KHumzt{~r2hgZ%zz+H1fEqHPFv!x6S O3=E#GelF{r5}E)!vyA=# diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png deleted file mode 100644 index ce4111e2bf4c432bd3d689fac265674e1103067b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmeAS@N?(olHy`uVBq!ia0y~yV31*8V36WqW?*2L+;wI*0|TRAfKP}k0|UeU{rhj+ zxN-mf{ad$g-M)QWN=iyvT3SX%MpjleXx4uHCe0)8@^a zw{6?DW5wy?Xun^&2;C+`M`7_U+r{7Z`IH7#P?}g8YIRSa=1@r~P5{*~!4b$nNRl7@`qe zddAnADN&^D;cv^65uGg=yiLnkT_>gl%&x2dZRVQV`r^0i&tu5=9&i3rYZjF0vJEpHZeaDyG{MYlD?N)hb=Bd6uzvH5Qe$AcJ zy)T1mK3Nnd|FLj<8!Ff{^|GSe(ih>Pj_*y%A9w~S@?TYGy5~9V%f2OFm9|9vay0%t z=|J4E9CJoqW8>eEeOV1$x6U{(U;g6KE#8FN-)&#qn!ohQ9L9fqJ-dJHoua}!t6@KD z{$q}|{HPY*H~*t+%bfm9O3sXBNK?KZ^xnDQm&vY}m|PAm{h~#`c-~iaCpY$1`d?k` jm3&iXdMtm(H{KgA diff --git a/src/libs/qmleditorwidgets/images/checkbox_indicator.png b/src/libs/qmleditorwidgets/images/checkbox_indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..8af2814a9de699bddbf3210757196c83361b08df GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0y~yVBiC>IT#oi81`&uSj@n{kmc#(7{W0#`A0v?zW5Y} zM|ZV;_8z&L`0by4({Aqvr|Mb08>Bz4=lC9Trw zs>#0Z<$J2z8Xe~?d~e_L`~K9%#)mvjyW1Nb-EaloF|qWdqK{Le zgxf=7w#$x*Icf^VGxB;~EZHPzAe_*XV327XnZvfq&Ac~cRZ5D`mIE0RcycUciX>;R zXFT=v-+j;Y>IpX&wP*f4-P>CK{dlqDj#cW%j0&PUN>U#foL$T#BU7lzZ2vfAI-B1l znYt6br-gS+mcM@WV%e+-AOF0Vs#!7V3frzv3&Yvgss3HEK*j!ClEaJGU97*VS7xvXAqECUHcuDF5RLQ66O#_GMo4_{ zv`n6Q!`tC{ecN`4Lx&7j{+9^)|1jv%R308<{p6`ajGN;A9#{SPU$;zi!CLuxrJcSl z|CL=%9TYtwI^*1iM-EGECYXj^>}*cFZnt3yOUTD$H&21o^ZUHLpK7{X-&B5ihU7F^ zhOTEns*MfyME?69bXIspY|R;m-3O#tB_!^x`*Z%oj*r$MUIH3Fgv9)p6H#pr- z&|_JZ`h#N{lUCJV`I{ddR{obi5cG$K$Ns|7egD!<>?myLoZa|Py-P%x`EWd6@Z+`r ze>SXnuMzayH1+3l+u8pFQsic>6EF3#x!=H-yhFTSu#KnQ{!xd%V@zPDdTxw@tt=Bm XSXiOi%Jgrsppfx&^>bP0l+XkK&bx(4 diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png deleted file mode 100644 index 818a51da847a0ca6f6bd8d6ceecd190cc9b797ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wQz`zjRuzLXm14D_Yi(?2!bn+x8HXj}zjspjd z9Oz+ikn8?3&q$1e;p9n!JuIg;6f;()t>xJm>KMIU?aMUAO7Uw3BHwa$etqq5H*bQM zV4MG$Gfvy%|Lx*<_V;hvA*BzzSAqECUW=|K#5RHk+lMZptkSJhU zAfg<`FfHj27l-FV^MKUv@9u`(DD`BN{UWnlZ^4!S<~K?`jSTku?!0hNP5m(AMbVvC zyBi%VUWdgm4x{GPMq1^_)tA7!@%Ir(?X;Dr&Tyo{<>V; z`v0JPqov(sc|#`I6Cb!;udlv!iQJ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png deleted file mode 100644 index b62b894fc2c1a20f54d4379f317f0018a275019c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wQz`zjRuzLXm14E&wi(?3fEbGD3s~j06*e*={ z+dX54N~zDD?&sh5+>WIM>8Wm89D9FT*k4A6n~WRucQWcsHM#wq)y4B=)dlUxuFnpi zKUHfLcyIpEm)TZTG3H)cu{^idPoJcA_sQKYf~x-?ms(GVn=(iLVTZ;{Mi)zl2kcH$ V4AvbewJQWU!qe5yWt~$(698ugL2Up4 diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png deleted file mode 100644 index e45da33a2ad9195451d278e7c87cd3d2862ae1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4h9AWh8{&>AqED9N1iT@AsQ1~FCO$d>>$$m zu--^G$W>`$(}mV`pH%F&zklFYu$a3$Yzwc(ER&Nm;+b1AjVh*nzRNw`IL}c-Ps3uz zyq4MZ+m8HxQF(8&+md)My@x-GCnY&9_1tuzY}TBNKk_qfn98Q6bIkr66{C8fXqxNG zWs7&bZ1YZHTwYc?XPWHZHN}TlF}yqfJiy*?_YJ{`job1U#5sPw@lGSGK0(EfCF>XW z+696Q!RCu=SFt9zTB~H(cCSC=@_@bNgPLvSMA diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png deleted file mode 100644 index 1710037c9c2bd2b4909137fa2ffca025803e6804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wQz`zjRuzLXm14E&wi(?3fEbGC8T#SJt3>S>w z-#gQxlxnQS#kLAtS^9Lp*McFZie)T!Mw(MI* z?6bpmU+@0u20vpKTd!Dh3yq7-MHiWdxum0IlmOWl#VWyw&Yl%z;KC^p+4=Y Vyl9M6-Xf4AJYD@<);T3K0RYF$Ksf*a diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png deleted file mode 100644 index 6d5cc5bd4137833f025642f048226a309704b89f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4h9AWh8{&>AqED9=bkQ(AsXjfC!Y3Vb`)^+ z54~<<#C5Ypu*ur>Nbmpu%1&ZVArd7MU7T1hpF8YYHAA4#RlNIbSX(^~czmUo-@*Z1#Q?%h|euqh|YEpJm~<=6v^^cePu^n}t``30~i( rQFrh{{QdCH+qYeuc7EaWLKCz7*I!t5GR)mq1M<43tDnm{r-UW|Cu4bI diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked.png deleted file mode 100644 index dd9cffac46355d83ac70c88c9fe2116552c5e979..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wQz`zjRuzLXm1B0=ri(?4K%;ZTAqEBpGfx-C5RLQ66O#_GMo4_{ zv`n6Q!`tC{ecN`4Lx&7j{+9^)-`*;6*x;+UoTg(;P{pNVtd}k;GRSpX=r3NR)(0}l M)78&qol`;+06$(LE&u=k diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png deleted file mode 100644 index 2358860d58d213c0728f77b7feb9bb0ee2d44341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wWz`#)S`biA~1A~L7i(`n!#JiUc@-i53Fgb)Q zEBLSLnAqEBpZBG}+5RHk+lMZptkSJhU zAfg<`FfHj27l-G>bOqbeUaRJ1efzsb8mdKI;Vst04s?a Ao&W#< diff --git a/src/libs/qmleditorwidgets/images/tr.png b/src/libs/qmleditorwidgets/images/tr.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f32287c7025c12f4ea6e0600e2dc10751d4b5a GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4wQz`zjRuzLXm14F2%i(?4K%;X>aJQ5#1zcW@* z`uNRYOT$e2{S1}2B_t%AeoIJb^)fpYh4P61`)~ey$Hz?R4)Nn3KK-w^WM5&Ye$77m r-$qu4%9(3Ua>p4TIq>GUAqED9vz{)FAsXkCfAk9*@Tjfq z=HcO)y}^4evsdgFWBSy_M6DYuvKE9~+yDQ$M4a=|d5o;r8kbIzka$whbah{| zb3d|?NbK~*j-o6X>@$@|9{8K|MkX( z20HE&wNeu%{4i+$`scs8LjFRJyGAUluEl)*|37oV6}v4SKmUF@p5QCZ@bjn1<>hO( Q`hYy>>FVdQ&MBb@04Zl|*8l(j literal 0 HcmV?d00001 diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 3c0b730732c..f43e57dd288 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -1,21 +1,9 @@ - images/checkbox_checked.png - images/checkbox_checked@2x.png - images/checkbox_checked_pressed.png - images/checkbox_checked_pressed@2x.png - images/checkbox_unchecked.png - images/checkbox_unchecked@2x.png - images/checkbox_unchecked_pressed.png - images/checkbox_unchecked_pressed@2x.png - images/checkbox_tr_checked.png - images/checkbox_tr_checked@2x.png - images/checkbox_tr_checked_pressed.png - images/checkbox_tr_checked_pressed@2x.png - images/checkbox_tr_unchecked.png - images/checkbox_tr_unchecked@2x.png - images/checkbox_tr_unchecked_pressed.png - images/checkbox_tr_unchecked_pressed@2x.png + images/checkbox_indicator.png + images/checkbox_indicator@2x.png + images/tr.png + images/tr@2x.png images/lock.png images/hole.png images/scrollbar-borderimage-horizontal.png diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 04db689f4c1..053bf1c240f 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -25,6 +25,8 @@ #include "qmldesignericonprovider.h" +#include + #include #include @@ -47,42 +49,37 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c { Q_UNUSED(requestedSize) - static Utils::Icon UP_ARROW({ - { iconPath() + QLatin1String("up-arrow.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon DOWN_ARROW({ - { iconPath() + QLatin1String("down-arrow.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon PLACEHOLDER({ - { iconPath() + QLatin1String("placeholder.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon EXPRESSION({ - { iconPath() + QLatin1String("expression.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon SUBMENU({ - { iconPath() + QLatin1String("submenu.png"), Utils::Theme::IconsBaseColor}}); + using namespace Utils; QPixmap result; if (id == "close") result = Core::Icons::CLOSE_TOOLBAR.pixmap(); - else if (id == "plus") result = Core::Icons::PLUS.pixmap(); else if (id == "expression") - result = EXPRESSION.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "placeholder") - result = PLACEHOLDER.pixmap(); - else if (id == "expression") - result = EXPRESSION.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("placeholder.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "submenu") - result = SUBMENU.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("submenu.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "up-arrow") - result = UP_ARROW.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "down-arrow") - result = DOWN_ARROW.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("down-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "checkbox-indicator") + result = Icon({ + { ":/qmldesigner/images/checkbox_indicator.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "tr") + result = Icon({ + { ":/qmldesigner/images/tr.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else - qWarning() << Q_FUNC_INFO << "Image not found."; + qWarning() << Q_FUNC_INFO << "Image not found:" << id; if (size) *size = result.size(); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index ef2b3bbce2b..b39d8ed2490 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -18,41 +18,6 @@ sodipodi:docname="qtcreatoricons.svg"> - - - - - - - - - - - - @@ -590,33 +555,6 @@ x="141" y="408" /> - - - @@ -1479,13 +1417,6 @@ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc" /> - - + - - - - - - + d="m 571.87109,590.50735 1.5,-1.5 c 0.62624,0.82304 1.36869,1.69471 2.11049,3.5 0.88951,-2.5 2.40793,-5.00735 7.51842,-8.50735 -4,4.5 -5.5625,7.125 -6.0625,10.625 l -2.28125,1.84375" + style="fill:#000000" + id="path4396" /> - - - - - - - - - - - - - + id="src/libs/qmleditorwidgets/images/tr" + transform="translate(-25,0)"> + - - - - + d="m 593.78663,588.98601 -0.3052,1.56048 -0.55626,0 c 0.01,-0.0689 0.0148,-0.13292 0.0148,-0.19199 0,-0.18378 -0.0394,-0.32653 -0.11814,-0.42827 -0.10502,-0.13784 -0.28223,-0.20675 -0.53165,-0.20675 -0.38068,0 -0.71378,0.16737 -0.9993,0.50211 -0.2855,0.33474 -0.44149,0.57814 -0.55636,1.17214 L 590.61539,594 l -1.74261,0 0.3926,-4.01028 -0.79747,0 0.17951,-0.98972 2.54009,0 -0.17722,0.97546 c 0.23957,-0.36428 0.51688,-0.63338 0.83193,-0.80731 0.31505,-0.17722 0.67604,-0.26583 1.08298,-0.26583 0.10174,0 0.22316,0.008 0.36428,0.0246 0.1444,0.0131 0.31012,0.0328 0.49718,0.0591 z M 583.624,589.98972 583.80351,589 l 0.86858,0 0.27086,-2 1.74261,0 -0.27085,2 1.34169,0 -0.17952,0.98972 -1.34169,0 c -0.0466,1.08737 -0.26951,2.07452 -0.31112,3.151 0,0.0886 0.008,0.1526 0.0246,0.19198 0.0525,0.11158 0.17396,0.16737 0.36427,0.16737 0.21003,0 0.37905,-0.0706 0.50704,-0.21167 0.12799,-0.14112 0.2248,-0.35936 0.29043,-0.65472 l 0.73348,0 c -0.13127,0.52509 -0.34623,0.89429 -0.64487,1.1076 -0.29864,0.21003 -0.76301,0.31505 -1.39311,0.31505 -0.71871,0 -1.18472,-0.11322 -1.39803,-0.33966 -0.13783,-0.1444 -0.20675,-0.36756 -0.20675,-0.66948 l 0.3299,-3.03691 z" + style="fill:#000000" + id="path4400" />