diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 24b1173c2..09c89cfe9 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -1,4 +1,4 @@ -//Leency & Veliant 2008-2014 +//Leency & Veliant 2008-2015 //GNU GPL licence. #ifndef AUTOBUILD @@ -83,8 +83,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v2.43" -#define ABOUT_TITLE "Eolite v2.43" +#define TITLE "Eolite File Manager v2.44" +#define ABOUT_TITLE "Eolite v2.44" dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; @@ -107,7 +107,6 @@ byte rename_active=0, del_active=0, show_dev_name=1, - drw_ram_disk_space=0, real_files_names_case=0, sort_num=2, itdir; @@ -143,7 +142,7 @@ void SetAppColors() sc.work_graph = 0x9098B0; //A0A0B8; //0x819FC5; sc.work_button_text = 0x000000; col_padding = 0xC8C9C9; - col_selec = 0x94AECE; + //col_selec = 0x94AECE; col_lpanel = 0x00699C; /* sc.get(); @@ -670,7 +669,6 @@ void Open_Dir(dword dir_path, redraw){ maxcount = sizeof(file_mas)/sizeof(dword)-1; if (files.count>maxcount) files.count = maxcount; if (files.count>0) && (files.current==-1) files.current=0; - if (drw_ram_disk_space) DrawRamDiskSpace(); } if (files.count!=-1) { @@ -896,7 +894,7 @@ void Open() if (!files.count) return; if (!itdir) { - RunProgram("/sys/@open", #file_path); + if (strrchr(#file_name, '.')==0) RunProgram(#file_path, ""); else RunProgram("/sys/@open", #file_path); } else { diff --git a/programs/cmm/eolite/include/about.h b/programs/cmm/eolite/include/about.h index fca24ebd9..f7e0530c4 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -58,7 +58,7 @@ void about_dialog() #endif WriteText(39,130,0x80,0,"Leency & Veliant"); WriteText(45,140,0x80,0,"KolibriOS Team"); - WriteText(61,150,0x80,0,"2008-2014"); + WriteText(61,150,0x80,0,"2008-2015"); #ifdef LANG_RUS WriteText(19,170,0x80,0,INTRO_TEXT_3); #else diff --git a/programs/cmm/eolite/include/ini.h b/programs/cmm/eolite/include/ini.h index dc17a4ecd..a328c6270 100644 --- a/programs/cmm/eolite/include/ini.h +++ b/programs/cmm/eolite/include/ini.h @@ -1,34 +1,18 @@ //INI parser in C--, GPL licence. //Leency - 2012 -#define COMMENT 0 -#define SECTION 1 -#define PARAM 2 -#define OPTION 3 - - void GetIni(byte onload) { - byte section[32], parametr[32], option[256], InfType=0; - char bukva[2]; - int errornum, tj; - static dword buff, fsize; - if (onload==1) - { - free(buff); - if (!GetFile(#buff, #fsize, abspath("Eolite.ini"))) notify("Eolite.ini not found. Defaults will be used."); - } - - ini_get_color stdcall (abspath("Eolite.ini"), "Config", "SelectionColor", 0x94AECE); + dword eolite_ini_path = abspath("Eolite.ini"); + ini_get_color stdcall (eolite_ini_path, "Config", "SelectionColor", 0x94AECE); edit2.shift_color = EAX; - ini_get_int stdcall (abspath("Eolite.ini"), "Config", "LineHeight", 18); + col_selec = EAX; + ini_get_int stdcall (eolite_ini_path, "Config", "LineHeight", 18); files.line_h = EAX; - ini_get_int stdcall (abspath("Eolite.ini"), "Config", "ShowDeviceName", 1); + ini_get_int stdcall (eolite_ini_path, "Config", "ShowDeviceName", 1); show_dev_name = EAX; - ini_get_int stdcall (abspath("Eolite.ini"), "Config", "RealFileNamesCase", 0); + ini_get_int stdcall (eolite_ini_path, "Config", "RealFileNamesCase", 0); real_files_names_case = EAX; - ini_get_int stdcall (abspath("Eolite.ini"), "Config", "DrwRamDiskSpace", 0); - drw_ram_disk_space = EAX; } @@ -44,20 +28,3 @@ void Write_Error(int error_number) strcat(#error_message, "\" -tE"); notify(#error_message); } - - -dword StrToCol(char* htmlcolor) -{ - dword j, color=0; - char ch=0x00; - - FOR (j=0; j<6; j++) - { - ch=ESBYTE[htmlcolor+j]; - IF ((ch>='0') && (ch<='9')) ch -= '0'; - IF ((ch>='A') && (ch<='F')) ch -= 'A'-10; - IF ((ch>='a') && (ch<='f')) ch -= 'a'-10; - color = color*0x10 + ch; - } - return color; -} \ No newline at end of file diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index b42981e76..64e88e3ae 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -120,8 +120,6 @@ void SystemDiscsDraw() case 'r': dev_icon=0; strcpy(#disc_name, "System "); - if (drw_ram_disk_space) - DrawRamDiskSpace(); break; case 'c': dev_icon=1;