From 318875bf09fa4f54fcf140a0503c125485db4052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Thu, 13 Jan 2022 00:47:14 +0100 Subject: [PATCH] Add proper icons --- src/win/86Box.rc | 7 +++++++ src/win/icons/acpi_shutdown.ico | Bin 0 -> 9622 bytes src/win/icons/hard_reset.ico | Bin 0 -> 9622 bytes src/win/icons/pause.ico | Bin 0 -> 9622 bytes src/win/icons/run.ico | Bin 0 -> 9622 bytes src/win/icons/send_cad.ico | Bin 0 -> 9622 bytes src/win/icons/send_cae.ico | Bin 0 -> 9622 bytes src/win/icons/settings.ico | Bin 0 -> 9622 bytes src/win/win_icon.c | 7 +++++++ src/win/win_toolbar.c | 14 +++++++------- 10 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 src/win/icons/acpi_shutdown.ico create mode 100644 src/win/icons/hard_reset.ico create mode 100644 src/win/icons/pause.ico create mode 100644 src/win/icons/run.ico create mode 100644 src/win/icons/send_cad.ico create mode 100644 src/win/icons/send_cae.ico create mode 100644 src/win/icons/settings.ico diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 1b48edb03..8b34c5c09 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -139,6 +139,13 @@ END 185 ICON DISCARDABLE ICON_PATH "icons/mo_empty_active.ico" 192 ICON DISCARDABLE ICON_PATH "icons/cassette_empty.ico" 193 ICON DISCARDABLE ICON_PATH "icons/cassette_empty_active.ico" +200 ICON DISCARDABLE ICON_PATH "icons/run.ico" +201 ICON DISCARDABLE ICON_PATH "icons/pause.ico" +202 ICON DISCARDABLE ICON_PATH "icons/send_cad.ico" +203 ICON DISCARDABLE ICON_PATH "icons/send_cae.ico" +204 ICON DISCARDABLE ICON_PATH "icons/hard_reset.ico" +205 ICON DISCARDABLE ICON_PATH "icons/acpi_shutdown.ico" +206 ICON DISCARDABLE ICON_PATH "icons/settings.ico" 232 ICON DISCARDABLE ICON_PATH "icons/cartridge_empty.ico" 240 ICON DISCARDABLE ICON_PATH "icons/machine.ico" 241 ICON DISCARDABLE ICON_PATH "icons/display.ico" diff --git a/src/win/icons/acpi_shutdown.ico b/src/win/icons/acpi_shutdown.ico new file mode 100644 index 0000000000000000000000000000000000000000..a2493b8031b6a7b5de4dff93d43e32c184d5336c GIT binary patch literal 9622 zcmeHNJ#HR15Tzi)Lg2zKT)30Ul)iyo%&-nYXiV zXNDZ^&!@z85d!q=k~8nU8FINRS*2W*C*{S9BKD@dds50zrIeR1_5QD?rTi&luU_f> zZ$Fgs%d=8$ZuI^SiThi8f0P)x6a*a?Q{GD4&Q`@Q>s#S-%tx_VUoaCK?_VW8>-3p$ z9LC4`{(b9DUs^wpF^}Qn)xS2)@&S&I_pz80;nHUO#p)R1sDl_jp0VDK{_WgWJm!5r z8n6DQ`)kCrZkijo(PAE~2lK}^h&5#GHJb6 z-+PmQ`5#>`_+;Jc;A66DzwZ9J_kFmo^>kJ1-DRz}7us!)`kZYZzKB6A&KWswrt=2p z725A|MjdR+b0Ts6`XCHrea`-x^P8}<2FAuZSbaFZhD#q<;`lLt-Of+Ajo5atmU{oG zrd{`o$87P&Sj{>t`0JP+Pj%Uzr4CxH8MGTFYC(-XR`ex~w^oZDv&S1pX1rQU)u?6{wKp! z>^e8Y03X-6)kaLkv-br3GkrS8cY)?Z9B;wZ;_CA?$4t5mNBuoQejRZcPpf%PdFJ86 zQS!HT7*M|8eIxIuQ~6Nu%A2X*mg|aM%JZ~yp8kjh2C(qnl27RJS~}lbKg+lDnN9fH zdQbOf!cAcgv#k^F1LpxQ#?x{SwwCj-d-G|Z7hrlEf9?79aJ1Np#pkfK#!H?xjuzXV z#}>D}SDrPFZS1+etaD2-*Kow)@uP0T^>ttB5O^$)Wq#gMIlk2w{?tZGKGT!qkFjyi z^tkPqYGool$M=HIdeAbDe@lN>XK;K^_|Ow|+8W1kxanL!u6siB(hZugG4_P*hYZKY zqOZpWgU9c4P(6mV&Ph%FJZ@Nq^+2T>Uf3 zIr_GBC$6^{#|WReuzRq{qa4V^@|o64aA@Pt=<_%Mc39}qPM+3se%8JNbL3)NM=|TK zwSJcGtq1wex|i>)Q@N6FuS@yvx>&lfy1Ll4_dyI|fdMRF0vq39H`3oq=XcmGesTHu zmTD4Mjz6BEMgIYWoXi9GFo=6$b?7?X|z8v3(< z9I&G`h(2C3bnMlTb9+vncdhk4s`IFZo?9{P3~xC{_lP^DVeCKR*cv~kq2<>#%Q)t> z_9DDg=Y|EM5_c=ri z&+l_*4pD!M&G_1}Eq>#P*n8qyuF?G#7Hi=1--0L-tYbXjvD&+O2CtP=r>oNul*c9 z`w;kmMZI-Bpd)J0IpyWL7^nKu=Ky8uN}Q;Ln!GhVi1{y?X^C7MKgL<_pHF{)@THUw wpG$f3P|Eea{KwC!l&iZ^F41r0R|xE7qtOrcZjL_*7BGPg4scC>6d~OI0KJFdkpKVy literal 0 HcmV?d00001 diff --git a/src/win/icons/hard_reset.ico b/src/win/icons/hard_reset.ico new file mode 100644 index 0000000000000000000000000000000000000000..d0494f40bb8220eaf8babada5cc3db648f6a67cd GIT binary patch literal 9622 zcmc(lF>V}35Jj7yV8U=91qzgrp+nz5ihK@7hHoJ{bLe9@a%^Qh3gH6?bYuc1cU-?` z-t6Dn?wQ%81vgNv?y6t^*L2Se2b4;=D6h(!HzoW{`RP?D-tWQDL;Nw%FWHV{w?Z02lm^jiD@v5@o?os)NLF?;99m;UTbb|%g{38JmPWur%z=V zhGPRW@yr~G3$HqA!MX>dm~(i&FylHX(*Wo7#H34HWfTAGp#l$0`h&L!BONsGwZMKT4xi>>bxw>>a0E=Ie2VKyze#=IrGmoAhfR#JtA&JkGVs8|L7;#m(?q@E&tMIFj3|;vQ2SXXyT1zTTO(&T~tD^eil+)jxaaIci%m=OWMbkLwXZj=knSBrcCOUX_Yt zuEjo37d3Tg&E7>|eugz~4aHT%Ib}YPIwx4e@l4HHOI*&!H8@_pZsgcg^(&4%r~yY^ z_T<55p1cM}UH0U2-P)SE?3e0x`h63>pYF@Y;jX-|c3Z9oSt+lZMjpIs#UU>J-ilA? z@?99ew|Wb}$Zoeg&{@-1<8Hm1h_z}J^Yd83i0Aq5&)^SyPh$&zIKr`_o^4&i4mrQfr?7S>;~h*ZnPHh!gWzZ{NhNQG1!r zPV)#=gNrqs^2CJkGuPZW0yYlC=mTErSO@ZeS8*_S#U|Xuym!i>0p2}2EneZ4xKUZt za6O-I;m#VmmZj?^Tm9kk<>R22pv&u*D;zV-8otl1 zdFtnw>9k1IbsfL=TXV-+FQ=&n+IdG!bOL-0oe5t#0&>Rb69 zFPuCOJzP&8UDaX4avv>j#U^}hp@s4L$MCgIYgxvC^Bxq_J(;oSxAKlwJyh~ahOv}T~9<(&Tv~uE9DNk%BkL;P(>_-}?<+mD{E~J{zqJSAkS6BqmZoBk&3n$;cqBWIR?muI z^lkOCUXaweW6{gr>St{x%IRLpHF=Fr_8FJgOWLRQkh#~^TeQDa52tA79=4oE@7h%> z3r^X|gY$)FOD~S4{$$})0FS)$x8{ybH2=xc`CIc-MTUph@v^)acBOoLD&_rSDc2A2 n4?p*%T-}v&DZ7n7Az)=?fRn$Q>hFU~oZ^;-wCaC~21jLZBci;e=fOs=gZqGMs zd%E2<4-i7MCF^y&-}h?9(?9MpyJKf|er~QidwFK|%*-w>%KqnjW}kfQ^0Mr|ePH(D zq1kR%_CGlH!@ZB4@l8)C<1TjP+@K{t)_3gvc;0W@t1rpwUb2d(9?#qLF;aZ|-M5tN zqxar3I=1nLIo{^)-#>ryZ#eyq^)<3T|7VX?=YMnkm22p5ZY&+Uev{I#^n9Q3+s$;p z$@i<=-updj(766acD-tinWkCC~F zc(%ObXXYt$a*B8RJ^qXHdHAg9&X=Lr&zG6|E(xs;yw^8R)9>v0x#de}d*Yqv)^lG= z4;s&(UI)l@sQ0tqa`WFkd&e!xx$p3-npHR>Z5 zjdD>RxoDJ&`p8A2T+~M{8s(xsa?vOk^^uE4xu}m^G|EMNLVA8a#0_-Xq1ck z$VH=E)JHBF<)S`v(I^-7k&8yTy^poh^ei5|t9JRToaY~{v+~$lTj9Q@yXjB%ybjxW zzw*vH>~;R*a@<%$E$NuPJ-Wm*e(S8amgcO?cV=Tv&2g?-%jNalDQh}DotmR^)J4@C zm7^}I=BONXQ8h>9sEevODo0&Z%~3h(qH2!HQ5RKnRF1l+nxk^mMb#XYqb{oEs2p`s zHAm&Bi>f&)M_p9SQ90_OYL3cL7gcjqj=HFtqjJ=INRdZC1x~Q6?a@0lD9F?Oks^+L1bx}2E&(;44uI?VC< Xv;Q?P&i7kW{7YK#-yhxF|C{|MaKmbx literal 0 HcmV?d00001 diff --git a/src/win/icons/run.ico b/src/win/icons/run.ico new file mode 100644 index 0000000000000000000000000000000000000000..90a7f28866ea609d94cf0c3c6d62b174f2d7ee21 GIT binary patch literal 9622 zcmc&)F>>255Il`M(PUD{g$s95nKD0+tGpvsCcltUC1rl#HdX4R(@Y+aC+G)xLYQ5F zXC6U71VB)NW(OpQ+ub|T04-Z&A$M|rFX*@O=}zRmh&(*F^PjIoeqikJ(Vc&NE%Nb= z$ad?_za#E1=DtM?4#D8Y(a96yBCWwVQPvKKB^*aS4`cZ$<m?`N-6_4_E|-*e8|U=9I*i5lpN%d~k7DswQ|E?yKip8>|8yn-dyqufcV*FEi)rZeti`VC` z&Fk|skCOT-PpqGb_jEd)f5#uZcdgoYtMhx;4)0oPU z8khQ7`c^kq>yVEc`l+?9t#5MEqhC{3y`<>Rp_{5tZF-zqXVvrj zSpGI=Kc?onuWxnd%Gvr?{cG#02i0ePjeJ#C`y1*0X`1FYa3prX2Eca;NBob%5r6wR m$_7{iOF)P{umM)UvIUPh#%qn6%NWLjgIwe!H#HikN$vj&jY=>8 literal 0 HcmV?d00001 diff --git a/src/win/icons/send_cad.ico b/src/win/icons/send_cad.ico new file mode 100644 index 0000000000000000000000000000000000000000..e3e64a74349af9f14f900b0cf1d5dcd7b37e024f GIT binary patch literal 9622 zcmeI1J#HLF5QUqdV8U=f1qzsvp+nz5ihK@5hHs$}U>FX43`dToj7K4S0D+E7z$C}@ zy64+{)7w3}!zJy+4b)cuRK555XL^UrlupvC^!jxQf0cfGmD2Yqr8jR%`_oq`{T_W6 z7p48n*D3w*O-ff+rTtsveTmp_BPXhXQ2N8AcaismGDeQup%6J|7}DrwSX~^C|NJ?P zZj4PhO$^11<2ElEn<6ZY_wrl0@B`Ar7=|HZJ2$y_VH}$8e8=R&>3FR*kpAoI>&+bM zJld^XHp17SwGQf&RqIb1pTxmlkRwmO^9if)4&>){>EGr|x=GDmc`BNBnR~(L_0N){ z(TnT#xAMhHQ9WX^{#JjTueP|{i19wv>32V#kK_I6INqHUyN&I+af|-ju%99(MXcM; zm*c2=Ca#-&-{`(l`8DpSCzj3rMZVY9!cA*9-+MbdVDH5xM_$jMpGE4#Oq#oxic`+^ zS#IkiM)6CSj;EZ`<|J)BaZ7l__}wIgiGSlkCBBErICCXV-c9%_#1mI9BIB(+s5#c) zv2L!ZUjH?C=vR&kx`ioQJKq`)O!TU)0uS-^`l(F}8t?^S`>B5LRS%=s?_q9Zra8z_>x)uDbR&w2g3l{o%criX{F1Y05HSSo4;w|z0 z8+iVGBP}ZG(|oj!OXIaZ=DfSV!)9$-W9n;RjUUJHF?|^C)7$YbU1qzDFQb-ed3b_)q0@I^d~dyvcj+Tb@Z`O({gJQ*lk-)3<6O&=b%Mt|T6@OV@Q@=9 zUhG1gs9j^6oQY>~E{YWvxvG<2dymuDKKvfGo`+Vc2m4$q~31|AKMQNHF}+jHRySA4ax&d2I!j+#5AH9z*i z$H-k;A7UIE4A!i)O9W#+uNq%%;^d>5lksY(A1lav_m*dFbKkJ`!j(A}n0Ut7cVeSI zv<_4L5EyRd+@Q0X^NyYtHu%y}H0!iw?zsi(iA^U&sCUy>}b&qhI*@;?Rv(ek;ed zf`3RHxbDTVWW+ATXpA`bnz^APP5&mlX(9+iFdEmG>r{mDdLNrg+Jf1 z;r(TP54#G&cVWDT4f^5oWlCtsXRP)w!&Xo?T-)U{Rpa5n3$K1}B={<_RE9K-Uu&%<68w&tH)#4$|9{25%>9rR)-lYZ z_W*GIlkv16iuW_QX8!)(SZi=x)n#zX)Atna$j?Q4Ft^<^?)Y%Zdp~v42nBwoJvw{s zI2X$r;HrI(Tk{j&e4h2ZOUyQ|XyB~ZT(lXNpXL;9Uc}3J>1l|JtPihv%?EQHuQNW) zeNH^J;1{OOTg%Yp{2uQ-URQjR)HT)SS)MYqnicx&U0 zs#yh3bM6(5DJ}rAXRQv2Z<1Q4aF@8@Pz?NQ;*F|Xm4-tMfJ0&xL;R8-^$#Ha`J;dO u+{6zO*YN{`erO1LjGqtg1E6CX!%idiEPi7+kMPT|w_$nBdVaV#8UF#0;gaA0 literal 0 HcmV?d00001 diff --git a/src/win/icons/send_cae.ico b/src/win/icons/send_cae.ico new file mode 100644 index 0000000000000000000000000000000000000000..757f38d351d3992669ae6dbdf051571b4731c873 GIT binary patch literal 9622 zcmeHNF>WL`5adD!3&t7H1qWDxfmP_xKae87Ly_TM+$cFa^fMeecDN7lBlH48p@W6! zswRumLy?@>yA@yq*FdXDc6U{?$(dd0E`(ip6W+ZGus7l7HzE8OLU{i^&Hwx=gg>x$ zeVyjNejUP3Z$r4bN%P;4_cvm{M-GNSNb4}+4tXa^%<;5d*I}k91}gJ3mQ7fF48&0a zHIK_YujP8$7%t!PGB3vz;dU?zXQ^K-4)=u*F_YtIa-5paT8XLNbG%$rWoA8p*{9-_ zt9j!Ln147N%KjG^oIpnWEP@zy9Vv4@ON4PxUgkY|A8Yo?49=Yx7jkGdhP#aGb(d;G z`YGHuRT#bX*T^TY#QLA>Z>`t-oU>N1it%e4Yu(%DUt&C7#Q4t+io<=nkMWU;x%3JC zkKf|_u9o_7A0yv0c-`3hhVLuNZ+J(YLE3j>JMc1}`}gYa*&3$L(-;SacC9`SFQAc6 zDY<#9HCd}Q)!00@j9Z>n;wd)|7jxrN?Tx+X`;qQ{RiokNT+dN3J9x@dPBXsZa{FGi z&gyfq1(S7oeizfjBCy93maNN5cLol(wx~;!8c$fVmd{#=C9P{0Sgz0B1&qmi5|*rR z%6x!FXx1ogVG@VZJf~EfdR<$4FQ@GJCppA}^u;}99bBXJn&ZknWWJPf=1&&GS?Hs% zXI_=F=AV($Xf1xt|9`~upEo*1yMy_hM*e!goU=zQRcy=0HTk`bPpBw-h|kbt*yFS6 zDn3!aq3$uhh0@Y@8y^sdvYYzwkUqEY6*~L?)#uhdzDu83(tS;Lzqzjy_=KgD@>~S= zEcNZvIFvtQBs{iUI{U=G%_5Joz#&#%E56h5tw!ckh({5wpO^KSqweKmFZm7@{1%px z6H~%`O2Nr>EY|7gdgp9~Z|`O0!%ALYWyfND1z#NO zlaw_{JeJmIx!$Q=`{~*8{h`J-JkMSAh4rylv@Okjw7Pt)RN6zxYq-m;Ynf;rmrcx|{HK1L_0j7f||k z_ov2z8Dx3ABd7#8n|z}~0+vzBv9Yk!Fk zm(bqXvgfTK@oH}~_JW(wL8)Pm`Me%@&KjS-ye4khvz!6&3!aVA{`?yGHLq<|!|C_I z@z>Z}=cNYrs`1Vo9!}=p%GHar8sIFo3`rNyu;mb!((85d_WimeYy4C05v`OtBX0Vo z!#FrCZg2*ZxEPahdzeiujh_!Iek{od52`tGJ04C^y$*uu?wKz?zPvli9U>x1IGe=E1{A!}&q8n^M}9aYuwm8hrJoX%Ljnd=h{^)D%)34=xi?gw-Au*(%+`BLp$2E+b!dMEN z-5TVRRlMO6yVi`wc<4~XPfXsomNJG4AhV36v|_pDyMGFGw$@6`A&{NoOs+Rszt z$L#-|^XJ{`iS9J^QttoO_$~V%VW}p@i2s!MHGcYerdw24TVffb_>sl`O!yGv<83_R yj|Tilo=4~*yoK(d;Tg$C)9+wScbH#hy@2JM_7bsI({D};Nvm@My-haRRmG+>60{*K!t3zRq3&Po{TekG0wLuQ!bjAdX)*6-^ga*MburLcr?FzfYGYs@ zEztA0pXXfGQ^#=iR+o7>rU|!+p?cPNt;!RlTuVxNy;Y8h`VMP!o!9DzJc)CdGgj8o zw%cuA&-nm@*vfJ2&gJW^F5?X_IDr{Pqu%rj*I}f})HB1-9*FSVgLN!my(JN4dFL*3-D(yK=VJ z`1Aa8jE7~6PYXCM_vtal9ej&?L&z5ud~BaU9PaR`ofX>rIQ- zlg57FQ2h}j z;j!iNdjer|_*W4GqMl=~*j$kIi+% zz+N2n=$wz&bc28zVv|Go#FTk1uJ@idv^Z+`;t)oa14+-xJ;rf7-{cv%pWJlv$VyC~ zH$BDY1M6w(J)>dzeR)rbZFrvB*Fb#@dkSA#8Hvq$yKBZY?t8)k*J)mR6+dl0-YM#O z>;d9%(!wt|Oe6P7$0^uJQqpgSXq3i5cRDFc&dsxRGF2B6- z{!0JytchXpoCtVLn(>S>kgo=ftge zl{)}_k7uKFKA$7M=4C82u!rZF<1evKo%b5pt8-rung3L-);`mK#a_!fT{uAld1;e( z!SxsPpovY)?6Vrq;h({*o&_~64b)$)8Qw+zJ~trNi+imjkm)(ojOa5 za$Y@4rLNFAdJl?|QQs59Uvidnr=jm#_1um39XV;@RTRI+D!DZ`4ZyL;B+S=Y{sMk! zNQgts5l6u}TBp8>hOTjb_CfrnKkxJBDmmunhI63?!+wE=7B}B|-9!(_%XK+6Gc~wh zKexqVoi(lA6PKpfosV1_)Xi`kPu@dJ-qjR0_s~42AGi2fGkP6(tzJXrzUO)_4I}Y?`=Q(P^-|u(`0yIAUohPUWXA?v>Ycnx;mdTMAh7bn*Nlh3CmH8CcQtMS3A>D1zedC_1{?hM<{=&)*Z2`(9e40;cne>^1Ln!QyKo41 zVIS@mNZnwGzJznWgx_?xVHIv)t;5~&0aM%uJ^g<17vcf)C;Zm&^a}rHT0X>Q{NLz5 DqNwaW literal 0 HcmV?d00001 diff --git a/src/win/win_icon.c b/src/win/win_icon.c index 8d3ec9590..33a5932ef 100644 --- a/src/win/win_icon.c +++ b/src/win/win_icon.c @@ -87,6 +87,13 @@ const _ICON_DATA icon_files[] = {185, "mo_empty_active.ico"}, {192, "cassette_empty.ico"}, {193, "cassette_empty_active.ico"}, + {200, "run.ico"}, + {201, "pause.ico"}, + {202, "send_cad.ico"}, + {203, "send_cae.ico"}, + {204, "hard_reset.ico"}, + {205, "acpi_shutdown.ico"}, + {206, "settings.ico"}, {232, "cartridge_empty.ico"}, {240, "machine.ico"}, {241, "display.ico"}, diff --git a/src/win/win_toolbar.c b/src/win/win_toolbar.c index dd484658f..cf461e4c1 100644 --- a/src/win/win_toolbar.c +++ b/src/win/win_toolbar.c @@ -89,13 +89,13 @@ ToolBarLoadIcons() win_get_system_metrics(SM_CYSMICON, dpi), ILC_MASK | ILC_COLOR32, 1, 1); - ImageList_AddIcon(hImageList, hIcon[16]); // Run - ImageList_AddIcon(hImageList, hIcon[24]); // Pause - ImageList_AddIcon(hImageList, hIcon[32]); // Ctrl+Alt+Delete - ImageList_AddIcon(hImageList, hIcon[40]); // Ctrl+Alt+Esc - ImageList_AddIcon(hImageList, hIcon[48]); // Hard reset - ImageList_AddIcon(hImageList, hIcon[56]); // ACPI shutdown - ImageList_AddIcon(hImageList, hIcon[64]); // Settings + ImageList_AddIcon(hImageList, hIcon[200]); // Run + ImageList_AddIcon(hImageList, hIcon[201]); // Pause + ImageList_AddIcon(hImageList, hIcon[202]); // Ctrl+Alt+Delete + ImageList_AddIcon(hImageList, hIcon[203]); // Ctrl+Alt+Esc + ImageList_AddIcon(hImageList, hIcon[204]); // Hard reset + ImageList_AddIcon(hImageList, hIcon[205]); // ACPI shutdown + ImageList_AddIcon(hImageList, hIcon[206]); // Settings SendMessage(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM) hImageList); }