From 29cc7502e319aa618734a681b6dcb8b2fdd48843 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 11 Feb 2016 01:07:04 +0000 Subject: [PATCH] CMM: checkbox and morelessbox convex Eolite: use system colors for some cases, better code for list click TinyGl better icons git-svn-id: svn://kolibrios.org@6191 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 59 ++++++++---------- programs/cmm/eolite/imgs/left_p.txt | 13 +++- programs/cmm/eolite/imgs/logo.raw | Bin 22188 -> 7396 bytes programs/cmm/eolite/imgs/png/Eolite-Sun.png | Bin 3032 -> 2573 bytes programs/cmm/eolite/include/about.h | 3 +- programs/cmm/eolite/include/gui.h | 8 +-- programs/cmm/eolite/include/left_panel.h | 6 +- programs/cmm/eolite/include/menu.h | 6 +- programs/cmm/eolite/include/settings.h | 13 ++-- programs/cmm/eolite/include/translations.h | 4 +- programs/cmm/lib/gui.h | 8 ++- programs/cmm/lib/system.h | 2 +- .../TinyGL/asm_fork/examples/toolb_1.png | Bin 1011 -> 1314 bytes 13 files changed, 66 insertions(+), 56 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 9d9adbb7b7..0088904580 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -30,7 +30,7 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum {CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement -dword col_padding, col_selec, col_lpanel; +dword col_padding, col_selec, col_lpanel, col_work, col_graph; int toolbar_buttons_x[7]={9,46,85,134,167,203}; @@ -191,29 +191,25 @@ void main() } } } - if (files.MouseOver(mouse.x, mouse.y))&&((mouse.down|mouse.dblclick|mouse.up)) + if (files.MouseOver(mouse.x, mouse.y)) { - //select/open file { - if (mouse.key&MOUSE_LEFT)&&((mouse.down)||(mouse.dblclick)) + //open + if (mouse.key&MOUSE_LEFT)&&(mouse.dblclick) { - if (mouse.y>=files.y)//&&(mouse.click) + if (mouse.y - files.y / files.item_h + files.first < files.count) { - id = mouse.y - files.y / files.item_h + files.first; - if (files.cur_y!=id) - { - mouse.clearTime(); - if(!mouse.up)&&(id-files.first2) return; if (Form.height < 350) { MoveSize(OLD,OLD,OLD,350); return; } if (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; } GetProcessInfo(#Form, SelfInfo); //if win_size changed PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal); - DrawBar(127, 8, 1, 25, system.color.work_graph); - for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,system.color.work); - for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,system.color.work); - DrawBar(246,0,Form.cwidth - 297,12, system.color.work); //upper editbox - DrawBar(246,29,Form.cwidth - 297,5,system.color.work); //under editbox - DrawRectangle(246,12,Form.cwidth - 303,16,system.color.work_graph); + DrawBar(127, 8, 1, 25, col_graph); + for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,NULL); + for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,NULL); + DrawBar(246,0, Form.cwidth - 297,12, col_work); //upper editbox + DrawBar(246,29,Form.cwidth - 297,5, col_work); //lower editbox + DrawRectangle(246,12,Form.cwidth - 303,16,col_graph); DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal); //main rectangles - DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42,system.color.work_graph); + DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42,col_graph); DrawRectangle(0,39,Form.cwidth-1,Form.cheight - 40,col_palette[4]); //bg for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]); llist_copy(#files_active, #files); @@ -575,9 +570,9 @@ void DrawList() if (sort_num==1) sorting_arrow_x = files.w - 141 / 2 + files.x + 18; if (sort_num==2) sorting_arrow_x = files.x + files.w - 90; if (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w; - WriteText(sorting_arrow_x,files.y-12,0x80,system.color.work_graph,"\x19"); - DrawBar(files.x+files.w,files.y,1,files.h,system.color.work_graph); - if (two_panels) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,system.color.work_graph); + WriteText(sorting_arrow_x,files.y-12,0x80,col_graph,"\x19"); + DrawBar(files.x+files.w,files.y,1,files.h,col_graph); + if (two_panels) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,col_graph); } void DrawFilePanels() @@ -1112,7 +1107,7 @@ void NewElement_Form(byte crt, dword strng) new_file_ed.left = dform_x+24; edit_box_draw stdcall (#new_file_ed); DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff); - DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, system.color.work_graph); + DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, col_graph); } void FnProcess(byte N) diff --git a/programs/cmm/eolite/imgs/left_p.txt b/programs/cmm/eolite/imgs/left_p.txt index a1d6c536cb..53762719e2 100644 --- a/programs/cmm/eolite/imgs/left_p.txt +++ b/programs/cmm/eolite/imgs/left_p.txt @@ -1,5 +1,4 @@ unsigned char blue_hl[sizeof(file "imgs\blue_hl8.raw")]= FROM "imgs\blue_hl8.raw"; - dword blue_hl_pal[]= {0x0001699C,0x0000699C,0x00026A9C,0x0002699C, 0x00036A9C,0x00046B9C,0x00046A9C,0x00056B9D,0x00046B9D,0x00066C9D, 0x00066C9E,0x00056C9D,0x00076D9E,0x00086E9F,0x00066D9E,0x00086D9E, @@ -22,4 +21,14 @@ unsigned char devices[18*204]= FROM "imgs\dev.raw"; unsigned char factions[14*39] = FROM "imgs\actions.raw"; -unsigned char logo[] = FROM "imgs\logo.raw"; \ No newline at end of file +unsigned char logo[] = FROM "imgs\logo.raw"; +dword logo_pal = {0x0000FF00,0x007C047C,0x00940494,0x00903490,0x00B092AE, +0x00D43CD4,0x008B0C8B,0x00AE75AE,0x00DF6CDF,0x00AC14AC,0x00976993, +0x00CB47C8,0x00C434C4,0x00D444D4,0x00D44CD4,0x00DC58DC,0x00AA2CA9, +0x00840484,0x0095128D,0x00AA50AA,0x009C869C,0x00B41CB4,0x00A40CA4, +0x00B424B4,0x00CC3CCC,0x00925191,0x00BC2CBC,0x00C499C4,0x009C049C, +0x00C441B7,0x00967995,0x008C048C,0x007C1C7C,0x008A2689,0x00B72567, +0x00E96A1B,0x00B72491,0x00EC9404,0x00F69C04,0x00FCA404,0x00FCB404, +0x00FCB80A,0x00FCAC04,0x00AB1BAB,0x00940C94,0x009C0494,0x00770777, +0x00F4A404,0x00FCBD10,0x00FBBC17,0x00FCC417,0x00FCC628,0x00FCBE17, +0x00FBBD1F,0x00FCCC34,0x00FBB618,0x00B9A8B8}; \ No newline at end of file diff --git a/programs/cmm/eolite/imgs/logo.raw b/programs/cmm/eolite/imgs/logo.raw index 6ad86d5de7c9721a1c81014b972793a5db7df999..96fdd1a9b806a4c5e2bce231fa77132bb8e105ea 100644 GIT binary patch literal 7396 zcmds*YkQ(d5QVv;1{FaY5F#Q`6OAULvy=V*zidxc0}@3{d?sJEI?=wqeY*NWqoVw; zP5qJ4Y5EUf4bw9IKGyDZdw-w$&~bji1rMG64^Ri4q5FNu+9S_y@tfc2blh=Eg)2qw zL|o^(!JSm)VHkGZ#x8xUI|McQz6XGV>%s=CZ;2^E2luV47;OjV*w_?Tvwj2c&0>m1q|v<>=w zI952&8c+L3bJk-ItJX9Fo-)X;TWn=*bEsq3pqh`Mnr1(6L+XX80WwU}A@ACeo@LSL zB(kSz>sHPJu=-|*ZQBh^Gju2!A|MZOGwjW5Hy#bcRKe1q5P^=9L?)vp*?swD}wls5@#+^2lGT0g(M zY}U*C>BJ2JaZ95VYecS?Y;pD_+n_QqH(-)IgIncKgkIZP)o2?dy6A3Q|8={aYy%1b zL!V0{EEi0+6CuRT;|I}|M|~W}Wgls`yTu<`ambg;^?I}3Y&HzuESGs%v_(CUXs(-N z4U=W-)-FjBSDqAlBDw-tX@D*XN>~OXofl>Jm&iRX-iDCuS9k*bne78~1=l3u4IevvVm* z+(p%Gl3ba8NoH)KA)E{jD3R<`63doTx20)WrR_4JVqcwyoESX$n`c^C6s4@ZB+3?} z>uxZB)y}Y>VmZl`D)#|W0Oz0TX<7?5Q%5O**>I=mm=UnDoLaHx(3X?oqah6?J4xB#Q7mM(ZZy}TcO9p8_?55Iv0 zce7bYjZ`xojnGV0ubJ@gszkDuaYL?AQsc1>fHO-S;VzW>zR*AJBn8ZS^n#uL)xA#laAOu_R%%%|CT8PTv`${V6Ia(0O?#awR6riML5=q6>4m|- z?xS0|OOm`ur=38q*zF=8Go_CepP8xE_5gry_jCE?U%8ng#KZvHoyJ&g=gn;7VJrD0 z6uUs~@K25E2_Aht1MxVOmq;3}v}hcoBM7vKIck3$CR)Q*wp0EYfTxD3#Cz39U`*7T z4meXOlLl`c8gpUfBwyoS0dW4{5WL}lMyf*El=AfASwdRpiTCKStv3v?nN-h>p~dAV z0*Ni(sUx~n*+eZ5?0TCo#d%uThxLVrrWS3&yF7r#kjj>wFT9wpEw?u8HQ@#G@-;>A z=^AkRBy0lXK8FR=z(nOSokvZLZsz%Lo^?L>s#S&qsY-k!LU+&RU&I(P&RTC**E%vl zZ9PGZyF9Djxq+_9l=&mI^=G>F##c*q^}cO+703m~UDMIdMCs_pL*yo)xkBp_Xm0W| Gx&HxofDnZM literal 22188 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 F{tvN>a@ha? diff --git a/programs/cmm/eolite/imgs/png/Eolite-Sun.png b/programs/cmm/eolite/imgs/png/Eolite-Sun.png index 146ee1098b685e000feb06442401c76dd35d39f0..aba8def8c0150ad90f58f86c42c600009fd98f71 100644 GIT binary patch delta 2107 zcmXw)c|6qH8^^zM$vTQqhA>$&S(` zSKQYZ0RV6V^jrYI<1|3xn3=+Dlb{$z4(J*?I{Ntj4_Njejl{dAh5tC^$A3f-Nld0m;nIL z)CP!@JC7e@5d4H=Bm`sgRP&O!JdZ`qGoBjp|CazycfyH2W*9-@G9hszNZf2ZHG~u6 z#N=jFkAeSS82~uNxysO~8o#W9e^u76FiMbMGh=f=b9vew09ab}wQpM7&l}F-3@KLO z?mwTBsTpTChy2?34nJ#eeI@b;iT8NAnM}mbjt8x4+ed9Kj<~wB?Og;D4}TnC%Qm_M zUxi>3F~|-`u5bCg61G6;ivtq%&>@l)-(=gmoA*B2$U>EdyVdsA7o6EDxa$^T9NSg9 zi?E7x^e}I34y(TNhQK8fKpdLM+zz;#zpv+@CV-X9Yg-L8%q<_}vI`$!)k+~OHYBB3 z_M5q|A>tyg4-P=dBljsjxLaPI?jQNIT}a>(=^6-bx2?0iQJRMPa&`x6j})7k@|PB& zUz!qxw!{0CRh0k4g1M#zCB%DFWnU(n*k9aw+mp-SBMvpR8nmJ#=RO;LNqiZ`COMoL zmA6Ei6nrmOcTvj!CmY2=9$p=&*)tai8(4p8ZcXZ?1xIiv z<0VDt8KEpN)bQUZL!5jx#kF%w_R-llIR}**6*1ZZG>mJo#cVgh4%wX=HQ(|h@$ej% z-?|BMm|CVjDX~EHS{Ay;E@+kufeaT^Aewu7pL{O!%9)hg#;KMWuWd&9qGB6+F54D3 znA3*!<-tdX)5LPnRXtoyN_rjZ*4^I$j)p6F#?AnWSqDxfziy!jj%EEGzERC)cF#b! z#CoElBW7aV}-yRWk8Vy1A`$a0$5xcf-?D`;U~ zhMVo-MEN)@e7X4Y`?W}LTJ&^Y#I%3<>L_&IbTGgnF)xf9Uy_^QM*HV!l1>F5b%xNQ zBOM5XQTTDb35S{uI>igTQ>M;Y2>DF?smp<(Vei)Qt!hdvbKN^TmFh_*s&VQ%=s<8x z8X>rA(WFo|;QuCI42DD^Tl2-@3R8QnN0RwX1<;?a%O*TF+te=J;+od3Z#{3!TzPOf zc$%ylX}RKjBcgs(8%@VJv-4W`JW96v5_PD%N$se0+a6-FhxAc1oMBdXKSooW&cqJD zIQ%4RSZGn{lEdT{qsrvEX?Pp69q5%cJ>e=~54>3k;D6XbX@Gpww5ojob6B^`;L)E< z9vWKmK0}laY+jHidRonHJ6DI(^z>@SVu~zA7e}5Hi1t5O6k?T8xT6)_$!McTu(X^S z8zn!sb!ivYhlPQ{0c51YynZA@147F=PIGoAu6gY$ZtG;bmDhG^aZ73yQHR7#{)8`?C{-yqwffn~I$i+s@&* zFzB1@mR(GTE2WKS$EtR!k#1@*N6oezaabsPtE*yLAuM2mKOD9g2jr|&t%~Qo-Jc3H zU89SQD=4OvS_LRf_-GB^J6r|T4#tY`^)X{3elGLslq!dJ>A!_hYdGdQUw$t!OrMZx zr}*8Yk^NMg-nD|$Kxz;Bs)Uv&_idF2Moem9Nit0#`2i_cP8)|MAmAxHTp37nTwPJ5$~r55&xi^bP+Q| zA3+rRZB+xTsD$NEbnf>$76qG%&vJzmKQ08BWyXHQyhsN%U0#qD=m|E1&1%ADAIk~# zDDX$|GD&7MhX;6kX~62IU2o+1ZthFAWD+ibGO1IW#S&JR%F!y17Rd9>-zvXCtC6!^ z8FbuRd7^2r9P5pF1MUMamVJe4*}j;)dSP%=w?8<1i2WMxpjM?2DEUg2Wh#H;?y2wN zgV0C9#%FLHCISbtT^vQbnq9AKazwiOK5Dj09Z^%h#xK07zoD?^WN;UM$;_#qmM90P zCL0uM6@+Y@$-bUtp!AozRr<@>-cPLLr0Z!#;O}w|`j_hJ8}`*~_T1s9qzL*?rqG+p UwwXG*<;TCEzK*eWEgDPw7xkaU<^TWy delta 2569 zcmX|@c{tQ<7sr40ZR}(#(kN48OJfToOJo}|npDRP|ckMC(UjUE*hpfB!hXNd8z#si4#cz>7Fvln}rxU;l066r=N3sco zSP1}dAjHE-AeW|(U^e&f%pWJ9S&GaaX6w)V(~CEY!P!_2c>!?9E_(+6@MPC>sQLwj zuooTu!?7<2`vg==l7s_(7v!RV|2^@$j{qZor#}okk%ZwSF$hVFKY*O@+x{cA^Dpo( zyu#iho5ZfOO*vOEig5eOY>Few+2IlZTb%R*0R9vk3p1Bng$?;a=FhFA5=P-R?u(YG zsc=;OY|GbiP64?=_`!kRSA%YI73wyFA=lcox)r|I=Evw+n!;5s_r+_xd-gu-$$U|U z{pfdxa9q4ePI6g`&w)YC9;4H=f)VEVwe``XLTpI!7Yu%OcF4i4RQv<4)!H@TFU^y> zpp(X^R=j0;YXze?-TqRm>W7Fk`o8LQ3TNoSefD*d3%5BShepLkXZoO8H7KCK>F zjD_U9GQvCxmG4$A$gPkbjUuJc`^9*?MRhFsV39nz{|*YtY{YSNPAKyqJsBiEb4 zxS)S*CvoDhi1FMc6zocgw8Tt)zRgq3oP2eVC}vi$K`E$jU_LtRl_0Tr5hW+*2&bBU>%3x;K z!xRFWx69c4vc-jIX<-K)}Zp4GF zK5YntNb2H*Qs8s*>w3)Q-y*^(#dX=CcTWNbS3>eC6#>BiqXL zGfqS3Ct(o7qs)J#n8rSK(VQBWTh@E@AiH`MH_q+*>uO{Rz$irAv?j_$e$S+7z?EPp zI=|=)Yi=_*XUtRLC0ofSijWK!UR6Uo;i|DnMaNSgm0s_o_O~`7Ubf5Jamm9-3jYUG z2FXlEl6?LmSkIx$f<6Zs3s$V!oCIb7sRh-9fh`~V<1u&`eq{Hn5wzzUHtlZ3h6cQ0 zq#^YBbr0+dRec@Q$+rtKy%Rq6qbc>$C;D6)W6!Ghp2=wZaGF=In`$b5z1zP~^wY09 zl-X*%f`^pm4w(nG6XC@t(poeyC*8mOm0+)2JhkEpvB8C^=HXmy6aqVkxQXAbEj3iT z>#{r)KA}tMpXU8C+o4!57fjy`eBbotYNr*KaP!n|M28!BJU@J0K9h;TPl%tAeCax+ zLEInHEP;&kseqgHZn=>h*^ z8YP&!#B67Yn~iPndGSmlcF5tW#OV>n)o$KKd+#jBQM#0~h5@3*!n$fX<-ls)mqo$R zhCSWquOy7zi#+ZmQ9(%%ejYOuEa<~O?apK4GK-?4^@p(z9{3e=NS0|tLi|F2*Wc8U zyS)wKLeZmqHOS9`{QHPoCFzJ9^3_f*7#80 zx|qB$uW9^Rk^4It9xCVd_V$a3j*nY=o7_m{@|}$uT#%xgVU}X7m0qf!+du+3u8&wa zP20@P%*B;l@7t9ZM+elm6Txwq%X zq?W(swxx+!1+!UjpelD0PLHJA+nXsA zQhZLF&lsy!f3`@c58PA5UzUZTf$OQapl^1hiL^&WA0G!OnX1vF31fQbi-`vz2wlrUXdhG2Sc% ze!d2^Ct~@ZYJcfzoNF*4#p8*lG~r{XUYgDqj3{r`89SyRIsQ1a?z!NJCY{*JJW$lj z(~uuy%B=HHk=vT-=1&xoh|R4@Wz?i)XUb&%&7scVH+ODF3)83i;tt;z!t&_b|DgU*sGA(nb^P2t=TrO;Ja)VI1fpw}cFW3e!yxf@orclF-QhmDhbjf%&i zm~>~q?*iZQXs4>`=&$BLN^TB80P&< zy;vdi0*>72cuP}sOUEix~Mzp3e$xH#ENQnOQ?7^<< z$%a~Et$?8C29@LtInLQREOO|w?6%g~hGzsY5?(c-AUo%3{ZlOv$nbpC2U4w@BuG5$ zs3e>6^3ZoE7sHOsOJZ)_|Moa}-dwy*@qL5DG>XbFYyh8JP0t|6b( z3#rZxOSkFh^*EMS=8E5Ub1y~B8`!18qt1#8yzZx4$ L2aB5Xo=N`&@h!&Q diff --git a/programs/cmm/eolite/include/about.h b/programs/cmm/eolite/include/about.h index 46e566d412..18e1ce263e 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -43,7 +43,8 @@ void about_dialog() DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,440,200+GetSkinHeight(),0x34,system.color.work,0); GetProcessInfo(#about_form, SelfInfo); if (about_form.status_window>2) break; - _PutImage(10, 23, 86, 86, #logo); + logo_pal[0] = system.color.work; + PutPaletteImage(#logo,86,86,10,23,8,#logo_pal); WriteTextB(112,16,0x82,0xD49CD2,ABOUT_TITLE); WriteTextB(110,14,0x82,0xBF40BF,ABOUT_TITLE); WriteTextLines(110,53,10010000b,0,DEVELOPERS_TEXT,21); diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index e8854ec9ad..1323c0e875 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -23,7 +23,7 @@ void Scroll() { if (sc_slider_h > sc_h-sc_slider_y+56) || (files.first+files.visible>=files.count) sc_slider_y= Form.cheight - 19 - sc_slider_h; //для большого списка } //slider - DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,system.color.work_graph); + DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,col_graph); DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2,0xFEFEFE,col_padding); if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_palette[13-i]); if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_palette[i]); @@ -45,7 +45,7 @@ void Scroll() { void DrawFlatButton(dword x,y,width,height,id,text) { - DrawRectangle(x,y,width,height,system.color.work_graph); + DrawRectangle(x,y,width,height,col_graph); DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding); PutPixel(x+width-1, y+1, col_padding); DrawFilledBar(x+2, y+2, width-3, height-3); @@ -54,7 +54,7 @@ void DrawFlatButton(dword x,y,width,height,id,text) WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,MixColors(system.color.work_text,0xFFFfff,210),text); } else { - DrawRectangle3D(x-1,y-1,width+2,height+2,system.color.work,MixColors(system.color.work,system.color.work_graph,200)); + DrawRectangle3D(x-1,y-1,width+2,height+2,system.color.work,MixColors(system.color.work,col_graph,200)); WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,MixColors(system.color.work_text,0xFFFfff,210),text); } } @@ -76,7 +76,7 @@ void DrawEolitePopup(dword b1_text, b2_text) int button_margin = form_w - b1_len - b2_len / 3; int b1_x = dform_x + button_margin; int b2_x = dform_x + button_margin + b1_len + button_margin; - DrawPopup(dform_x, 160, form_w, 90, 1, system.color.work, system.color.work_graph); + DrawPopup(dform_x, 160, form_w, 90, 1, system.color.work, col_graph); DrawFlatButton(b1_x, 210, b1_len, 24, 301, b1_text); DrawFlatButton(b2_x, 210, b2_len, 24, 302, b2_text); } \ No newline at end of file diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index 554a3840f2..13735df22b 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -201,10 +201,10 @@ void Tip(int y, dword caption, id, arrow) { DrawBar(17,y,160,1,0xEFEDEE); DrawFilledBar(17, y+1, 160, 16); - WriteText(25,y+5,0x80,system.color.work_text,caption); + WriteText(25,y+5,0x80,0x000000,caption); if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button - WriteText(165,y+5,0x80,system.color.work_text,arrow); //arrow - DrawBar(17,y+17,160,1,system.color.work_graph); + WriteText(165,y+5,0x80,0x000000,arrow); //arrow + DrawBar(17,y+17,160,1,col_graph); } void ActionsDraw() diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h index 597c7999d6..3f30cacc2e 100644 --- a/programs/cmm/eolite/include/menu.h +++ b/programs/cmm/eolite/include/menu.h @@ -88,7 +88,7 @@ void FileMenu() if (menu_call_mouse) DefineAndDrawWindow(mouse.x+Form.left+5, mouse.y+Form.top+GetSkinHeight(),menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF); else DefineAndDrawWindow(Form.left+files.x+15, files.item_h*files.cur_y+files.y+Form.top+30,menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF); GetProcessInfo(#MenuForm, SelfInfo); - DrawRectangle(0,0,menu.w+1,menu.h+2,system.color.work_graph); + DrawRectangle(0,0,menu.w+1,menu.h+2,col_graph); DrawBar(1,1,menu.w,1,0xFFFfff); DrawPopupShadow(1,1,menu.w,menu.h,0); MenuListRedraw(); @@ -110,10 +110,10 @@ void MenuListRedraw() } else { - DrawBar(2,start_y+2,menu.w-1,menu.item_h,system.color.work); + DrawBar(2,start_y+2,menu.w-1,menu.item_h,col_work); WriteText(8,start_y+menu.text_y+4,menu.font_type,0xf2f2f2,file_captions[index*3]); } - WriteText(7, start_y + menu.text_y + 3, menu.font_type, system.color.work_text, file_captions[index*3]); + WriteText(7, start_y + menu.text_y + 3, menu.font_type, 0, file_captions[index*3]); WriteText(-strlen(file_captions[index*3+1])-1*menu.font_w + menu.w, start_y + menu.text_y + 3, menu.font_type, 0x888888, file_captions[index*3+1]); start_y+=menu.item_h; } diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index ffd0a878e3..8f7957f0ed 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -145,14 +145,17 @@ void Write_Error(int error_number) void SetAppColors() { - system.color.work = 0xE4DFE1; - system.color.work_text = 0; - system.color.work_graph = 0x7E87A3; //A0A0B8; - system.color.work_button = 0x7E87A3; - system.color.work_button_text = 0x000000; + system.color.get(); + //system.color.work = 0xE4DFE1; + //system.color.work_text = 0; + //system.color.work_graph = 0x7E87A3; //A0A0B8; + //system.color.work_button = 0x7E87A3; + //system.color.work_button_text = 0x000000 + col_work = 0xE4DFE1; col_padding = 0xC8C9C9; col_selec = 0x94AECE; col_lpanel = 0x00699C; + col_graph = 0x7E87A3; } diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 6846e21077..f637c71c46 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.39" -#define ABOUT_TITLE "EOLITE 3.39" +#define TITLE "Eolite File Manager v3.4" +#define ABOUT_TITLE "EOLITE 3.4" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 84e0fcf691..d4941a8070 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -81,13 +81,14 @@ else if (is_checked == 1) { DrawWideRectangle(x+1, y+1, w-1, h-1, 2, 0xffffff); - DrawBar(x+3, y+3, w-5, h-5, system.color.work_button); //0x13A113 + DrawBar(x+3, y+3, w-5, h-5, 0x00C000); //0x13A113 } else if (is_checked == 2) //not active { DrawWideRectangle(x+1, y+1, w-1, h-1, 2, 0xffffff); DrawBar(x+3, y+3, w-5, h-5, 0x888888); } + DrawRectangle3D(x-1,y-1,w+2,h+2,system.color.work_dark,system.color.work_light); } :void MoreLessBox(dword x,y, bt_id_more, bt_id_less, value, text) @@ -100,9 +101,10 @@ DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xffffff); WriteText(x+6, SIZE / 2 + y -3, 0x80, 0x000000, itoa(value)); - DrawCaptButton(VALUE_FIELD_W + x + 1, y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+"); - DrawCaptButton(VALUE_FIELD_W + x + SIZE + 2, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-"); + DrawCaptButton(VALUE_FIELD_W + x, y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+"); + DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-"); WriteText(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -3, 0x80, system.color.work_text, text); + DrawRectangle3D(x-1,y-1,VALUE_FIELD_W+SIZE+SIZE+2,SIZE+2,system.color.work_dark,system.color.work_light); } :void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent) diff --git a/programs/cmm/lib/system.h b/programs/cmm/lib/system.h index 4e6afa61c9..18ddbcde88 100644 --- a/programs/cmm/lib/system.h +++ b/programs/cmm/lib/system.h @@ -6,8 +6,8 @@ dword nonset1, nonset2, - work_light, work_dark, + work_light, nonset3, work, work_button, diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png b/programs/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png index d9582395d1578036236f17fd4508632aa9318c96..84268ca6822af26a6013474a5fe2c8f088aa084e 100644 GIT binary patch delta 1295 zcmV+q1@QXw2cim)B!32UQchC<000000U4n;2LJ#B*GWV{RCt{2m|sX+R~*NGxw)4c z{1+0_1`Qpe^+>koB3Q`0gN;@B%Ova>$ z477}n)gZB?>o#Jl1>Hd&VN1UeD3#me&^(uoJb}o zCm{!s05C8xa5C6nFp#KqaBy&P|6>#g1OOl!jiSd$BvM#dSX5M$5s%^W?>++nBIMt` zIUNiJgTWwv3z3fG!$inWt0dGb_obe8j^p@m7xHem+wFEoqtRe6h&!oD1=w5wP~_cl zI5s(s!=t1C7Jr0F(=@&J7ii{4e4vYJS-_X?htSkDoxW@zJLA@wSRkOLYxNxsZ<(^#a`ZB zWLHma$pcEwWI4k@|Di8sS15)sb3CQMMGRLwFl%ZS*O zC{+_CTcchWKMr+&(5#we_HTXqqOMiIUVFBpnq~F}&HVXC@v|(;vTXS6ZUA^u*Q!hr z9>SAF)}M)FG8t~4gy-vw@F*F%`sd~4q2qDw*?&r2itrF0$@2UF&<|$9je5KVLVkbH zteP!^1(-G{aKdvHtP50^Z=mbZ8FkcqaGUdf=;2oECoA$DA)Zv@AdP) z$RAcF1rw6%vT*+|Gw=Qjy>5SU=V5tyxsX3HU$-BF2jT_%$4tL}1;U^AGg5yt%>4i6 ze}4w}la=6H>vzieS+@&LSQb3XvQO?j%*kJ=RA$9r)K36NUq5|5A8soYiqr|m<v24ShlYmQ+S%1~!%X{k=98-E`kpPrtssHmu_suGVMg)NuMF?>VYa6{XG zMu&%oS(aT}TSE&GU%$y@>hJHz&I0Lly3x^5bQczn-|O{iwOZtiJ5k&A*jis-?{c}& z9}(jI5{V?;g$XHgt-G7k^$= zk!&^_!!Smp5nUvOyx;FvC=@H}KR&fTU0hsrI-SVb_SoulI+vH1JsywMYHec9VC=98~_hnBY*zNxtVem5HRcsvZlSglrz#X^!K@+U>$g_$qypC=SGfuDc( z)5@Nn9+%6NNF>y1wb5vtnwla>GJiimA5lj= zyIqDbT-48VQ9t=Qz50oC8ugQ})2N@=`J#Rbb>8de-(Vy;E5F7WzyJUM00>D%PDHLk FV1gfuh-&}< delta 989 zcmV<310wvQ3iAh$B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M{WJyFp zR9Hvtmd{HRQ5?Y6n_f2v6$!!)9(0R5^usyqMJfxbQ<3KgkAM3Y1a%P1TNn!=>_H(C z58}a#M%2~vBDh0E_|nP_o2k0V#g}oV#Q8u6-D3LWM9+^78A710i%R(X1a}Yv zb^N5yFBFLjZc0)g2t^RnmLaJxLkMy!U5R`_G|+pO6n}mw>T}7A@moRXpAF4VO&64s zcKcr~q{T)%tgaCMTlp#HlwS$8@wy}!LVR=19rN*sEJHa?p~Oezck=vx2;g-^`e3Hu zvBENe`nWqmLk@<~#{`3iYZ=oG7 z(h}mQqJK?3m&_Qy6?FdD(EQYNK`Cjs?;g|UNHB!>=D&sbV!c8Ue&Ed8g(KYYJHE@` z@ZE^`66phdNs!e$%W_<#8L^7698MEW9EDwTtS1A1*{W@Z>- zdwZL(a9^fPW=}3S7b#K)W-&K6$3i0g{{H^O#YKq*pFcf4-PhN*wY3%Lvtj04IyUV> zQ^10(SJsbn}Ye;mx@GFF`M0ZoeBHbs3dnK6DV==`&x`KjrG0`M+* zXp=<~ALsx0e)>rL{q*tAeLrood_QeS-uZqie|-7=b-te|DHeYNKG$jiG8~D900000 LNkvXXu0mjf