diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index f75ef0ed7..ffad4b037 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/about.h b/programs/cmm/eolite/include/about.h index 8f04b46b0..29e532e77 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -42,7 +42,7 @@ void about_dialog() about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2; WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE); WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE); - WriteTextLines(73,163,0x90,sc.work_text," By Leency\nand KolibriOS Team\n 2008-2021",20); + WriteTextLines(73,163,0x90,sc.work_text," By Leency\nand KolibriOS Team\n 2008-2025",20); #ifdef LANG_RUS DrawStandartCaptButton(60,about_form.cheight-38,11,"История разработки"); #endif 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 801b10fee..7a4885f81 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 show_status_bar = { SHOW_STATUS_BAR }; checkbox big_icons = { BIG_ICONS }; @@ -132,7 +132,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; }