From 4606ae2802436c24b124271100e0f5056800a101 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 20 Feb 2015 16:25:57 +0000 Subject: [PATCH] Eolite 2.48: fix check box labels behavior git-svn-id: svn://kolibrios.org@5436 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 4 ++-- programs/cmm/eolite/include/settings.h | 9 +++++++-- programs/cmm/liza/settings.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 1bae889f4c..f81fc0ed04 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -83,8 +83,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v2.47" -#define ABOUT_TITLE "Eolite v2.47" +#define TITLE "Eolite File Manager v2.48" +#define ABOUT_TITLE "Eolite v2.48" dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index 8ea794f68b..7e571cb40b 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -23,8 +23,8 @@ int mouse_ddd; char lineh_s[30]="18\0"; edit_box LineHeight_ed = {52,10,70,0xffffff,0x94AECE,0xffc90E,0xffffff,2,4,#lineh_s,#mouse_ddd, 1000000000000000b,2,2}; -checkbox2 ShowDeviceName_chb = {10*65536+15, 10*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, SET_1, 110b}; -checkbox2 RealFileNamesCase_chb = {10*65536+15, 30*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, SET_2, 100b}; +checkbox2 ShowDeviceName_chb = {10*65536+15, 10*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, SET_1, CH_FLAG_MIDDLE, 0}; +checkbox2 RealFileNamesCase_chb = {10*65536+15, 30*65536+15, 5, 0xffffff, 0x9098B0, 0x80000000, SET_2, CH_FLAG_MIDDLE, 0}; void settings_dialog() { @@ -32,8 +32,13 @@ void settings_dialog() unsigned int key; proc_info settings_form; dword eolite_ini_path = abspath("Eolite.ini"); + if (active_about) ExitProcess(); active_about=1; + + ShowDeviceName_chb.size_of_str = strlen(SET_1) * 6; + RealFileNamesCase_chb.size_of_str = strlen(SET_2) * 6; + SetEventMask(0x27); loop() switch(WaitEvent()) { diff --git a/programs/cmm/liza/settings.c b/programs/cmm/liza/settings.c index 21722b4011..20b0443995 100644 --- a/programs/cmm/liza/settings.c +++ b/programs/cmm/liza/settings.c @@ -12,7 +12,7 @@ unsigned char POP_server1[128]="pop.server.com"; unsigned char POP_server_port1[5]="110"; unsigned char SMTP_server1[128]="smtp.server.com"; unsigned char SMTP_server_port1[5]="25"; -edit_box POP_server_box = {210,190,90 ,0xffffff,0x94AECE,0xffc90E,0x9098B0,0,sizeof(POP_server1),#POP_server1,#mouse_opt,0}; +edit_box POP_server_box = {210,190,90 ,0xffffff,0x94AECE,0xffc90E,0xffffff,0,sizeof(POP_server1),#POP_server1,#mouse_opt,0}; edit_box POP_server_port_box = {210,190,115,0xffffff,0x94AECE,0xffc90E,0xffffff,0,5,#POP_server_port1,#mouse_opt,0b1000000000000000}; edit_box SMTP_server_box = {210,190,140,0xffffff,0x94AECE,0xffc90E,0xffffff,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,0}; edit_box SMTP_server_port_box = {210,190,165,0xffffff,0x94AECE,0xffc90E,0xffffff,0,5,#SMTP_server_port1,#mouse_opt,0b1000000000000000};