From 1f0b08d588b5a0043d36a4b0f7da68e5b3792ef5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 5 Apr 2013 00:26:21 +0000 Subject: [PATCH] Eolite 1.89: bugfix in Paste(), much more movable files list git-svn-id: svn://kolibrios.org@3447 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 36 +++++++++++++----------- programs/cmm/eolite/imgs/icons.raw | Bin 6240 -> 6240 bytes programs/cmm/eolite/imgs/icons.txt | 2 +- programs/cmm/eolite/imgs/png/icons.png | Bin 6134 -> 6136 bytes programs/cmm/eolite/include/copypaste.h | 6 ++-- programs/cmm/eolite/include/icons_f.h | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 40387d5fc4..845f370863 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -22,8 +22,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v1.88" -#define ABOUT_TITLE "Eolite v1.88" +#define TITLE "Eolite File Manager v1.89" +#define ABOUT_TITLE "Eolite v1.89" dword col_work = 0xE4DFE1; dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; dword col_padding = 0xC8C9C9; @@ -307,8 +307,8 @@ void main() List_ReDraw(); break; case 181: //end - files.first=files.count-files.visible; - files.current=files.visible-1; + files.first = files.count - files.visible; + files.current = files.visible - 1; List_ReDraw(); break; case 183: //Page Down @@ -453,25 +453,25 @@ void List_ReDraw() //in the bottom paint_y = j * files.line_h + files.y; DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF); - DrawBar(onLeft(168,0),paint_y,1,onTop(paint_y,6),col_work); - DrawBar(onLeft(95,0),paint_y,1,onTop(paint_y,6),col_work); + DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),col_work); + DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),col_work); Scroll(); } void Line_ReDraw(dword color, filenum){ dword text_col=0, name_len=0, y=filenum*files.line_h+57; - DrawBar(192,y,3,files.line_h,color); - DrawBar(192+19,y,onLeft(46,192),files.line_h,color); DrawBar(195,y+17,16,1,color); - if (files.line_h>18) DrawBar(195,y+18,16,files.line_h-18,color); - if (files.line_h>15) DrawBar(195,y,16,files.line_h-15,color); + DrawBar(files.x,y,3,files.line_h,color); + DrawBar(files.x+19,y,files.w-19,files.line_h,color); + DrawBar(files.x+3,y+17,16,1,color); + if (files.line_h>18) DrawBar(files.x+3,y+18,16,files.line_h-18,color); + if (files.line_h>15) DrawBar(files.x+3,y,16,files.line_h-15,color); off=file_mas[filenum+files.first]*304 + buf+72; if (!TestBit(ESDWORD[off-40], 4)) //file or folder? { - strcpy(#temp, off); - Put_icon(#temp+_strrchr(#temp,'.'), files.line_h/2-7+y, color); + Put_icon(off+_strrchr(off,'.'), files.line_h/2-7+y, color); WriteText(7-strlen(ConvertMemSize(ESDWORD[off-8]))*6+onLeft(75,0),files.line_h-6/2+y,0x80,0,ConvertMemSize(ESDWORD[off-8])); //size } else @@ -490,6 +490,7 @@ void Line_ReDraw(dword color, filenum){ } if (Form.width>=480) { + FileShow.start_x = files.x + 23; FileShow.font_color = text_col; FileShow.area_size_x = Form.width - 380; FileShow.text_pointer = off; @@ -497,8 +498,8 @@ void Line_ReDraw(dword color, filenum){ PathShow_prepare stdcall(#FileShow); PathShow_draw stdcall(#FileShow); } - DrawBar(onLeft(168,0),y,1,files.line_h,col_work); //gray line 1 - DrawBar(onLeft(95,0),y,1,files.line_h,col_work); //gray line 2 + DrawBar(Form.cwidth-159,y,1,files.line_h,col_work); //gray line 1 + DrawBar(Form.cwidth-86,y,1,files.line_h,col_work); //gray line 2 } @@ -708,12 +709,13 @@ void FnProcess(char N) break; case 2: if (!files.count) break; - edit2.flags=100000000000010b; //set active - edit2.width=onLeft(24,217); + edit2.flags = 100000000000010b; //set active + edit2.left = files.x + 21; + edit2.width = files.w - 26; edit2.top=files.current*files.line_h+59; edit2.size=edit2.pos=strlen(#file_name); edit_box_draw stdcall (#edit2); - DrawBar(213,files.current*files.line_h+58,edit2.width+1,1,0xFFFFCC); //bg + DrawBar(edit2.left,files.current*files.line_h+58,edit2.width+1,1,0xFFFFCC); //bg rename_active=1; break; case 3: diff --git a/programs/cmm/eolite/imgs/icons.raw b/programs/cmm/eolite/imgs/icons.raw index e17c8710bb803171fd2c5a6a234139801f00c84d..ee268377128379b3d3464272fbd0e71cd23fb0aa 100644 GIT binary patch literal 6240 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 literal 6240 zcmcJTk3&<}6~}K>~c4M-DtQ}5Y zg>{yumO+`7;g8yG>uRl3HgN^qO7}yhx=~y3Z`nEbSMCe0*meDqyn8?AoO|v)d6)NI zLWqUSN|-FHxzEB477`Z+rUf=`KnBD8Ho^=RVn@TmZ$Ta$Y9aB|;8?Usa6Gdla88V8 z2EjIN5S+vfg00*j*uf2wxj`@?$q7_!K2e}pALqraPFU{)*t^fd4V}cg z)AXhB>oXRwUI1GH84MdTmaN`@TY@sd`4`e1z}RB7TEU0KBFGz%k;H|Dq=%Y1AT9fF***`4!9=H|_ryxxsDZt!mgKd(0{FF!y3 z(JcHIVEM9h@^iAXlzJccJTA60A>LTwUXIG^B?XEgoD}#9eBwp9piqkW3klKqi;geE zy-al%|CWM+sDF#sn^543j!!^V{J?hbCnRX>Wk**0z+3E!AYY6`<+9yslEq@etujn@ zoF-W;&LXF?s0fbGI-S6xOAU%29n`NTz<5<(pXEYXC#HO_*IeIRjvWx)3)qA6iOUri z49N}<7$x%n$>@g&$zRovbHW?Pn-sfRZ%p}f&!@TmIpOq@5S@bElFa-Bsu%?~D~O+u zx1pXyvH1BoIva~O^V}7iEwS~*vN<|hUx}v#CK8;T?b+_h&W>`P%jL?GT;g#(<$22G zDdF)Rzu!}e2VhK8;_-vukA9k{EIY5fyqu0_iORA)M2F%0JP|KCcD2gssi<(M zpG-yN+6u{41n_Bzf$9LF7_o!YxB`HDL{&{qwQFZUj@VHRxU)7O5(KJUuAQ~DwRJpS zfKsq(2cIC|stpDK>(g7?)!uXTCe!VYMVQ{B<6$T^*+|~-JC1CW68>AasHlj*3*K-50pWqQcVillV^};Lq#Q&p=@z*}cnq`ozbxPX zcYTC3NwH-&eUIxI&bxTPF3!UKb=u^{rY6jn+_-x;wDyepmGw=m-LspJ@9)|B>^|V< znnU|Sz(3fx_t|w2_grZ2-u=+7YucCb{7ORh?+UH|A+%)Ok20_!`=4hm_Tl-?q!w$s zNgG;FE7H?f@Qz+tS!ruYPjC700r+c4N3KLZK;RD;ZzRl5sK2$fm9p^TZ3q27K|y?M ze$({n>88~o@EetAzA_U%PLJcGp-Vpi$vW~}zp@DChi607y^fzRf2?25C)UTNiv#;z z*B3ipGL8?ML`Ylv!FH)I;|{L&pAr&qA9M?L3x0vB!~G)o^AF~CaLyOZ2ju^Z`&I7f z>^Q{L5dc5%&$;e}53BKq2|0YI^N<*S2)NTELXH@yBXo1)!FUPeHx$mz%{}U;Q5a_& z?TV_~0Ol^%5F^+4g%sog&Xog@yNukIg&24JQV6-*=sG5Z+-`IWJcew%;*ZMU>lbT) zIx59phnC-@WHHc**4snPvfiFoslj-O)f;*3_-heS@Aj9Ez24JX{Htiaef_;X#c#YG z;q{jF*Ypk)7r**zR`2!`{r$af_VoAnv3if4JoyIlNm@Uxm->}@2YXK(e^aUVMDOu| z6H2|mK>@S%-+R4k?RV*mM6zw~%00@J+tqFu?L$N2^bHLmcPm0Zr3hJ^TWpcVxy2S) zo=oTf!*i7)I1fsxxQLvUuN_x87QI=Ipt1=a35u-hPK^!8^#m{T;`avfm@WE3~ZaU1a%Xv(QeauDq2DC6652O;5#+_5c8K2Gj4yhE^!kvlH;434NQd7@bPYRtbEDqas9QBnAH$B` z+@Pm6=o+p;Z)iYH6)97Z_cW*imTp~7{j09mv$@!Wls}fzfkQF=kS^UH>+56uz_>gi z{TZk#@KMg~RM^_#+XwyFJV2Vw4r;uYx)5b|0jGKDl z)0?gl(&|V{yG5)MR&w*^&E9{Jk$;281pM7f>+PK;*OTG*Ch8y8G>1-FKRbQ;_H7t% zx8KsnKPT4f@C{tElKWG-?Qzpql3a0ns|M^$N!gzG1;pK$9$%!{$ifXNDPPb9-z_f7kQsWEhnbmJgLJWu*YMP^E8B|wMFnB2&Ud!`cBZ<3f_EdD>3BO`JE diff --git a/programs/cmm/eolite/imgs/icons.txt b/programs/cmm/eolite/imgs/icons.txt index bc007e3e67..fa2f4064b1 100644 --- a/programs/cmm/eolite/imgs/icons.txt +++ b/programs/cmm/eolite/imgs/icons.txt @@ -2,6 +2,6 @@ //Иконки папок и файлов// ///////////////////////// -dword ficons_pal[] = {0x00FFFFFF,0x00606078,0x00D0D0D8,0x008888A8,0x00F8F8F8,0x009098B0,0x00E0E0E0,0x00A0A0B8,0x00F0F0F8,0x00A8A8C0,0x007880A0,0x00E8E8F0,0x00C8C8D0,0x00C8C8C8,0x00F0F8FF,0x00E0E0E8,0x00D8D8E0,0x00F8F8FF,0x00C8C8D8,0x00FFB898,0x008080A0,0x00C0C0C8,0x00FFA078,0x00586080,0x005878A8,0x006880A0,0x00D0D8E0,0x0080A0C0,0x00586078,0x00E0E8F0,0x008898B8,0x00B8C0D8,0x00D8E8F0,0x00D8F0FF,0x007088A8,0x00A8B0C0,0x007890B0,0x00C8E8F8,0x00F8F8F0,0x00E0E8E8,0x00D0D8D8,0x00C0C8E0,0x0080A0E0,0x007098C8,0x006090C8,0x005888C0,0x00A8B0C8,0x00A87868,0x00604840,0x00786038,0x00705028,0x00685048,0x00FFF8B8,0x00B89848,0x00F8E070,0x00C0A850,0x00F8D858,0x00A09880,0x00F8C050,0x00F0B848,0x00E0A850,0x00986860,0x00583830,0x00707898,0x0068C0D8,0x00B0E0F8,0x0070B8E0,0x00F8FFFF,0x00A0C8F0,0x00000000,0x00F84050,0x0048D040,0x000078B8,0x00F8C048,0x00A06858,0x00FFE898,0x00989070,0x00F8B840,0x00FFF8F0,0x00C0B8A8,0x00D8B040,0x00788088,0x00E8F0F0,0x00C08830,0x00584840,0x00A85800,0x00FFE8A8,0x00A86818,0x00F0F0D8,0x00F8C830,0x00F0B828,0x00381010,0x00D8A028,0x00B0C8E0,0x0078A0D0,0x0098B8E8,0x0088A8D0,0x0098B8E0,0x003070B8,0x00A0C8E8,0x005090C8,0x004888C0,0x003078C0,0x00B8D0E8,0x002068A8,0x0088B0E0,0x0080B0D8,0x0090B8E0,0x002068B0,0x00B8D0F0,0x002060A8,0x0070A0C8,0x002868B0,0x002870B0,0x002868A8,0x00687088,0x00E89090,0x00D09898,0x00909088,0x00C88080,0x00B87820,0x00B86818,0x00E8C068,0x00885810,0x00D09850,0x00B07028,0x00F0D8B0,0x00A87028,0x00B05800,0x00885028,0x00C89048,0x00C89038,0x00985000,0x00E8D8B0,0x00C89810,0x00FFF8D8,0x00FFFFC8,0x00F8E8A8,0x00F8E098,0x00FFE8C0,0x00F8D888,0x00F8D880,0x00F0D078,0x00D8A020,0x0088E068,0x00209018,0x00A87800,0x00188000,0x00A0D868,0x00309018,0x00C8F8A0,0x00289018,0x00608818,0x0050A830,0x0030A028,0x00A8F068,0x00808000,0x0088C840,0x0070C848,0x00D8C070,0x0080C840,0x00C0B850,0x00F8E0A0,0x00F8E090,0x00D8E0F8,0x0098D0D0,0x0038A878,0x0058A890,0x00309068,0x00308880,0x00105870,0x002890B8,0x00186880,0x00105058,0x0048A8C8,0x001098D8,0x0078B8E0,0x002098C8,0x002898C8,0x0058C8FF,0x002088B8,0x0030A0D8,0x00C84048,0x002078B0,0x0030A8D8,0x00808080,0x00407888,0x0040A060,0x0080B820,0x00A02828,0x00F86068,0x00E02040,0x00E01828,0x00A8A8A8,0x00B8B8C0,0x00787878,0x00407828,0x00406040,0x007898C8,0x00E85878,0x00E04870,0x000098E0,0x0008A8F8,0x00D85868,0x00E86080,0x00E88098,0x00E888A0,0x00888888,0x00E8E8E8,0x00A0A0A0,0x00F0E0B8,0x00FFD850,0x00B8B8C8,0x00606080,0x00FFC818,0x00505870,0x00D8D0D8,0x0098C8F0,0x00606880,0x00405068,0x00303840,0x00FF0000,0x00F8C8C8}; +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}; unsigned char ficons[6240] = 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 296ddfdaca945ce61055b9098bf126419cb132aa..aaff11d53e0856964dbefc38eadbb49cf42d5569 100644 GIT binary patch delta 6073 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 delta 6071 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 diff --git a/programs/cmm/eolite/include/copypaste.h b/programs/cmm/eolite/include/copypaste.h index 309c164923..d18d2656b2 100644 --- a/programs/cmm/eolite/include/copypaste.h +++ b/programs/cmm/eolite/include/copypaste.h @@ -41,13 +41,11 @@ void Paste() notify("Copy directory into itself is a bad idea..."); ExitProcess(); } - copy_rezult = copyf(#copy_from,#copy_to); - if (copy_rezult) + if (copy_rezult = copyf(#copy_from,#copy_to)) { Write_Error(copy_rezult); - ExitProcess(); } - if (cut_active) + else if (cut_active) { strcpy(#file_path, #copy_from); Del_File(true); diff --git a/programs/cmm/eolite/include/icons_f.h b/programs/cmm/eolite/include/icons_f.h index 2b984af1b9..1397445c34 100644 --- a/programs/cmm/eolite/include/icons_f.h +++ b/programs/cmm/eolite/include/icons_f.h @@ -36,7 +36,7 @@ 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; } - PutPaletteImage(icon_n*16*15+#ficons,16,15,195,yy,8,#ficons_pal); + PutPaletteImage(icon_n*16*15+#ficons,16,15,files.x+3,yy,8,#ficons_pal); 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); //закрашиваем иконку }