From 9beff35f4f8dac6777eca893fc20c1b61bfac2ea Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 2 Jul 2019 13:00:45 +0000 Subject: [PATCH] ide: IconDes export to .png now exports correctly uhd/dark variants git-svn-id: svn://ultimatepp.org/upp/trunk@13469 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/IconDes/List.cpp | 11 +++++++++-- uppsrc/ide/icon.ico | Bin 10134 -> 10134 bytes 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/uppsrc/IconDes/List.cpp b/uppsrc/IconDes/List.cpp index 0f6ecbb95..f99f3381b 100644 --- a/uppsrc/IconDes/List.cpp +++ b/uppsrc/IconDes/List.cpp @@ -354,8 +354,15 @@ void IconDes::ExportPngs() { String dir = SelectDirectory(); if(!dir.IsEmpty()) - for(int i = 0; i < GetCount(); i++) - PNGEncoder().SaveFile(AppendFileName(dir, GetName(i) + ".png"), GetImage(i)); + for(int i = 0; i < GetCount(); i++) { + dword f = GetFlags(i); + String n = GetName(i); + if(f & IML_IMAGE_FLAG_UHD) + n << ".uhd"; + if(f & IML_IMAGE_FLAG_DARK) + n << ".dark"; + PNGEncoder().SaveFile(AppendFileName(dir, n + ".png"), GetImage(i)); + } } void IconDes::InsertIml() diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index 02b0e923ef43a2e6378f53789a7ec1a414bbf3dd..885d4138866ae9ffd191d1c2810ea9317088e21b 100644 GIT binary patch literal 10134 zcmeGgZD<>1_{q|Iz<#)@MI6FrrgU_m%v5nzOTkoOu*nV%U2z~((^6Mt!jf)vE+A}y zIb3n-sMBfFb~Rh42%WgGt>A|G#}B5$CXAu5sdca)Y6-~V^E~gpmwVsbT|-QxKl+6C zo_oGO?!D(O2M~ZTELj2!y$t|KJX^k8&=bi23VF6X1dwWS$fE$4mX_oz0|2{Ll;poG z0yuUTz)EySA;@ijj{qI$w~kQ6So-n{uj>|(QJkKh=2d|&*2`ovMOvg!_RyFFb(@=NtrV9!o0 zebEQ974{^vd*jSpoLf1IUQs;KE%_+%IhS&Kom1vdSEvO|mHoX8U^-Y@8JsEla?0tP zY{-`8%yL{Exa6G4ShEdT3s8Lru)Ae@#*J5f1b<7p@$G#q_p`)Se*Rv(rEaw-JS2Q` zu;ME=4xV>pA>q2@GeO7X#~Gi_W!(~!j&A2OpY(iq)L;}bpL9&|NuuQ;V-u$Mx_!;# z`{Yo!_#QdbHNHy@RmK; z`fiwgD506~wUK_<*3LlR<@JwGozVM0Im&$9FxS8(D+ga2>4$AOqPz;_*MfAUz8hvA zN@ym0ZKNNzwJUbdfpnz48)hFIQaSkANIz_A$EVJ#Kjzdmet8a*qs-S0a}7%AO!(SJ zKWwYiFL$4#4^_su@|t`8&~4_I1IDkw7Z>evK+j(Ok+KWmL^c?CC-#3Rk#rMpi2Jz`0a0A-^au!I8EbV&G?o&bJ%J+uLEvK;1 zmvs+$U>Vnm)f{~7m0(p6W%bKEN;yGfc-i0eAQO>S!% zAXv$Avvu+)1}`hH`aKjsq9SzQcMct*iyGjyS9U|R*Z|+1{Su;!iV&ek5b}%2Lw7Ls z<{8*{@n<-4;|Q$pKLr>5coHDG4^~}02eY?z!RUsa@YL8f*l}hGP9I$cTlYQ$9j%*S z+u0M)``l*e``{#eynY>g^Y|n@+>?UG`jpRzLHM<26NK-60UkVl5H7ZV0w>R%hig}6;j^J2q;lWGEcRi~!By~K{|xNh z{0Nv+y>S2W7AOqe4xe`|hQB_#584;+hi%UmpfLC%bbq=IF2DN&+_`ZloK6uerg zpPYd;yCQT6*a4$52nU0GpZgm{7;Q0dUXfRwXcC^R7L4e~#XOZsPe*g;35MsRr8h?Y`BU&FS&?+LwO)b4w* zn6nv|aX@o+pL5Ozia2v|&IW=Db9Q0Q*6_`0Vb0FuxUAZ>?+~iB5T`SPm*23Zpv!Tx z6X0|g3OM44v;ikC0Zn^WFo<%KTMFKCq2MED1zj!^!KVp6VDOQnfT$Ud#(<^3&l+Md zIORgYN6rdfa(r5G2v51C;4K#lK5|y@laqofFEs<7mIx@zg%_{jn zNdFfI=zqlJ&U^WP1F<5w^5rldCtj{`y!-v7`TT@=I5~zmpFf~{R&Y=e4W`W0I zg!B0^gN_sCs7d;WI~iwliHSCn13aXm5U>c zG^bO2h%pC2$I@w)ZccA^$j4$al{R9{irkFFRN9EOIPFbS(wxPpX&NmeAKVZoZVA(D zanv`OFwHK7?o{YpBB9c)iB6|}E}lr(bT*sK#ak0=vst_4Saf2o6`v5&txnn@n&b4p Ho(KN`tJvqL literal 10134 zcmeHNJ#QOF5M7E4&8uP-Y1~9$0?1HHA%&nq1=Sd=1YDC=01>GTAOfif1W4E=KOqq% zSzwXhz`{+MRH;*^^bZJdnK!$$Uw6BrDTYp=5tehaGw;pp+}@rXdkQ zC>7<3M=pIFThTK8~Sy z(U#4d6Q9wfSnN83^}1@9Q+&{b!VpQ~DT>!Yfk6yx0mnYeuaU&Sv01#~le)Cl9klp{ z7_S7>X**_kBAfh){)49(k6Q>{talAOlbCqj2VgZGKHD3=a(!)T*1bYL#5xW)&$ZO? z@l1^`4%mi`mHqR%QmeKbGdfe^;rnq746rz7_Gz5bkaK2c&NiBQmd!gr-L37Jrn${C zjhGmhIiKQs z_^6>Q`h1Et^1~C=A-SQEKgMr8f2M|=&yP;TeL#&;Zg{5Ab+-o9pz8fu!a112ATx>U(N#2G!@+s z?7mQRt^8~>JaWMlahYc*p(U@c!y2;qAlU{+ZT(V*t6{BmZjhQGkM@V65c4c+binS? z_wA~p@m{G(3zv50g0jK9s&hB{`+cTUc6pAb7Ecq^O09ShF!sk>95+++EiDbi11}t~ zeP0aL@fH%`!2v($gge3;zr<hA&y`4A9gELippV=8K3Jc#vxa|n!a4i1f6lflI&I) zvxxISo^9;gXqfG7703E#De%GptnafZcY%8$5YFWpY=bWGoEv{wV;vv*U23<^c)h}b z`o*W8UFH&sz~}k7E^usyM?YN6x%_^dyOw@B4(AK%r)e}_;w5k0PV|3k_>X?hX3wg% zopd_0qySwL5c}z5htTP+1L%l{X@yQ+2u^zrC}1`DO+ebO12TRNi2YIsy-nx^L$91b z^qT3jI57eIuE7M0@7DntKL@1z^tR#@Nxun5`*lFZ&jC3<0z$uQ2E8pw$RCN^zm5rr z`|JEVAmitNl%L+loFeHr0cpPusQG&=ylkW>V0v$TSuWpc_!FXcLfW5zJ!Sg;_4lCu z1!aYEGm>@w9vssDxq;x%$zQ(xO2Nj|3mVJ1+z&Cg=-*%b`f9m+DBn)*NH3Rfukkq? z-b@!1LHa=Jy8-lad3TP_hw`>WJn1vm^Tp`l7@oxuJ|n?9V|%~P=|0WOdTDu9*7<$z z1N#)Mq{+O$7!G;u#(6(+_M+eK-%l=v$NfIH_n|DQ)sx|ISvvcAauL|m$t1L|Cs!sO zDQ>3I$(7Ev7?Ru^Os}semMF_ZZ+*9;viv%*&jNcf8in@J=**8_3`Zkt&*$^S@M!dAKDRBWMUUQ? S{7_^c`L^eJ