From 9d3814b61fd7fb25bd59b7b4a1d5af71f4f335bb Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 26 Dec 2013 21:48:54 +0000 Subject: [PATCH] cmm: small fixes git-svn-id: svn://kolibrios.org@4409 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/include/ini.h | 12 ++++++------ programs/cmm/installer/installer.c | 4 ++-- programs/cmm/lib/list_box.h | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/cmm/eolite/include/ini.h b/programs/cmm/eolite/include/ini.h index d76ed90741..a52ec1cc1f 100644 --- a/programs/cmm/eolite/include/ini.h +++ b/programs/cmm/eolite/include/ini.h @@ -30,13 +30,13 @@ void GetIni(byte onload) case 0x0a: case 0x0d: InfType=PARAM; - IF (!strcmp(#parametr,"SelectionColor")) edit2.shift_color=col_selec=StrToCol(#option); - IF (!strcmp(#parametr,"LineHeight")) files.line_h = atoi(#option); - IF (!strcmp(#parametr,"ShowDeviceName")) show_dev_name=atoi(#option); - IF (!strcmp(#parametr,"RealFileNamesCase")) real_files_names_case=atoi(#option); - IF (!strcmp(#parametr,"DrwRamDiskSpace")) drw_ram_disk_space=atoi(#option); + if (!strcmp(#parametr,"SelectionColor")) edit2.shift_color=col_selec=StrToCol(#option); + if (!strcmp(#parametr,"LineHeight")) files.line_h = atoi(#option); + if (!strcmp(#parametr,"ShowDeviceName")) show_dev_name=atoi(#option); + if (!strcmp(#parametr,"RealFileNamesCase")) real_files_names_case=atoi(#option); + if (!strcmp(#parametr,"DrwRamDiskSpace")) drw_ram_disk_space=atoi(#option); - IF (parametr) && (!strcmp(#file_name+strrchr(#file_name,'.'),#parametr)) && (!onload) + if (parametr) && (!strcmpi(#file_name+strrchr(#file_name,'.'),#parametr)) && (!onload) { errornum = RunProgram(#option,#file_path); if (errornum<0) diff --git a/programs/cmm/installer/installer.c b/programs/cmm/installer/installer.c index 74cda0cc6f..c82169559d 100644 --- a/programs/cmm/installer/installer.c +++ b/programs/cmm/installer/installer.c @@ -34,10 +34,10 @@ void main() RunProgram("/sys/REFRSCRN", NULL); copyf(abspath("sys"), "/rd/1"); RunProgram("/sys/launcher", NULL); - SetSystemSkin("/kolibrios/res/skins/Octo - flat.skn"); + SetSystemSkin("/kolibrios/res/skins/OpusN.skn"); + notify(T_END); DeleteFile("/sys/3d/free3d04"); DeleteFile("/sys/games/invaders"); - notify(T_END); ExitProcess(); } diff --git a/programs/cmm/lib/list_box.h b/programs/cmm/lib/list_box.h index 1b4ed3a1e1..68dbfd0735 100644 --- a/programs/cmm/lib/list_box.h +++ b/programs/cmm/lib/list_box.h @@ -4,6 +4,7 @@ struct llist { int x, y, w, h, min_h, line_h, text_y; int count, visible, first, current; + int active; void ClearList(); int ProcessKey(dword key); int MouseOver(int xx, yy);