From a77c5836e98a6b26b1339b9720953d9d9b1893ac Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 12 Oct 2016 15:55:25 +0200 Subject: [PATCH] Utils: HighDPI and themable copy/cut/paste icons Change-Id: I7ff7ca17f719d1a94b9b4e841db4d8f01f2781d7 Reviewed-by: Alessandro Portale --- src/libs/utils/images/editcopy.png | Bin 1715 -> 160 bytes src/libs/utils/images/editcopy@2x.png | Bin 0 -> 196 bytes src/libs/utils/images/editcut.png | Bin 1949 -> 249 bytes src/libs/utils/images/editcut@2x.png | Bin 0 -> 470 bytes src/libs/utils/images/editpaste.png | Bin 2087 -> 154 bytes src/libs/utils/images/editpaste@2x.png | Bin 0 -> 214 bytes src/libs/utils/images/redo.png | Bin 134 -> 135 bytes src/libs/utils/images/redo@2x.png | Bin 222 -> 222 bytes src/libs/utils/images/undo.png | Bin 132 -> 131 bytes src/libs/utils/images/undo@2x.png | Bin 211 -> 211 bytes src/libs/utils/utils.qrc | 3 + src/libs/utils/utilsicons.cpp | 12 +- src/tools/icons/qtcreatoricons.svg | 163 ++++++++++++++++++++++++- 13 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 src/libs/utils/images/editcopy@2x.png create mode 100644 src/libs/utils/images/editcut@2x.png create mode 100644 src/libs/utils/images/editpaste@2x.png diff --git a/src/libs/utils/images/editcopy.png b/src/libs/utils/images/editcopy.png index ceb520e3051909a7545ef6fe6cafbf89445270c7..69d0c5ec7a0abb0702df204d547fb90acedd02ce 100644 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#LVtS;fS}8X6k* z?%lh8|Ng^=5C8xFe?n&R6b1$cXHOT$5Dr<^gN}mD3=AwATiN*v8X9&TICu6#$6qzZ zBd^qs{p{+0eeu<`g@yZ;71}Plm?)J7hTpsoUohCB#qxnYj?v(Sf~w4X1_lNOPgg&e IbxsLQ0M8>iWB>pF literal 1715 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 VfqKPy69xtb22WQ%mvv4FO#n0+p|}75 diff --git a/src/libs/utils/images/editcut@2x.png b/src/libs/utils/images/editcut@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d41f7febeaa575f60ed64a97a7cfae63ecc2f2d1 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3rxt=bLAr_~nPWIMtDHJ)j zf99Dh6)7<(3uhkHT|d=knTc?s^TtgIU9%2#Qb341GtKcv#x}82UdcA% z!m2z%pABX_j_a@foBr;r#p?GZb>Huu`#zWZ*U}H}2PRv5G-&v#R9Bat#^7A5!fZjQyJGRS zEhqN=oWNgsVU4PlC4))r3cdy52VZ#@ZcyMd4-g4Cbtv26mEc87_Pc#W5q<}RmO3WH zsGf~rHt4`a4QfCJ9QlSZ*41o?6ulL;8$x`U{Wrb&_;eoAF(yEyfn!RfR8wo7;nG6 aYA>UGwt4=woS#QP5$5UY=d#Wzp$PyM1I|zY literal 0 HcmV?d00001 diff --git a/src/libs/utils/images/editpaste.png b/src/libs/utils/images/editpaste.png index 7238fae7f19365b9add1bbdfb9beb6b775709c3b..1e22d0a2366f4ac5d45a44ecc38edb34c7078330 100644 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqBzn3yhDb=V9^5E+$U%T% zqwk;lj9Z;bzO-;kGHDgDI&m>5>?!-ra-ueLtDM8N(s$o}-*RBGX=GW|r!T~D*G@&? z*IhfI6F#LL3JRPlX>ObJI6UN5SEZ$SG&HcRSS7@8Kwf|5PQQbDrsRVx^>p=fS?83{ F1OP88F@^vD literal 2087 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Ea{HEjtmUfZd~z?Fk)a} zkSuYHC<)F_D=AMbN@Z|N$xljE@XSq2PYp^&mFD zS&>nV8C+UkKQ9P$1xSl++@h*!Q7vzx^`lRb1dT1o%2z54z3-qj89Om7cdIV2VE zp+@!n!B?Ume$B2=NvU8s{o`PE=&5eooa4(jB}}Q^pSfg1iRA;vEQjC~OkK}+J}I)C zlOg!pJk+Y(Om4sVdpqgsR~-GF9__21r88E%+xgtZ(IzxTKJP{ad%1|~hrg;C3-&3w zt%#VXB)9pc?Ki&GrP>b58O$BlKh$I}pPyQj(~}Z7$3^MnHe3H?pML)Fo5=ic^8ZJL zf-gg^{;^>bIU24JJLS=~Nv=zbEjLB-pAXjY?r_tc#42dFk#_<=155kN)SoeJ7ccr3 zEIO(poV(GiT%<=528cYlftoO6Jup~F8a!ymV*miImZ=dkFZ3j282s-=~ zsHnU5;f~JCFA_In>aP9k&c88-;TluxW~UAL_w8z*9d^IEiS>44#+3&T6I?nh+x6g@ctf`hYZ+P$nSLyYTfkVF{(Sq};D8AW3`AAu`U!V0Es(Je;SlQE8M#10 zT83REYlAZ1#TBj3W7laqX7IRiFg$3oxAbT3dm0oZlIZ)i=+tR0LE*(4Dl84zc|*As zK6`C6WHPhpJJ=PmLaK)MfZ`!;{i~m@?auvT(*JRLF@M7|C&5#ys`rV+!C zd8+c+wGVokCnwf^K765NrRFT=&K9YU=_)lJ62w>(j3wqKSIh62=`I&@y7T$|v%fy+ z&0!H>Rca7^x5DmKx?}N*EQ8-WXENxu|M6mwnsqEAOL88s$AZ1ZJ1p+sz<;7Ew#MzBmFxwhm0+^{`}s@zaNLJee+~lX{t|Z?5kJoD=nXIDm$%Q zlKazc`K*>XvP=bs6I-7qt}_p1*=xm+FV`CV{oj;%q1!JOKRItAZ{02IDG>iP_Kkkt zvj+*1^5utH_`_tp76-&|Ep|?DZOW~=&)*&T;{NxI>!vm4#y2+Wzg_;Q-9K>q)5Ny? z=8HUE`VSp2ShBon>Pn}Gy&T&_${)}F&pkPmf5VC;O%n}Rrt`0NOw(PklGU`J+Vsr| zxn=Lfci*V^;u`jvqfRoq4i`gerblW%TflG{^nd;gZ9V{I+-UfKUCOIA-m zbVDGx`NM_t{=s1;jqm#wta`Jv-n#nT{koG6&+wM+I#8p=U_AG9M)KU^UbIfUjW6lv3!PO6>BqaVFUwS-qd9V1wb&|h+ zU3^^=Fd;KZzgZxJH_25%_~;ClV}6fz8SX9kvf=gxSN{m}yZ%=X98uX)e)y+aMrQlM z#4D#CxY@*5pI$Oug;C1+;P>XsZ0fy9Yb=sP6W%!OnsvT%bzJ==gB@E|+x}g zSC1ws7H^z?Z?gE#3zyuv4H&*K#TvF(_r!LHY97zv%#+Kt`P*3i?eG3)=Vj~FWAD2@ z|Jc9swd6uon?magyfsWcZHY5@6B4Fe=aWy#jFvywezv65?{~wx0v?8Bhg;iDNNGDp zAO88LbyoP^%&zlWF2>w;l)b>bg;Ca_{)Ne6tKFrOX1-KXTDc){4Ug+3fzfHI9!VTYD8{6*%uQloMza(ju%YB`%{dH0Ju2pAQ6Bs!ar zTY{;9pwSiM=0}>LU+rJ#X@pm{$GrIUj=|Nz@dp3W!?QP5>;C>D|MdKtZ!vycpe6x> Mr>mdKI;Vst0KJ*!1poj5 diff --git a/src/libs/utils/images/editpaste@2x.png b/src/libs/utils/images/editpaste@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..09a3ebf9dc398c10d5c356c8fbab2fa84bf6b411 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=xt=bLAr}5iFB}wXG7xBe zxW6}HNA-bE9lf2R3EJl}SSzCRC1cEV0&BLvsrkH#Gl=tk(`iNpKD`cx3+ozJ@~>$5 zVzl7+lN^T!%hpR|@-PTWDmhe7tjbR_Oa{gem<*x?{MvUi-+lSNQ-pzGlk>xkdCYg8GcYhP Nc)I$ztaD0e0st#`E42Us delta 105 zcmZo?Y-60DlH}{@;us<^HTg$Bo5X}0-!HO0dAEqupuyz;ll|}B9TE-)n;D&9U|?YI MboFyt=akR{0Ab226951J diff --git a/src/libs/utils/images/redo@2x.png b/src/libs/utils/images/redo@2x.png index 4f15b451e67c114dca1015d7bd6ab313eac840d6..f38b88584a0f81a235f7cd7c9915019890673afc 100644 GIT binary patch delta 66 zcmcb|c#m;{p{Sdqr6McO(-skhl?N6wEM%I_w1cZgTe~DWM4f7)TfJ delta 66 zcmcb|c#m;{p{SRmr6McO(-x5fp$|eBf*Ye5Ls&OWbSqQxDoOUg>cQE@C)vJ^i{b0e Xu8U`c6ABp^7#KWV{an^LB{Ts5385D# diff --git a/src/libs/utils/images/undo.png b/src/libs/utils/images/undo.png index bea04707faeb25d2b262dfe207cfdf3537963eca..7ba4e37cab20929a5b87347d1780b902c2877e35 100644 GIT binary patch delta 58 zcmZo+Y-XIG!sq4b;usY+;N diff --git a/src/libs/utils/images/undo@2x.png b/src/libs/utils/images/undo@2x.png index db21fb16f0ac60a510f31cacdf37f0773b621fc9..d4b6be89aae6612c1b412225816741f6be413e20 100644 GIT binary patch delta 170 zcmcc2c$sm6VST8hEhFn!o*$xDj30zEOgX-qL8afHF+z@Ohe(W7-a_pc2@b4hHlDw@ z=7mGV$FKixxtOud+?>((#-Z@Ab2Zz>_KbUP915T4>$9nUX?W%E@o2SRTkVhLT@w{~ zV;Qw9&M)YTKPb+Y_lL{Q@Iz1rtD<|-XEmb(VgV-@q5}>y_MK2>GWzIdK8a}!C!4v1 c5EsMImUdmvSM?Ja7#J8lUHx3vIVCg!0JalF(*OVf delta 170 zcmcc2c$sm6VSS*ZEhFn!o*$xDj30ytoNtJCv}LYi{mR2}VCjQPh1{`@?95sTeYJgQ zuIz`p)_=dQw#o3s9M|F$_AY6;TgDx>E}zrbyOirI4J{V3hp>0)-|IGbb6EaLFHhzV z<<~aNR&}iL5<5O>|2T5Md!cBHOy}9z|2bJij1GuhDQHmMv_M&A&c)s(4B1T!!_O_6 b$;4pO+^@R*images/compile_error_taskbar@2x.png images/dir.png images/editcopy.png + images/editcopy@2x.png images/editcut.png + images/editcut@2x.png images/editpaste.png + images/editpaste@2x.png images/empty14.png images/filenew.png images/fileopen.png diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index c91a0981b32..5b3a1737d8b 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -76,12 +76,12 @@ const Icon UNDO({ {QLatin1String(":/utils/images/undo.png"), Theme::PanelTextColorMid}}, Icon::Tint); const Icon REDO({ {QLatin1String(":/utils/images/redo.png"), Theme::PanelTextColorMid}}, Icon::Tint); -const Icon COPY( - QLatin1String(":/utils/images/editcopy.png")); -const Icon PASTE( - QLatin1String(":/utils/images/editpaste.png")); -const Icon CUT( - QLatin1String(":/utils/images/editcut.png")); +const Icon COPY({ + {QLatin1String(":/utils/images/editcopy.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon PASTE({ + {QLatin1String(":/utils/images/editpaste.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon CUT({ + {QLatin1String(":/utils/images/editcut.png"), Theme::PanelTextColorMid}}, Icon::Tint); const Icon DIR( QLatin1String(":/utils/images/dir.png")); const Icon RESET({ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index f6e5541ece7..2b4688f6964 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -440,6 +440,17 @@ height="16" id="rect6129" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +