From 36119794f49cdb4a3317a46cdd98483a4b407c1f Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 26 May 2020 15:07:13 +0000 Subject: [PATCH] Eolite 4.35: file selection with SHIFT holded, new /rd icon git-svn-id: svn://kolibrios.org@7989 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 39 +++++++++-- programs/cmm/eolite/imgs/dev.raw | Bin 11016 -> 12960 bytes programs/cmm/eolite/imgs/png/dev.png | Bin 2823 -> 2453 bytes programs/cmm/eolite/include/about.h | 2 +- programs/cmm/eolite/include/left_panel.h | 73 +++++++++++---------- programs/cmm/eolite/include/translations.h | 4 +- programs/cmm/kf_font_viewer/font_viewer.c | 2 +- 7 files changed, 77 insertions(+), 43 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 62de1a3252..9d296d7a3f 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -235,13 +235,24 @@ void main() mouse.get(); ProceedMouseGestures(); + + GetKeyModifier(); + if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) + if (mouse.key&MOUSE_LEFT) && (mouse.up) { + files.ProcessMouse(mouse.x, mouse.y); + EventChooseFile(files.cur_y); + List_ReDraw(); + break; + } if (files.MouseOver(mouse.x, mouse.y)) { //select file if (mouse.key&MOUSE_LEFT) && (mouse.up) { - if (files.ProcessMouse(mouse.x, mouse.y)) List_ReDraw(); else { + if (files.ProcessMouse(mouse.x, mouse.y)) { + List_ReDraw(); + } else { if (mouse.y - files.y / files.item_h + files.first == files.cur_y) Open(0); } } @@ -405,6 +416,18 @@ void main() break; } + if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) { + if (key_scancode == SCAN_CODE_DOWN) { + EventChooseFile(files.cur_y); + files.KeyDown(); + } else if (key_scancode == SCAN_CODE_UP) { + EventChooseFile(files.cur_y); + files.KeyUp(); + } else break; + List_ReDraw(); + break; + } + if (files.ProcessKey(key_scancode)) { List_ReDraw(); @@ -489,11 +512,9 @@ void main() Del_Form(); break; case SCAN_CODE_INS: - if (getElementSelectedFlag(files.cur_y) == true) setElementSelectedFlag(files.cur_y, false); - else setElementSelectedFlag(files.cur_y, true); + EventChooseFile(files.cur_y); files.KeyDown(); List_ReDraw(); - DrawStatusBar(); break; case SCAN_CODE_F1...SCAN_CODE_F10: FnProcess(key_scancode-58); @@ -1314,4 +1335,14 @@ char line_param[4096+5]; } } +void EventChooseFile(int _id) +{ + if (getElementSelectedFlag(_id) == true) { + setElementSelectedFlag(_id, false); + } else { + setElementSelectedFlag(_id, true); + } + DrawStatusBar(); +} + stop: diff --git a/programs/cmm/eolite/imgs/dev.raw b/programs/cmm/eolite/imgs/dev.raw index bf5f75d732ccfd7e1b0a93a49baf9e4f707ac73e..c9d61c2f5e16da435717680b01dacb346c15f33d 100644 GIT binary patch literal 12960 zcmeI2Z){g*6~}qu3*uXS;R`j<1Q%z}7^6abql6d%|weag-`_^~6+c)jq!U`q7u5EhxXze=*NNH8QqfmO^JTGZ%sO}&9 za*~ukk=$R|xa#hP##IOR?MjlLwY&#Kl9qD%z+mU@mbShzNhZulP;!Do{TF_bXT(bXU z!5?{YU-HA<$)_LBOcmsl4P}#$w>9-8OL_|a%Nh$30YS!f+)^_1lbTD-54_re5K%%b zNf;4i?4etsruEK7W*nM3t-1Qvtz8ou&yIUO`P`O)(VGh+7Q3ay`o^xCVSh6;0r|tr zC5U5hY8nI?zwR(@mO_8&KnvhQhsN$7_(EsLXM0*kGm8CAZ3_qv9->3+wL3q7fDCLN z#fU7~K7Q=_vMj`b&5K9%uDC4dYim9gM;v(g!7EfA#DcK-5rJ%1xMP~SwnhqHG4)Gv zIk|D3ElS8coi9K!O2Of|@^3QAIMBKt#ZuP(>Xt|4z*iv@BePft6jIpn$8ITohejxz zMd1?)Q>n2qB4Wc)v#jRTC3}2Kr5>AoZW7RMox1sp1@pF6B9_ zshW7TVzEvhu?c(}bguK?uU#{LZe>OJOh$Ap@xr-1acCp(T(3&NC*r3A<%j79$J z)urwe$lLp`JO{FfD5?(YVt;-+=RW)q+*A?k{Az8&PY+nq3-^$$$l;Nn->E&(*AUcG z&mIIMH)453>G0yki%OnYP^=GCwdOEOWg%{z!T$63Y+k)|&7!#o^{`0N1BU=?@Wo+^(#Tw(Wt=cVd} z4@!8v?C*WU6CNE8H2-CC$v8{l&*7cZr}M-Gg-qd46lXm5@@6x;J^aC6iPMpRw)c2u~fY+cm1Un!K%U%$HSW<-k}vqD#5s zmA5!d{a|NS4vch0Lfr#}s52r&oe}Bkj3_#wQc@a4J0p(zP@NG`3ZdM{B;FaJ5rd~b z%8)~`kTxFSM@oe?N6Juf2R!p?{?%mNiod3v1@ zfi{HIE$DSd0JFleg22?yNKuNFZD%B&p|Vvtw$4c;idP_>PV7{u%S|Dqhd!RgAylD4 zih>qVXQU|TA+9qL0WA`CMp8kGWOYV7&?529hy|h8WGs0)BNh~rvok^nn_iyIh>hiv zjCV#X!nI)|W_3n9L|2pr!_G)55`wlf5ZV4^o)alb!npr$p$MBdHnYiM2RM5H4Dl$|*Q=MRkn)6^&o*WF^7PUA@Ym!=hp<^>h*-ZMy>hof7}( zUgPDz%L--Qz(2gi>>?YJMwXuJ5y(g&3a1uF z*=~jHjNoZ063EjT@hD>D>5N!Pb@9uwXlF!q6?Sao`eA>Hc1BzvM`2mk+8*hQFw2$0 zB}x>16iy(mldv-aVgr4^UCxs!YV} zFrxgYcK1_tsxURi>^bQP!8!iU90v#T8XR2+FE>)#A{f;Oz>S>waBs4)M2R4_GeW8= zR#ZGaH>+@fN^c}`kpVWOvU(h{+tO^TEXsC9^2Z7(PL}E-fjpfNoI&^|;?`KWe7W1D zh=Ln;4G14bHa~JXu|9$W_lpqiHM*`Vox#-6`ir_T+8rpmfo@mbP72|a>AXZne8Aml z;xK1tM4$q(zFy|rv_l=Ag69X9gs6C1gxRY|#oHpxda(*M=4gxHquronyCEttHjemf zqu3UCDrnYN@cB;)PmD!JDEDz!6c1F`vql@pvDdf4&csFKdp>MbT;%Wh=#+8pQl)SK zj4aF3k#&f7M(`Ac!ZTjZ&WNR+TJbw-%+ne1sGOaVkjm2;@u-}g5l4A@$YXPATLdGW b5mB77k8r-&x{q*eg!h!UNO%|`*Nx@hk^OK6 literal 11016 zcmeI1Z%ori7{`6*yJc^d_-2b{iP?+2;FWWUFE-q=M6<=QMWAtWVGbrLPGp)@3r0~u zk%2MHKUk|MGbmM=Wr~Q1+8{baa122T0=A`;@>l4R(e4XRxSjX=^?EF3o0H3v``%*=^qwe{^UrN ztGi7==;I^D{e0`I=P$nQte)d2n$uJ^x2gP%oRX#Qn%7}XU4((Qy)U&Mm_1>+vv2I1 zckqWdW``BaXX6&kL}J#Pc?2v4<94r zrywAijK1nA&FAGCDe1Q&k1) z=;&y!uZLAyi!k2sORbi|Hn1iTzu!-k*Xt$9VzHRbX3X~XxcKeC$NsS~iU-JMft+i0 z$29w6Y9D9p+`-1l!NGABqA-FinVFgB;ZGpV{v$)z)7GvMC{!$>#!rSRAgsqy7Jm&a z`Lj<23b`IOHV?Q5V3^`_(FU*+Z7!Va(&-X^M>A}o#=_RbB1GZT+H>`~U3*QNe0DPs zgwctr&Ydz91}zqyJ|P2*7eJvW2fx+NZg>Yh1|3(6?iXjl z;VBBn6dcTw)7I7o3O!Nv$J2BvT8*cGC{kEZYsfCig+!q&6qTK_Mq;5TYz$YR+b|`e zGS<3uO-|`1!l0beO@u*Eco^t~Tc&NJ*R@c&Fs@>Jt{Gojfz+oK!L1`!~D_^4=nI$;rhiuZ*u`snlcB<6Lxr$x;_l{CLNY1&jVsBg4X z{?_FvQTM|Kazhw@%-V`#j9}XmLjb~fYHVz5NTK0hK0Gz!KX(;an~)H_Y?<5;!=DT9 z0`dHat}nz8^|-TBZqJZ9eY{X^y16hI*7)<%w*&|sP}1`h`LqFfucc;2UYrW#q#I4i z3A(m>dn#Xtiu0$A<)$Cb-j=&7HPyJO&*K!VwW;Bb{aW1er95@kl8=x0g7^D;pb(=q zT?+9qkK0WYVg$QrEf#VW9n1lOT#UL|SuU6^Md#YRW8z$QZ`}lP<-$4MK&^=Sh(8zk z^xe$bxpRH|7g~!m7!p^Be=qZk5U$(vVK0bZ6Aa>yIv58f=dJPE7wOo+#g_lDW6;>1wb**ok-w0xW?WyZQtTc2$>;5WH0$ zVLrfE-xI{}h7n<7ES@=39N^5@@mUP-XyX|O2eSfB@v%L_{Kf=7%{@dcB_hPs=m@KQ zt*NdCNDU4lDjF;{KwAZcEI?E=SWvW2I7F#vutWhADBaUB4OW*5CBR~w1V$|-5nwSD zio)K)>Z00Qpd`BJKbea(SYd~>0ra|t&9fbv@Rsm}>KWF(Bi%s+<3-({{2s|)J9b5e zFuV$CV383Y!x|!=Rl`!D(qT$SG(0(ictdADJA&X~>eZ(~Eb`vu%a=%Vn8G>?#Q(-E zm_ov8umG_oG#l>AJ&dIkHCSww&Q6qkdu*1{0fd7=m5V@_mXZjtm?B+No#HjvX;7R7 zOB5~(j=BbmU?2^_;AYq0w@nXKG+2biy9R-vp^tVB#I}14zq%y0{BeI)AV3He96s{W z^@ZyBc%o){z5-zj$O_vvg%J|lJA!+c8)ASH2nQb%Q&Pf8j))-;2|*zR$%a$;^?xE} zB64z)QE~wmv(J!{3$U0Ka!s63L4ZXJs|Hn`3KG8Oegm_DP|{F6Dwr7wgM=W+-LFW2pNg=E L_M;a0503l^QdB}^ diff --git a/programs/cmm/eolite/imgs/png/dev.png b/programs/cmm/eolite/imgs/png/dev.png index 81887115eded102b1f9e3a3de11e0396d612ba34..638cac172f60313e4d0f9f5a0bee20ceebfb7804 100644 GIT binary patch literal 2453 zcmd6o`9IT-1IH)SC?!XvK3(P*N#*vbzOLEiXd7WjuE?BI$Qg6xzOPk|%{4iPnq#6# zn_CHmLXvaCAwelY5C|k>gfKuKP~^aCVBUk& ze$ll80`Y>7CKfQ@KUpn}+W`PW7LyKh4M!ra!pbIC%d8(iesVaR#f8;P)&`Bn*j&PF zK8%a6`G)nzX&RcpX?^!)YHoUZ`s3&XiTElgG~C)5x53`%>iI+}e={^R-cIkyBfKbL zto>SLhkYM>H~G)x`Wh&G_4jgLRef_+9o5p&7icpEfKh*ZCb(-E0LtilIY1L`W!jyR z>*QG}0|2eL-JEmtbHL{@kpBQEfez3cP?dFtBPBrR%f(O00Fc0*4=^)#3hj63%Ch~l zZVfn?Ox3};Ukvm{HP>qX+Iuevq=>O+F>>6!FSC1p{`~O8-cp& zQSVB=mU3XHFgm>;3&;gT;E-+TQb9waKL0RK;1{-!KFW^#%&H6k1hUKFe&*RD7@Z000?p0MKOvL95#! z@)~rVod7JnoSKhZpN(Ca)c|I|z*y4UM@8n4!karKnm>*-&rDL{TI;c8waK~UnvM$KpYl#-Ie}PyXQed9g5;20>{U_JTUsERL+}Oi zk#TvQz1cQ7S$(+7?WvUIiDY0oQHzq885=*47nhcX$32Od`W%$q7^Ku62n;-S3h)c` z@V2vZ-S2wPSnE<%YgHU+$s99h7MjzNQ56BGmY_R78%=&O49kNJ2WNG<%Krwan(E5e z0GBK9ex=F|C8r{#^=7&7)Jsmaf&dvj83|fsufOeeIN00&vp9X}o*>X+q>+KH#gni7 zxgnlnFv*U$&9qkg+CU_hoj{|X^1SVNGBJ(#OsN~p(0^9sa2_FVBXi9Z(k%rR7UhEY zFNq5s7R_Emr19bL>B!6KrZ!-u+K;1B(P;VC{5?%$TdaVwpw$7p^YOxvf%%r!w|xVl zoGFcvx0ljvgGISf<1(tHtu2djq|MX(iuYu`iR8X|d>qdHW^8W}_S%6R{nq1-L!uC~4AreM&9x80e})A|Lxf7e8ce2|0{ zNVAo+4&DAWP6$Z35$B@;3FAQan39GC%ti4*T{RtW#MLC%r+&zo-qWV9yb7y#E%vjw z6sRk4hwI!_t0y$WPptB{Yn1QfTC}RC+UFUOmbXYg+9QLz0=LXCU$NakLx{W=aPMO+ zp~2tt%n)s(QcZ^6B_F!~l_qea@qgBWq;z%;)oMpzW9oJ@;gFSd;&B`Ek>!(kMvNji zxNqhD&c4Ro*uB73fkVO!{;5!il`>qg%WveUtVq93P^*^wq{oF&*JS(aVjobc*QsLz zvyLG!CG8F2N?+jw;}v#l{Nln%hQww7pC}9Sa{kTg(QmjYI!|zF=9s~Y{o~Zm>Ii;T zOtAcI+++kuOSzpIj5z}%(Jz9N1SV`;b!``}!$<{3G__m29zPE`3whx}Q&pV2K$~>< zhhh(1YVhT#>iB^&TF0$%##eOoLld9c2X6n7QkTB*dJV}KX59~bt>-aUe5GR3K5+c< z^E(#m32K(gws(26JGXYt26!($4>~i?aMjpZD!vNCUyYsnFizr&k#YLLa1@bI1wGKC zuRSbLwUmIJ(Lg+;OW{wQ%^gyVJ8#r}PK*XrQIEA?q@+Cq=dw5+IGI@_d? zV!ls!DZuKFZLi-eY#7u>YUo4arIVBw^D|xT%%m%)>DDA7`20U-3ivY@>dUmXnplO|GfPz{ z)G{;~I*+@SlU!Q%HK{a^k)DbA*NJ)36d*$DS+PX#<~M_f4>9 z0sUx$fz#+r?b5Ad%$ris64|B{F>{tU2CM$obg5U-*py^8guq}Gn!~A3$35bBHTc0F;VD8xkWO& zE@a0Fy&S2O11@M_uwbG}uqnCNCqfq|baEf*5&8tWccdf2>#!ZTQ0~9)GlH2J)aW_j F{{F2fAmK?YF37c@vWr9-t4>1rv4TAPS_ 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 Z{{=#Lfz8YGV^shE002ovPDHLkV1n=Form.cwidth-100) && (Form.cwidth) { - DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, draw_h, 0xFFFFFF); + DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, DEV_H_HOR, 0xFFFFFF); draw_x = 2; - draw_y += draw_h; + draw_y += DEV_H_HOR; } } else { - DrawBar(draw_x,draw_y,6,draw_h+1,0xFFFFFF); - DrawBar(draw_x+6+18,draw_y,160-6-18,draw_h+1,0xFFFFFF); + DrawBar(draw_x,draw_y,6,DEV_H+1,0xFFFFFF); + DrawBar(draw_x+6+18,draw_y,160-6-18,DEV_H+1,0xFFFFFF); DefineButton(draw_x,draw_y,159,16,100+i+BT_HIDE,0xFFFFFF); if (show_dev_name.checked) { @@ -166,16 +167,18 @@ void _SystemDiscs::Draw() if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#dev_name); WriteText(draw_x+29,draw_y+5,0x80,0,#dev_name); } - _PutImage(draw_x+6,draw_y, 18,17, is_active*6+dev_icon*17*18*3+#devices); - draw_y += draw_h; + _PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices); + draw_y += DEV_H; } } if (two_panels.checked) { - DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, draw_h, 0xFFFFFF); + DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, DEV_H_HOR, 0xFFFFFF); DefineButton(Form.cwidth - 23, draw_y+2, 17,16, 60+BT_HIDE, 0xCCCccc); _PutImage(Form.cwidth - 21, draw_y+4, 14,13, 2*14*13*3+#factions); - files.y = draw_y + draw_h + 17; + files.y = draw_y + DEV_H_HOR + 17; + } else { + DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff); } } @@ -225,12 +228,12 @@ void Tip(int y, dword caption, id, arrow) void ActionsDraw() { int i; - int actions_y= SystemDiscs.list.count*16+108, lineh=16; + int actions_y= SystemDiscs.list.count*DEV_H+108; Tip(actions_y-18, T_ACTIONS, 77, ""); //заголовок - for (i=0; actions[i*3]!=0; i++, actions_y+=lineh) + for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H) { - DrawBar(17,actions_y,160,lineh,0xFFFFFF); //белое - DefineButton(17,actions_y,159,lineh,actions[i*3]+BT_HIDE,0xE4DFE1); + DrawBar(17,actions_y,160,DEV_H,0xFFFFFF); //белое + DefineButton(17,actions_y,159,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1); WriteText(45,actions_y+4,0x80,0,actions[i*3+1]); WriteText(-strlen(actions[i*3+2])*6+170,actions_y+4,0x80,0x999999,actions[i*3+2]); _PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions); @@ -239,8 +242,8 @@ void ActionsDraw() void DrawLeftPanelBg() { - int actions_y = SystemDiscs.list.count*16; - int start_y = actions_y+156; + int actions_y = SystemDiscs.list.count*DEV_H; + int start_y = actions_y+159; int area_h; DrawBar(2,41,190,15,col.lpanel); //синий прямоугольник - над девайсами DrawBar(17,actions_y+75,160,15,col.lpanel); //синий прямоугольник - под девайсами diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 7d2ffca9f2..cdb52b2e14 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager 4.3" -#define ABOUT_TITLE "EOLITE 4.3" +#define TITLE "Eolite File Manager 4.35" +#define ABOUT_TITLE "EOLITE 4.35" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/kf_font_viewer/font_viewer.c b/programs/cmm/kf_font_viewer/font_viewer.c index 0367c462ea..7c6bdd9290 100644 --- a/programs/cmm/kf_font_viewer/font_viewer.c +++ b/programs/cmm/kf_font_viewer/font_viewer.c @@ -4,7 +4,7 @@ #include "../lib/gui.h" #define PANELH 28 -#define WIN_W 490 +#define WIN_W 520 #define WIN_H 315 #define BASE_TAB_BUTTON_ID 97