Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Appearance, Eolite, Installer: fixes

Browse Source 
git-svn-id: svn://kolibrios.org@5767 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-08-23 13:06:45 +00:00
parent 0fc1052214
commit cdc2991cc4
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/appearance/appearance.c
View File

@ -67,6 +67,8 @@ void Draw_List()
int i; int i;
int yyy; int yyy;
int list_last; 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[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); 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; if (list[active].count > list[active].visible) list_last = list[active].visible; else list_last = list[active].count;

12
programs/cmm/eolite/include/settings.h
View File

@ -88,7 +88,9 @@ void DrawSettingsCheckBoxes()
void LoadIniSettings() 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, "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, "RealFileNamesCase", 0); 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, "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, "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, "WinW", 550); WinW = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "WinH", 500); WinH = 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 = 0xD2D3D3;
system.color.work_button_text = 0x000000; system.color.work_button_text = 0x000000;
col_padding = 0xC8C9C9; col_padding = 0xC8C9C9;
//col_selec = 0x94AECE; col_selec = 0x94AECE;
col_lpanel = 0x00699C; col_lpanel = 0x00699C;
} }
void BigFontsChange() void BigFontsChange()
{ {
files.line_h = font.height + 4; files.line_h = font.size.text + 4;
if (files.line_h<18) files.line_h = 18; if (files.line_h<18) files.line_h = 18;
files_active.line_h = files_inactive.line_h = files.line_h; files_active.line_h = files_inactive.line_h = files.line_h;
} }

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.12" #define TITLE "Eolite File Manager v3.13"
#define ABOUT_TITLE "Eolite 3.12" #define ABOUT_TITLE "Eolite 3.13"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

1
programs/cmm/installer/_compile_en.bat
View File

@ -7,3 +7,4 @@ C-- installer.c
@pause @pause
@del lang.h-- @del lang.h--
@del warning.txt @del warning.txt
kpack installer.kex

1
programs/cmm/installer/_compile_ru.bat
View File

@ -7,3 +7,4 @@ C-- installer.c
@pause @pause
@del lang.h-- @del lang.h--
@del warning.txt @del warning.txt
kpack installer.kex

1
programs/cmm/installer/installer.c
View File

@ -16,6 +16,7 @@ void main()
SetAddApplDir("kolibrios", abspath("install/kolibrios")+1); SetAddApplDir("kolibrios", abspath("install/kolibrios")+1);
io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png"); 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"); copyf(abspath("install/sys"), "/sys");
RestartProcessByName("@icon", MULTIPLE); RestartProcessByName("@icon", MULTIPLE);
RestartProcessByName("@taskbar", SINGLE); RestartProcessByName("@taskbar", SINGLE);