From 6c7fff8c91d68912797fa84360ab374b858f44c4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 11 Jan 2018 12:54:56 +0100 Subject: [PATCH] QCommonStyle: Add title bar and tool bar extension icons Add larger pixmaps for the title bar and tool bar extension icons. Task-number: QTBUG-38776 Change-Id: If2514f7aa66fa46d25133165ca45318a5045d387 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Gabriel de Dietrich --- .../styles/images/titlebar-contexthelp-16.png | Bin 0 -> 396 bytes .../styles/images/titlebar-contexthelp-32.png | Bin 0 -> 661 bytes .../styles/images/titlebar-contexthelp-48.png | Bin 0 -> 891 bytes src/widgets/styles/images/titlebar-max-16.png | Bin 0 -> 158 bytes src/widgets/styles/images/titlebar-max-32.png | Bin 0 -> 163 bytes src/widgets/styles/images/titlebar-max-48.png | Bin 0 -> 167 bytes src/widgets/styles/images/titlebar-min-16.png | Bin 0 -> 166 bytes src/widgets/styles/images/titlebar-min-32.png | Bin 0 -> 171 bytes src/widgets/styles/images/titlebar-min-48.png | Bin 0 -> 175 bytes .../styles/images/titlebar-shade-16.png | Bin 0 -> 253 bytes .../styles/images/titlebar-shade-32.png | Bin 0 -> 282 bytes .../styles/images/titlebar-shade-48.png | Bin 0 -> 339 bytes .../styles/images/titlebar-unshade-16.png | Bin 0 -> 244 bytes .../styles/images/titlebar-unshade-32.png | Bin 0 -> 294 bytes .../styles/images/titlebar-unshade-48.png | Bin 0 -> 336 bytes .../styles/images/toolbar-ext-h-16.png | Bin 0 -> 349 bytes .../styles/images/toolbar-ext-h-32.png | Bin 0 -> 568 bytes src/widgets/styles/images/toolbar-ext-h-8.png | Bin 0 -> 220 bytes .../styles/images/toolbar-ext-h-rtl-16.png | Bin 0 -> 128 bytes .../styles/images/toolbar-ext-h-rtl-32.png | Bin 0 -> 148 bytes .../styles/images/toolbar-ext-h-rtl-8.png | Bin 0 -> 114 bytes .../styles/images/toolbar-ext-v-10.png | Bin 0 -> 387 bytes .../styles/images/toolbar-ext-v-20.png | Bin 0 -> 625 bytes src/widgets/styles/images/toolbar-ext-v-5.png | Bin 0 -> 223 bytes src/widgets/styles/qcommonstyle.cpp | 42 +++++++++++++++--- src/widgets/styles/qstyle.qrc | 24 ++++++++++ 26 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 src/widgets/styles/images/titlebar-contexthelp-16.png create mode 100644 src/widgets/styles/images/titlebar-contexthelp-32.png create mode 100644 src/widgets/styles/images/titlebar-contexthelp-48.png create mode 100644 src/widgets/styles/images/titlebar-max-16.png create mode 100644 src/widgets/styles/images/titlebar-max-32.png create mode 100644 src/widgets/styles/images/titlebar-max-48.png create mode 100644 src/widgets/styles/images/titlebar-min-16.png create mode 100644 src/widgets/styles/images/titlebar-min-32.png create mode 100644 src/widgets/styles/images/titlebar-min-48.png create mode 100644 src/widgets/styles/images/titlebar-shade-16.png create mode 100644 src/widgets/styles/images/titlebar-shade-32.png create mode 100644 src/widgets/styles/images/titlebar-shade-48.png create mode 100644 src/widgets/styles/images/titlebar-unshade-16.png create mode 100644 src/widgets/styles/images/titlebar-unshade-32.png create mode 100644 src/widgets/styles/images/titlebar-unshade-48.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-16.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-32.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-8.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-16.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-32.png create mode 100644 src/widgets/styles/images/toolbar-ext-h-rtl-8.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-10.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-20.png create mode 100644 src/widgets/styles/images/toolbar-ext-v-5.png diff --git a/src/widgets/styles/images/titlebar-contexthelp-16.png b/src/widgets/styles/images/titlebar-contexthelp-16.png new file mode 100644 index 0000000000000000000000000000000000000000..2cead1991020d1ee9f9db523aaebaaefe040ead2 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`kN5fEmas?8@26zmP~ z32_C|5a8h8pr@y2XlQF}Y;0<3YGPtxYHDc)20#XoYhrE=Oq1i=!Jb!FVHo5B|(0{42(=1+@f+y*7i>B z9-dx4u}P_!xp@WU6}2s`y_09nowsP`ozdeyLVXDf>l}s7`K1J!pdGc@Yp7mvt=>pq%3+KII zTwtLl%plVKB#!lf+RkeX7d+RgGMt&r$RJ@WrwcUM;U)vauJ=BS2h4UdH2nH|oBdza WRnFUGlUbEO!RP7f=d#Wzp$P!qc5*ZT literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/titlebar-contexthelp-32.png b/src/widgets/styles/images/titlebar-contexthelp-32.png new file mode 100644 index 0000000000000000000000000000000000000000..1cd4843d5e8fad0b0eb5d26307c60c0fb066f128 GIT binary patch literal 661 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyoCO|{#S9F5M?jcysy3fAQ1EAf zPlzj!hJet}PzMJGZEbB86;B{TPfyR>+}zmM*wWI{%E}7DHnOw?3IN%rrlvp%AOi@D zEi8=9%}u~;AZZ2zrluA^CXj?MOdxEqN-!Iu(gMhaa7|6kO+jj4Bv7RpPz{JQH3KRG zS_y$Qgl>!a$z~l?3?(GcYnSv#_yqaP#pCiHXap zXlQBc>KU8cxVm}y1Ox_!hJ`1m=j9g^7MGP*)lZnWWckW9YqxCOxo6-0!$*#vxN!0E zwOhCE-GA`-$;(&ozWx05`_JD6O&-}m)1P>{IEF|_9z7VT%#KmPHma>>ED0($8#P&lD5jT<(E-@?YR2z_U`6Fo{)Wyw|~FOQ+M*(i;6Rk+ZRd& zN6B5%@+mpI;q(!?OL{AtWF~O0kee{6S96^W$NRP{p>?jSY=l;asP4G->iYM<4t?X0 z)EQzcmL*EsF7Ieh{O~$N-QWlBsyfEzpS-K?aq%nUG!?$DF1E4?;|%(Q4q)me6{F?0T-Ql@QZ er}w8ZuJg~k=f=yGIyn`TjyzrcT-G@yGywpm|K5H8 literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/titlebar-contexthelp-48.png b/src/widgets/styles/images/titlebar-contexthelp-48.png new file mode 100644 index 0000000000000000000000000000000000000000..9b170687beefdfef44e6c60c116b4d475e4dc6d7 GIT binary patch literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-soCO|{#S9F5M?jcysy3fA0|TRP zfKP}kP!a+{Lqm;?jkUG4Ra87392|gbJv}{ZYik1o0~;F~OG`^LGc%x|xw$!zG&MD~ zu&@BKfdD8D1V9lW8z>EAn3{qVgBcbkU^ONt7A6)JU_p=woM8fFnVCUEfNUTGEMfs9 zf#v~Cgm8fjQ?Lk>3sh+aGz~0hW&x4{A+QKYB~Uw*gs6dVO@V?yGeIgrCWA;bp!o$mSee*XIN_utQBcm04-8s+KY7$PD0_F%bn zbfN_NgLoEGKCb{14%@6_9=+G()^2m_b?)1%o%`|kzj~?jzs;tfp8ez}!#ipHsbxLu zce!{vCD@-(;n6DL`srM3di7L02xVso5rWPKUWOmMjkV zz!dctM4S#3dB(bB-}D6=E;U?B;uJZSQLEMDH0juUyNoUA8tZN^2&{1}oZa9x=NL~( zP1kAj3m-L|G=7RGPO0e<@UnB|SX$2gh&%4-RTHb(tJ?K6b6ELlLXv=$rc`)p zz|AFBnWn~X5ekr87Ro+#yW&xEjjL@nTY_2F&RSVK&nN7_Lpjskmvv@JzqtjX?_wfUrhfFVdQ&MBb@0N_(7hX4Qo literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/titlebar-max-32.png b/src/widgets/styles/images/titlebar-max-32.png new file mode 100644 index 0000000000000000000000000000000000000000..529c54f61d53e83890665433ac59880ed2b412e7 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv&H|6fVg?4jBOuH;Rhv&5C@2)* z6XFV_&CJY9%*{>A%uP&zq=nKx*?T}y){-E{HM1~*q3`c|8iAs$B|(0{45?=xd_CGf`!-NO%hSa%#Nu=^$5BQJH`NtN zi5eY@EeD0TcqAG!Ly|(0G(0Rc6B$H*J<(ub>Dcf1I_dFEpe_baS3j3^P6`b#b-$jRjF6b#+Su6m&|Z15#^HLl-7a3P}@P<>l{{R}=s!@vH@Zp_M$_nS|N>SAK>kPt|H@ag|npdAdJu6{1- HoD!MBk?BBbj*=k1V20?b88a83K2sBrFc~PO<)5S5w z;&gI?1nc4ikqOLKPG4+b3{hId%&Wp<%qb{tvcO@z0Xsu@R=i2U20R#ujlmgeT>W@ct4VA9mo!qn8<)ZE;}%*+&oKx`0+Kp?>gGbIhdi?#zCdC61KzSEW7sn6@$+ZVP`5F`iSPsYqIEuu) z_`g52DMcwfNwiL-DK6q-;ghC*%gNtaQuV}^J1S4Ss#lSl!=&Z^G~h}@Z z?BtSwC_n4%H;$Sm^1;h%q&bz&4FA~Aj1quq99lPeSJVv z#7ctvf*BZ@*m+e{J-xisGODWAtX+5I>iZA>{DbDz098!#ba4#vIR5s^MxiDH5tl$E zP9>pck9Ys;SM?f5sy8l8QQLkme9kjd-?e35t;+NApKrI_Y|a?>>_{WK#MfGR#z(Pi z`V1cmwPwUi-C^0LvP0do!9J-gTe~DWM4f D^cZcG literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/titlebar-unshade-16.png b/src/widgets/styles/images/titlebar-unshade-16.png new file mode 100644 index 0000000000000000000000000000000000000000..ef19de6c2fbdf088e2d7f934f91b16e22e2e6855 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`kN5fEmas?8@26toQR z32_C|#>U20R#ujlmgeT>W@ct4U=qkMH8nRiH#Y$?fXLk3)C`V*BIYu@Hzol!3zY=< z1v9XUNgJEQ#>G#VIO)KVGmpOi*i*G31t{z6>Eak7A-VRTBVU6856c1F6&g*gfBz?| zdPwb*O8?M$e)>tdvwp%C=E^9^O}e3a@WGT`s~KA-r5^NFF!y=XIFsXFF?04K=9&94 Sz83yjm^=#OLBn_2{#du;x>fHq)$ literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/titlebar-unshade-48.png b/src/widgets/styles/images/titlebar-unshade-48.png new file mode 100644 index 0000000000000000000000000000000000000000..bd17c3cf48a6e3b6184619e5db4fb74f22406765 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-soCO|{#S9F5M?jcysy3fAP|!ZW zC&U#<1A&T)r?!KGwY9a8rKP#KxrvE|iMhF{xw)B{nF$b^S(uuFxTa?4XjNX?5}NRVxTz&uHA6Lk&;I9c)(0VtQy@0Fd(B22; zPYa}C4q1MXKG&=m!^BqbKe14{3_M-^T-G@y GGywoy+;#K- literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-h-16.png b/src/widgets/styles/images/toolbar-ext-h-16.png new file mode 100644 index 0000000000000000000000000000000000000000..c6bd1b178456fa79fca425a6d80a063ef7607d96 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~g!3-q367<#qDb50q$YKTtz9S&aI8~cZ8YoyA z;1l8sq=CS}!NJnf(%9J8#>U3b+S=UQ+{DDh*wWI>%*@2Z0z{gd14&bJb0{(eGl1e| z79bG_X=-j_W^M|V0ty1PfJkHpgu83W(mOy~)k=c=f*BY&IJpF+WOQ`(t$jj5^Ghmg zXU(27f5GDA`}UtaegDC;7oWfV`nTGF9ps%DPZ!4!j_b(@2?+vI(%2^HC@t#Y5je13 zjWfl_YXzqRtHjYOEe#@@*J$yFw0OGp@_TI5)+%&zy&*DXXM@Q0E*tGx4Kmt3-1;uu q>_-9$O`Hwah)!X$_K9G5V!-fhE9;4%TWzwS0P%G7b6Mw<&;$UY_+ab+ literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-h-32.png b/src/widgets/styles/images/toolbar-ext-h-32.png new file mode 100644 index 0000000000000000000000000000000000000000..99c62698f269a08d5ab41b3c07be7d91a5be976f GIT binary patch literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ev!3-pC`=74`Qk(@Ik;M!Qd`Cc-ajG_-G*IwZ zfKP}kkOqR#&`<{l2TMy!V`F1&2M2R=b3?}fRI40si`HHv;Z

&5YRdZ1Bt{GfhtC* zxwros$R~~^L4LsujLaOITs(YI@`_5TYR0y9_RcOIA)!gh+4*I)bv<+DFIc#2`HD4L zw(i@1^3>@w=Pq5j`sneKr_Wx$dHe0x?>~S4*>JD90yONjr;B5V#`&p}qQjd41X}r7 zI|DKkQW-V7o~iDN?7X}G|NrGx6AmX?@UMB6yMF8SGy8giesjM6y-G?w@}}207B2th z$>Jw;JSF}d2wu)|O{POyTPdM1plPxD11F(1ngxp|e&>^4KIx$igL7|FenqkB;^+hE zsZXU&$ey(L-86T-e_vzd;Zvd?)~uCT*SJKnge664XSBi}`Gs#=L}p4U`OYriCU_;) zc15`0l&M!2e>=NE`9au}QoYyza#vcfwLkOmSdE0}lfAPZR76VtU{3v~)_QY^I3p;o NJzf1=);T3K0RViq#ohn_ literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-h-8.png b/src/widgets/styles/images/toolbar-ext-h-8.png new file mode 100644 index 0000000000000000000000000000000000000000..340a374bce8f0f96239b8fcca2a2d495382213e3 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^96-#^XDiZ9Vbs`(}sTKxr*c7sn8e>&XcZ9wep+C8Q@LBs_VX t^gtwqaZ^O=4T*}KjY@wM1k>1NNHK`9GcsJYei;sOkEg4j%Q~loCIEZvH_ZS5 literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-h-rtl-16.png b/src/widgets/styles/images/toolbar-ext-h-rtl-16.png new file mode 100644 index 0000000000000000000000000000000000000000..31c72892b4486e6793bf1a8be80a025305f8b141 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~g0VEh^Ty1m!QcNX5e!&b3Ws}cZ0C}7R9+AZi z417mGm~pB$pEOWV#nZ(xgyVX00s~WWGMm9s24(@qib%-sx(dUDGIOrP|67Bd)rGAUI^WMx^a q@W$iNM~78hpJYxs@U|yCXJk10MsB@-`xOJA84RATelF{r5}E+_pD9NG literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-h-rtl-8.png b/src/widgets/styles/images/toolbar-ext-h-rtl-8.png new file mode 100644 index 0000000000000000000000000000000000000000..538e4083108754ddf80e6c3a0e56a3025b3b1706 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^96-zpA{b(Sed+{KOeH~n!3+##lh0ZJd7K3vk;M!Q zd`Cc-ajG_-G*D2?)5S4_<9c#Jf&rT{2V-(WW(!9M2ZQbz#{Y45XC4EpVDNPHb6Mw< G&;$S(Vj8Rf literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-v-10.png b/src/widgets/styles/images/toolbar-ext-v-10.png new file mode 100644 index 0000000000000000000000000000000000000000..2a6d0e4c70c196976a77c742a8d6e2cf30db56e3 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMpGmw;6C|3leI14-?iy0XBj({-ZRBb+KpkP;k zPlzj!1_B2M2TMy!V`F0*8yiDwYjbmRV@pdjGc!|DOA`|dFvG&c+#JF%H8%$$6QC@R zVG3e{keQi@nFW{uCc)w+W*`M-KoXRVa+_=be$<(HIJ*4E9MJ!k%c#miUh+kfKZ=`;5qJbUr^+pm8vZeM2uHKuvGIEHY@ zvL0k*Y6=ix*iaiFU~RBr_lLXxtMWj8ymFZ(GtBz9ney$Uo^?ImfiaIKOb+{4b=0Ww zq@pm T%*nR}K}LGI`njxgN@xNA0q}Wv literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-v-20.png b/src/widgets/styles/images/toolbar-ext-v-20.png new file mode 100644 index 0000000000000000000000000000000000000000..adc27f52b5cd2c829a5f5a31cb784aa00cbeee08 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lb!3-o-_pE3EQk(@Ik;M!Qd`Cc-ajG_-G*Iwf zfKP}kkcNQJ&`<{l2TMy!V`F1&2M2R=b3Wxfv`rF;^C8$S5#6nwzac&aCY$s z2~A4Q&dJL!E3d7q@9CX0f5EclD^{-AvUT776DLodK6CE;r7Kq-J$~}^+3PoNzy13C z=kLFjN*Yl>L!WrMIEF|_9zA$G>`(xM>&4$KEi6oKjJuh%f{yfcMXYc;|NsAl^Ezjg zcw{UJ^Z#xR3)Q?jE#%?j6B>zG^QV;ZZ;932A-iCG0h7%W(bM)!k4rTrm>%;+&Q5-? zQsMM&mV4iOZuU2D`)@p>8Me8zbkfECyOtY&_DyRMUgNo9N&?4W2kkw6w=c_!^afq) zn)Lh9=}gac-`}j_Yi<%c$na_x+p<*MDa#K`ouelpD-rq3fXS*aMJggaQuFqqRnoP$ z=P{b^tLHwmZA(BEvzzjRtxH<&tCu~`?yT;+S~?}EZ(-t=RY4cm?_-#EK)Wz$YUgrL O8u4`Xb6Mw<&;$V1BH4lf literal 0 HcmV?d00001 diff --git a/src/widgets/styles/images/toolbar-ext-v-5.png b/src/widgets/styles/images/toolbar-ext-v-5.png new file mode 100644 index 0000000000000000000000000000000000000000..21c670446c19c33e2b34021cbae32a2f9486a964 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c!3HD^Kbl$tDb50q$YKTtz9S&aI8~cZ8Yno? z)5S4_V`lF0jl4|`A`K7!J0^J?iQ+ahSorB(%Mrso7Tq^!`@2cuZo zha8>1yZHYZF4JKA8QP=i6?yZkrju(+vzEK-@fTw2qCJ#odYZGUSRt96aV UoW$O}2Re?y)78&qol`;+0QjI*K>z>% literal 0 HcmV?d00001 diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 06590afe722..f78aca58ac9 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5716,14 +5716,14 @@ static inline QString iconPngSuffix() { return QStringLiteral(".png"); } static void addIconFiles(const QString &prefix, const int sizes[], size_t count, QIcon &icon) { - for (size_t i = 0; i < count; ++i) { - const int size = sizes[i]; - icon.addFile(prefix + QString::number(size) + iconPngSuffix(), QSize(size, size)); - } + for (size_t i = 0; i < count; ++i) + icon.addFile(prefix + QString::number(sizes[i]) + iconPngSuffix()); } static const int dockTitleIconSizes[] = {10, 16, 20, 32, 48, 64}; - +static const int titleBarSizes[] = {16, 32, 48}; +static const int toolBarExtHSizes[] = {8, 16, 32}; +static const int toolBarExtVSizes[] = {5, 10, 20}; #endif // imageformat_png /*! @@ -6038,6 +6038,27 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption switch (standardIcon) { #ifndef QT_NO_IMAGEFORMAT_PNG + case SP_TitleBarMinButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-min-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarMaxButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-max-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarShadeButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-shade-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + + break; + case SP_TitleBarUnshadeButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-unshade-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; + case SP_TitleBarContextHelpButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("titlebar-contexthelp-"), + titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); + break; case SP_FileDialogNewFolder: icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-32.png"), QSize(32, 32)); @@ -6246,6 +6267,17 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption addIconFiles(iconResourcePrefix() + QStringLiteral("normalizedockup-"), dockTitleIconSizes, sizeof(dockTitleIconSizes)/sizeof(dockTitleIconSizes[0]), icon); break; + case SP_ToolBarHorizontalExtensionButton: { + QString prefix = iconResourcePrefix() + QStringLiteral("toolbar-ext-h-"); + if (rtl) + prefix += QStringLiteral("rtl-"); + addIconFiles(prefix, toolBarExtHSizes, sizeof(toolBarExtHSizes)/sizeof(toolBarExtHSizes[0]), icon); + } + break; + case SP_ToolBarVerticalExtensionButton: + addIconFiles(iconResourcePrefix() + QStringLiteral("toolbar-ext-v-"), + toolBarExtVSizes, sizeof(toolBarExtVSizes)/sizeof(toolBarExtVSizes[0]), icon); + break; #endif // QT_NO_IMAGEFORMAT_PNG default: icon.addPixmap(proxy()->standardPixmap(standardIcon, option, widget)); diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc index 93e4bf480e4..d3511ee754f 100644 --- a/src/widgets/styles/qstyle.qrc +++ b/src/widgets/styles/qstyle.qrc @@ -140,6 +140,30 @@ images/normalizedockup-32.png images/normalizedockup-48.png images/normalizedockup-64.png + images/toolbar-ext-h-8.png + images/toolbar-ext-h-16.png + images/toolbar-ext-h-32.png + images/toolbar-ext-h-rtl-8.png + images/toolbar-ext-h-rtl-16.png + images/toolbar-ext-h-rtl-32.png + images/toolbar-ext-v-5.png + images/toolbar-ext-v-10.png + images/toolbar-ext-v-20.png + images/titlebar-contexthelp-16.png + images/titlebar-contexthelp-32.png + images/titlebar-contexthelp-48.png + images/titlebar-max-16.png + images/titlebar-max-32.png + images/titlebar-max-48.png + images/titlebar-min-16.png + images/titlebar-min-32.png + images/titlebar-min-48.png + images/titlebar-shade-16.png + images/titlebar-shade-32.png + images/titlebar-shade-48.png + images/titlebar-unshade-16.png + images/titlebar-unshade-32.png + images/titlebar-unshade-48.png images/closedock-macstyle-16.png