From 8b2e98ff52629d19f3b09405e4e2361043bada78 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Sat, 27 Aug 2016 23:44:17 +0000 Subject: [PATCH] Eolite 3.61: status bar optionaly; Show file names in original case; git-svn-id: svn://kolibrios.org@6505 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/eolite.ini | 3 +- programs/cmm/eolite/Eolite.c | 32 +++++++++++++--------- programs/cmm/eolite/include/left_panel.h | 4 ++- programs/cmm/eolite/include/settings.h | 10 +++++-- programs/cmm/eolite/include/translations.h | 4 +-- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/data/common/File Managers/eolite.ini b/data/common/File Managers/eolite.ini index 8d7f4ae930..1566456f1c 100644 --- a/data/common/File Managers/eolite.ini +++ b/data/common/File Managers/eolite.ini @@ -1,5 +1,6 @@ [Config] SelectionColor=148,174,206 ShowDeviceName=1 -RealFileNamesCase=0 +RealFileNamesCase=1 InfoAfterCopy=0 +ShowStatusBar=1 diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 6772644e35..6a2db35bf1 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -97,10 +97,11 @@ byte CMD_REFRESH; //struct t_settings { char sort_num=2; bool show_dev_name=true, - real_files_names_case=false, + real_files_names_case=true, info_after_copy=false, two_panels=false, show_breadcrumb=false, + show_status_bar=true, active_panel=1; //} settings; @@ -425,7 +426,7 @@ void main() selected_count++; } List_ReDraw(); - DrawStatusBar(); + if (show_status_bar) DrawStatusBar(); break; case 022: //Ctrl+U - unselect all files for (i=0; i15) files_inactive.item_h = files.item_h = files.item_h-1; + else if (id==27) show_status_bar ^= 1; else if (id==30) { label.size.pt++; IF(!label.changeSIZE()) label.size.pt--; BigFontsChange(); } else if (id==31) { label.size.pt--; IF(!label.changeSIZE()) label.size.pt++; BigFontsChange(); } EventRedrawWindow(Form.left,Form.top); @@ -88,7 +91,7 @@ void settings_dialog() break; case evReDraw: - DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 332+GetSkinHeight(),0x34,system.color.work,TITLE_SETT); + DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 357+GetSkinHeight(),0x34,system.color.work,TITLE_SETT); DrawSettingsCheckBoxes(); } } @@ -109,6 +112,7 @@ void DrawSettingsCheckBoxes() y.n = 0; CheckBox(x, y.inc(14), 20, SHOW_DEVICE_CLASS, show_dev_name); CheckBox(x, y.inc(25), 21, SHOW_REAL_NAMES, real_files_names_case); + CheckBox(x, y.inc(25), 27, SHOW_STATUS_BAR, show_status_bar); CheckBox(x, y.inc(25), 22, NOTIFY_COPY_END, info_after_copy); CheckBox(x, y.inc(25), 32, SHOW_BREADCRUMBS, show_breadcrumb); CheckBox(x, y.inc(25), 24, USE_TWO_PANELS, two_panels); @@ -130,7 +134,8 @@ void LoadIniSettings() FileShow.font_size_x = files.font_w; FileShow.font_number = 0; ini_get_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", 1); show_dev_name = EAX; - ini_get_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", 0); real_files_names_case = EAX; + ini_get_int stdcall (eolite_ini_path, #config_section, "ShowStatusBar", 1); show_status_bar = EAX; + ini_get_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", 1); real_files_names_case = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", 0); info_after_copy = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "FontSize", 12); label.size.pt = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "TwoPanels", 0); two_panels = EAX; @@ -154,6 +159,7 @@ void LoadIniSettings() void SaveIniSettings() { ini_set_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", show_dev_name); + ini_set_int stdcall (eolite_ini_path, #config_section, "ShowStatusBar", show_status_bar); ini_set_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", real_files_names_case); ini_set_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", info_after_copy); ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", label.size.pt); diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 4ceafc5b17..c028403f27 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.60" -#define ABOUT_TITLE "EOLITE 3.60" +#define TITLE "Eolite File Manager v3.61" +#define ABOUT_TITLE "EOLITE 3.61" #ifdef LANG_RUS ?define T_FILE "Файл"