From 55a2139aa1e6d38c3efc37f0d97173ff53c1136b Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 26 Feb 2015 16:48:22 +0000 Subject: [PATCH] Update System panels configuration utility (panels_cfg) to version 1.0. Add MoreLessBox element to library. git-svn-id: svn://kolibrios.org@5477 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/lib/figures.h | 39 ++++-- programs/cmm/lib/kolibri.h | 12 +- programs/cmm/panels_cfg/compile_en.bat | 1 + programs/cmm/panels_cfg/panels_cfg.c | 170 +++++++++++++---------- programs/cmm/panels_cfg/panels_cfg.png | Bin 1996 -> 758 bytes programs/cmm/panels_cfg/panels_image.raw | Bin 0 -> 14985 bytes 6 files changed, 132 insertions(+), 90 deletions(-) create mode 100644 programs/cmm/panels_cfg/panels_image.raw diff --git a/programs/cmm/lib/figures.h b/programs/cmm/lib/figures.h index 3f7b8ba6e5..6712202d2b 100644 --- a/programs/cmm/lib/figures.h +++ b/programs/cmm/lib/figures.h @@ -46,25 +46,38 @@ DefineButton(x-1, y-1, strlen(text)*6 + w + 17, h+2, bt_id+BT_HIDE+BT_NOFRAME, graph_color); WriteText(x+w+8, h / 2 + y -3, 0x80, text_color, text); DrawRectangle(x, y, w, h, graph_color); - if (is_checked == 1) - { - DrawRectangle(x+1, y+1, w-2, h-2, 0xffffff); - DrawBar(x+2, y+2, w-3, h-3, graph_color); - return; //не дадим стрелять себе в ногу - } - if (is_checked == 2) //not active - { - DrawRectangle(x+1, y+1, w-2, h-2, 0xffffff); - DrawBar(x+2, y+2, w-3, h-3, 0x888888); - return; - } - else + if (is_checked == 0) { DrawRectangle3D(x+1, y+1, w-2, h-2, 0xDDDddd, 0xffffff); DrawBar(x+2, y+2, w-3, h-3, 0xffffff); } + else if (is_checked == 1) + { + DrawRectangle(x+1, y+1, w-2, h-2, 0xffffff); + DrawBar(x+2, y+2, w-3, h-3, graph_color); + } + else if (is_checked == 2) //not active + { + DrawRectangle(x+1, y+1, w-2, h-2, 0xffffff); + DrawBar(x+2, y+2, w-3, h-3, 0x888888); + } } + +:void MoreLessBox(dword x,y,s, bt_id_more, bt_id_less, color_border, color_button, color_text, value, text) +{ + #define VALUE_FIELD_W 26; + DrawRectangle(x, y, VALUE_FIELD_W, s, color_border); + DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, s-2, 0xDDDddd, 0xffffff); + DrawBar(x+2, y+2, VALUE_FIELD_W-3, s-3, 0xffffff); + WriteText(x+6, s / 2 + y -3, 0x80, color_text, itoa(value)); + + DrawCaptButton(VALUE_FIELD_W + x + 1, y, s, s, bt_id_more, color_button, color_text, "+"); + DrawCaptButton(VALUE_FIELD_W + x + s + 2, y, s, s, bt_id_less, color_button, color_text, "-"); + WriteText(x+VALUE_FIELD_W+s+s+10, s / 2 + y -3, 0x80, color_text, text); +} + + :void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent) { int progress_w; diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 5843bf1a15..449ba1c7df 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -53,13 +53,17 @@ char program_path[4096]; //------------------------------------------------------------------------- -struct mouse +:struct raw_image { + dword w, h, data; +}; + +:struct mouse { signed x,y,lkm,pkm,hor,vert; void get(); }; -void mouse::get() +:void mouse::get() { EAX = 37; EBX = 1; @@ -91,14 +95,14 @@ void mouse::get() } -struct system_colors +:struct system_colors { dword frame,grab,grab_button,grab_button_text,grab_text, work,work_button,work_button_text,work_text,work_graph; void get(); }; -void system_colors::get() +:void system_colors::get() { EAX = 48; EBX = 3; diff --git a/programs/cmm/panels_cfg/compile_en.bat b/programs/cmm/panels_cfg/compile_en.bat index bfdc1ff6c3..9ba367052d 100644 --- a/programs/cmm/panels_cfg/compile_en.bat +++ b/programs/cmm/panels_cfg/compile_en.bat @@ -2,5 +2,6 @@ cls c-- panels_cfg.c @rename panels_cfg.com panels_cfg +@kpack panels_cfg @del warning.txt @pause \ No newline at end of file diff --git a/programs/cmm/panels_cfg/panels_cfg.c b/programs/cmm/panels_cfg/panels_cfg.c index b729fba40a..8e0c82210d 100644 --- a/programs/cmm/panels_cfg/panels_cfg.c +++ b/programs/cmm/panels_cfg/panels_cfg.c @@ -8,26 +8,26 @@ #include "..\lib\figures.h" #include "..\lib\lib.obj\libio_lib.h" -#include "..\lib\lib.obj\libimg_lib.h" #include "..\lib\lib.obj\libini.h" #include "..\lib\lib.obj\box_lib.h" #include "..\lib\patterns\libimg_load_skin.h" -#define WINDOW_TITLE "System panels configuration v0.8" +#define WINDOW_TITLE "System panels configuration" -frame taskbar_frame = { 0, 100, 10, 152, 14, 0x000111, 0xFFFfff, 1, " Taskbar ", 0, 0, 6, 0x000111, 0xCCCccc }; -frame docky_frame = { 0, 100, 10, 98, 183, 0x000111, 0xFFFfff, 1, " Docky ", 0, 0, 6, 0x000111, 0xCCCccc }; +frame taskbar_frame = { 0, 000, 10, 188, 14, 0x000111, 0xFFFfff, 1, " Taskbar ", 0, 0, 6, 0x000111, 0xCCCccc }; +frame docky_frame = { 0, 000, 10, 73, 217, 0x000111, 0xFFFfff, 1, " Docky ", 0, 0, 6, 0x000111, 0xCCCccc }; char taskbar_ini_path[] = "/sys/settings/taskbar.ini"; -char taskbar_category[] = "Flags"; +char taskbar_c_flags[] = "Flags"; +char taskbar_c_variables[] = "Variables"; char docky_ini_path[] = "/sys/settings/docky.ini"; +unsigned char panels_img_data[] = FROM "panels_image.raw"; +raw_image panels_img = { 37, 27, #panels_img_data }; system_colors sc; proc_info Form; -mouse m; -libimg_image panels_image; struct docky_cfg { word fsize; @@ -36,11 +36,15 @@ struct docky_cfg { struct taskbar_cfg { byte Attachment; - byte PanelHeigh; + byte PanelHeight, SoftenHeight, ButtonOffset; byte SoftenUp, SoftenDown, MinLeftButton, MinRightButton, MenuButton, RunApplButton, ClnDeskButton, Clock, CpuUsage, ChangeLang; } taskbar_cfg; +enum { + TASKBAR, + DOCKY +}; void main() @@ -48,13 +52,9 @@ void main() dword id, key; mem_Init(); - if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); - if (load_dll2(libimg, #libimg_init,1)!=0) notify("Error: library doesn't exists - libimg"); if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini"); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Eror: library doesn't exists - boxlib"); - Libimg_LoadImage(#panels_image, abspath("panels_cfg.png")); - LoadCfg(); loop() switch(WaitEvent()) @@ -76,9 +76,15 @@ void main() if (id==112) taskbar_cfg.CpuUsage ^= 1; if (id==113) taskbar_cfg.ChangeLang ^= 1; if (id==114) taskbar_cfg.MenuButton ^= 1; - DrawWindowContent(); - SaveCfg(); - RestartProcess("@taskbar"); + if (id==120) taskbar_cfg.PanelHeight++; + if (id==121) && (taskbar_cfg.PanelHeight>6) taskbar_cfg.PanelHeight--; + if (id==122) taskbar_cfg.SoftenHeight++; + if (id==123) && (taskbar_cfg.SoftenHeight>0) taskbar_cfg.SoftenHeight--; + if (id==124) taskbar_cfg.ButtonOffset++; + if (id==125) && (taskbar_cfg.ButtonOffset>0) taskbar_cfg.ButtonOffset--; + DrawWindowContent(TASKBAR); + SaveCfg(TASKBAR); + RestartProcess(TASKBAR); } //docky buttons if (id>=200) @@ -91,9 +97,9 @@ void main() } if (id==201) docky_cfg.fsize ^= 1; if (id==202) docky_cfg.ashow ^= 1; - DrawWindowContent(); - SaveCfg(); - RestartProcess("@docky"); + DrawWindowContent(DOCKY); + SaveCfg(DOCKY); + RestartProcess(DOCKY); } break; @@ -104,12 +110,13 @@ void main() case evReDraw: sc.get(); - DefineAndDrawWindow(130, 150, 400, 300+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE); + DefineAndDrawWindow(130, 150, 390, 300+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE); GetProcessInfo(#Form, SelfInfo); if (Form.status_window>2) break; taskbar_frame.size_x = docky_frame.size_x = - taskbar_frame.start_x * 2 + Form.cwidth; taskbar_frame.font_color = docky_frame.font_color = sc.work_text; taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = sc.work; + taskbar_frame.ext_col = docky_frame.ext_col = sc.work_graph; DrawWindowContent(); } } @@ -120,76 +127,86 @@ void DrawWindowContent() word win_center_x; frame_draw stdcall (#taskbar_frame); - DefineButton(22, taskbar_frame.start_y + 12, panels_image.w-1, 27-1, 100 + BT_HIDE, 0); - img_draw stdcall(panels_image.image, 22, taskbar_frame.start_y + 12, panels_image.w, 27, 0, taskbar_cfg.Attachment * 27); + DefineButton(22, taskbar_frame.start_y + 12, panels_img.w-1, 27-1, 100 + BT_HIDE, 0); + _PutImage(22, taskbar_frame.start_y + 12, 37, 27, taskbar_cfg.Attachment * 37 * 27 * 3 + panels_img.data); WriteText(68, taskbar_frame.start_y + 20, 0x80, 0x333222, "Click on image to change position"); - PanelCfgCheckBox(22, taskbar_frame.start_y + 48, 105, "Soften Up", taskbar_cfg.SoftenUp); - PanelCfgCheckBox(22, taskbar_frame.start_y + 68, 106, "Soften Down", taskbar_cfg.SoftenDown); - PanelCfgCheckBox(22, taskbar_frame.start_y + 88, 107, "Min Left Button", taskbar_cfg.MinLeftButton); - PanelCfgCheckBox(22, taskbar_frame.start_y + 108, 108, "Min Right Button", taskbar_cfg.MinRightButton); - PanelCfgCheckBox(22, taskbar_frame.start_y + 128, 109, "Run Application Button", taskbar_cfg.RunApplButton); - win_center_x = Form.cwidth * 55 / 100; - PanelCfgCheckBox(win_center_x, taskbar_frame.start_y + 48, 110, "ClnDeskButton - wtf?", taskbar_cfg.ClnDeskButton); - PanelCfgCheckBox(win_center_x, taskbar_frame.start_y + 68, 111, "Clock", taskbar_cfg.Clock); - PanelCfgCheckBox(win_center_x, taskbar_frame.start_y + 88, 112, "Cpu Usage", taskbar_cfg.CpuUsage); - PanelCfgCheckBox(win_center_x, taskbar_frame.start_y + 108, 113, "Change Language", taskbar_cfg.ChangeLang); - PanelCfgCheckBox(win_center_x, taskbar_frame.start_y + 128, 114, "Menu Button", taskbar_cfg.MenuButton); - //PanelCfgCheckBox(22, taskbar_frame.start_y + 64, 204, "111", taskbar_cfg.PanelHeigh); + PanelCfg_CheckBox(22, taskbar_frame.start_y + 48, 105, "Soften Up", taskbar_cfg.SoftenUp); + PanelCfg_CheckBox(22, taskbar_frame.start_y + 68, 106, "Soften Down", taskbar_cfg.SoftenDown); + PanelCfg_CheckBox(22, taskbar_frame.start_y + 88, 107, "Min Left Button", taskbar_cfg.MinLeftButton); + PanelCfg_CheckBox(22, taskbar_frame.start_y + 108, 108, "Min Right Button", taskbar_cfg.MinRightButton); + win_center_x = Form.cwidth / 2; + PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 48, 111, "Clock", taskbar_cfg.Clock); + PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 68, 112, "Cpu Usage", taskbar_cfg.CpuUsage); + PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 88, 113, "Change Language", taskbar_cfg.ChangeLang); + PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 108, 114, "Menu Button", taskbar_cfg.MenuButton); + PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 131, 120, 121, taskbar_cfg.PanelHeight, "Panel Height"); + PanelCfg_MoreLessBox(win_center_x, taskbar_frame.start_y + 131, 122, 123, taskbar_cfg.SoftenHeight, "Soften Height"); + PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 159, 124, 125, taskbar_cfg.ButtonOffset, "Button Offset"); frame_draw stdcall (#docky_frame); - DefineButton(22, docky_frame.start_y + 12, panels_image.w-1, 27-1, 200 + BT_HIDE, 0); - img_draw stdcall(panels_image.image, 22, docky_frame.start_y + 12, panels_image.w, 27, 0, docky_cfg.location * 27 + 27); + DefineButton(22, docky_frame.start_y + 12, panels_img.w-1, 27-1, 200 + BT_HIDE, 0); + _PutImage(22, docky_frame.start_y + 12, 37, 27, docky_cfg.location + 1 * 37 * 27 * 3 + panels_img.data); WriteText(68, docky_frame.start_y + 20, 0x80, 0x333222, "Click on image to change position"); - PanelCfgCheckBox(22, docky_frame.start_y + 48, 201, "Full width", docky_cfg.fsize); - PanelCfgCheckBox(22, docky_frame.start_y + 70, 202, "Always show", docky_cfg.ashow); + PanelCfg_CheckBox(22, docky_frame.start_y + 48, 201, "Full width", docky_cfg.fsize); + PanelCfg_CheckBox(win_center_x, docky_frame.start_y + 48, 202, "Always show", docky_cfg.ashow); } void LoadCfg() { - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "Attachment", 1); taskbar_cfg.Attachment = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "PanelHeigh", 18); taskbar_cfg.PanelHeigh = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "SoftenUp", 1); taskbar_cfg.SoftenUp = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "SoftenDown", 1); taskbar_cfg.SoftenDown = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "MinLeftButton", 1); taskbar_cfg.MinLeftButton = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "MinRightButton", 1); taskbar_cfg.MinRightButton = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "RunApplButton", 1); taskbar_cfg.RunApplButton = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "ClnDeskButton", 1); taskbar_cfg.ClnDeskButton = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "Clock", 1); taskbar_cfg.Clock = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "CpuUsage", 1); taskbar_cfg.CpuUsage = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "ChangeLang", 1); taskbar_cfg.ChangeLang = EAX; - ini_get_int stdcall (#taskbar_ini_path, #taskbar_category, "MenuButton", 1); taskbar_cfg.MenuButton = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Attachment", 1); taskbar_cfg.Attachment = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "SoftenUp", 1); taskbar_cfg.SoftenUp = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "SoftenDown", 1); taskbar_cfg.SoftenDown = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MinLeftButton", 1); taskbar_cfg.MinLeftButton = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MinRightButton", 1); taskbar_cfg.MinRightButton = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Clock", 1); taskbar_cfg.Clock = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "CpuUsage", 1); taskbar_cfg.CpuUsage = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "ChangeLang", 1); taskbar_cfg.ChangeLang = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MenuButton", 1); taskbar_cfg.MenuButton = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "PanelHeight", 18); taskbar_cfg.PanelHeight = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "SoftenHeight", 4); taskbar_cfg.SoftenHeight = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "ButtonTopOffset", 3); taskbar_cfg.ButtonOffset = EAX; + ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "ButtonBotOffset", 3); taskbar_cfg.ButtonOffset = EAX; ini_get_int stdcall (#docky_ini_path, "@", "location", 0); docky_cfg.location = EAX; ini_get_int stdcall (#docky_ini_path, "@", "fsize", 0); docky_cfg.fsize = EAX; ini_get_int stdcall (#docky_ini_path, "@", "ashow", 0); docky_cfg.ashow = EAX; } -void SaveCfg() +void SaveCfg(byte panel_type) { - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "Attachment", taskbar_cfg.Attachment); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "PanelHeigh", taskbar_cfg.PanelHeigh); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "SoftenUp", taskbar_cfg.SoftenUp); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "SoftenDown", taskbar_cfg.SoftenDown); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "MinLeftButton", taskbar_cfg.MinLeftButton); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "MinRightButton", taskbar_cfg.MinRightButton); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "RunApplButton", taskbar_cfg.RunApplButton); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "ClnDeskButton", taskbar_cfg.ClnDeskButton); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "Clock", taskbar_cfg.Clock); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "CpuUsage", taskbar_cfg.CpuUsage); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "ChangeLang", taskbar_cfg.ChangeLang); - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "MenuButton", taskbar_cfg.MenuButton); - - ini_set_int stdcall (#taskbar_ini_path, #taskbar_category, "Attachment", taskbar_cfg.Attachment); - ini_set_int stdcall (#docky_ini_path, "@", "location", docky_cfg.location); - ini_set_int stdcall (#docky_ini_path, "@", "fsize", docky_cfg.fsize); - ini_set_int stdcall (#docky_ini_path, "@", "ashow", docky_cfg.ashow); + if (panel_type==TASKBAR) { + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Attachment", taskbar_cfg.Attachment); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "SoftenUp", taskbar_cfg.SoftenUp); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "SoftenDown", taskbar_cfg.SoftenDown); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MinLeftButton", taskbar_cfg.MinLeftButton); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MinRightButton", taskbar_cfg.MinRightButton); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "RunApplButton", taskbar_cfg.RunApplButton); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "ClnDeskButton", taskbar_cfg.ClnDeskButton); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Clock", taskbar_cfg.Clock); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "CpuUsage", taskbar_cfg.CpuUsage); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "ChangeLang", taskbar_cfg.ChangeLang); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "MenuButton", taskbar_cfg.MenuButton); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "PanelHeight", taskbar_cfg.PanelHeight); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "SoftenHeight", taskbar_cfg.SoftenHeight); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "ButtonTopOffset", taskbar_cfg.ButtonOffset); + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_variables, "ButtonBottOffset", taskbar_cfg.ButtonOffset); + } + if (panel_type==DOCKY) { + ini_set_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Attachment", taskbar_cfg.Attachment); + ini_set_int stdcall (#docky_ini_path, "@", "location", docky_cfg.location); + ini_set_int stdcall (#docky_ini_path, "@", "fsize", docky_cfg.fsize); + ini_set_int stdcall (#docky_ini_path, "@", "ashow", docky_cfg.ashow); + } } -void RestartProcess(dword proc_name) +void RestartProcess(byte panel_type) { - int i, slot; + int i; + dword proc_name; proc_info Process; + if (panel_type == TASKBAR) proc_name = "@taskbar"; + if (panel_type == DOCKY) proc_name = "@docky"; for (i=0; i<1000; i++;) { GetProcessInfo(#Process, i); @@ -197,14 +214,21 @@ void RestartProcess(dword proc_name) } RunProgram(proc_name, ""); - pause(20); + if (panel_type == TASKBAR) pause(50); + if (panel_type == DOCKY) pause(120); GetProcessInfo(#Form, SelfInfo); - slot = GetProcessSlot(Form.ID); - ActivateWindow(slot); + ActivateWindow(GetProcessSlot(Form.ID)); } -void PanelCfgCheckBox(dword x, y, id, text, byte value) { + + +void PanelCfg_CheckBox(dword x, y, id, text, byte value) { CheckBox(x, y, 14, 14, id, text, sc.work_graph, sc.work_text, value); } +void PanelCfg_MoreLessBox(dword x, y, id_more, id_less; byte value; dword text) { + MoreLessBox(x, y, 18, id_more, id_less, sc.work_graph, sc.work_button, sc.work_button_text, value, text); +} + + stop: \ No newline at end of file diff --git a/programs/cmm/panels_cfg/panels_cfg.png b/programs/cmm/panels_cfg/panels_cfg.png index 7721996bb2169a593e621a4011923de75c12ae89..d3f747ef5286582295c83ff8ab72301857ea208a 100644 GIT binary patch delta 745 zcmV6WMpJY zS6M(^byQ4DRa#s~TWd&JXwn1(&OM&qt0mds-%DI%g#3g6EdN|gOrFN)1O)t4SX%%8 z|5jRDR9jt6U}scWTT5GI`T6-ZrDNFL-hD^_OI&5v+ur2le>v!i*HaUOsHh6y(g5OTL zX1i&)&}zS2^6}0ogPje7|S6x;K@W-mTqoSq5SO!oOuT@-Y?#l0`kP{}%m$Up^#WAvAi`)Yt7dzvCERWzG?{wVynE1*b2dqE$3((C$?N@ zEiD_d)d!S+$m)=+?(d!C|9b#xP7sbufM<}>VVI@BDRYC&v5v}%TOYRs$qHl3LoL@> z+>mdXIQoee{kTj-{zQv@TvAJdrL`tlb<(yt-(n+JaVhy}mO~n^xb(8T1b~R&Eddn4 zQZ$RW$ADmk;FEH-^%vFc|2+V+v2Iy<-_#=XzKI1`@0(dz@0(dj@0;}iVC#L?6Ts5@ b#{Yf>Jievmw66QU00000NkvXXu0mjfQmcH~ delta 1993 zcmV;)2R8Wj1DD7_SJU+-@x0hu+OuSs{9mrXb96@BzI}U9 z6yAIEDF$U(W-HPMKJWp|Mfbn|{cTy6&biIc+>8t;FnrqKkAIwVj>)W+?g3l3zU$BuPT-$2>=Gj0gs9;VnsxSfBXC2$Hz8Z z567yCHnOM~5CEtSSZV9ltuKGYYvCXQ?@_>2Z!4zs4nfUhbsj;5D{*Ayk^@+8;LQkt zaOtT}c`~;>@PDDBwPI9^FiXZ5kWg`+06?OhsA}j8Ay9z_#2AZ}zgVYw#s}YxBkS%b zJop-0pMe%qjlTdGzsKi_zpoZ&e*Qbw7bSq@<>i@!c>lpeMd<;C*KBG0fUFN0$ONG2 zCLjc0NdaI)DAMFfW&{)hiI$EqRRlP$j5P@wuP9;Y0e@HkfBDBhzVel?l5Fyp)-8b$ z;WR3-6Eha11jnUOb$pv-CF1}4u>jYX7iGCsuu&bW@|tyurbdg?-(ME z!E1s8KsCO@7fP?~+7mD&ID^OdNsL$@1BUQk74Y>r(5gM_{!65YZr}-xFxAkQULmB9 zcVMLEaep$Vb@r4}HB2)iewxEHwi|0CK!!V12%scuo;Bu|2M!cP$tH}C*$onj=-2T3r>7)GH0NH8YY zcob+tg3!=(l^E)VD7@BWdez7iLWBa65Sg$+M%DxhMbhL}`1`C616>&yN)IrA5}Ou62$aC7pZ{JxAAh)MU?#9M^k&XH9vzsFgi7jO{B@;F&(EX7 zj^+lLj9)To>5j75o^c>XP5EfDNt#Vfb_^gRo2h928|R z^@?`2erUN~0lHj2;FwZ$w0>yUp7g$}^+T)njP-T3eo*xQocHj)$@7KtP{Z!l50crR z?%j(cNHUXIAv;??%stQ2zy0Y$?|*&o{PIs1G@tyl0$Ej^TmGr4^Ugo#o|k{|!gohQ zSN`=`xho1+5}K)sdTG&sL{w(2RsH;>cD42M`%XFa%u`OpacK9w?|t`MT)T~*PaTuz z8G=Tm;^1jlV75++l}q0H=ik2Nd(FVQwemWjyZ??II|hTn+S=NOPCW6)d4Ep80oSbl zL0N7bn3jGXxlVUy1(R%JeYJwwjX8oU*!uPBNg6-^K@!>8&l~784`vFxgE z0M5C}i@37XWF{kQrk|hXuYo0FhQA*EV&7ao+Dcbl4mi8h>kDG1~v@-)7c=Y~`;3td`|tpY~ku6z5A~C}r8!UlY9A zgWqsI{B=51CGhX}*Qx&`raDb>EUe3XKDQ=1zKCpA*=ar>Grlp5))PEXHYM1_6NJBDG zvB>8a`TYNBK0p7wTrfvxQ~lQPv_^YYk?7)#XmnU@D0I{V6syk1UDkZ!;MO1T8S4lDfMI`rK1c>u z)|*rx`}6Zbey#N0RrN)l^z7%a{+T^MlJw~3gHAZ%1Y=AU+njjfi2zKGem*G6vZbXZ zjAf)}KVKHbifUC~DA9qEUqF-diC=N zm1%0vKK;BHR`HrWFa(eRKZ{XYZ+>3>^2cXA`jJHl&nHoEe}3M6>oO-i{XRD(C9NG~ z;phJ!_uDM?+x&;@e;HHewf{u{{x|G@S>*GJe14J7FY@_CK7Ym=o_PHG3vT(Ox3Fmp@i3 b6EyTs!@>uzjlHCg00000NkvXXu0mjf%*^ug diff --git a/programs/cmm/panels_cfg/panels_image.raw b/programs/cmm/panels_cfg/panels_image.raw new file mode 100644 index 0000000000000000000000000000000000000000..d6eb89fa8e2fc579604bea8abe8ced2c939be015 GIT binary patch literal 14985 zcmeHN&rcIU6z-w_iZ`zwO+4_UVuO)XrQNL|QUZjQn@4YW^XN^(&68IXqedVhF`PVj zP#S0jQsdP_p-7tG*FL(L>`Z5e*|($CoqU1q_RW0r-rHTi_t@o9ZmBrw2Fs-!u-07* zp`FYC7yJTO=5;0jKDJt|7tfyti2MkH(3pRD4Zz9ss~JLb?+e8+3A#+~F(A_^gNdCa z0dTE&xtc$*QW{gD>W$a@@tQZj>Wy6%m{s#8s@^0hs$Oojd~>Oo^GkQnwWH$SK6vva zK7M>$e^kCvnk|6sST#;gPWI|wAI?sJ>-*NTm>@c@*rV%oPJc<`?Ch-Btk2KpdFk5i zpBo?EZf?8_VQcgK&d&CHk(o~K-GXcMII2{qHJCSZjpnU~-p}`d~UPmU&wN z)adA-^&kzZ?|2&>XyfSXJKi>q<0h4|1(!@avz_)c85^4jCdJcb>s#h3-k+M8xkJe3 z3s&&uWy!mc(tuO|Q8(Ve4nvXyT7@DxlrEd?61v?hubKqxV*UCj0*fxNozQvXupP5@*0A>rBS0QCtf70v8lo0BBSIvMnU<#aY(J zphLv4IOHoda4^7_936yfk4`8DlA}W~UDEYlkCD8S^|p1s#EHlq?z;=RAaknHOq^wX zEYgY9q66NI#-(?I z+_l|!r|+JLcdPZWc$<$Zovc+7y%Dgu1V15ZL@F9dlrI3BWJfC6Y8P~VN=uH0YXlNsDRYM2yiQ$zk=C)T0*x<=!jIURXt r_*MXU2VN0y5Oi@~3BX*+ow#h^9g&JZVT_9t%|JU~E>;j1432*TTLaQz literal 0 HcmV?d00001