diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 1cb01acb4d..f0d9f1b502 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -9,8 +9,8 @@ TODO: */ #define ABOUT_TITLE "EOLITE 5 RC6" -#define TITLE_EOLITE "Eolite File Manager 5 RC6" -#define TITLE_KFM "Kolibri File Manager 2 RC6"; +#define TITLE_EOLITE "Eolite File Manager 5 RC7" +#define TITLE_KFM "Kolibri File Manager 2 RC7"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -59,6 +59,7 @@ dword waves_pal[256]; //Folder data dword buf, buf_inactive; collection_int items=0; + collection_int selected=0; int selected_count; int folder_count; dword path; @@ -775,7 +776,8 @@ void Line_ReDraw(dword bgcol, filenum){ ext1=""; WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, col.list_gb_text, ext1); } - if (chrnum(path, '/')==1) && (streq(path, "/kolibrios")==false) file_size = GetDeviceSize(#full_path); + if (chrnum(path, '/')==1) && (streq(path, "/kolibrios")==false) + && (streq(path, "/sys")==false) file_size = GetDeviceSize(#full_path); } else { @@ -929,7 +931,7 @@ void Dir_Up() strcpy(#old_folder_name, path+iii); if (iii>1) ESBYTE[path+iii-1]=NULL; else ESBYTE[path+iii]=NULL; SelectFileByName(#old_folder_name); - if(efm)DrawPathBarKfm(); + DrawPathBar(); } void EventOpenSelected() diff --git a/programs/cmm/eolite/include/const.h b/programs/cmm/eolite/include/const.h index ed38afc3a4..7cd36c8d56 100644 --- a/programs/cmm/eolite/include/const.h +++ b/programs/cmm/eolite/include/const.h @@ -171,15 +171,16 @@ enum { char *devinfo = { - "r", 0, T_SYS, - "k", 1, T_PROG, - "f", 2, T_FD, - "c", 3, T_CD, - "h", 4, T_HD, - "b", 4, T_HD, - "s", 4, T_SATA, - "t", 5, T_RAM, - "u", 6, T_USB, + "sy", 0, T_SYS, + "rd", 0, T_SYS, + "ko", 1, T_PROG, + "fd", 2, T_FD, + "cd", 3, T_CD, + "hd", 4, T_HD, + "bd", 4, T_HD, + "sd", 4, T_SATA, + "tm", 5, T_RAM, + "us", 6, T_USB, 0 }; diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index 8a0e144eea..319c110c4b 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -230,7 +230,7 @@ void DrawPathBarKfm() void DrawBreadCrumbs() collection_int breadCrumb=0; char PathShow_path[4096]; - int btnx; + int btnx, btnw; int i; { breadCrumb.drop(); @@ -247,13 +247,18 @@ void DrawBreadCrumbs() } breadCrumb.add(i+1); - if (!efm) btnx = 250-4; - else btnx = Form.cwidth/2-2*active_panel + DDW + 2; + if (!efm) { + btnx = 250-4; + btnw = Form.cwidth-278; + } else { + btnx = Form.cwidth/2-2*active_panel + DDW + 2; + btnw = 35*active_panel + Form.cwidth/2 - 17 - DDW - 2; + } for (i=0; i