From 95f1cee2c68fc115b1c88869bc88055fc139c9b9 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 7 Jun 2021 20:03:19 +0000 Subject: [PATCH] eolite: update git-svn-id: svn://kolibrios.org@8779 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/efm | Bin 461 -> 461 bytes programs/cmm/eolite/Eolite.c | 45 +++++++++++++--------- programs/cmm/eolite/include/breadcrumbs.h | 2 +- programs/cmm/eolite/include/left_panel.h | 4 +- programs/cmm/eolite/include/settings.h | 6 +-- programs/cmm/lib/patterns/select_list.h | 8 +++- 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/data/common/File Managers/efm b/data/common/File Managers/efm index 6e4e82b52ee9a4f99e2fe0b0c1bd135024d97df2..aecda359a9dce4141b6e7c5bfb6e48ceb77b6ba8 100644 GIT binary patch delta 12 TcmX@he3p5_DaM$Mr : delete file/folder //-v : paste files/folder from clipboard dword p = #param; - if (param[0]=='/') && (param[1]=='E') && (param[2]=='F') && (param[3]=='M') { + if (param[0]=='\\') && (param[1]=='E') && (param[2]=='F') && (param[3]=='M') { efm = true; p += 4; if (param[4]==' ') p++; } + LoadIniSettings(); + if (ESBYTE[p]=='\0') return; if (ESBYTE[p]=='-') switch (ESBYTE[p+1]) @@ -198,7 +200,9 @@ void handle_param() ExitProcess(); } - if (ESBYTE[strlen(p)+p-1]=='/') ESBYTE[strlen(p)+p-1]=NULL; //no "/" at the end + ESBYTE[0] = NULL; + + if (param[strlen(#param)-1]=='/') ESBYTE[strlen(#param)-1]=NULL; //no "/" at the end if (dir_exists(p)) { strcpy(#path, p); @@ -206,7 +210,7 @@ void handle_param() if (file_exists(p)) { ESBYTE[strrchr(p, '/')+p-1] = '\0'; strcpy(#path, p); - SelectFileByName(p+strlen(p)+1); + SelectFileByName(p+strlen(#path)+1); } else { notify(T_NOTIFY_APP_PARAM_WRONG); } @@ -222,11 +226,8 @@ void main() SetAppColors(); handle_param(); - ESBYTE[0] = NULL; - rand_n = random(80); - LoadIniSettings(); SystemDiscs.Get(); Open_Dir(#path,ONLY_OPEN); @@ -659,7 +660,7 @@ void DrawFilePanels() } else { - SystemDiscs.Get(); + //SystemDiscs.Get(); llist_copy(#files, #files_inactive); strcpy(#path, #inactive_path); col.selec = col.selec_inactive; @@ -702,6 +703,7 @@ void List_ReDraw() int all_lines_h; dword j; static int old_cur_y, old_first; + dword separator_color; files.CheckDoesValuesOkey(); //prevent some shit @@ -729,8 +731,9 @@ void List_ReDraw() //in the bottom all_lines_h = j * files.item_h; DrawBar(files.x,all_lines_h + files.y,files.w,files.h - all_lines_h, col.list_bg); - DrawBar(files.x+files.w-141,all_lines_h + files.y,1,files.h - all_lines_h,col.list_vert_line); - DrawBar(files.x+files.w-68,all_lines_h + files.y,1,files.h - all_lines_h,col.list_vert_line); + if (colored_lines.checked) separator_color = col.list_bg; else separator_color = col.list_vert_line; + DrawBar(files.x+files.w-141,all_lines_h + files.y,1,files.h - all_lines_h, separator_color); + DrawBar(files.x+files.w-68,all_lines_h + files.y,1,files.h - all_lines_h, separator_color); Scroll(); if (del_active) Del_Form(); @@ -764,13 +767,22 @@ void Line_ReDraw(dword bgcol, filenum){ icon_y = files.item_h-icon_size/2+y; BDVK file; char full_path[4096]; + dword separator_color; char label_file_name[4096]; if (filenum==-1) return; + DrawBar(files.x,y,4,files.item_h,bgcol); DrawBar(files.x+4,y,icon_size,icon_y-y,bgcol); if (files.item_h>icon_size) DrawBar(files.x+4,icon_y+icon_size-1,icon_size,y+files.item_h-icon_y-icon_size+1,bgcol); - if (colored_lines.checked) && (bgcol!=col.selec) && (filenum%2) bgcol=col.odd_line; + if (colored_lines.checked) { + if (bgcol!=col.selec) && (filenum%2) bgcol=col.odd_line; + separator_color = bgcol; + } else { + separator_color = col.list_vert_line; + } DrawBar(files.x+icon_size+4,y,files.w-icon_size-4,files.item_h,bgcol); + DrawBar(files.x+files.w-141,y,1,files.item_h, separator_color); + DrawBar(files.x+files.w-68,y,1,files.item_h, separator_color); file_offet = items.get(filenum+files.first)*304 + buf+32; attr = ESDWORD[file_offet]; @@ -797,7 +809,6 @@ void Line_ReDraw(dword bgcol, filenum){ } if (file_size) WriteText(7-strlen(file_size)*6+files.x+files.w-58, files.text_y+y+1, files.font_type, col.list_gb_text, file_size); - DrawIconByExtension(#full_path, ext1, files.x+4, icon_y, bgcol); if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=col.list_text_hidden; //system or hiden? if (bgcol==col.selec) @@ -838,8 +849,8 @@ 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); } - DrawBar(files.x+files.w-141,y,1,files.item_h,col.list_vert_line); //gray line 1 - DrawBar(files.x+files.w-68,y,1,files.item_h,col.list_vert_line); //gray line 2 + if (bgcol == col.selec_inactive) DrawWideRectangle(files.x+2, y, files.w-4, files.item_h, 2, 0x92B1D9); + DrawIconByExtension(#full_path, ext1, files.x+4, icon_y, bgcol); } @@ -1137,9 +1148,7 @@ void FnProcess(byte N) if (two_panels.checked) { DrawFilePanels(); - } - else - { + } else { Tip(56, T_DEVICES, 55, "-"); Open_Dir(#path,WITH_REDRAW); pause(10); diff --git a/programs/cmm/eolite/include/breadcrumbs.h b/programs/cmm/eolite/include/breadcrumbs.h index 1eead2c8c3..f72ab58283 100644 --- a/programs/cmm/eolite/include/breadcrumbs.h +++ b/programs/cmm/eolite/include/breadcrumbs.h @@ -2,7 +2,7 @@ PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0}; void DrawPathBar() { - PathShow.start_x = -efm*20 + 250; + PathShow.start_x = -efm*22 + 250; PathShow.area_size_x = Form.cwidth-300; DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line); diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index 787f5604ec..0a2efe0007 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -131,8 +131,8 @@ void _SystemDiscs::Draw() for (i=0; i<30; i++) DeleteButton(100+i); - if ( two_panels.checked) { draw_y = 41; draw_x = 2; } - if (!two_panels.checked) { draw_y = 74; draw_x = 17; } + if (two_panels.checked) { draw_y = 41; draw_x = 2; } + else { draw_y = 74; draw_x = 17; } for (i=0;i