diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 9c39e6e0f1..80bf5a9f1a 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -67,6 +67,8 @@ void Draw_List() int i; int yyy; int list_last; + list[SKINS].SetFont(6, 6, 10000000b); + list[WALLPAPERS].SetFont(6, 6, 10000000b); list[SKINS].SetSizes(0, PANEL_H, Form.cwidth-scroll1.size_x-1, Form.cheight-PANEL_H, 20); list[WALLPAPERS].SetSizes(0, PANEL_H, Form.cwidth-scroll1.size_x-1, Form.cheight-PANEL_H, 20); if (list[active].count > list[active].visible) list_last = list[active].visible; else list_last = list[active].count; diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index 6abc7a0b93..aad2ac67dd 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -88,7 +88,9 @@ void DrawSettingsCheckBoxes() void LoadIniSettings() { - ini_get_color stdcall (eolite_ini_path, #config_section, "SelectionColor", 0x94AECE); col_selec = EAX; + files.SetFont(6, 9, 10000000b); + 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, "InfoAfterCopy", 0); info_after_copy = EAX; @@ -100,10 +102,6 @@ void LoadIniSettings() ini_get_int stdcall (eolite_ini_path, #config_section, "WinY", 50); WinY = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "WinW", 550); WinW = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "WinH", 500); WinH = EAX; - BigFontsChange(); - files.SetFont(6, 6, 10000000b); - FileShow.font_size_x = files.font_w; - FileShow.font_number = 0; } @@ -143,14 +141,14 @@ void SetAppColors() system.color.work_button = 0xD2D3D3; system.color.work_button_text = 0x000000; col_padding = 0xC8C9C9; - //col_selec = 0x94AECE; + col_selec = 0x94AECE; col_lpanel = 0x00699C; } void BigFontsChange() { - files.line_h = font.height + 4; + files.line_h = font.size.text + 4; if (files.line_h<18) files.line_h = 18; files_active.line_h = files_inactive.line_h = files.line_h; } diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 8bb81c7b5e..1e1c79f919 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.12" -#define ABOUT_TITLE "Eolite 3.12" +#define TITLE "Eolite File Manager v3.13" +#define ABOUT_TITLE "Eolite 3.13" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/installer/_compile_en.bat b/programs/cmm/installer/_compile_en.bat index 558371806b..f0247698cd 100644 --- a/programs/cmm/installer/_compile_en.bat +++ b/programs/cmm/installer/_compile_en.bat @@ -7,3 +7,4 @@ C-- installer.c @pause @del lang.h-- @del warning.txt +kpack installer.kex \ No newline at end of file diff --git a/programs/cmm/installer/_compile_ru.bat b/programs/cmm/installer/_compile_ru.bat index 7bcc5efc2c..c0f6da318a 100644 --- a/programs/cmm/installer/_compile_ru.bat +++ b/programs/cmm/installer/_compile_ru.bat @@ -7,3 +7,4 @@ C-- installer.c @pause @del lang.h-- @del warning.txt +kpack installer.kex \ No newline at end of file diff --git a/programs/cmm/installer/installer.c b/programs/cmm/installer/installer.c index 6c51fc2ab2..293787528f 100644 --- a/programs/cmm/installer/installer.c +++ b/programs/cmm/installer/installer.c @@ -16,6 +16,7 @@ void main() SetAddApplDir("kolibrios", abspath("install/kolibrios")+1); io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png"); + io.del("/sys/docpack"); copyf(abspath("install/sys"), "/sys"); RestartProcessByName("@icon", MULTIPLE); RestartProcessByName("@taskbar", SINGLE);