diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 6cafa6cae3..a0c47e095a 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -83,8 +83,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v2.53" -#define ABOUT_TITLE "Eolite v2.53" +#define TITLE "Eolite File Manager v2.54" +#define ABOUT_TITLE "Eolite v2.54" dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index 5b902e1d71..750a171ecc 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -1,55 +1,63 @@ #ifdef LANG_RUS - ?define PROP_TITLE "Свойства" + ?define WINDOW_TITLE_PROPERITIES "Свойства" ?define BTN_CLOSE "Закрыть" - ?define SET_1 "Расположение" - ?define SET_2 "Размер" + ?define T_NAME "Имя:" + ?define T_DEST "Расположение:" + ?define T_SIZE "Размер:" ?define SET_3 "Создан" ?define SET_4 "Открыт" ?define SET_5 "Изменен" ?define SET_6 "Файлов: " ?define SET_7 " Папок: " - ?define SET_8 "Содержит " - ?define HIDDEN_T "Скрытый" - ?define SYSTEM_T "Системный" - ?define ONLY_READ_T "Только чтение" + ?define T_CONTAINS "Содержит: " + ?define FLAGS " Аттрибуты " + ?define T_HIDDEN "Скрытый" + ?define T_SYSTEM "Системный" + ?define T_ONLY_READ "Только чтение" #elif LANG_EST - ?define PROP_TITLE "Свойства" + ?define WINDOW_TITLE_PROPERITIES "Свойства" ?define BTN_CLOSE "Закрыть" - ?define SET_1 "Расположение" - ?define SET_2 "Размер" + ?define T_NAME "Имя:" + ?define T_DEST "Расположение:" + ?define T_SIZE "Размер:" ?define SET_3 "Создан" ?define SET_4 "Открыт" ?define SET_5 "Изменен" ?define SET_6 "Файлов: " ?define SET_7 " Папок: " - ?define SET_8 "Содержит " - ?define HIDDEN_T "Скрытый" - ?define SYSTEM_T "Системный" - ?define ONLY_READ_T "Только чтение" + ?define T_CONTAINS "Содержит: " + ?define FLAGS " Аттрибуты " + ?define T_HIDDEN "Скрытый" + ?define T_SYSTEM "Системный" + ?define T_ONLY_READ "Только чтение" #else - ?define PROP_TITLE "Свойства" - ?define BTN_CLOSE "Закрыть" - ?define SET_1 "Расположение" - ?define SET_2 "Размер" - ?define SET_3 "Создан" - ?define SET_4 "Открыт" - ?define SET_5 "Изменен" - ?define SET_6 "Файлов: " - ?define SET_7 " Папок: " - ?define SET_8 "Содержит " - ?define HIDDEN_T "Скрытый" - ?define SYSTEM_T "Системный" - ?define ONLY_READ_T "Только чтение" + ?define WINDOW_TITLE_PROPERITIES "Properities" + ?define BTN_CLOSE "Close" + ?define T_NAME "Name:" + ?define T_DEST "Destination:" + ?define T_SIZE "Size:" + ?define SET_3 "Created" + ?define SET_4 "Opened" + ?define SET_5 "Modified" + ?define SET_6 "Files: " + ?define SET_7 " Folders: " + ?define T_CONTAINS "Contains: " + ?define FLAGS " Attributes " + ?define T_HIDDEN "Hidden" + ?define T_SYSTEM "System" + ?define T_ONLY_READ "Read-only" #endif dword mouse_ddd2; char path_to_file[4096]="\0"; char file_name2[4096]="\0"; -edit_box file_name_ed = {100,30,5,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#file_name2,#mouse_ddd2, 1000000000000000b,2,2}; -edit_box path_to_file_ed = {100,100,27,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#path_to_file,#mouse_ddd2, 1000000000000000b,2,2}; -checkbox2 HIDDEN_chb = {10*65536+15, 115*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, HIDDEN_T, CH_FLAG_MIDDLE, 0}; -checkbox2 SYSTEM_chb = {90*65536+15, 115*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, SYSTEM_T, CH_FLAG_MIDDLE, 0}; -checkbox2 ONLY_READ_chb = {180*65536+15, 115*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, ONLY_READ_T, CH_FLAG_MIDDLE, 0}; +edit_box file_name_ed = {150,50,25,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#file_name2,#mouse_ddd2, 1000000000000000b,2,2}; +edit_box path_to_file_ed = {150,100,46,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#path_to_file,#mouse_ddd2, 1000000000000000b,2,2}; + +frame flags_frame = { 0, 180, 10, 80, 106, 0x000111, 0xFFFfff, 1, FLAGS, 0, 0, 6, 0x000111, 0xCCCccc }; +checkbox2 HIDDEN_chb = {22*65536+15, 120*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_HIDDEN, CH_FLAG_MIDDLE, 0}; +checkbox2 SYSTEM_chb = {22*65536+15, 140*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_SYSTEM, CH_FLAG_MIDDLE, 0}; +checkbox2 ONLY_READ_chb = {22*65536+15, 160*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, T_ONLY_READ, CH_FLAG_MIDDLE, 0}; int file_count, dir_count, size_dir; char folder_info[200]; @@ -100,6 +108,8 @@ void properties_dialog() file_name_ed.size = strlen(#file_name2); strcpy(#path_to_file, #path); path_to_file_ed.size = strlen(#path_to_file); + + if (itdir) GetSizeDir(#file_path); SetEventMask(0x27); loop() switch(WaitEvent()) @@ -123,39 +133,51 @@ void properties_dialog() break; case evReDraw: - DefineAndDrawWindow(Form.left + 150,150,300,228+GetSkinHeight(),0x34,sc.work,PROP_TITLE); + DefineAndDrawWindow(Form.left + 150,150,300,238+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE_PROPERITIES); GetProcessInfo(#settings_form, SelfInfo); DrawFlatButton(208, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE); - if (! TestBit(file_info.attr, 4) ) Put_icon(#file_name2+strrchr(#file_name2,'.'), 10, 5, sc.work, 0); - else Put_icon("