From a453f0c5c66e1e106129f31c5a84791ea3ac8fdb Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 5 Aug 2015 11:00:04 +0000 Subject: [PATCH] CMM: use disabled flag for editbox git-svn-id: svn://kolibrios.org@5683 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/downloader.h | 13 ++++++------- programs/cmm/liza/settings.c | 21 +++++++++++++++------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/programs/cmm/browser/downloader.h b/programs/cmm/browser/downloader.h index 830489130e..ef7ed8d032 100644 --- a/programs/cmm/browser/downloader.h +++ b/programs/cmm/browser/downloader.h @@ -67,11 +67,8 @@ void Downloader() case evKey: key = GetKey(); - if (DL_address_box.flags & 0b10) - { - EAX=key<<8; - edit_box_key stdcall(#DL_address_box); - } + EAX=key<<8; + edit_box_key stdcall(#DL_address_box); if (key==13) DL_Scan(301); break; @@ -208,7 +205,8 @@ void StopDownloading() DL_bufpointer = mem_Free(DL_bufpointer); downloaded_size = full_size = 0; } - DL_address_box.color = DL_address_box.blur_border_color = DL_address_box.focus_border_color = 0xFFFfff; + DL_address_box.color = DL_address_box.blur_border_color = 0xFFFfff; + DL_address_box.flags = 10b; DL_Draw_Window(); } @@ -218,7 +216,8 @@ void StartDownloading() if (strncmp(#DL_URL,"http:",5)==0) { download_state = STATE_IN_PROGRESS; - DL_address_box.color = DL_address_box.blur_border_color = DL_address_box.focus_border_color = 0xdddDDD; + DL_address_box.color = DL_address_box.blur_border_color = 0xCACACA; + DL_address_box.flags = 100000000000b; http_get stdcall (#DL_URL, 0, 0, #accept_language); DL_http_transfer = EAX; DL_progress_bar.value = 0; diff --git a/programs/cmm/liza/settings.c b/programs/cmm/liza/settings.c index b6c99990f1..b588b09b9f 100644 --- a/programs/cmm/liza/settings.c +++ b/programs/cmm/liza/settings.c @@ -12,10 +12,10 @@ 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,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}; +edit_box POP_server_box = {210,190,90 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b}; +edit_box POP_server_port_box = {210,190,115,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#POP_server_port1,#mouse_opt,100000000000b}; +edit_box SMTP_server_box = {210,190,140,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b}; +edit_box SMTP_server_port_box = {210,190,165,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#SMTP_server_port1,#mouse_opt,100000000000b}; void SettingsDialog() @@ -35,7 +35,6 @@ void SettingsDialog() { case evMouse: IF (GetProcessSlot(Form.ID)-GetActiveProcess()!=0) break; - if (checked[1]==0) break; edit_box_mouse stdcall(#POP_server_box); edit_box_mouse stdcall(#POP_server_port_box); edit_box_mouse stdcall(#SMTP_server_box); @@ -50,7 +49,17 @@ void SettingsDialog() { if (checked[id-17]==1) break; checked[0]>