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

Eolite: use bigger fonts by default, other small fixes

Browse Source 
git-svn-id: svn://kolibrios.org@6039 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-01-07 13:10:39 +00:00
parent 909027f891
commit 6a46b302a9
6 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,25 +602,25 @@ void DrawFilePanels()
llist_copy(#files, #files_inactive); llist_copy(#files, #files_inactive);
strcpy(#path, #inactive_path); strcpy(#path, #inactive_path);
col_selec = 0xCCCccc; col_selec = 0xCCCccc;
files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y, files.item_h); files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col_selec = 0x94AECE; col_selec = 0x94AECE;
files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y, files.item_h); files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
} }
if (active_panel==2) if (active_panel==2)
{ {
files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y, files.item_h); files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col_selec = 0x94AECE; col_selec = 0x94AECE;
files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y, files.item_h); files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
} }

7
programs/cmm/eolite/include/gui.h
View File

@ -51,10 +51,9 @@ void DrawFlatButton(dword x,y,width,height,id,color,text)
if (color!=-1) DrawFilledBar(x+2, y+2, width-3, height-3); if (color!=-1) DrawFilledBar(x+2, y+2, width-3, height-3);
IF (id<>0) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF); IF (id<>0) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
if (height<18) if (height<18)
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80 ,system.color.work_text,text); WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,system.color.work_text,text);
else else
WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,10010000b,system.color.work_text,text); WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,system.color.work_text,text);
} }
void DrawFilledBar(dword x, y, w, h) void DrawFilledBar(dword x, y, w, h)
@ -62,7 +61,7 @@ void DrawFilledBar(dword x, y, w, h)
int i, fill_h; int i, fill_h;
if (h <= 14) fill_h = h; else fill_h = 14; if (h <= 14) fill_h = h; else fill_h = 14;
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette[14-i]); for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette[14-i]);
DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]); DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]);
} }
void DrawEolitePopup(dword b1_text, b2_text) void DrawEolitePopup(dword b1_text, b2_text)

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

@ -100,49 +100,40 @@ void LoadIniSettings()
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;
ini_get_int stdcall (eolite_ini_path, #config_section, "FontSize", 9); label.size.pt = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "FontSize", 12); label.size.pt = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "TwoPanels", 0); two_panels = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "TwoPanels", 0); two_panels = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "LineHeight", 18); files.item_h = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "LineHeight", 19); files.item_h = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "WinX", 200); WinX = EAX; ini_get_int stdcall (eolite_ini_path, #config_section, "WinX", 200); WinX = EAX;
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", 506); WinH = EAX;
ini_get_str stdcall (eolite_ini_path, #config_section, "DefaultPath", #path,4096,"/rd/1/"); ini_get_str stdcall (eolite_ini_path, #config_section, "DefaultPath", #path,4096,"/rd/1/");
ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font file",#temp,4096,DEFAULT_FONT); ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font file",#temp,4096,DEFAULT_FONT);
label.init(#temp); label.init(#temp);
ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font smoothing",#temp,4096,"on"); ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font smoothing",#temp,4096,"on");
if(!strcmp(#temp,"off")) label.smooth = false; else label.smooth = true; if(!strcmp(#temp,"off")) label.smooth = false; else label.smooth = true;
} }
void ProceedSaveSettings(dword save_path)
{
ini_set_int stdcall (save_path, #config_section, "ShowDeviceName", show_dev_name);
ini_set_int stdcall (save_path, #config_section, "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (save_path, #config_section, "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (save_path, #config_section, "FontSize", label.size.pt);
ini_set_int stdcall (save_path, #config_section, "TwoPanels", two_panels);
ini_set_int stdcall (save_path, #config_section, "LineHeight", files.item_h);
ini_set_int stdcall (save_path, #config_section, "WinX", Form.left);
ini_set_int stdcall (save_path, #config_section, "WinY", Form.top);
ini_set_int stdcall (save_path, #config_section, "WinW", Form.width);
ini_set_int stdcall (save_path, #config_section, "WinH", Form.height);
}
void SaveIniSettings() void SaveIniSettings()
{ {
ProceedSaveSettings(eolite_ini_path);
ini_set_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", show_dev_name); if(CMD_ENABLE_SAVE_IMG) ProceedSaveSettings(fd_path_eolite_ini_path);
ini_set_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", label.size.pt);
ini_set_int stdcall (eolite_ini_path, #config_section, "TwoPanels", two_panels);
ini_set_int stdcall (eolite_ini_path, #config_section, "LineHeight", files.item_h);
ini_set_int stdcall (eolite_ini_path, #config_section, "WinX", Form.left);
ini_set_int stdcall (eolite_ini_path, #config_section, "WinY", Form.top);
ini_set_int stdcall (eolite_ini_path, #config_section, "WinW", Form.width);
ini_set_int stdcall (eolite_ini_path, #config_section, "WinH", Form.height);
if(CMD_ENABLE_SAVE_IMG)
{
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "ShowDeviceName", show_dev_name);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "FontSize", label.size.pt);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "TwoPanels", two_panels);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "LineHeight", files.item_h);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "WinX", Form.left);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "WinY", Form.top);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "WinW", Form.width);
ini_set_int stdcall (fd_path_eolite_ini_path, #config_section, "WinH", Form.height);
}
} }

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

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.34" #define TITLE "Eolite File Manager v3.35"
#define ABOUT_TITLE "Eolite 3.34" #define ABOUT_TITLE "Eolite 3.35"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

7
programs/cmm/lib/kolibri.h
View File

@ -26,15 +26,14 @@ dword I_Path = #program_path;
char param[4096]; char param[4096];
char program_path[4096]; char program_path[4096];
dword TEMP = 0; #define bool char
#define NULL 0 #define NULL 0
#define OLD -1 #define OLD -1
#define true 1 #define true 1
#define false 0 #define false 0
//Events //Process Events
#define evReDraw 1 #define evReDraw 1
#define evKey 2 #define evKey 2
#define evButton 3 #define evButton 3
@ -44,8 +43,6 @@ dword TEMP = 0;
#define evNetwork 8 #define evNetwork 8
#define evDebug 9 #define evDebug 9
#define EVENT_MOUSE case 6: mouse.get();
//Button options //Button options
#define BT_DEL 0x80000000 #define BT_DEL 0x80000000
#define BT_HIDE 0x40000000 #define BT_HIDE 0x40000000

4
programs/cmm/lib/list_box.h
View File

@ -34,10 +34,10 @@ struct llist
int KeyLeft(); int KeyLeft();
int KeyRight(); int KeyRight();
void CheckDoesValuesOkey(); void CheckDoesValuesOkey();
void debug_values(); void debug();
}; };
void llist::debug_values() void llist::debug()
{ {
char yi[128]; char yi[128];
sprintf(#yi, "%s %d %s %d %s %d %s %d %s %d %s %d", "first:", first, "visible:", visible, "count:", count, "col_max:", column_max, "cur_y:", cur_y, "cur_x:", cur_x); sprintf(#yi, "%s %d %s %d %s %d %s %d %s %d %s %d", "first:", first, "visible:", visible, "count:", count, "col_max:", column_max, "cur_y:", cur_y, "cur_x:", cur_x);