From b7c730f2b98d7b9123487202ad86384604ca4eb3 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 15 Oct 2013 23:30:35 +0000 Subject: [PATCH] Eolite 1.98.6: better icon wrap by selection, a little bit decrease repaint, much unnecessary now code were deleted git-svn-id: svn://kolibrios.org@4038 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 4 +- programs/cmm/eolite/imgs/icons.raw | Bin 6240 -> 6096 bytes programs/cmm/eolite/imgs/icons.txt | 2 +- programs/cmm/eolite/imgs/png/icons.png | Bin 6136 -> 5810 bytes programs/cmm/eolite/include/icons_f.h | 109 ++++--------------------- 5 files changed, 20 insertions(+), 95 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 66a175ea34..6ce20b3aa9 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -76,8 +76,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v1.98.5" -#define ABOUT_TITLE "Eolite v1.98.5" +#define TITLE "Eolite File Manager v1.98.6" +#define ABOUT_TITLE "Eolite v1.98.6" dword col_work = 0xE4DFE1; dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; dword col_padding = 0xC8C9C9; diff --git a/programs/cmm/eolite/imgs/icons.raw b/programs/cmm/eolite/imgs/icons.raw index ee268377128379b3d3464272fbd0e71cd23fb0aa..ba332b3b424ca8277c077d9ecffbbf2edde7cc12 100644 GIT binary patch literal 6096 zcmb`L3t&@M8OQI*k%p{k!&0Ox!$Mevx?x|dT}Rr|v~=RKb_tX=ZHVoIxKd(;IvfU zV-=htIwYry4#lEFvLjt|i18NLA$XSPkomA0D-(}PgK~XIelJBoI=_r(IF(<^Pk_h&&fsR1lFl#l zr#rvX_?>P)=jG?=_H#jD(bf3{1-Rwe`U;BQQ&MtG0cIfQ6_s9_e{BgHf?TxJT~wC8 zbZNfun^)w9_|p75{7m5b3yRAtDy}KO9nZP2sJsa4E5FMsmkEoI?=g#+Q!gG5tIqO3Ag^aJ)h0)p|_!lh3Eoe^R>mwvv;O zDfl|ndr_2Pd^%o%dLN4CPseg@Y?J3tUa_&q?9a@`>_mOID(L1bEUdh`vanFiUszmH zQc|pVS!K!fmDiWxg@moP((A3H_yUZDmQ{Ko?!`DObVFfrMMVW0&kNm9SXsgAi$ZJ| z`W1y(S!9#&3e8npEAKcM*SZ|FGNjdMfHx}i`F)6T#7erV-Ulc~)U8_OuV3v`BUbtW zS2y@%0iVCVesx1bL!+qYV-%=cDJJmMHv|HJjSiOJTeUh+SGUsF$d`xM2)Z#5ZM0Y{ z4i~THhp66%36+JU0}n{o+0+~i>e%TCHtV@*O)yi(5YF`I7?A21vY~n+?g<4^vOX3A zNq)a4xHy!auGrHY%+$0N;3iz4hmRDE_{LF<&cb;PX-!QHJSl4-hXMiMqlQk&EFZ`4 zxY$apVfmsK)&;M4 zw63)hbS-ckV+d~~4*slFxM_aoS+M7dbTA|g} zwqJ#fYVjEE?+ogi+ilR2F4QgE-M5GX;&QoCy1Ki&*4+w!UERnoFHrCc)ndf{v(=p`^F8j+{TT-8w}F4{wS)S?{0XF-T`t) zbv!UI03BTY5celE7zGv~-e}Q*=tq^H4)A~)fb5SB+$qJ`f0q>UVAOxN6mn_QUn&J0 z_*lT5P(bSs=;jZA4=a4aq^!z@I!O54#QK!qP4{fV%V+cs?sxOO_kDabyf57Eou&8R z_lZy5ul#=Mfd?OY_|u(+<9{FTQa|0?(UwQbwJ z4*cjg=AZff2C~lYH=h`K@+qC)El)i8tt~pg-$uEo^NS8HO1d|XA4dEGxC2lF{zx<$ z861?SZ*Y+Fpwd(<&n>nXm**B+WO;6}1s*mi+8o1{p6?5BPV{2{;Udlw@%0g8LS|f9VaCihGRYb`z5)0&z?Qi z5Rm-B-o1NY(DAN)`}XZpeB1sPfnQX-|GJ<5;+Mbr^;5qQMKZI&|pIz<=Q!I}EBla^%Qg4`bY*Bs*rmrY~TPbavt+6-Amt zgmi{TD1`qbA$B|Y_I=art>x}Vr)5J&3^^(RL>p{9^m>*ZGTMwXi41_-@M?gBS@wg7Oczkd$ z(Gw5zOGKFEU@Qzh_=KD|zx;&5yp6{rZ~+R3`7`Q`$KCEom|udz-smv0I~<9WmU_M6 zVPvn@9fln5@Gx)y+1m>_a2e_iAO`~8UdR~^1c0M3VLSlrgv2$a^`>dZ$6}V$^z5DIC=66Jzh33F~Q=ojMrvO(jJG?dG;(+n3#y!W2dNN41R&XW}!=F`zOjKVU6Qw zm)jZ7_W%0~h4oFwX4zAyE%!gO&+r9Lc3IM?&35Wc7B@sKWO8znFn{zMTbz11ch20Q TLj1rOE;EiVd)>fgufOqMPL9=} literal 6240 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 diff --git a/programs/cmm/eolite/imgs/icons.txt b/programs/cmm/eolite/imgs/icons.txt index a22b3c7fbe..f531a86783 100644 --- a/programs/cmm/eolite/imgs/icons.txt +++ b/programs/cmm/eolite/imgs/icons.txt @@ -2,6 +2,6 @@ //Иконки папок и файлов// ///////////////////////// -dword ficons_pal[] = {0xFCFEFC,0x5C627C,0xCCCCD0,0x848AA4,0xFCF2F5,0xF4F4FA,0x9498AF,0xE4DEEC,0x9CA4B6,0xE4E2E4,0xF4EDFB,0xACABAC,0x74799A,0xECEDEE,0xC4C2C9,0xE4E5EC,0xECF2F3,0xDBDCE4,0xD4CEDC,0x00D4D3DA,0xC6CBE2,0x5C6684,0x5C568C,0xFCB694,0xC4C6D4,0x7C829C,0xBCBECC,0xFC9D73,0xBBBCC3,0xC4BEC7,0xD7E2EF,0x515870,0x5C7AA4,0x647EA4,0xA4A3AC,0x8CA2BC,0xE4EBF0,0xCCD5D9,0x7896B8,0xBCC2D4,0xDCF0FC,0xD4EAFC,0x6C86A7,0xC4CBD1,0x9CADC4,0x748EAC,0xB5E2FC,0xC4DEFC,0x00B9CDE4,0x7CAADA,0xABAEBC,0xCCDBE4,0x578FC4,0x5484B8,0x6482A4,0xABB2C4,0x5C89BC,0xA47868,0x644A44,0x7C603C,0x6C4F26,0xFCFD9F,0xBA9D40,0xFCE274,0xFCDE60,0xC4A650,0x644E44,0xF4D27C,0xA29880,0xFCDA84,0xFCC354,0xECB847,0xFCC24C,0x9C8E74,0xE4AA54,0xDCA24C,0x9B6A55,0x543A34,0x6EBEE0,0x64BEDC,0xB4DEF4,0x7CBAE4,0xECFEFC,0xA4CAF4,0x99C5F1,0xA4C6EA,0x040204,0x94BAE4,0x64718B,0xB4B2B4,0xF43E4C,0x44CE3C,0x4CDA44,0x047CBC,0xFCBB3C,0x1C62AC,0x00FBD65C,0xC4B6A4,0xD59A52,0x7B7C7E,0x7B828A,0xC48A34,0x54463C,0xAB5A04,0xFCDE98,0xAC6A14,0xF4EED4,0xFCE8A1,0xFCCA34,0xECB624,0x34120C,0xD2A226,0xAEC5DA,0x7C9DCC,0x5C7A9C,0x84AAD4,0x2C72BD,0x518AC2,0x447EBC,0x3C7AB4,0x247AB4,0x2669B1,0x8BB5E0,0xBCD2EC,0x6C9CC9,0x008496BC,0xEC8D99,0xD49694,0x8C8C8C,0x949392,0xCC8387,0xFCFBD3,0xE4FED4,0xBC7A24,0xA47A04,0xE7C267,0x8C5A14,0xDCBA54,0xBC6A1C,0xCC923F,0xB0722C,0xF0DAB4,0x8C522C,0x9C5204,0x945204,0xC49204,0xCC9A14,0xFCF6BC,0xFCEAC4,0xF8E4B4,0xF4D67C,0xECD274,0x7CBE7C,0x1C8E1C,0x00A98D04,0x1C8204,0x90D280,0x2C9018,0xBCFAAC,0x3CC234,0x488404,0x54AE4C,0xC8F7A4,0x84F26C,0x5CE64C,0x24AE1C,0xB4D6A4,0x49A939,0xA8F694,0x44E63C,0x149E0C,0x848204,0x97B951,0x5C9D2F,0x6FCB4C,0x8CE264,0x4C9A24,0x509224,0x749224,0xECCA7C,0xDCBE74,0x349E2C,0x5CAE3C,0x84B64C,0xD0EC90,0x9CDA64,0x70B63C,0xBCE274,0xC4BA4C,0xDCB23C,0xC4E6F4,0x94CDC6,0x3CA674,0x51A389,0x74BAAC,0x2C8E64,0x3C8E94,0x1C6E5C,0x84AEA4,0x2489B9,0x1C6A84,0x145A6C,0x0064827C,0xACBEA4,0x0C4E5C,0x4CA6CC,0x84BAB4,0xB4CEA4,0xA4CEAC,0x0796D9,0x1C96CC,0x2496CC,0x54CAFC,0x30A6D8,0xBC2E34,0x946684,0x447684,0x34867C,0x449664,0xA4CA94,0xF46264,0x8C6E34,0xACEE64,0x9C2624,0xE42A3C,0xDC1A2C,0x846224,0x84C73F,0x8C4644,0x3C7A24,0x547A44,0x00E15671,0x6492CC,0x5C8614,0xC44244,0xDC4A6C,0x84BA1C,0x04A6F4,0xE4627C,0xEC7E94,0xB45A04,0x848387,0x9C9D9E,0xFCD94A,0xC9FEA4,0xFCCE1C,0xFCC514,0x464F6A,0x343644,0xFC0204,0xFCCBCC}; +dword ficons_pal[] = {0xFCCEFC,0x5C627C,0xCCCCD0,0xFCFDFC,0x848AA4,0x9498AF,0xE4E2E4,0xF4F4FA,0x9CA4B6,0xABAEBC,0x7C829C,0xECEDEE,0xC4C2C9,0xE4E5EC,0xDBDCE4,0xD4D3DA,0xC4C6D4,0xFCB694,0xD7E2EF,0xBCBECC,0xFC9D73,0x5C7A9C,0x5C7AA4,0x647EA4,0x8CA2BC,0xE4EBF0,0xCCD5D9,0x7896B8,0xBCC2D4,0xD4EAFC,0xC4CBD1,0xCCDBE4,0x6C86A7,0xECF2F3,0xDCF0FC,0x748EAC,0xB5E2FC,0xC4DEFC,0xB9CDE4,0x7CAADA,0xABB2C4,0x6492CC,0x5484B8,0x5C89BC,0x9CADC4,0x6482A4,0xA47868,0x644A44,0x7C603C,0x6C4F26,0x644E44,0xFCFD9F,0xBA9D40,0xFCE274,0xFCDE60,0xC4A650,0xECD274,0xA29880,0xFCC354,0xECB847,0xFCF2F5,0xE4AA54,0xDCA24C,0x9B6A55,0x543A34,0x74799A,0x6EBEE0,0x7CBAE4,0xA4CAF4,0x040204,0xF43E4C,0x44CE3C,0x047CBC,0xFCC24C,0x9C8E74,0xFCBB3C,0xC4B6A4,0x7B828A,0xC48A34,0x54463C,0xAB5A04,0xFCE8A1,0xAC6A14,0xF4EED4,0xFBD65C,0xFCCA34,0xECB624,0x34120C,0xD2A226,0xAEC5DA,0x7C9DCC,0xB4DEF4,0x578FC4,0x94BAE4,0xECFEFC,0x84AAD4,0x2C72BD,0xA4C6EA,0x518AC2,0x447EBC,0x2669B1,0x8BB5E0,0xBCD2EC,0x1C62AC,0x6C9CC9,0x3C7AB4,0x64718B,0xC6CBE2,0x8496BC,0xEC8D99,0xD49694,0x949392,0xCC8387,0xBC7A24,0xBC6A1C,0xE7C267,0x8C5A14,0xD59A52,0xB0722C,0xF0DAB4,0xB45A04,0x8C522C,0xCC923F,0x9C5204,0x945204,0xCC9A14,0xFCFBD3,0xFCF6BC,0xFCDE98,0xFCEAC4,0xFCDA84,0xF4D67C,0xF4D27C,0xDCBA54,0x7CBE7C,0x1C8E1C,0xA98D04,0x1C8204,0x90D280,0x147E04,0x2C9018,0xBCFAAC,0x3CC234,0xC49204,0x488404,0x54AE4C,0xC8F7A4,0x84F26C,0x5CE64C,0x24AE1C,0xF8E4B4,0xB4D6A4,0x49A939,0xE4FED4,0xA8F694,0x4CDA44,0x44E63C,0x149E0C,0x848204,0x97B951,0x5C9D2F,0x6FCB4C,0x8CE264,0x4C9A24,0x749224,0xECCA7C,0xDCBE74,0x349E2C,0x5CAE3C,0x84B64C,0xD0EC90,0x84C73F,0x9CDA64,0x70B63C,0xBCE274,0xC4BA4C,0xDCB23C,0xC4E6F4,0x94CDC6,0x3CA674,0x51A389,0x74BAAC,0x2C8E64,0x64BEDC,0x3C8E94,0x1C6E5C,0x84AEA4,0x2489B9,0x1C6A84,0x145A6C,0x64827C,0xACBEA4,0x0C4E5C,0x4CA6CC,0x84BAB4,0xB4CEA4,0xA4CEAC,0x0796D9,0x1C96CC,0x2496CC,0x54CAFC,0x30A6D8,0xBC2E34,0x247AB4,0x946684,0x5C568C,0x447684,0x34867C,0x449664,0xA4CA94,0xF46264,0x8C6E34,0xACEE64,0x6CAE34,0xA02624,0xE42A3C,0xDC1A2C,0x846224,0xB4B2B4,0x8C4644,0x7C6634,0x509224,0xBBBCC3,0xACABAC,0x3C7A24,0x547A44,0xE15671,0x5C8614,0xC44244,0xDC4A6C,0x84BA1C,0x04A6F4,0xE4627C,0xEC7E94,0xA47A04,0x8C8C8C,0x848387,0x7B7C7E,0x9C9D9E,0xA4A3AC,0xD4CEDC,0xFCD94A,0xC9FEA4,0x5C6684,0xFCCE1C,0xFCC514,0x464F6A,0xF4EDFB,0xC4BEC7,0x515870,0x99C5F1,0xE4DEEC,0xFCA274,0x343644,0xFC0204,0xFCCBCC}; unsigned char ficons[sizeof(file "imgs\icons.raw")] = FROM "imgs\icons.raw"; \ No newline at end of file diff --git a/programs/cmm/eolite/imgs/png/icons.png b/programs/cmm/eolite/imgs/png/icons.png index aaff11d53e0856964dbefc38eadbb49cf42d5569..017acd118c24c58b3a8ad5971181a8aea33c233d 100644 GIT binary patch literal 5810 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 literal 6136 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf7mZ0oK~#8N?VJgC zRMpwX|1()93nUOoSb_l)b|pY8P(UImphYbx2rVeMAxI0Nv`8%iRY24VA`k=-3(AfZ z7Xk_dP}u?`tRc~4*kVHVeKN_+^uFibbLZY!Gm|{EU%&o%Ue0pQ`#Bhr_B1pQ|Q~Lvy@Um0>s40^DOoC^$u;x+n=)Ssb{WArLAZs9T~xanUauT9o|^* zJeIHg1ZU1>O1UBq1bAo_2@Vcq;l}lg>_nWjz#1oXfdN>z;ag08c0Nm!2*+0nWvn&( z!dKWz>9LOuLFd>o7!2LmmNo0XVj*GI0)wGmG6M@qk3@R(=z)Iy`k_a!eo{#hr=7?h zd7N*v#f5-l5nJ2{h>ps*Ee`s?pm4A{^0+NdI?=g^Ee?0Vm542N0{#22t!~<7^`*?{)<;GOt0e&z5qmohUD7+L-v-6d*YjiHY|}xmKvwn(7`b zzV72MSV+hMF)^Kxl5!e}d3qK)Mk9p^SXT~ObWP97ay)E-10L^J1A;iyuX%mK^YfNk51nY|(yN=-Er5s$l z?qoT?yD0@eFk|VgM`7{xLs8z(*nQ{{ngwNH#`uA*&(2>TyM)w32eEMR9GLxrP*$&l zp|TvKhxUX%w*Vh*N@ly`^z6K8!&bb#^kswz`|0BwfWSZ>&_4P5X_3$+3O6e(4*P|} zIx(v@3|ET$P-y}xema8z{raL)WDq(=N8nar6?1gp%U}X=0R;%H$;Qp>Z0yVo!|YWD zQCL`n8@c&t(=tdBaB^y!^z?YlnfpGpzB+Vk7lzz|V&s%saHG(O6PIqIQ@Ag47i5@0P5{)q)doW(f~`+#cVwKi6V{rX#W_qMuz3KM#w%x-`hwaK+oU_?Y{om>B12+t3zS zVCU|`szQ{u4IPQ7TEGhvj%s!!(sX^`E&mf}imCk4oDUi=(Ce{@QqnWhcWrKhK4|PN zfCRjSeC5OX=l?t^#Y7VN2sh#`h>nhCq02tFexp=nj&Lc^Av#QDj_{}j+?06K0&YtF z!&`7F^(Wbg)U!FNG^4Q-sqw3^NltD5x6jTX0dFDSM(={^GS4vh5h-Tn(Utbgcz?Y0 z*wN?~H0>_v2E8c7tQg9cOEJg%^1JZM&x1x!<)&%Df5CFDckl#HY3pAYXL-DTJPVbO zuWBmWGJCZ6=qtA%7(0&7#Ml8VaQ+eTnc|AQ;sZIieK2}VTkP1<3(%*qkkU$=3T&M5 zJ63aIVhq;pj=CU4bLEBbUNYMiiv`EF< zQ=7Ap(v<(qnr&7AM;*0u?Ls_0^>uu{I~Q}-iY=j#(n^?svyRIAaxWV$YA!ibNNGNV z44MpVuBaAMu09t*_36wk1z!P`S6Kf2lVZ^4 z@;uzSk&icKJ%=s(gheHx63`YGvyeGUR1{UPkVKvt+*jpHs00XJbH%k&vU6S`aPd+I zUKy{$ga^eH$*~h4$dR1573PPq-Fs(i4PINmPAVlL&&1sm12J+{8gyBckae|!IT7SY zySD6r4y%(7t7joW0@TZF*n}Rx{7I}Op+%_5sMo3YdCx0NL(a;YpL{8w)x-%1ZiaTz zkq8S4mU3)hRKr#^4^lEQq0LbP_pZ|9)VpFFl_3R z%xrNfkd<48@AmG;z{KwOKE?5)bC&|=ua%%E>Mj;9$vMwLTbv5;+Q&WG8()6B13F`k zv_*|mfz>OwvVA7!q=okT&T%L}9mktaHQSDY5{DNU)b#$tMzOe~o>yWgz-u2C+k!P; z$*3t~rI;1fF5EVm<&H}|k&Rvh@5S87!?eqYL0(ZY`J!HA!{JSHZ3(R@U=3>f*-6wMJ`RxAA1)^IAs7m}Gg9%W9i7UQGmv*7pF{>}$8Xt=i zqxGzpFncd1KF|x-OMz`C^O0F#mbOR&edZ)%>VrLzU*(4b7fSGxaEY(PWHuu!uLkwP z>7U3F?p#_1ixtSbKn1F6>rhrxhfJYBxWDzAkw^P=z(0>(fG)rf898}KNxOy*r;9JJ znZP6Ww8M_083>XJ97xNR3lJ-w8-Vyu;YiwZ0@}JN?43UXaZ%#^ggljJZb(J)*j=FLJd_36i;NjahSN+A12E>0dh1mDlLZkMt|I(E4m1A2F5 z@#E(*kaN}k5|@`bP+ke&MGKynvW3Z1T8YKWKa&N>c~Oi%^8Ne}Syv~A^M!m~Mjl2Y zQ1Klehn()7K3x?m(Ne8SvxRCrzj`%urjXJ~w0rh!1~=grOw3ilYvv-hE$~f97%4@8 zn>XzrgVz)k;N-%EEY3q9ND2jkf9yOUMMbEGITYXEWE41F&jTVUDarep$kFKa-nU@x zf+Y1k@P=PrfSsABBMk;$ygVu9m?rImUw#xC-2%B2NtHGHT~Ss*^T1&r z&@ehPqDlLp(WAinVE?PGzjkoOh$T7FD3lryKmNCZ@>ZdF<5`wFP9*PPp}Y%9@-l=D zb72gF_!R&XC@sxHK(+W-gNLqAma$&T*$|UBS&FIAr)*>)`*2!7-i5Mq@ykyhxWC`a1CDD;1 zfVoC|Nky28uDLaiT?Jlj?9C0kQZjHl+F>Ui* zXcifZn*0lB9Th8Wa*dy*4*LAt*0qp(avqFT>PO(N@DFZ_w*3~10+dm0sDZK8$Tl_v z{{Vjk`1v>dwXrkgU1-R1e*N(4n1Anl_Tvy45@^VBo_}b*CHn8}SZFd?fA4HvOfHtQ zzPbW4E9&sqaf`8F>pZ*@@-VQr1xmv@SOsjCb3slnMg(`p{5yu>lBQ0$EjPnx ztQXdS3BF-Eyw`OM#`~4qw}3C_kYHc5X&sEVks-LdS%kDzgl1ku{W%tw1zauX*x=^S z)m9^_J`fQ`A9M+BDV1#Ca*p&3L|~l}QIW0D&OZdv{-ILI1}^6eh(C7Vn1y}luBpYX zyj%YX%b5#!OXH6Rv^1r-S7>O>OL4DY0`0qxLF;Zqq1Clu#{riJi;iaN?JI|H^YU)R zTBs7vIEA_F6z|Gd8KEr4x)v z0ox_)&Nyrso3|0)^m?f+lKI9w0NMkPGyOfeioIvLl&UI zvBHH%xLKnz%2NtPSxRudSiEZ`h-(#xFV25~TP61A4O!sJ?CUJNoSuwp*UqxINV*h?JUjRStUvaRlu`&B zOv^@9_8AyU^MzD1G1G>JyEMmL;Tn`>TaQSxK$pl?K&16KyCd$5EQC*sA`E)sWhqB7 z3LRUwa%=gPZYVS9SezrbU}I*r6m!i+&`oMJmJb!vjh@Pl|9xYl&(4i)L8JRX9>%QP zT91rlx12efuHMG*y%%Mpv?H7f?99B4e*F?;qqHNO3e=U9;%Y{QY?O9{oj~zXwU@2O%|ogH%$)PJsH? z5*LMM>#t#b&`)^SxEphxyM?Ep@Wp`seenG?wSc^s^0QB|u&lNU1;;O-u2lSk0u>LM zP;u4zfpbMk6)PLpb}&n;T2NYAid)gqI4B%Ak2W_kGx~->>!X!Txc^ciw}1!?3`EE2 z)9F@F$`M8*<2xMN^R<)$S|J)mMMY9dps`cA@yoeMu9biPjAwt!g!Ab~ZvynT=D>v_ zX14L7qCz{P{GC7KSXO;=lf~s>q?h+RIhuFa88bsBRP>h_M5&ekD%?mjA|k^?;xBwu3uqBtlnUq zKpZNgguQc}JaYz8(h8)khNC~S&DsL`4wcvJ4r)bsTk&r|FoDXNI_A9U-B(zqJ7`2y z0-W0EZ%Z*Z=&T<#F#$fV0juY*&@Dm>I9|8lmchX=dffs(tC9{i{N}sDqy=4;HU8au zqp#ML0#lYo;^EF~5E&WC(uv=iuT&`wyee<3uH;vWjpghe9dqtR#;5r^QQmhiiy4XRIHV%vi6?TgFj-0 zBL??Poh#+2IlOi$N}yK>F#);8XIHZD@cMUIc;B<)-I;BA_xeAukc2c_=E5>&vbv)< zhc}A9Texqs^;aWGc5i%DJSrF77JtVc*0LQ7k8KkFnAqS+PqB~-@$|)GE77Z?_~eHP z1XYSJp6D{-!q?xT|L?^Y`22YhPm^%seeGFXFFlJ=O(ZTpa7jevC~V`7943&Rm&c4_+ahwZb*zvc z=4)vz)35x?a9=Q8K@$q=4s3<1NYs*O~h9yQlrCqLtUfp8l z8VRK%$Dsg+3psM+Fadsp!Cyd~KYtY|Df>}dTg%>Z2L$*FHzPVECXPUl9-W198VG)@ ztSmszH*e+PqxEYM5)zE=J^LZDRXEzUYlX5h1By#3@Wc1XC@wC=^cVk#wryH75hkG3 zYMJx;bxD{${SVOVZ$hipprWD*ojbQjK|!@pffjzgzDWNu7gtgb;Q1F`WFlJn485+- zgmoXT!K_)c(XwS2`u6Q9)LH>Ey@{Y^3T0@*oXfb5>cULi5fg*et5ymvu#kWjSFc{d zop*LZSXeW`$;>PK6N!&sj04x-gs(OLLBq~LhdLA%7K#D^{(h*9`x&)$LWc=y zt=R}_{J61`nDba6B($1ZVRXze9_|i}zdwS5FN%He{`)I1T$m(2;c>z~negrP8leZY zm^RS*KB=OJ*0lyF)6NRRsfAIPWS@P0NED!%m%MK`S`D2kbR<2w*CMt$9nG4Bqj%pP z_;A}nJYTvSbr1J}Az%`80a}cH`V}ns>vU)>7BjjDi>A2Tf;vMre0}}V*>F)15vH{; z!3df_5c2)LzKo#yPw{g>32KBX-m_s&AT5mz zBRLUD=c+hbJGRjAi%fDv@7`iff|IQ?p%UP=Pyy~(Qe4ama}lL8!B%76d+rzKfKa1t z0e8qP;I(_=OvnPfd7h%`15awdf4KOAN!42L3hG2})`I9`vHS~F`{j;ah4;Py0000< KMNUMnLSTZ(9??Sp diff --git a/programs/cmm/eolite/include/icons_f.h b/programs/cmm/eolite/include/icons_f.h index 1397445c34..c327703a48 100644 --- a/programs/cmm/eolite/include/icons_f.h +++ b/programs/cmm/eolite/include/icons_f.h @@ -30,26 +30,25 @@ char *ext[]={ #include "imgs\icons.txt" - void Put_icon(dword extension, yy, fairing_color) { int icon_n=0, i; for (i=0; ext[i]!=0; i+=2;) if (!strcmp(extension, ext[i])) { icon_n = ext[i+1]; break; } + ficons_pal[0] = fairing_color; PutPaletteImage(icon_n*16*15+#ficons,16,15,files.x+3,yy,8,#ficons_pal); + if (fairing_color!=0xFFFfff) IconFairing(icon_n, files.x+3, yy, fairing_color); if (icon_n<>17) && (strlen(extension)<9) WriteText(-strlen(extension)*3+Form.cwidth-120,yy+4,0x80,0,extension); - if (fairing_color<>0xFFFfff) IconFairing(icon_n, yy, fairing_color); //закрашиваем иконку } -void IconFairing(dword filenum, y, color) +void IconFairing(dword filenum, x,y, color) { switch(filenum) { - case 0...1: //файлик - DrawBar(195,y,2,15,color); + case 0...1: //file + case 3: //настройки RIGHT_PAINT: - DrawBar(209,y,2,15,color); DrawBar(205,y,4,1,color); DrawBar(206,y+1,3,1,color); DrawBar(207,y+2,2,1,color); @@ -61,27 +60,7 @@ void IconFairing(dword filenum, y, color) DrawBar(195,y+10,1,5,color); DrawBar(196,y+11,1,4,color); GOTO RIGHT_PAINT; - case 3: //настройки - DrawBar(195,y,2,7,color); - DrawBar(195,y+7,1,2,color); - DrawBar(195,y+12,1,3,color); - PutPixel(196,y+14,color); - GOTO RIGHT_PAINT; case 9: //inc - DrawBar(195,y,1,12,color); - DrawBar(196,y,1,11,color); - DrawBar(197,y,1,10,color); - DrawBar(198,y,1,5,color); - DrawBar(199,y,1,4,color); - DrawBar(200,y,1,3,color); - DrawBar(201,y,1,2,color); - DrawBar(202,y,1,3,color); - DrawBar(203,y,1,2,color); - PutPixel(204,y,color); - PutPixel(205,y+4,color); - PutPixel(206,y+3,color); - PutPixel(207,y,color); - PutPixel(207,y+2,color); DrawBar(208,y,1,3,color); DrawBar(209,y,2,4,color); DrawBar(210,y,1,15,color); @@ -96,7 +75,6 @@ void IconFairing(dword filenum, y, color) PutPixel(209,y+5,color); return; case 10: //font - DrawRectangle3D(195,y,15,14,color,color); DrawBar(196,y+1,1,13,color); DrawBar(197,y+1,1,11,color); DrawBar(198,y+1,1,10,color); @@ -111,37 +89,24 @@ void IconFairing(dword filenum, y, color) DrawBar(203,y+10,2,1,color); DrawBar(202,y+11,2,3,color); return; - case 11: //asm - DrawBar(195,y,1,15,color); - return; case 12: //audio - DrawBar(195,y,16,1,color); - DrawBar(195,y,1,15,color); - DrawBar(196,y+1,4,8,color); - DrawBar(196,y+9,1,2,color); - PutPixel(197,y+9,color); - PutPixel(196,y+14,color); - DrawBar(210,y+1,1,14,color); - DrawBar(202,y+4,6,4,color); - DrawBar(202,y+8,4,1,color); - DrawBar(202,y+9,3,1,color); - DrawBar(202,y+10,2,3,color); - DrawBar(201,y+13,4,1,color); - DrawBar(200,y+14,14,1,color); - DrawBar(209,y+12,1,2,color); - PutPixel(208,y+13,color); + PutPixel(x+2,y+9,color); + PutPixel(x+1,y+10,color); + PutPixel(x+10,y+8,color); + PutPixel(x+9,y+9,color); + + PutPixel(x+6,y+13,color); + PutPixel(x+5,y+14,color); + PutPixel(x+14,y+12,color); + PutPixel(x+13,y+13,color); return; case 13: //skin PutPixel(210,y,color); return; - case 14...15: //video, book - DrawBar(195,y,1,15,color); - DrawBar(210,y,1,15,color); - return; - case 16...17: //папка + case 16...17: //folder DrawBar(195,y,1,15,color); DrawBar(203,y,8,2,color); - IF (filenum==17) PutPixel(206,y+1,0x1A7B17); //зелёная точка стрелки + IF (filenum==17) PutPixel(206,y+1,0x1A7B17); //green arrow part DrawBar(196,y+13,15,2,color); PutPixel(196,y,color); //.точки PutPixel(202,y,color); @@ -150,49 +115,9 @@ void IconFairing(dword filenum, y, color) PutPixel(210,y+12,color); return; case 18: //картридж - DrawBar(195,y,16,2,color); DrawBar(195,y+11,1,2,color); DrawBar(210,y+11,1,2,color); - DrawBar(195,y+13,16,2,color); - return; - case 19: //изображение - case 20: //изображение - DrawBar(195,y+14,16,1,color); - return; - case 21: //дискета - PutPixel(195,y,color); - PutPixel(210,y,color); - return; - case 22: //библиотека - DrawBar(195,y,16,1,color); //сверху слева - DrawBar(195,y+1,3,1,color); - DrawBar(195,y+2,2,1,color); - PutPixel(195,y+3,color); - PutPixel(210,y+11,color); //справа справа - DrawBar(209,y+12,2,1,color); - DrawBar(208,y+13,3,1,color); - DrawBar(207,y+14,4,1,color); - return; - case 23: //архив - PutPixel(195,y+3,color); - PutPixel(195,y+11,color); - PutPixel(210,y+3,color); - PutPixel(210,y+11,color); - - DrawBar(195,y,7,1,color); - DrawBar(204,y,7,1,color); - DrawBar(195,y+14,7,1,color); - DrawBar(204,y+14,7,1,color); - - DrawBar(195,y+1,5,1,color); - DrawBar(206,y+1,5,1,color); - DrawBar(195,y+13,5,1,color); - DrawBar(206,y+13,5,1,color); - - DrawBar(195,y+2,3,1,color); - DrawBar(208,y+2,3,1,color); - DrawBar(195,y+12,3,1,color); - DrawBar(208,y+12,3,1,color); + DrawBar(195,y+13,16,1,color); return; case 24: //образ DrawBar(195,y,6,1,color);