From dc25b692fa9f5acdff1194075af4c55cacae69bf Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 25 Oct 2016 00:05:26 +0200 Subject: [PATCH] ScxmlEditor: Themable toolbar icons for Adjust and Align actions Change-Id: Ibd3a70a17362431fb1b11aecd18e9af6276b30c3 Reviewed-by: Alessandro Portale --- src/plugins/scxmleditor/common/common.qrc | 9 + .../common/images/adjust_height.png | Bin 1305 -> 132 bytes .../common/images/adjust_height@2x.png | Bin 0 -> 130 bytes .../scxmleditor/common/images/adjust_size.png | Bin 2452 -> 133 bytes .../common/images/adjust_size@2x.png | Bin 0 -> 134 bytes .../common/images/adjust_width.png | Bin 1137 -> 158 bytes .../common/images/adjust_width@2x.png | Bin 0 -> 140 bytes .../common/images/align_bottom.png | Bin 1263 -> 136 bytes .../common/images/align_bottom@2x.png | Bin 0 -> 130 bytes .../common/images/align_horizontal.png | Bin 1060 -> 139 bytes .../common/images/align_horizontal@2x.png | Bin 0 -> 140 bytes .../scxmleditor/common/images/align_left.png | Bin 1069 -> 158 bytes .../common/images/align_left@2x.png | Bin 0 -> 136 bytes .../scxmleditor/common/images/align_right.png | Bin 1061 -> 154 bytes .../common/images/align_right@2x.png | Bin 0 -> 133 bytes .../scxmleditor/common/images/align_top.png | Bin 1261 -> 139 bytes .../common/images/align_top@2x.png | Bin 0 -> 134 bytes .../common/images/align_vertical.png | Bin 973 -> 174 bytes .../common/images/align_vertical@2x.png | Bin 0 -> 143 bytes src/plugins/scxmleditor/common/mainwidget.cpp | 8 +- src/plugins/scxmleditor/common/mainwidget.h | 2 +- .../plugin_interface/actionhandler.cpp | 18 +- src/tools/icons/qtcreatoricons.svg | 220 ++++++++++++++++++ 23 files changed, 243 insertions(+), 14 deletions(-) create mode 100644 src/plugins/scxmleditor/common/images/adjust_height@2x.png create mode 100644 src/plugins/scxmleditor/common/images/adjust_size@2x.png create mode 100644 src/plugins/scxmleditor/common/images/adjust_width@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_bottom@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_horizontal@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_left@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_right@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_top@2x.png create mode 100644 src/plugins/scxmleditor/common/images/align_vertical@2x.png diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc index b3b7bd9664f..36cdafe2414 100644 --- a/src/plugins/scxmleditor/common/common.qrc +++ b/src/plugins/scxmleditor/common/common.qrc @@ -1,14 +1,23 @@ images/adjust_height.png + images/adjust_height@2x.png images/adjust_size.png + images/adjust_size@2x.png images/adjust_width.png + images/adjust_width@2x.png images/align_bottom.png + images/align_bottom@2x.png images/align_horizontal.png + images/align_horizontal@2x.png images/align_left.png + images/align_left@2x.png images/align_right.png + images/align_right@2x.png images/align_top.png + images/align_top@2x.png images/align_vertical.png + images/align_vertical@2x.png images/colorthemes.png images/final.png images/font_color.png diff --git a/src/plugins/scxmleditor/common/images/adjust_height.png b/src/plugins/scxmleditor/common/images/adjust_height.png index 3a8388385190883810550a2d592c0116843d569c..f3917bd462bfc785def1b99e3b50b430cd8ec1d0 100644 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdqsCd_r6q7#K`UOp=q6H*em2 z=FFM@|Nk4dZ_#03V9@n+aSY*zPUdK3YI9HxR7grl||jCTIWv literal 1305 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#RHU#*DxH2#>u(7dKPg1I$ zq+C5&sb-Q=%_QZT$x1bol^dq3HcVG*n4#J*L#=VTYU6aZ#u=)OGt^qu)-+r> z+c$bkV*~qc$3!h);nA`4Y@YeO%~|T-XYU2||F$aD*0TMYb>7$R@2>rIUpAbqZ8~ml zWVdX>_ut{>mD|0y|E@Xlr{;L_^uxRPb*nEMIk2euR^PnREfxOfZuR}o|GwBX_v>3} zii9@BUfyx~JU=hD_?&D(j@KfeD(m8O9kfJ+Q(m>|N7slhu<+(tmE|+3>dzMe&u)gs z*ACl!ExTvL*Is_gVE^aD-MdE2F)9jT9xl_(TlKv>7RoN_xRO=y>eD*5RTARg!oI$7 zm_EPkVQ2$$gr{qO7~dC*3pO)1&l2zpnI0CucIWBFFn{iV)f3nR3g20*KHqrl-T7M* z6_<|{+n&GGae7(rOI5RJBDc+!iQiapYFqDDR0tUm) zdhgQ$l7*}?qH-=u1yBFZ?#0k^WDUROubQ2bVsksXC#z4od}f!7!cVOR^}v}r=a*Im zO`m`3%PN+pxqOqJJ)GX57oXR*MdzemL}}g<-a5Vao2GtlQF*#bE$n3Q^!aVCuIA0z zq?IgN*lhSzFaF$-vMs&r9vYg9dRKpBnE$in>7S2h{yhGod|v66Y2wtfdy{t9sP{|m z_wC=ixYu@;PN>%9Gy8T#u_anhuH|r_cXR%F{rmdm&A-;ZQCzv=k&tdKe`c-REonxD zRHhZaE{Ds*=O2IkKKe5Q*Sel1pUT(y`ZB*?^H6Nlv-5jDAJ1QJDzUw9+s3GdH^tKz zZCv+WiPMKyR9~xYxCCKp5-B|BI2%ZD-w&>@^-~d15n581rhnaGnsTMhbLPzd z|NpD`9`i9UFc^BeIEF}sC;#AQIim7K{V9@h)aSY*zPUdK3YGYs%7br;ONIiO3AV{duU`lUjNBV)%#x{2 literal 2452 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 diff --git a/src/plugins/scxmleditor/common/images/adjust_size@2x.png b/src/plugins/scxmleditor/common/images/adjust_size@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..62162d1dc772908ac0f03651dab95405e2123ff8 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EJOMr-t_%zen>TMhbLPzd z|NpD`9`i9UFqnF}IEF}sC;#AQ^Zs(pjg8!g1bDwLl4j1+ykY)_ m;}|=efkRTls)HQ73^^QA-_ literal 0 HcmV?d00001 diff --git a/src/plugins/scxmleditor/common/images/adjust_width.png b/src/plugins/scxmleditor/common/images/adjust_width.png index 89e509878c4b75707380472df648bc63a8aced1e..a261321bb417c1207c0c8067b3e33f9b4063a5e1 100644 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r6q7#Iu<4J|D#V`5^G zlasTuvNmtteCEuV|NsA|8ath3U|_KGba4#fh)#adz|`iJY%n1q!;_hrpJlP82#<-x zgRa05$!XKW8$_2cFmTw_zopr0LC#f;Q#;t literal 1137 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE~)joO=c#X;bo zT}fdDx5|-8YSmlX+ zTrXz-_@dkGP`d5Kliy0Vc1l~`{g%CBpKKs#^}p8QM`!BI(0{vjt+K0*kNmvbWb-ro z|5Z|AtY*5)#fu#p7XQ^}Xy_L&=4e>l{`1F|r`Eig!TaqDn`8>(*ERg! zDK*zMrE|77s5D#OTw9-Zy7UXf#+k-?MqWG~laAbKD9m=?3SaQCdZph5WA}wOH-)U8 zxp?_uFSkU-%tG$&Q{pFO)%F``EY~QmV+0fO1s<)EqApF)s?PeRd44UanEdkg?eEnr z9g`p1PwIa!C@@DRewE>sKXROprarHVx7ripx#pf!_1|~vq@{aymmFr$oW|I?H9kAc zE7^w0N_ORw#TB1Fy|404%F9{7`b&YwAbR1=4JMxh!~}x_^Q^ZsLG4B}3C5nqwSh4cp0TaHFW!HlW7FwW2}ivG*`<@YW4^x&*uc#bEAn>pjaQRj>Ki3L zWwcFTP#2#Oqp(EDBqM%7*WD{0W1dQ}zP<3p(`2c^o~9VRvvRrd2O`rdoHRp!l09tTy7)pGCL&tqQegPq?b3uzKo|wzu3r-aR@caU?lX_nYvdhK0YGraDF3 z=2=_!+x=!zUd_pOS6m|6x8U__ z#+ZTMhbLPzd z|NpD`9`i9UFj#xKIEF}sC;#AQ+rK4-4{jOy9!tEwD)jZiTh1P7 t2eu{~N;-X3Hca4iHZZu7FoT)ljrO9c_bRUHGcYhPc)I$ztaD0e0sz&WE;s-H literal 0 HcmV?d00001 diff --git a/src/plugins/scxmleditor/common/images/align_bottom.png b/src/plugins/scxmleditor/common/images/align_bottom.png index f827993a211093a8d390be309c49697bc6f40b9a..6b24ef1bba2e06e9fcbdd3aefbd2d7d5ead2796d 100644 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r6q7#K`UOp=q6H*enj z|Ns9dav4G(Ax{^_5RT~Nf<`7bcU3`-!zUwHrI|JO6B#()@F==!IN#*3X3l7tpmaiJ j$5K9?gab_Cj0`vRq_m?QKOSXZU|{fc^>bP0l+XkK*Q+Fp literal 1263 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE)O%~BLM5)5~8&~{_I9@?~^L11E`_{-*7Dgq~Wx%Eo8#$4}UY*E;F%bQO~ zcEOH-6%vV43SyTFEL!!b#^lp(r}%q5&37kpnk0x6#vWxAI{jcqQ%Q_?WZ+7{#T~D; z^c-Z59(JE;TKz=gLz>=&rocm`Q-ds)=|vh?`>ooYx_!$5jh*K#*a9^5I{#Hh-efww zh-rmx>*L%LOXggEp5(LaMsi4zDciv%LSEPHGLNRLcF#Ym@o-lgcSld^ihyOB5qhPv zn$pZ0+AnpjlxEjU5EKlb^9Io-k!#rN0kt@fSEeSv-6#yZ*HNgh7Fhk6g} zX-+&edA0XPrj8?qZCP)RO*1?9XU}>s%QjB`b$U-7C!C(^d&Baf1bd3E$=ig8k0~#M z-Y{jRKPW%)dw+c1)vX(44!5WWPcP!Wz`8<9z;N#8-0P{;5@I$xcZnQl$n~_#V6_j< z6O)hJ08$q|T}u2xlYZ~-sXsPONd_C1%E)tAW7QYmqmDV>)U74dYLoc4`is{d}Rua^hcyRJ+Z(mKDYMs-D99a=J^5#+FTHP7fA0FqnQtef z;M3RY4Br`Q*d8RC?6LmPc#_lMdGhIahI_n+Kji-iw3ph={(!NeonhaH|0Uu_7=N%F zkUWsj5XbbRdJ{wK{qFle-5K_M?^Y~7amqTMb3Sv$TJZ-Z&gTO%|NpVZmdKI;Vst0F_-Q<^TWy literal 1060 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#RrUv+gxH2#>u+beu)-+r@xmY~tG)7#P$_ zg8YIR7@1gj#U-TV6tr~ojEo(eJqsIp`Eaj?aro`@z`VyEJTCDQb#LBdnGyZw=XV>+_U4ZfS=Z_;ByXJ32r$|I^1c|C>nBrB z(|@0~3bdU@iWK6hX1TM9 zyQOujvqDwkB)80PNpIf@uZ|gf)lLE)VJp8qRVa+@KWnx(iNEumuY=IU*gxt8W4|9t0~hYOMm&$1LrKjNNntkQw~Y;U_& zP16sirz|s!9KXxdH2pZ_*t+}BXMw)l4*h_6>|Hxg@@xL!`N$^Ne6NS~ASW~am1?QLxjzr0%@|6I*;?JTVaTbh1wiU@u^ zefqkEe5m2mDRml;=L>9)ZEIV8GGDRhG9y!~k>H2V-`?(U`J?W!D<;o#&F5;NdX_TQ zu>6REeVl(Hlq&3jJ}b`6Wqu^@xU28g+Dm^A zFrU)ys26F-PzlIjepEl}oNTy{WbK`XAMWhUrM8ZjA1{tp+IKHtSsLS}*LK%bAHDvY zu&0#gaKZgu(>m6FZ?06ivROW>>Q=*#<1#xYzB?sX`2LId^xn&s&6Pg0uf(p=zrDP8 zzntny{&&0GW_zkS9@zI$@3d{V$joY)mN{(aPcnDjK3*Nr=(%EFy1hoCwd0X}rt6nD zUJu?>e6;ZFT8Wn%%bhLFq^?iqx%Kox&A-*Te_Pkje;+?DpRwUTqhqvvQabBwO$G)A N22WQ%mvv4FO#o0hz5)OM diff --git a/src/plugins/scxmleditor/common/images/align_horizontal@2x.png b/src/plugins/scxmleditor/common/images/align_horizontal@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..574f4dce0da312719a254ea6be2d20d5dc483652 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|t_%zen>TO%|NpbP0l+XkKXHY07 literal 0 HcmV?d00001 diff --git a/src/plugins/scxmleditor/common/images/align_left.png b/src/plugins/scxmleditor/common/images/align_left.png index e015bc93e8fdb2796a6b7a120545cff2a8f2fad6..24a597bb59318662cf389cc852202f7cd4ac14d0 100644 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#Iu<4J|D#V`5^G zlasTuvNmtt{Qv)dUP0B93=9m8o-U3d9MQ=d?M!V=PRRlS=^7fI%#7tKZh;ycD~v@H zG|gBxI%Wl3kZ@h-C?F^@x$%@D8`D%}LkBhHsm2H9FfzDIH~z$TX=wxl0|SGntDnm{ Hr-UW|8G9<} literal 1069 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEoXT(@i9uND{I-WCTZC#Q0cZJV71Z*QF2 ze>?ix?vr^jbA;4ye(t%yr&3P+z#YEb8&?Nwx~|>&B}UsyVeQv2*$pRpq8WB@K3Es@ zO21(}LtWO|+?x9*Zx&8GXtS$+S1F6mrq9w0^B60*9>^T1W{_w2bK|8%)KV8Wb9=f?OEPmX{WADvCJ7toix6M>$~AzPnZo4F4Eb+zD8{ZlPp$ zbcoY?j{C|D8~V$Z{M3H;Y@)&eh9A5R?&l1CI$yhyvP^Z>ohgwo=P2zxquqS&);{KG z3^^&?rL`-k`?PMm`J%vifA%3$aiwI(172q(CQCd!Dn;O5$l_UcLeLQr8p)$@3$A1zHsv9$744WJmPh($vnBo zwQ#O^cCN6DP+_a}`mgR%`9d#ythRccwf~#-zut1e908+aWzV?l9gbZ&oM3CcVrh(+ zhDOVpjpqcKrkt2};^xKrx2G4b{*{=^GDXPAkZH-`!rGH*5&1bW>{EoDj@@D?eJ@(r z;TXWi9Pd2&G0t&q-5t0nC> z1gz(nsFP~+>U;X+fTn9<2X9z?_B4)8TvB&H&$#+p*`@9Nwm#0Bue44+?)+{0%_Zo^ zHkHLGn@_ydICx!uzo_z3O%2C=zbn@F2q-OI#Ny4V$hOryPcQ@Kle)5+{u(Rmb1F zyj-ZY~c5JvI zF~jD4`-LupGLgq>3N6bvNKNUyb*fi!!Ig6XE6qX#EDtqqpZJz%X=MEt)`_`$l#Jgs zc`Tf}Fr_`=4C}-oYv)-1{!I!&dFd+(PpsH}tm`e$#MSGQpEaF`5tzxXRP30d*Kvk* z;!Xu4ahI|UQaZnqey`rX-Mp{CoLSgxm$~cq-gVm63Af`*r{)#AYFNiF`sZ?N@^Z)H z;>y3@G;lNA53Dz0FRv-|;QPV)z=W$e`13=9mOu6{1-oD!MTO%|Np$pQlD=^CEQjO8kBff^huHXA!! zb&@!wa8#j9+QX2`S=4uhE&{o8+|rQ#8Kd% zRtwuli4Tj?4{m;<>Z0;w((daqEMHX@g)64VJ2>8$F2Krf*O;`2qv^=ulJnErSH4>} zZ~u`u=lssU`=Yp{x+;Cy>V3anz0P8raXZia))(ep!{&SYHM-V44+<2Ck-sm0_|yrN5H{{p>PHh(+tK%5=VL13STdN$5g@efU&`rp`Wov;x5BAE~c5QT$@sB zPf5&Lv18UM&u;5y+X`Yh6Er9PPdUhVZPx~kvxn|fRC}${5O85A)Snw2xn=6V{ICBz z6dwpWG&Sv*GfPvWw>xagmcMpeR2i1nJxFX0sa+X)#YG*J!ZE<~%|G`!(6ElsL zYmE)sLcH<8?JF!N3p!of_27?JcF4VJ=Tl4m|#`ixF|$q-6xAu!G#yJ zCi^^$+Qr*r#H*Tdwf6SSt<66t?>VUzdM}2*XE95z0ItlZGGHwz6D*eeFlo9ma`gS|@DwR*jfd{oz!m%FLdrJ)XRW zmw1O=Ts&F8X`|V5PJP}(Df8tl`lmSBY&w~K=~`3RG^Z6CQX`htuc)`1eCcng;$p!E z>Y1{FI#YKFRDFG9y>0JT$p-aZ%f8O#;Vo@44%vP3qRg&2XE+)BlcDS91e zSSRjOFcNnuD>L`dkG~&n&2-Ml_*GBCxgYO;{K~q0D@O3vr?0w!wMvhJTaK3Qm$*6U zoA?3N2Je^gCvKdRcp%=;%JsFiXY0E++t*1Ze+#HJs9eBP6e)7FXnDsu3Fl)HhwjXJ aE6-^5Gb40XMI!?P1B0ilpUXO@geCwVgzQ=X diff --git a/src/plugins/scxmleditor/common/images/align_right@2x.png b/src/plugins/scxmleditor/common/images/align_right@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7e50ee73797c1ab03ea9151be2a6fb7b1035d9a2 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|t_%zen>TO%|NpFVdQ&MBb@0B^S@*#H0l literal 1261 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE;N<7jp!2_(`3Hj&k0hVqC61p0KHp2e z+WZdeepYRf^#pus!I3$?@pI!YZb7P@ti!v`)|Q{<_R(mH#fMM{W#x!Qi=Uy1<0GlPZ56 zZE2e##lt-BO@x=agN0Hh6XWscN(?VIhlj`nH6|XIEbaY~<-%cs2R#n!!~Yn+Hkegu zl&pE4p}{FYnBg(k(k-`3Uoaf*QrDjLiRZ&)t*lUvf^7$nuzQCkMSMt!3yxq3zZ96X zD)7=)5zXTU4^Q?jt>8XlYqhS!%e*b<^o*)C2R1x7*}L@J0q6UD7XMU)>$g1aGh9Y*)MBb5)V$6_V(p{;Iu{M*U|T}@8q(-8Gy`Od4nlt%c=!7sZ0H*C(Zbf zay&@6#U-dxOX6~9SjhA#$umAYITobcnyNZ|hg$k%r)m9(M<hz3PWY7&i|{p7&02d|)37E3)z(eDgenY@sTF}N)1JYyTDf1b|L zbp|`HMj!2dFYw9iwISPwFSD=v&inD$eScc~Y*R-6dA0{G=l>7bTY9a3*`d>}ruW~S ze=Tu;e}zWv^#%`COG{n%bC)EIn{bbDOdl-9b9!xz8gxoKhI;%F#MmBH4AiiIwG{tOFX4H)S>7 z`WC!w`I+!kMUNEG)vSwKR;z3`KW_bF)0Uej3|-F`_7%^0EK^?jhkf47pktpzZT~Vb PFfe$!`njxgN@xNAu%J;e diff --git a/src/plugins/scxmleditor/common/images/align_top@2x.png b/src/plugins/scxmleditor/common/images/align_top@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d387248dd064cde8d392469b9cc7fc4c190f67de GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|t_%zen>TO%|Np@;i*o~us00sBz_C@KB1Q}N lnk}YEumv#BVo&5@I3ZSQ*xtXukAZ=K!PC{xWt~$(696KIBIW=9 literal 0 HcmV?d00001 diff --git a/src/plugins/scxmleditor/common/images/align_vertical.png b/src/plugins/scxmleditor/common/images/align_vertical.png index 036f8d40b73620d07a4f49e80094070a3c823143..f72b06483e336986be4db9cd531c4b6ff1549c03 100644 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#Iu<4J|D#V`5^G zlasTuvNmtt{Qv)dUP0B93=9l`o-U3d9MQ=d?M!V&iOI=n$;pLnMccQSY};Z|uF{s3 zp^=@j!iw2L*IJ-i;?S8#0&UW>t)-l&hRP~21?%vbM9Qc>F}VkIObB*dapzbsIs9zw?q=+A=c^mCsUI-PN#bo$~QL(TghmIaoscCiLmI zyxR07{pF=%6|ZwPtWjU<55ygA=(r$RvyJ&-RQ4*ShD-a_t@`rh*hbTSA}y>vwA*&~J}*M2>gllEb&Xz{inzvVXKemy1R_GxAXJa$}wO^`Mc6q&g?U8qS z&s^{CXH!^vO@HB{01J!TVRBmAPsGhn5O4QfDvI;vxJ;NQQ59?3feRU&^;RoY`V@vM$_N8u=$?uC}s9<@pk@3m8RjXvT krJS>zcl!6?+1u*%f~>1VX1;jOz`(%Z>FVdQ&MBb@0GMsK?*IS* diff --git a/src/plugins/scxmleditor/common/images/align_vertical@2x.png b/src/plugins/scxmleditor/common/images/align_vertical@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..218c904f63c12fb8665f231eff6779e9c53d8dca GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|t_%zen>TO%|Np9L7{fq}u()z4*}Q$iB}Zo4SL literal 0 HcmV?d00001 diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp index 09c00c0f623..3952b35812c 100644 --- a/src/plugins/scxmleditor/common/mainwidget.cpp +++ b/src/plugins/scxmleditor/common/mainwidget.cpp @@ -289,8 +289,8 @@ void MainWidget::init() // Init ToolButtons auto stateColorButton = new ColorToolButton("StateColor", ":/scxmleditor/images/state_color.png", tr("State Color")); auto fontColorButton = new ColorToolButton("FontColor", ":/scxmleditor/images/font_color.png", tr("Font Color")); - QToolButton *alignToolButton = createToolButton(":/scxmleditor/images/align_left.png", tr("Align Left"), QToolButton::MenuButtonPopup); - QToolButton *adjustToolButton = createToolButton(":/scxmleditor/images/adjust_width.png", tr("Adjust Width"), QToolButton::MenuButtonPopup); + QToolButton *alignToolButton = createToolButton(m_actionHandler->action(ActionAlignLeft)->icon(), tr("Align Left"), QToolButton::MenuButtonPopup); + QToolButton *adjustToolButton = createToolButton(m_actionHandler->action(ActionAdjustWidth)->icon(), tr("Adjust Width"), QToolButton::MenuButtonPopup); // Connect state color change connect(stateColorButton, &ColorToolButton::colorSelected, [this](const QString &color) { @@ -725,10 +725,10 @@ void MainWidget::setMagnifier(bool m) } } -QToolButton *MainWidget::createToolButton(const QString &iconName, const QString &tooltip, QToolButton::ToolButtonPopupMode mode) +QToolButton *MainWidget::createToolButton(const QIcon &icon, const QString &tooltip, QToolButton::ToolButtonPopupMode mode) { auto button = new QToolButton; - button->setIcon(QIcon(iconName)); + button->setIcon(icon); button->setToolTip(tooltip); button->setPopupMode(mode); diff --git a/src/plugins/scxmleditor/common/mainwidget.h b/src/plugins/scxmleditor/common/mainwidget.h index 6b75895b0f3..984c364f5b1 100644 --- a/src/plugins/scxmleditor/common/mainwidget.h +++ b/src/plugins/scxmleditor/common/mainwidget.h @@ -108,7 +108,7 @@ signals: void dirtyChanged(bool dirty); private: - QToolButton *createToolButton(const QString &iconName, const QString &tooltip, QToolButton::ToolButtonPopupMode mode); + QToolButton *createToolButton(const QIcon &icon, const QString &tooltip, QToolButton::ToolButtonPopupMode mode); void documentChanged(); void createUi(); void init(); diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index b697e0e8d8e..026e442557a 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp @@ -59,15 +59,15 @@ ActionHandler::ActionHandler(QObject *parent) { Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false }, { Utils::Icon(":/scxmleditor/images/fullnamespace.png"), AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true }, - { Utils::Icon(":/scxmleditor/images/align_left.png"), AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false }, - { Utils::Icon(":/scxmleditor/images/align_right.png"), AH::tr("Align Right"), AH::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false }, - { Utils::Icon(":/scxmleditor/images/align_top.png"), AH::tr("Align Top"), AH::tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false }, - { Utils::Icon(":/scxmleditor/images/align_bottom.png"), AH::tr("Align Bottom"), AH::tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false }, - { Utils::Icon(":/scxmleditor/images/align_horizontal.png"), AH::tr("Align Horizontal"), AH::tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false }, - { Utils::Icon(":/scxmleditor/images/align_vertical.png"), AH::tr("Align Vertical"), AH::tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false }, - { Utils::Icon(":/scxmleditor/images/adjust_width.png"), AH::tr("Adjust Width"), AH::tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false }, - { Utils::Icon(":/scxmleditor/images/adjust_height.png"), AH::tr("Adjust Height"), AH::tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false }, - { Utils::Icon(":/scxmleditor/images/adjust_size.png"), AH::tr("Adjust Size"), AH::tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false }, + { Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false }, + { Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Right"), AH::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false }, + { Utils::Icon({{":/scxmleditor/images/align_top.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Top"), AH::tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false }, + { Utils::Icon({{":/scxmleditor/images/align_bottom.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Bottom"), AH::tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false }, + { Utils::Icon({{":/scxmleditor/images/align_horizontal.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Horizontal"), AH::tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false }, + { Utils::Icon({{":/scxmleditor/images/align_vertical.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Vertical"), AH::tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false }, + { Utils::Icon({{":/scxmleditor/images/adjust_width.png", Utils::Theme::IconsBaseColor}}), AH::tr("Adjust Width"), AH::tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false }, + { Utils::Icon({{":/scxmleditor/images/adjust_height.png", Utils::Theme::IconsBaseColor}}), AH::tr("Adjust Height"), AH::tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false }, + { Utils::Icon({{":/scxmleditor/images/adjust_size.png", Utils::Theme::IconsBaseColor}}), AH::tr("Adjust Size"), AH::tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false }, { Utils::Icon(":/scxmleditor/images/statistics.png"), AH::tr("Show Statistics..."), AH::tr("Show Statistics"), "", false } }; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 0daf90e7c70..5bcdd09f53d 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3770,6 +3770,226 @@ d="m 1240,574.5 -5,0" sodipodi:nodetypes="cc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +