Eolite 2.57: use MoreLessBox (remove 14 liness, add 3).

git-svn-id: svn://kolibrios.org@5478 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-02-26 17:20:30 +00:00
parent 55a2139aa1
commit 9dca7a3284
2 changed files with 6 additions and 19 deletions

View File

@ -83,8 +83,8 @@
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
#define TITLE "Eolite File Manager v2.56" #define TITLE "Eolite File Manager v2.57"
#define ABOUT_TITLE "Eolite v2.56" #define ABOUT_TITLE "Eolite v2.57"
dword col_padding, col_selec, col_lpanel; dword col_padding, col_selec, col_lpanel;
int toolbar_buttons_x[7]={9,46,85,134,167,203}; int toolbar_buttons_x[7]={9,46,85,134,167,203};

View File

@ -22,9 +22,6 @@
?define APPLY_T "Apply" ?define APPLY_T "Apply"
#endif #endif
int mouse_ddd;
char lineh_s[30]="18\0";
edit_box LineHeight_ed = {52,10,97,0xffffff,0x94AECE,0xffc90E,0xffffff,2,4,#lineh_s,#mouse_ddd, 1000000000000000b,2,2};
void settings_dialog() void settings_dialog()
{ {
@ -35,7 +32,6 @@ void settings_dialog()
if (active_settings) ExitProcess(); if (active_settings) ExitProcess();
active_settings=1; active_settings=1;
SetEventMask(0x27);
loop() switch(WaitEvent()) loop() switch(WaitEvent())
{ {
case evButton: case evButton:
@ -60,6 +56,8 @@ void settings_dialog()
if (id==20) show_dev_name ^= 1; if (id==20) show_dev_name ^= 1;
if (id==21) real_files_names_case ^= 1; if (id==21) real_files_names_case ^= 1;
if (id==22) info_after_copy ^= 1; if (id==22) info_after_copy ^= 1;
if (id==25) files.line_h++;
if (id==26) && (files.line_h>8) files.line_h--;
DrawSettingsCheckBoxes(); DrawSettingsCheckBoxes();
break; break;
@ -71,12 +69,6 @@ void settings_dialog()
action_buf = 300; action_buf = 300;
ExitProcess(); ExitProcess();
} }
EAX=key<<8;
edit_box_key stdcall(#LineHeight_ed);
break;
case evMouse:
edit_box_mouse stdcall (#LineHeight_ed);
break; break;
case evReDraw: case evReDraw:
@ -85,12 +77,6 @@ void settings_dialog()
DrawSettingsCheckBoxes(); DrawSettingsCheckBoxes();
WriteText(10, 84, 0x80, 0x000000, SET_3);
key = itoa(files.line_h);
strcpy(#lineh_s, key);
edit_box_draw stdcall (#LineHeight_ed);
DrawRectangle(LineHeight_ed.left-1, LineHeight_ed.top-1, LineHeight_ed.width+2, 16, sc.work_graph);
DrawFlatButton(9, 127, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS); DrawFlatButton(9, 127, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
DrawFlatButton(128, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, APPLY_T); DrawFlatButton(128, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, APPLY_T);
@ -103,6 +89,7 @@ void DrawSettingsCheckBoxes()
CheckBox2(10, 11, 20, SET_1, show_dev_name); CheckBox2(10, 11, 20, SET_1, show_dev_name);
CheckBox2(10, 33, 21, SET_2, real_files_names_case); CheckBox2(10, 33, 21, SET_2, real_files_names_case);
CheckBox2(10, 55, 22, SET_4, info_after_copy); CheckBox2(10, 55, 22, SET_4, info_after_copy);
MoreLessBox(10, 82, 18, 25, 26, sc.work_graph, 0xD2D3D3, 0x000000, files.line_h, SET_3);
} }
@ -126,7 +113,7 @@ void SaveIniSettings()
ini_set_int stdcall (eolite_ini_path, "Config", "ShowDeviceName", show_dev_name); ini_set_int stdcall (eolite_ini_path, "Config", "ShowDeviceName", show_dev_name);
ini_set_int stdcall (eolite_ini_path, "Config", "RealFileNamesCase", real_files_names_case); ini_set_int stdcall (eolite_ini_path, "Config", "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (eolite_ini_path, "Config", "InfoAfterCopy", info_after_copy); ini_set_int stdcall (eolite_ini_path, "Config", "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (eolite_ini_path, "Config", "LineHeight", atoi(#lineh_s)); ini_set_int stdcall (eolite_ini_path, "Config", "LineHeight", files.line_h);
} }