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

cmm apps: various fixes

Browse Source 
git-svn-id: svn://kolibrios.org@7004 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2017-09-23 11:02:57 +00:00
parent a83abc4c5f
commit 52a56199a3
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/browser/html/homepage.htm
View File

@ -8,7 +8,7 @@
Bookmarks:<br> Bookmarks:<br>
1. <a href="http://kolibrios.org">KolibriOS homepage</a><br> 1. <a href="http://kolibrios.org">KolibriOS homepage</a><br>
2. <a href="http://kolibri-n.org">KolibriN homepage</a><br> 2. <a href="http://kolibri-n.org">KolibriN homepage</a><br>
3. <a href="http://store.kolibri-n.org">Kolibri Staff</a> 3. <a href="http://store.kolibri-n.org">Kolibri Stuff</a>
</body> </body>

6
programs/cmm/eolite/Eolite.c
View File

@ -107,7 +107,7 @@ bool show_dev_name=true,
int status_bar_h = 0; 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}; 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; byte cmd_free=0;
#include "include\translations.h" #include "include\translations.h"
#include "include\fs.h" #include "include\fs.h"
@ -731,7 +731,7 @@ void Line_ReDraw(dword bgcol, filenum){
FileShow.font_color = text_col; FileShow.font_color = text_col;
FileShow.area_size_x = files.w - 164; FileShow.area_size_x = files.w - 164;
FileShow.text_pointer = file_name_off; 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_prepare stdcall(#FileShow);
PathShow_draw stdcall(#FileShow); PathShow_draw stdcall(#FileShow);
} }
@ -831,7 +831,7 @@ void Del_Form()
{ {
byte f_count[128]; byte f_count[128];
int dform_x = files.w - 220 / 2 + files.x; 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 else
{ {
if (!files.count) return; if (!files.count) return;

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

@ -122,17 +122,15 @@ void DrawSettingsCheckBoxes()
path_start_ed.top = y.inc(23); path_start_ed.top = y.inc(23);
path_start_ed.left = x; path_start_ed.left = x;
DrawEditBox(#path_start_ed); DrawEditBox(#path_start_ed);
but_x = DrawFlatButton(x-1, y.inc(34), 6, SAVE_PATH_AS_DEFAULT); but_x = DrawStandartCaptButton(x-1, y.inc(34), 6, SAVE_PATH_AS_DEFAULT);
DrawFlatButton(x-1+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT); DrawStandartCaptButton(x-1+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT);
DrawFlatButton(x-1, y.inc(38), 5, EDIT_FILE_ASSOCIATIONS); DrawStandartCaptButton(x-1, y.inc(38), 5, EDIT_FILE_ASSOCIATIONS);
} }
void LoadIniSettings() void LoadIniSettings()
{ {
files.SetFont(6, 9, 10000000b); 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, "ShowStatusBar", 1); show_status_bar = 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; ini_get_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", 1); real_files_names_case = EAX;

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

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.79" #define TITLE "Eolite File Manager v3.8"
#define ABOUT_TITLE "EOLITE 3.79" #define ABOUT_TITLE "EOLITE 3.8"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

7
programs/cmm/lib/patterns/rgb.h
View File

@ -17,10 +17,11 @@
:dword _rgb::RgbToDword() :dword _rgb::RgbToDword()
{ {
dword _b, _g; dword _r, _g, _b;
_b = b << 16; _r = r << 16;
_g = g << 8; _g = g << 8;
return _b + _g + r; _b = b;
return _r + _g + _b;
} }
:dword MixColors(dword _base, _overlying, byte a) :dword MixColors(dword _base, _overlying, byte a)

1
programs/cmm/txtread/prepare_page.h
View File

@ -11,7 +11,6 @@ dword bufoff, buflen;
byte ch; byte ch;
char line[4096]=0; char line[4096]=0;
int srch_pos; int srch_pos;
dword stroka=0;
dword stroka_y=5; dword stroka_y=5;
dword line_length=30; dword line_length=30;
dword line_start=io.buffer_data; dword line_start=io.buffer_data;