From 0cb57998a69a896b2e29d236988ca950a35a12ee Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 14 Jun 2021 23:33:54 +0000 Subject: [PATCH] FKM2 (Eolite 5 beta): a new two panes mode git-svn-id: svn://kolibrios.org@8854 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/ca/settings/icon.ini | 4 +- data/ca/settings/menu.dat | 2 +- data/common/File Managers/{efm => kfm2} | Bin data/common/icons16.png | Bin 10268 -> 10264 bytes data/eng/settings/icon.ini | 4 +- data/eng/settings/menu.dat | 2 +- data/et/settings/icon.ini | 4 +- data/et/settings/menu.dat | 3 +- data/it/settings/icon.ini | 4 +- data/it/settings/menu.dat | 2 +- data/rus/settings/icon.ini | 4 +- data/rus/settings/menu.dat | 2 +- data/sp/settings/icon.ini | 4 +- data/sp/settings/menu.dat | 2 +- programs/cmm/eolite/Eolite.c | 212 ++++++++++++++------- programs/cmm/eolite/include/breadcrumbs.h | 8 + programs/cmm/eolite/include/left_panel.h | 106 +++++++---- programs/cmm/eolite/include/menu.h | 12 +- programs/cmm/eolite/include/settings.h | 8 - programs/cmm/eolite/include/translations.h | 3 + 21 files changed, 252 insertions(+), 136 deletions(-) rename data/common/File Managers/{efm => kfm2} (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 8c1ad66c46..430641e2f8 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -27,7 +27,7 @@ img_files = { {"NOTIFY3.PNG", "common/notify3.png"}, {"UNIMG", PROGS .. "/fs/unimg/unimg"}, {"3D/HOUSE.3DS", "common/3d/house.3ds"}, - {"File Managers/EFM", "common/File Managers/efm"}, + {"File Managers/KFM2", "common/File Managers/kfm2"}, {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, {"File Managers/KFM.INI", "common/File Managers/kfm.ini"}, {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"}, diff --git a/data/ca/settings/icon.ini b/data/ca/settings/icon.ini index fbbf2e382c..5a8ff6c55a 100644 --- a/data/ca/settings/icon.ini +++ b/data/ca/settings/icon.ini @@ -5,8 +5,8 @@ Background=/sys/media/palitra Device setup=setup Shell=shell [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index e4ac5b8199..62b75c4b78 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -85,7 +85,7 @@ Informaci #10 **** ARCHIUS **** KFAR /sys/File Managers/kfar fNav /sys/File Managers/fNav/fNav -KFM /sys/File Managers/kfm +KFM2 /sys/File Managers/kfm2 Eolite /sys/File Managers/Eolite Virtual disks /sys/tmpdisk SHELL /sys/shell diff --git a/data/common/File Managers/efm b/data/common/File Managers/kfm2 similarity index 100% rename from data/common/File Managers/efm rename to data/common/File Managers/kfm2 diff --git a/data/common/icons16.png b/data/common/icons16.png index a433c6a326393944996c0221d07fde9f393d7852..307272117c80a192d584a01f03ce0edb552483ae 100644 GIT binary patch delta 10234 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 AF8}}l delta 10232 zcmV&aK%90Ts&J(B~Me`UEN*X@5?2@ z&(E%|uKM;<)m2Yd`mL_kAWZ)>{NK89zi^ZiXimR7pdv38s(x4i)h9PwRQUDXN-z#W z$c1l**ot6I7IRQZMq5W=;*vc*q2}U2i!gren4i~z3R51i6+vW0$GCsf8Bv!(PG%Ft zP6m*ylFetv3nG&NX1a%tJQk9c z4QHV3JN5y>LJ=~wusXIY4raBm|0}Mag-FdZ4}cR|n~JT6-43c_|JlexH35H(0Uh!P0vB4&ItPv|B`5LTe9Vr6oy?2tWVRCIqO zxpomuR9#)|sMs;{ZDAHrFc{>LfhJ8|4h01TQkVr)RuoOoX|DcJI#9VRqK>I=gD1jEr0zW>-uOa|5NN?bcy- z)*;LlL<$CLRVIHCLL5PUbi;Va8mL}9xppg2?5KsR9?}_v9`f)pB@gKgil4WJgD`CC zAqNhPhd>|$s^fd}txO3E*70--9@5z&6k4%q(>5+CNW~(vLb8ZNm0oXAy+vk=ct2tm z;Z{XAh=)}D7c*=$m#sfig_M+@hn#N@@~|>!^XP_LX2^dl&-_V`BgRcoy%2~`x=LtAq19!uqXr|ix5y_?lu;BxT#JSfez}=7l#zr0 zJT8M6KxTgkW-!Zqr7R#Bgr0+la_s$f5YKLex0w(j925@7we^rnp!;8);7bNKf)Ois ze$TgqRvhBOaAjqMRFrCNFanzIvpfN zcKtkC4=-7gB$fGuQjm(84OlM+Q6yEgiX1^+h1Gvx0in5G+7G6ef}GloU0bpR{Sett zS&pEephXlBvPGdPe2(qI-h&_<;-E{HYC@6$bS7#8oP9gMb^gN?C?C8Wsz3jPtNhD# zP?5eHs9HCy&tLBWx0;bQE1uJV~%A(*liDi)`51*dO->a|%=z2guBXRL$r z(W~IX-~d!i*>D9x6_ZjR$o}F%Rb_k&!8Pg3{4B2E;;m4*J_l-cABM_}IZ&PUEu7z! z30YfbN-P?h3}-)EU8~q6I5+Vt2#!hNs+@nj5vupGO3vR8)u*zd{AfN*Sp5PFU-Mfl zsJL$;lzh32>*DMU5d0<`F7CRvAZW++|(Q@mi`>hu6_uT*AIYY-+XKZElqC%UuS3W@SPc@+EaA;8%aga7ngXN`3 zFr;V{3_3QFZ_S|RQeK9CoBp3VL>qOx^&ty_@N7Mg43VBqglTcNLc{q@m$HH!uLllUxW9f=dt08(9XF-$;P z5XOlB3{yIuMg}^*xg!@%OeQOE+BtzRO!1U1bNVkKxK;q2UDJ{aVVIC6D4S=8Q#__Y z0D^GByaj~9L}VdaAqq32Fbx6_WGEUXAQ0^%jKV0)Om&A_1mRFBG3tNW&g?!%WNN&Igv{9Aywu?D$R#fnG>lrA5vvb zq|$syl{t}0^C4A1B-`m{VFxXU=?rf_-vSc)zH6Dfs5C=!P;`G2=+@>jc(>KFP*t^% z!v?(ZKU^~F96@Vlw1i8AJ)r8y2T*mi8*Ew7hJ$3&J*6Nl4q9?{Z%0V@d>Fj-TyvN+ zWeA6f#dMumi4fQt$^8$8D=wbqu&T{%xDaNUjOu6+1EEFHfB7@anmiaPH?@Yho^KBG z`n+qMTqy%#Q>TAADqQ?B`BsdUv4hTB1JHi3amp5{ZMRd`_9 zdr{Etk5BRKwVUk|85tRp3?SMLUw2ALVjihQUO@F0T`v~Zx1)NCu6aAU$=<1v4P`vP zQxnn{GP2`9h#Ht+Q7*g7D!)_1Z;lL9RKo7>B|)yN+~S2wKDDKlF&ttre>iR8dhrB&-hbu;Un#t{PSZVoE_N*! zT0>XObqs$=FuXbhAR#0^F->g@>D00l5(D1fsi7BgL{Y~2cWUb2I=r#oI*f00H+Ye) zhs1-qk&TpuX>I)xfvWR!xyeppHBen*r!c0qb!;+_9SqajIyPz1u-&kIb65$aTG_T9 z((C1~f9tT`L*8T_GP3L4;6=6`5)TfHe^^PF*4BTq$v{-O7%nQw)x(}a1QWLevh|Q| zATf+-Z5^9k(XdG7uxF4{W!rj4ub2NP;32VRcj-3PAWuK}h=9c9>kV=OYIcAWHknx_ zJD{cta06;y0d_zRqD$@-a{TxYTsr9Z@#Apv zO2a{+wj&)Bj+V_q`1B=I)q}1!=!(r4e`DmYVCmAOuzB-luD=_+(XgNP=VvYZ7Lb2e z$kFG!T0wpw7LZ@askm8}K?oV1d^gvy^gnXQEmMwg-8%mQPk5m1`%n};7)}nEW`Gzh z@&h7BNEV5Zuvru`NYqaZ6qY(NL-eJc{1#1w_y(CFzCbdF4ibeRQJ7Jb@{-PBeWwP` zI$^>D7(IG43>!9#Yt*PX9;ajxCK`V_bSR7+I|kMyZ)U$Z>}3yli@6RQD1dDldtuzT zF)(1j0Q(}V4!t!#hf{_IiRw#k_&&s$*g#E z@7ld959TIrfG^_XVfu{OaK7Lh7&C5?anZ85bLT>8>ULg~l$0%XR#jU5=9n^d2As)X z4W|yK033V)&gZ_#ia6{tX#DuekjfU=2&C?Xlnr~~o0RQ5V^-Ea=-00w7uFHRUCMg~ zs`Db?(!N%Z1q9j51`mH336OOsTgl_!xhgmRf@eYiSwrDuc9K9K2e!g&$cDM_ zeCzI405o#sXb7GMI9~!#%2al$f@jL!b-8G}SeQR{UAKkRWd@{f*bdv+0V-uE(S z!i4d#KW9H2EM!aZ7FNLYv~w^ut<+N4r6uJ|L0A{q$}SFje!F%PM0bB4V!ZsL;y!_y z+b=*od#yD-qm-R-3+&3u)ghlR3II&+0+q+(8LR@TeyoCsSGrr*tox|{Ncep74=_9H zB5Y1&XJk!*io<_4OiTrc?*Z^dFQ_h_357>aLGxCfdqeXVyV^fK!~?Au?A;GWuy8gUI+S0BVXvkw-w5-UZGhK1 zeGJV^5JxxiYIHwn`^HDmx_!@Dz1j<2e`~;1aBM0+>tyXbpayb!I6%J?yTKem_}ex9 zBbX8hf1s?Ws4#%=mtus`PtH!o)V_e+tZJ5;X=7L5IT2U;u>Kn{2BG+$+H|riJh#~LFwr^>=wOWUx54Y;p4ox z#l>g6f!u`YoQi+#>78SzVskfwEmI~h#dh>ZUW)As3ft?{cEvU;e6F@}zm*UUaS%-v zCJhP{TjHGJ4WJe53mv2$$pwaexA^dbFhMACv`E(Qw&xtQf1d3HguiEB9gwWtSPa$Q z{jcMqUC}yn`<2E#pTv_zm?l-B>GE%;;|LyMYP{A(ZdClu+`PF}Q>e%>9%r2cmQtkX~7WiUbqUAMe zRbgIaaL~SeYzh8mO}QR?@IfU}ddw>Yz5MbE5FPzDgT!J`oD%5Xd++5Us4^%w_gnn{ z0`L!&zp!;#2xhht_bEN*)j@mr<{Cg_$Bs3?8a8aG14)z~^Xi~oyRr=+84R}s!7!!A zygGj&@X()MGFoJ= zY>X5uT-;KT5Q0Jo#=C+jq1)CGqzbVunqB?Kwsc`EAhGjegA1lLcHD~Tb&%NmaT|Zk zY6`*0w>xgdPA>IFX4m4R8{oTHH^!1YVSSz2^O8K~*QtFk>u7$R+V`@KDj-jvxpo4% zE~1E)mZxcOh$)}x0MoZjyP38#rSurAwumBT`i|)oQwh@vrlU;zn07F2Vp0O-u!IFn z-!m2e{ok`0Czs&ZJ@-H^+s|ZLk0*anS&eZgOL&m!2-ERL9)Zfed*MXKj*!jvw=gBE zg0`}Rd+O??xKk%M-k}4OZ`%g@nl^<1i%Y_Im1P|_u!P&tqBd=y=I~)S$0mQ3vv$IA zLSFCQu#_EBT9W5$mT)Z-96JUlCQgK$hzQtt*Ikfw%Pp{s#m~b!R9V(>IZJ6{elzq3r;9|$iMc~pjB^82VofF zWOoks-*75@lCKlcXlaBubMD)50!!X9-F-()1y2X91vFEz6o?m_|&x~_u5r$!m z!(&)X(cRkK*PfFh6c&F)%P=xCGn0!zTefC$k((9W?ajC(&rJdfJe)La!vPLB{X_|u1r$}yGP?B0M<< zkz+?#yI?o>jDyhIq0sZ8&CskRk-zl^Mc856!*b(feU0Crd0( zM(uw@ASZ}YUlToLNUJfDmvsB|_0@B1s>46mF(h4b-;RxjI@GVI{rDb3ik;L6<~W8# zmmv;y#Fp&{k`4dFj%seij=EHCHaSqOwa+in2rI;=qu-ii=}HvoU9k*wq8M-blE!UDpZBrh7fH8~AHl|gu) z3kgJbUc70B1acY{PGXTfIsQJeggkgP9Wt%~^gHhQpH3So-G#GV)sf=h{mj)M~W{IQxYd7=@%V6~B z4vUrI96^}D4rB+@WQmWn)v4@2cE>bX!aYaN>1Q_!kI7(~41)T$uoQB?E9Kig1?Mh@ z>yDdY8bQ8i3vFS7E#IC}5~jsG1k-;oFmKgfShMArCnc^w#5HWjMh*)f2%Ehhmmr^Un;q!dETR}T&?Pn< zwpIWa%d4O~SjEE_S5tGzpG8hSNEt+(S?rv?TrGJ7b5Hl=Y6(Jp%MGSELC}Bih#i%D zk&>$wi(>|fa&)z#_I>xG1%$odoX)n>Quja~Z3mJqJYieeP8NB(YIx@e3&^Qxjv#X- z<{m5cSJ|R>+_>|5UNrM1$9UX&a<%B2-R>Mpu9je;>>#eLR)jf0T*r`f*KmWl`Xlj< za`hi*+TB@2DHRP99yw7amFRyuTq_$Btw)6V&3^G5m zr^@#QGW(=!4>H%29mw@ALNMLAN$zb*V@MfH1bK37GMF1gX;?$f&9`F{VIey@j4 zr|cP}wApVsD`IJ`X_Iu~pD#@F>`p zwHpS-4u@r3k{}~`qB?(QOCL6wDXSTK)wKZ}UiTUF8~zzAN%|Vz>C;1fy%7%C*@8hH z1(^41fGM{?_JY39rB{sg(U?1=A%pw|U@BWVZ|ZFj|Mmmwi{Dux{{k@WXE5cR$JK{5 zc96;MG*Tbdc!fwoejpamW}grPXk(9u0CqI1yTslgI_QVQ=InnR?0EpmzXzCu?d0d4 zAUf#O{H6eB*sDOtmjHbJ@64LpJwbHPv;l2l<*XRERJZ_O{{)!))}x*vI;i*Ctzpoc zO(E~o=8!$IrDurkM5e3eA%FI>f7PYjX=RX}J$pj0UcI1s^ANl8H5?zwSSevZomDP@CaKg zL9B3B5CT5=>?t}2|^aPY}wKZ;wyWx18xwq7Sr0xk1{1M3@uAF!Zwni7-2eS+ z9#YeW=)!sGUcx8?$hRd|1cavg{YQE0i&kH>`l6|U!s14*-^YjOd;hyxD}y{eWDx<& zH|BpBWCqKmJAd3cUQ+5?m|q8>+P?jPelYiN5w{3GLnI30@R$We#pxb1kw=IbaEl46 zs;am!EW*3?9>}GG=m5g-Y$)8v%(x|s#W+ewC9+sV5Ij4c4dbJ~+`)xmjKgCDGl0w% z;T98Pogv^r6~Kqtz{6CJl-AKAIxB$)LLh%kLt96S5JZ(K77azmaO-Lj?sx3kTd!C= zI|?&n9EPbGI9fz?K<3lsry@}u8bB1l1Y{Ax@T{G?#^{$Ht;9HjNI`VKi|C&YlJ$Bo z3jc`h`UTN&_r!@4*BE3TfFnp{pe~*;ydaDaGt<7EY(ZY@s2+49f;|1e;_Hc4*g=18 zE!wUJg#4?hZDn6o4{7^$hTFR`PA`Fp>9t=!JP}0Mfy9hrS`r80eaU>#4PrjIW_Lg) zI6ZZckea2qUX=e+A7)KcloAF|YxLSwI+x ziByY(Fh`5ChsunJFfrB{#+3yA*&sZI>7^Dmh-?I}z5S@cBFu#Q z)wvHtS=vAATRZ`kfLp}!8bBC{FtW%AL>6IsBdCR7QDh?>gmBD^VcPPd)s=tXMzE;G zWs5LOml@BFqAG>prONIP@ov5#HBxdxU#W!23P=!pQNnA$#cK z&LC`j1nb$o8$`8l&-J(0UW4f9x1n>7LF_xUPXQci2bmu~>E3DWK2JFFt@{90{MG{V z{E5O&AM}Hn?>$xv%V2-Qq2W(CFQwupgw6cmN&j`bXH`m!(z(~2;SAb8LYAOo3U8V1lS+5u#l%|ZqT4UL-}l5~)0kyl|}9fT2Q zPMz^3EbdPX)NRrI&~3^6Mi7y`2q8U0P}_l1rESBDkilCv23mjjo#;#45OGz{Q1nxG zY>j$1f^dj~dZ+bSAeT*o+rZWez~Slme199vk&kmC16LVBSR zKV?Cm)ca%lAAA9IkobK*KR_KMe(cW=PzQ;hA#?-UK4K-12y+6Wq>oq;MBfiH0}5pSvY)eH{;k0i6 zVZ^0NHA*4?hV%0BYL`+GA*v5p2uS-JM39V(3}q3B_H|I)&^UcP5ftu|l9Q8lQJgs) z2Z;-kkVL2mGN%>OX|g6SCNzV@v`T-AsDP9nvfzKJFftIvdj{cpHcdOv)`k1NK+{(M zbf3K+Vy5qg==j^` z2GdGGixw?Xf{75!Bdu&ql$w!e3nK`oF(21tiDfV+i0$P!!`vW_?MQ@0M@KtCTpJ|8 zirIf00Jp2@Y7t%;1i8TsAiSjQV=fCJSS%ER#A9L`GJqaz*%{&jwTW?yLIB;nFii23 z2J;v|bO5(>X4cQ08|qPCuytv~*fbWCt}uW&7GaxkldDDCv9pHdCRdA8f2nb`NY!z`5M2ot55r2O) z*0cXeXy4&|U3h?|5aA3>oUM6zZd*`~!^xL82@@yJ;j;q{s;H=h(W6K6Exx=(Q$8_a zaq(s0gd7w-%D^d)xW&cGb3AqRzn()*Zs~stX_H>B zt)m%p7s8}ZM!`q#cY{}3zXTsFnhnFMQsMWHJ_gx^O}Un*vOmi!X2Qb$&%&Nu_93A1 zg&a~azdg4`I+dKz2V4`cCdBAi|+GkF~QiPJ@5gPaNQ33VKTE0e&`DO z)8B&3Sud-t>5GX59nFT(P|WoJ1mQovFM>tsA41|+?O@KwZPi=$+i3y#_M?Sbw<$3+YWpZ=0=EQVsQ=2`4X=%sOmflt++|8KLHVWsund z(LyY;63B3Np-#j)Gg~DEi5XN*AO#tU;38*`r0v+rP;4{E?J^rI7Sb3%PIX`?1_PKY y-2igBDz;sxt|=HnF2%Cz%u2oAvl|JA{ufI--LWhiZ{Gj_000O{MNUMnLSTYv8TlFj diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini index 592dbf1285..a21cd18b7f 100644 --- a/data/eng/settings/icon.ini +++ b/data/eng/settings/icon.ini @@ -4,8 +4,8 @@ Theme settings=skincfg Background=/sys/media/palitra System panel=syspanel [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index cc750a52e0..191b6487a5 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -75,7 +75,7 @@ System panel |syspanel #8 **** FM KFAR |File Managers/kfar fNav |File Managers/fNav/fNav -KFM |File Managers/kfm +KFM2 |File Managers/kfm2 Eolite |File Managers/Eolite Virtual disks |tmpdisk Shell |shell diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini index 6e83fd59dd..b34f4f3343 100644 --- a/data/et/settings/icon.ini +++ b/data/et/settings/icon.ini @@ -4,8 +4,8 @@ Theme settings=skincfg Fondo=/sys/media/palitra System panel=syspanel [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 1ad73c6b9e..b9f434b777 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -85,7 +85,8 @@ K. Bus disconnected |kbd HDD info |hdd_info #10 **** WORK WITH FILES **** KFAR |File Managers/kfar -KFM |File Managers/kfm +KFM2 |File Managers/kfm2 +fNav |File Managers/fNav/fNav Eolite |File Managers/Eolite Virtual disks |tmpdisk SHELL konsool |shell diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini index 592dbf1285..a21cd18b7f 100644 --- a/data/it/settings/icon.ini +++ b/data/it/settings/icon.ini @@ -4,8 +4,8 @@ Theme settings=skincfg Background=/sys/media/palitra System panel=syspanel [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index ae71842c16..e630d1d3db 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -86,7 +86,7 @@ HDD informer |hdd_info #10 **** FM KFAR |File Managers/kfar fNav |File Managers/fNav/fNav -KFM |File Managers/kfm +KFM2 |File Managers/kfm2 Eolite |File Managers/Eolite Virtual disks |tmpdisk SHELL console |shell diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini index 991e5d93f8..a9ab5e2d43 100644 --- a/data/rus/settings/icon.ini +++ b/data/rus/settings/icon.ini @@ -4,8 +4,8 @@ Настройка фона=/sys/media/palitra Системная панель=syspanel [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 4509cc923c..d45a98d470 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -75,7 +75,7 @@ ScummVM |/kolibrios/emul/scummvm #8 ==Система > ФМ KFAR |File Managers/kfar fNav |File Managers/fNav/fNav -KFM |File Managers/kfm +KFM2 |File Managers/kfm2 Eolite |File Managers/Eolite #9 ==Система > Спец.возможности Экранная лупа |magnify diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini index 592dbf1285..a21cd18b7f 100644 --- a/data/sp/settings/icon.ini +++ b/data/sp/settings/icon.ini @@ -4,8 +4,8 @@ Theme settings=skincfg Background=/sys/media/palitra System panel=syspanel [00] -name=KFM -path=/SYS/FILE MANAGERS/KFM +name=KFM2 +path=/SYS/FILE MANAGERS/KFM2 param= ico=3 x=0 diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 0ddd450f6d..11be31e25a 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -86,7 +86,7 @@ Informaci #10 **** ARCHIVOS KFAR |File Managers/kfar fNav |File Managers/fNav/fNav -KFM |File Managers/kfm +KFM2 |File Managers/kfm2 Eolite |File Managers/Eolite Virtual disks |tmpdisk SHELL |shell diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 917493ccac..b4528ecae7 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -3,8 +3,8 @@ // 70.5 - get volume info and label -#define TITLE "Eolite File Manager 4.80" -#define ABOUT_TITLE "EOLITE 4.80" +#define TITLE "Eolite File Manager 5 Beta" +#define ABOUT_TITLE "EOLITE 5 Beta" #ifndef AUTOBUILD #include "lang.h--" @@ -37,7 +37,16 @@ enum { PATH_BTN = 10, POPUP_BTN1 = 201, POPUP_BTN2 = 202, - BREADCRUMB_ID = 300 + KFM_DEV_DROPDOWN_1 = 205, + KFM_DEV_DROPDOWN_2 = 207, + BREADCRUMB_ID = 300, + + BACK_BTN = 400, + FWRD_BTN, + GOUP_BTN, + COPY_BTN, + CUT_BTN, + PASTE_BTN }; //NewElement options @@ -85,8 +94,10 @@ bool _not_draw = false; bool exif_load = false; bool dir_at_fat16 = NULL; -word about_thread_id; -word settings_window; +bool dev_popin_active_on_panel=0; + +dword about_thread_id; +dword settings_window; byte del_active=0; byte new_element_active=0; @@ -241,7 +252,7 @@ void main() loop() switch(@WaitEventTimeout(80)) { case evMouse: - if (del_active) || (Form.status_window>2) break; + if (del_active) || (dev_popin_active_on_panel) || (Form.status_window>2) break; if (new_element_active) { edit_box_mouse stdcall(#new_file_ed); @@ -331,7 +342,7 @@ void main() break; } - if (two_panels.checked) && (mouse.y > files.y) && (mouse.down) { + if (efm) && (mouse.y > files.y) && (mouse.down) { if (mouse.x2) break; - if (new_element_active) || (del_active) + if (new_element_active) || (del_active) || (dev_popin_active_on_panel) { - if (del_active) - { + if (dev_popin_active_on_panel) { + if (key_scancode == SCAN_CODE_ESC) EventClosePopinForm(); + } + if (del_active) { if (key_scancode == SCAN_CODE_ENTER) EventDelete(); if (key_scancode == SCAN_CODE_ESC) EventClosePopinForm(); } - if (new_element_active) - { + if (new_element_active) { if (key_scancode == SCAN_CODE_ENTER) NewElement(); if (key_scancode == SCAN_CODE_ESC) EventClosePopinForm(); EAX = key_editbox; @@ -462,7 +481,7 @@ void main() case SCAN_CODE_1...SCAN_CODE_10: key_scancode-=2; if (key_scancode >= SystemDiscs.list.count) break; - if (!two_panels.checked) + if (!efm) { DrawRectangle(17,key_scancode*16+74,159,16, 0); //display click pause(7); @@ -479,7 +498,7 @@ void main() EventOpenConsoleHere(); break; case SCAN_CODE_KEY_V: - EventPaste(); + EventPaste(#path); break; case SCAN_CODE_KEY_D: //set image as bg strlcpy(#temp, "\\S__",4); @@ -492,6 +511,9 @@ void main() case SCAN_CODE_KEY_M: Open_Dir(#inactive_path,WITH_REDRAW); break; + case SCAN_CODE_KEY_R: + EventRefresh(); + break; case SCAN_CODE_ENTER: if (!itdir) ShowOpenWithDialog(); else EventOpen(1); @@ -509,14 +531,13 @@ void main() switch (key_scancode) { case SCAN_CODE_BS: - //EventHistoryGoBack(); Dir_Up(); break; case SCAN_CODE_ENTER: EventOpen(0); break; case SCAN_CODE_TAB: - if (!two_panels.checked) break; + if (!efm) break; if (active_panel==1) active_panel=2; else active_panel=1; ChangeActivePanel(); DrawFilePanels(); @@ -548,7 +569,7 @@ void main() if (CheckActiveProcess(Form.ID)) && (GetMenuClick()) break; if (action_buf==OPERATION_END) { - FnProcess(5); + EventRefresh(); action_buf=0; } break; @@ -569,29 +590,35 @@ void main() void draw_window() { - dword i; + dword i=0; incn x; + dword title; if (show_status_bar.checked) status_bar_h = STATUS_BAR_H; else status_bar_h = 0; - DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,TITLE,0); + if (efm) title = "Kolibri File Manager 2 - BETA"; else title = TITLE; + DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,title,0); GetProcessInfo(#Form, SelfInfo); if (Form.status_window>2) return; - if (Form.height < 350) { MoveSize(OLD,OLD,OLD,350); return; } + if (Form.height < 356) { MoveSize(OLD,OLD,OLD,356); return; } GetProcessInfo(#Form, SelfInfo); SetAppColors(); - if (two_panels.checked) { - if (Form.width < 573) { MoveSize(OLD,OLD,573,OLD); return; } + if (efm) { + if (screen.width > 693) && (Form.width < 693) { MoveSize(OLD,OLD,693,OLD); return; } DrawBar(0, 0, Form.cwidth, 34, sc.work); #define PAD 7 #define GAP_S 26+5 #define GAP_B 26+14 - x.set(-GAP_S+8); - DrawTopPanelButton(21, x.inc(GAP_S), PAD, 30, false); - DrawTopPanelButton(22, x.inc(GAP_S), PAD, 31, false); - DrawTopPanelButton(23, x.inc(GAP_B), PAD, 01, false); - DrawTopPanelButton(24, x.inc(GAP_B), PAD, 55, false); - DrawTopPanelButton(25, x.inc(GAP_S), PAD, 20, false); - DrawTopPanelButton(26, x.inc(GAP_S), PAD, 56, false); - DrawTopPanelButton(51, Form.cwidth-GAP_S-PAD, PAD, -1, false); //burger menu + x.set(Form.cwidth/2-DDW-203/2-GAP_S); + while (i<200) { + DrawTopPanelButton(i+BACK_BTN, x.inc(GAP_S), PAD, 30, false); + DrawTopPanelButton(i+FWRD_BTN, x.inc(GAP_S), PAD, 31, false); + DrawTopPanelButton(i+GOUP_BTN, x.inc(GAP_B), PAD, 01, false); + DrawTopPanelButton(i+COPY_BTN, x.inc(GAP_B), PAD, 55, false); + DrawTopPanelButton(i+CUT_BTN, x.inc(GAP_S), PAD, 20, false); + DrawTopPanelButton(i+PASTE_BTN,x.inc(GAP_S), PAD, 56, false); + x.set(Form.cwidth/2-DDW-203/2-GAP_S+calc(Form.cwidth/2)); + i+=100; + } + //DrawTopPanelButton(51, Form.cwidth-GAP_S-PAD, PAD, -1, false); //burger menu } else { if (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; } ESDWORD[#toolbar_pal] = sc.work; @@ -616,6 +643,7 @@ void draw_window() DrawStatusBar(); if (!selected_count) Open_Dir(#path,ONLY_OPEN); //if there are no selected files -> refresh folder [L001] DrawFilePanels(); + dev_popin_active_on_panel = 0; } void DrawList() @@ -633,13 +661,20 @@ void DrawList() if (sort_type==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w; WriteText(sorting_arrow_x,files.y-12,0x80, sc.work_text, sorting_arrow_t); DrawBar(files.x+files.w,files.y,1,files.h,sc.work_graph); - if (two_panels.checked) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,sc.work_graph); + if (efm) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,sc.work_graph); } void DrawStatusBar() { char status_bar_str[80]; int go_up_folder_exists=0; + + if (efm) { + DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, sc.work); + WriteTextCenter(0,Form.cheight - 12, Form.cwidth,sc.work_text,T_KFM_FUNC); + return; + } + if (!show_status_bar.checked) return; if (files.count>0) && (streq(items.get(0)*304+buf+72,"..")) go_up_folder_exists=1; DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, sc.work); @@ -657,7 +692,7 @@ void DrawFilePanels() int files_y; int w2 = -Form.cwidth-1/2+Form.cwidth; int h2; - if (!two_panels.checked) + if (!efm) { DrawDeviceAndActionsLeftPanel(); files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 59 - status_bar_h, files.item_h); @@ -855,7 +890,7 @@ void Line_ReDraw(dword bgcol, filenum){ kfont.WriteIntoWindow(files.x + icon_size+7, files.item_h - kfont.height / 2 + y, bgcol, text_col, kfont.size.pt, #label_file_name); } - if (bgcol == col.selec_inactive) DrawWideRectangle(files.x+2, y, files.w-4, files.item_h, 2, 0x92B1D9); + if (bgcol == col.selec_inactive) DrawWideRectangle(files.x+2, y, files.w-4, files.item_h, 2, col.selec_active); sprintf(#full_path,"%s/%s",#path,file_name_off); DrawIconByExtension(#full_path, ext1, files.x+4, icon_y, bgcol); @@ -880,7 +915,7 @@ void Open_Dir(dword dir_path, redraw){ } if (files.count!=-1) { - if(!_not_draw) if (show_breadcrumb.checked) DrawBreadCrumbs(); else DrawPathBar(); + if(!_not_draw) DrawPathBar(); history.add(#path); SystemDiscs.Draw(); files.visible = files.h / files.item_h; @@ -1156,21 +1191,19 @@ void FnProcess(byte N) case 4: if (files.count) && (!itdir) RunProgram("/sys/develop/cedit", #file_path); break; - case 5: //refresh cur dir & devs - if (two_panels.checked) - { - DrawFilePanels(); + case 5: + if (efm) { + EventCopy(false); + EventPaste(#inactive_path); } else { - Tip(56, T_DEVICES, 55, "-"); - Open_Dir(#path,WITH_REDRAW); - pause(10); - SystemDiscs.Get(); - Open_Dir(#path,WITH_REDRAW); - DrawDeviceAndActionsLeftPanel(); + EventRefresh(); } break; case 6: - //Move + if (efm) { + EventCopy(true); + EventPaste(#inactive_path); + } break; case 7: NewElement_Form(CREATE_FOLDER, T_NEW_FOLDER); @@ -1196,6 +1229,21 @@ void FnProcess(byte N) } } +void EventRefresh() +{ + if (efm) + { + DrawFilePanels(); + } else { + Tip(56, T_DEVICES, 55, "-"); + Open_Dir(#path,WITH_REDRAW); + pause(10); + SystemDiscs.Get(); + Open_Dir(#path,WITH_REDRAW); + DrawDeviceAndActionsLeftPanel(); + } +} + void ChangeActivePanel() { llist_copy(#files_active, #files_inactive); @@ -1246,9 +1294,9 @@ int GetRealFileCountInFolder(dword folder_path) void EventRefreshDisksAndFolders() { if(GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) { - FnProcess(5); + EventRefresh(); } - if(two_panels.checked) + if(efm) { if(GetRealFileCountInFolder(#inactive_path) != files_inactive.count) { ChangeActivePanel(); @@ -1256,9 +1304,7 @@ void EventRefreshDisksAndFolders() ChangeActivePanel(); } if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW); - } - else - { + } else { if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW); } } @@ -1330,9 +1376,9 @@ void ProceedMouseGestures() } } -void EventPaste() { +void EventPaste(dword _into_path) { char paste_line[4096+6]; - sprintf(#paste_line, "-v%i %s", cut_active, #path); + sprintf(#paste_line, "-v%i %s", cut_active, _into_path); RunProgram(#program_path, #paste_line); EventClosePopinForm(); } @@ -1352,11 +1398,12 @@ char line_param[4096+5]; void EventClosePopinForm() { - del_active=0; + del_active = 0; new_element_active = 0; + dev_popin_active_on_panel = 0; draw_window(); - DeleteButton(POPUP_BTN1); - DeleteButton(POPUP_BTN2); + //DeleteButton(POPUP_BTN1); + //DeleteButton(POPUP_BTN2); } void EventShowProperties() @@ -1400,6 +1447,29 @@ void EventChooseAllFiles(dword state) DrawStatusBar(); } +void EventToolbarButtonClick(int _btid) +{ + switch(_btid) { + case BACK_BTN: EventHistoryGoBack(); break; + case FWRD_BTN: EventHistoryGoForward(); break; + case GOUP_BTN: Dir_Up(); break; + case COPY_BTN: EventCopy(CUT); break; + case CUT_BTN: EventCopy(NOCUT); break; + case PASTE_BTN:EventPaste(#path); break; + } +} +void EventDriveClick(int __id) +{ + if (dev_popin_active_on_panel != active_panel) { + if (active_panel == 1) active_panel=2; else active_panel=1; + ChangeActivePanel(); + } + + SystemDiscs.Click(__id-100); + if (efm) { + draw_window(); + } +} stop: diff --git a/programs/cmm/eolite/include/breadcrumbs.h b/programs/cmm/eolite/include/breadcrumbs.h index f72ab58283..05139c9c92 100644 --- a/programs/cmm/eolite/include/breadcrumbs.h +++ b/programs/cmm/eolite/include/breadcrumbs.h @@ -2,6 +2,14 @@ PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0}; void DrawPathBar() { + if (efm) { + return; + } + if (show_breadcrumb.checked) { + DrawBreadCrumbs(); + return; + } + PathShow.start_x = -efm*22 + 250; PathShow.area_size_x = Form.cwidth-300; diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index c2b80e2ee3..5a3214da5d 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -43,11 +43,13 @@ struct _SystemDiscs int dev_num; void Get(); void Draw(); + void DrawSelect(); + void DrawOptions(); void Click(); } SystemDiscs=0; #define DEV_H 17 -#define DEV_H_HOR 21 +#define DEV_H_HOR 20 void GetDiskIconAndName(char disk_first_letter, dword dev_icon, disc_name) { @@ -124,37 +126,32 @@ void _SystemDiscs::Get() free(devbuf); } +#define DDW 120 + void _SystemDiscs::Draw() { - char dev_name[15], disc_name[100], i, dev_icon, is_active, name_len; + char dev_name[15], disc_name[100], i, dev_icon, is_active=0, name_len; int draw_y, draw_x; for (i=0; i<30; i++) DeleteButton(100+i); - if (two_panels.checked) { draw_y = 41; draw_x = 2; } - else { draw_y = 74; draw_x = 17; } - - for (i=0;i=Form.cwidth-100) && (Form.cwidth) { - DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, DEV_H_HOR, 0xFFFFFF); - draw_x = 2; - draw_y += DEV_H_HOR; - } + if (efm) { + if (active_panel==1) { + DrawSelect(Form.cwidth/2-DDW, 10, #path, KFM_DEV_DROPDOWN_1); + DrawSelect(Form.cwidth-DDW-2, 10, #inactive_path, KFM_DEV_DROPDOWN_2); + } else { + DrawSelect(Form.cwidth/2-DDW, 10, #inactive_path, KFM_DEV_DROPDOWN_1); + DrawSelect(Form.cwidth-DDW-2, 10, #path, KFM_DEV_DROPDOWN_2); } - else - { + files.y = 40 + 17; + } else { + draw_y = 74; + draw_x = 17; + for (i=0;i