From 52a56199a365b044df96b890c4b4c080634aaac0 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 23 Sep 2017 11:02:57 +0000 Subject: [PATCH] cmm apps: various fixes git-svn-id: svn://kolibrios.org@7004 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/html/homepage.htm | 2 +- programs/cmm/eolite/Eolite.c | 6 +++--- programs/cmm/eolite/include/settings.h | 8 +++----- programs/cmm/eolite/include/translations.h | 4 ++-- programs/cmm/lib/patterns/rgb.h | 7 ++++--- programs/cmm/txtread/prepare_page.h | 1 - 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/programs/cmm/browser/html/homepage.htm b/programs/cmm/browser/html/homepage.htm index 8bcdc23bfa..91a2a0d3c4 100644 --- a/programs/cmm/browser/html/homepage.htm +++ b/programs/cmm/browser/html/homepage.htm @@ -8,7 +8,7 @@ Bookmarks:
1. KolibriOS homepage
2. KolibriN homepage
-3. Kolibri Staff +3. Kolibri Stuff diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index f14f673454..6a88ca2fd2 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -107,7 +107,7 @@ bool show_dev_name=true, int status_bar_h = 0; edit_box new_file_ed = {200,213,180,0xFFFFFF,0x94AECE,0xFFFFFF,0xFFFFFF,0x10000000,248,#new_element_name,#mouse_dd,100000000000010b,6,0}; -PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #temp, 0}; +PathShow_data FileShow = {0, 56,215, 8, 100, 1, 0, 0x0, 0xFFFfff, #file_name, #temp, 0}; byte cmd_free=0; #include "include\translations.h" #include "include\fs.h" @@ -731,7 +731,7 @@ void Line_ReDraw(dword bgcol, filenum){ FileShow.font_color = text_col; FileShow.area_size_x = files.w - 164; FileShow.text_pointer = file_name_off; - FileShow.start_y = files.text_y + y + 1; + FileShow.start_y = files.text_y + y - 3; PathShow_prepare stdcall(#FileShow); PathShow_draw stdcall(#FileShow); } @@ -831,7 +831,7 @@ void Del_Form() { byte f_count[128]; int dform_x = files.w - 220 / 2 + files.x; - if (!strncmp(#file_name,".",2)) || (!strncmp(#file_name,"..",2)) return; + if (selected_count==0) && (!strncmp(#file_name,"..",2)) return; else { if (!files.count) return; diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index c55a75735b..a5e9d704b3 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -122,17 +122,15 @@ void DrawSettingsCheckBoxes() path_start_ed.top = y.inc(23); path_start_ed.left = x; DrawEditBox(#path_start_ed); - but_x = DrawFlatButton(x-1, y.inc(34), 6, SAVE_PATH_AS_DEFAULT); - DrawFlatButton(x-1+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT); - DrawFlatButton(x-1, y.inc(38), 5, EDIT_FILE_ASSOCIATIONS); + but_x = DrawStandartCaptButton(x-1, y.inc(34), 6, SAVE_PATH_AS_DEFAULT); + DrawStandartCaptButton(x-1+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT); + DrawStandartCaptButton(x-1, y.inc(38), 5, EDIT_FILE_ASSOCIATIONS); } void LoadIniSettings() { 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, "ShowStatusBar", 1); show_status_bar = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", 1); real_files_names_case = EAX; diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 1686340378..bc6ad7349e 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.79" -#define ABOUT_TITLE "EOLITE 3.79" +#define TITLE "Eolite File Manager v3.8" +#define ABOUT_TITLE "EOLITE 3.8" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/lib/patterns/rgb.h b/programs/cmm/lib/patterns/rgb.h index a89955c3e6..a845c55ce4 100644 --- a/programs/cmm/lib/patterns/rgb.h +++ b/programs/cmm/lib/patterns/rgb.h @@ -17,10 +17,11 @@ :dword _rgb::RgbToDword() { - dword _b, _g; - _b = b << 16; + dword _r, _g, _b; + _r = r << 16; _g = g << 8; - return _b + _g + r; + _b = b; + return _r + _g + _b; } :dword MixColors(dword _base, _overlying, byte a) diff --git a/programs/cmm/txtread/prepare_page.h b/programs/cmm/txtread/prepare_page.h index 05140d45fe..452da85540 100644 --- a/programs/cmm/txtread/prepare_page.h +++ b/programs/cmm/txtread/prepare_page.h @@ -11,7 +11,6 @@ dword bufoff, buflen; byte ch; char line[4096]=0; int srch_pos; -dword stroka=0; dword stroka_y=5; dword line_length=30; dword line_start=io.buffer_data;