From 4d30fd7a2b7cef8398901f4e03048231e5e9fa5b Mon Sep 17 00:00:00 2001 From: leency Date: Sat, 15 Mar 2025 04:15:38 +0200 Subject: [PATCH] Eolite 5.29: Fixed bug in "Apply to all files?" dialog - line height can no longer be smaller than icon size; - fixed bug with edit box activation under "Apply to all files?" dialog; - updated dates; - fixed kfont initialization. --- programs/cmm/eolite/Eolite.c | 8 +++++--- programs/cmm/eolite/include/properties.h | 6 ++++-- programs/cmm/eolite/include/settings.h | 3 +-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 7fadf3837..93433a964 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -11,9 +11,9 @@ TODO: http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334 */ -#define ABOUT_TITLE "EOLITE 5.28" -#define TITLE_EOLITE "Eolite File Manager 5.28" -#define TITLE_KFM "Kolibri File Manager 2.28"; +#define ABOUT_TITLE "EOLITE 5.29" +#define TITLE_EOLITE "Eolite File Manager 5.29" +#define TITLE_KFM "Kolibri File Manager 2.29"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -195,6 +195,8 @@ void main() handle_param(); + kfont.init(DEFAULT_FONT); + SystemDiscs.Get(); OpenDir(ONLY_OPEN); llist_copy(#files_inactive, #files); diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index c3c1f32c1..4dc5ce69d 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -175,8 +175,10 @@ void properties_dialog() break; case evMouse: - edit_box_mouse stdcall (#file_name_ed); - edit_box_mouse stdcall (#path_to_file_ed); + if (!apply_question_active) { + edit_box_mouse stdcall (#file_name_ed); + edit_box_mouse stdcall (#path_to_file_ed); + } break; case evKey: diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index 1af05e584..bac389c15 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -7,7 +7,7 @@ edit_box path_start_ed = {290,50,57,0xffffff,0x94AECE,0xffffff,0xffffff,0x100000 #path_start,0, 100000000000010b,0,0}; more_less_box font_size = { NULL, 9, 22, FONT_SIZE_LABEL }; -more_less_box line_height = { NULL, 16, 64, LIST_LINE_HEIGHT }; +more_less_box line_height = { NULL, 18, 64, LIST_LINE_HEIGHT }; checkbox show_dev_name = { SHOW_DEVICE_CLASS }; checkbox big_icons = { BIG_ICONS }; checkbox colored_lines = { COLORED_LINES }; @@ -134,7 +134,6 @@ void LoadIniSettings() Form.height = ini.GetInt("WinH", efm*100+517); ini.GetString("DefaultPath", #path_start, 4096, "/sys"); path_start_ed.size = path_start_ed.pos = strlen(#path_start); - kfont.init(DEFAULT_FONT); ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font smoothing",#temp,4096,"on"); if(streq(#temp,"off")) kfont.smooth = false; else kfont.smooth = true; }