From 3333411699ff7e49415dbc262c2faa1d72bebf81 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 23 Oct 2013 17:55:07 +0000 Subject: [PATCH] Eolite 2.0.3: better colors management, ability to use system colors in future (available now, but code not used) git-svn-id: svn://kolibrios.org@4076 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 78 ++++++++++++++--------- programs/cmm/eolite/imgs/goto_about.raw | Bin 1904 -> 1904 bytes programs/cmm/eolite/imgs/png/rb.png | Bin 1329 -> 1323 bytes programs/cmm/eolite/imgs/toolbar.txt | 2 +- programs/cmm/eolite/include/about.h | 3 +- programs/cmm/eolite/include/copy.h | 8 +-- programs/cmm/eolite/include/left_panel.h | 6 +- programs/cmm/eolite/include/menu.h | 6 +- programs/cmm/eolite/include/open_with.h | 10 +-- programs/cmm/eolite/include/other.h | 10 +-- 10 files changed, 69 insertions(+), 54 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index da2c3d8fbc..97851fb2dc 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -79,13 +79,9 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v2.0.2" -#define ABOUT_TITLE "Eolite v2.0.2" -dword col_work = 0xE4DFE1; -dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; -dword col_padding = 0xC8C9C9; -dword col_selec = 0x94AECE; -dword col_lpanel = 0x00699C; +#define TITLE "Eolite File Manager v2.0.3" +#define ABOUT_TITLE "Eolite v2.0.3" +dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; char tmp_disk_del_param[3]="d0"; @@ -109,6 +105,7 @@ byte itdir; proc_info Form; +system_colors sc; mouse m; int mouse_dd, scroll_used, scroll_size, sorting_arrow_x, kolibrios_drive; dword buf, off; @@ -131,6 +128,24 @@ PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #t #include "include\about.h" #include "include\open_with.h" +void SetAppColors() +{ + sc.work = 0xE4DFE1; + sc.work_text = 0; + sc.work_graph = 0x9098B0; //A0A0B8; //0x819FC5; + sc.work_button_text = 0x000000; + col_padding = 0xC8C9C9; + col_selec = 0x94AECE; + col_lpanel = 0x00699C; + /* + sc.get(); + for (i=0; i<=14; i++) col_palette[i] = sc.work; + toolbar_pal[0]= goto_about_pal[0] = sc.work = sc.work; + col_lpanel = sc.work_graph; + for (i=0; i<=99; i++) blue_hl_pal[i] = sc.work_graph; + */ +} + void main() { word key, id, can_show, can_select, m_selected; @@ -139,7 +154,8 @@ void main() mem_Init(); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(ERROR_1); SystemDiscsGet(); - GetIni(1); + GetIni(1); + SetAppColors(); if (param) { strcpy(#path, #param); @@ -448,7 +464,7 @@ void menu_action(dword id) void draw_window() { - DefineAndDrawWindow(40,20,550,500,0x73,col_work,TITLE); + DefineAndDrawWindow(40,20,550,500,0x73,sc.work,TITLE); GetProcessInfo(#Form, SelfInfo); if (Form.status_window>2) return; files.SetSizes(192, 57, onLeft(192,27), onTop(57,6), disc_num*16+195,files.line_h); @@ -457,26 +473,26 @@ void draw_window() GetProcessInfo(#Form, SelfInfo); //if win_size changed PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal); - DrawBar(127, 8, 1, 25, col_border); - for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,col_work); - for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,col_work); - DrawBar(246,0,onLeft(246,60),12, col_work); //upper editbox - DrawBar(246,29,onLeft(246,60),5,col_work); //under editbox - DrawRectangle(246,12,onLeft(66,246),16,col_border); + DrawBar(127, 8, 1, 25, sc.work_graph); + for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,sc.work); + for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,sc.work); + DrawBar(246,0,onLeft(246,60),12, sc.work); //upper editbox + DrawBar(246,29,onLeft(246,60),5,sc.work); //under editbox + DrawRectangle(246,12,onLeft(66,246),16,sc.work_graph); DefineButton(onLeft(34,0),6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal); //main rectangles - DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),col_border); + DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),sc.work_graph); DrawRectangle(0,39,Form.cwidth-1,onTop(44,0),col_palette[4]); //bg for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]); DrawLeftPanel(); //ListBox - DrawFlatButton(files.x,40,onLeft(files.x,168),16,31,col_work,T_FILE); - DrawFlatButton(onLeft(168,0),40,73,16,32,col_work,T_TYPE); - DrawFlatButton(onLeft(95,0),40,68,16,33,col_work,T_SIZE); - DrawBar(onLeft(27,0),files.y,1,onTop(22,files.y),col_border); //line to the left from the scroll - DrawFlatButton(onLeft(27,0),40,16,16,0,col_work,"\x18"); - DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,col_work,"\x19"); + DrawFlatButton(files.x,40,onLeft(files.x,168),16,31,sc.work,T_FILE); + DrawFlatButton(onLeft(168,0),40,73,16,32,sc.work,T_TYPE); + DrawFlatButton(onLeft(95,0),40,68,16,33,sc.work,T_SIZE); + DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),sc.work_graph); //line to the left from the scroll + DrawFlatButton(files.x+files.w,40,16,16,0,sc.work,"\x18"); + DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,sc.work,"\x19"); Open_Dir(#path,ONLY_SHOW); if (del_active) Del_Form(); //if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0); @@ -557,8 +573,8 @@ void List_ReDraw() //in the bottom paint_y = j * files.line_h + files.y; DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF); - DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),col_work); - DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),col_work); + DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),sc.work); + DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),sc.work); Scroll(); } @@ -606,8 +622,8 @@ void Line_ReDraw(dword color, filenum){ PathShow_prepare stdcall(#FileShow); PathShow_draw stdcall(#FileShow); } - DrawBar(Form.cwidth-159,y,1,files.line_h,col_work); //gray line 1 - DrawBar(Form.cwidth-86,y,1,files.line_h,col_work); //gray line 2 + DrawBar(Form.cwidth-159,y,1,files.line_h,sc.work); //gray line 1 + DrawBar(Form.cwidth-86,y,1,files.line_h,sc.work); //gray line 2 } @@ -639,7 +655,7 @@ void Open_Dir(dword dir_path, redraw){ IF (sort_num==1) sorting_arrow_x = Form.width+60/2; IF (sort_num==2) sorting_arrow_x = Form.width-115; IF (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w; - WriteText(sorting_arrow_x,45,0x80,col_border,"\x19"); + WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\x19"); IF (redraw!=ONLY_SHOW) Sorting(); IF (redraw!=ONLY_OPEN) List_ReDraw(); } @@ -692,12 +708,12 @@ void Del_Form() else { if (!files.count) return; - DrawPopup(dform_x,160,220,80,1,col_work,col_border); - WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,0,T_DELETE_FILE); + DrawPopup(dform_x,160,220,80,1,sc.work,sc.work_graph); + WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,sc.work_text,T_DELETE_FILE); IF (strlen(#file_name)<28) { - WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,0,"?"); - WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,0,#file_name); + WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?"); + WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name); } else { diff --git a/programs/cmm/eolite/imgs/goto_about.raw b/programs/cmm/eolite/imgs/goto_about.raw index 5a6b23e435bafb5bf663917721bf1b33e9469e6e..472cf55932e3757a27b3021ee415af3c0c2b0c89 100644 GIT binary patch delta 27 dcmeys_knLiA`8Dh2spUKhK0FADA&6S)*EYQ$tfz zW3l2!AZMj@XkxOz&GOwS8c#v>&73|Np?`6UV17|iVL`qsUkix4uPr({eH%=Y;n>XS z)2GjzGzmn30FuU9J~3$-X=w=o_HxX?VmLf)3JO3h>N!pi$*;8af`g5q=vGFxPa_tEE+L|5THy>LPJ?eR3sOR9R5#&Bj9mQx@WPK~-|PVO%D###X|jXOX9r18`w5DP`)rkb3Rtg7{3r|NhFM@0HL zYxlr3ZU6yBCZIkLV{eZ7@lO zV>72upFVTaBoGAxNE&PT#H3}Ur6mN|%P|9s;qbI6C;%y~R&a9g@bhuAv$ADl(YUh} z6(Hq~S^<7xF)48&F5XHk8u8@EE%Jhr8p;~t0}Ep-)jTd>N|za$3$!EfNRwigq500000NkvXXu0mjfsMDHT diff --git a/programs/cmm/eolite/imgs/toolbar.txt b/programs/cmm/eolite/imgs/toolbar.txt index c93e11a6ad..25860c96aa 100644 --- a/programs/cmm/eolite/imgs/toolbar.txt +++ b/programs/cmm/eolite/imgs/toolbar.txt @@ -532,6 +532,6 @@ unsigned char toolbar[8364] = { }; -dword goto_about_pal [] = {0x00E4DFE1,0x00C4CBDD,0x00C5CCDF,0x00CAD1E0,0x00C2CADC,0x00E7E1E3,0x00E3DFE2,0x00C1C9DB,0x00E4E9F1,0x00E4E9F0,0x00DAD6DD,0x00BEC5D8,0x00CAD2E2,0x00CBD2E2,0x00CBD3E2,0x00CBD2E3,0x00C9D1E0,0x00C8D1DF,0x00BBC2D6,0x00AFB9D2,0x00B5BED5,0x00B7C1D6,0x00B7C2D6,0x00B6BFD5,0x00B3BCD2,0x00ADB6CD,0x00E2DDE1,0x00819FC5,0x00C1CCDE,0x00DCDADF,0x00ADB6D1,0x00ACB5D0,0x00AEBAD1,0x00AFBAD2,0x00ADB9D0,0x00AAB4CC,0x00A8B3CB,0x00E4E0E2,0x00FBFBFB,0x00FFFFFF,0x00F3F3F3,0x00E6E3E4,0x00C5CBDF,0x00AEB9D0,0x00B6BFD4,0x00B9C3D6,0x00BFC6D8,0x00E3DFE1,0x00C8C9C9,0x00B4BED5,0x00B4BED4,0x00B4BED3,0x00B2BBD3,0x00E5E0E2,0x00D8D7D8,0x00CBD0E1,0x00B9C2D6,0x00C8CDE0,0x00E4DFE2,0x00BFC5DA,0x00C8D0DF,0x00CBD2E1,0x00BDC5D6,0x00E0DAE0,0x007DB835,0x00DCDDE9,0x00B3BDD4,0x00F2F4F9,0x00BAC4D8,0x00D5D6E4,0x00B3DA82,0x0076AD32,0x00A5B2CD,0x00DBE0EC,0x00DCE1EC,0x00DCE1EB,0x00DBE0E9,0x00A7B4CD,0x00CBD0E2,0x00AAB4D0,0x00C8CEE1,0x00CAD1E2,0x00C8CEDD,0x00C5CDDD,0x00ACB6CE,0x00C3CADD,0x00A0D162,0x00B7C2DB,0x00AAB5CE,0x00B9C2D8,0x00B6BFD3,0x00A6B2CA,0x00B2BCD6,0x0097CD53,0x00A4AFCB,0x00ABB4CE,0x00AEB9D1,0x00ADB7D0,0x00A8B4CB,0x009FABC5,0x00B4BDD6,0x00E2DEE0,0x00D3D3D3,0x00E5DDDA,0x00F5CFA3,0x00F7C888,0x00F8CC8E,0x00F7C787,0x00F5CC9D,0x00E5DBD7,0x00A3AFCB,0x00B1BBD2,0x00B4BFD4,0x00B5BED3,0x00AFB9D0,0x00A3AEC9,0x00E1DDDE,0x0090C947,0x00DFDCDD,0x00F7C279,0x00FCDBAF,0x00FCE4C2,0x00F9D6A2,0x00F7C177,0x00E6D9D1,0x00A6B3D0,0x00AEBAD0,0x00BDC5D8,0x00BDC6D8,0x00A5B1CC,0x00E5E0E3,0x00DDDBDC,0x00F7C17A,0x00FBD197,0x00FCD7A2,0x00FBD6A3,0x00FCD4A2,0x00FBC885,0x00F7BE74,0x00E4DDDA,0x00DDDDEA,0x00AAB6D1,0x00BBC3D8,0x00BBC4D8,0x00ABB6D0,0x00D9DAE5,0x00D7D6D7,0x00F5DFC8,0x00F6B965,0x00F8C782,0x00F9C986,0x00F9C887,0x00F9C885,0x00F7C276,0x00F5B661,0x00F4D8BA,0x00C1C8DA,0x00B9C2D5,0x00BFC5D8,0x00E1DDE1,0x00F7D2A4,0x00F7BB6B,0x00F7BD6F,0x00F7BF6F,0x00F7BC6B,0x00F7B962,0x00F7B359,0x00F6CC95,0x00EFECEE,0x00DCDADB,0x00F7CD94,0x00F7B45B,0x00F7B459,0x00F7B65C,0x00F7B662,0x00F5B75F,0x00F7B254,0x00F7B454,0x00F6C689,0x00F7B967,0x00F7BC6F,0x00F7BC6A,0x00F7B964,0x00F7B55B,0x00F7B85C,0x00F6CF9A,0x00F8BD6B,0x00F7BC6D,0x00F8C072,0x00F7C076,0x00F8BA65,0x00F5DBC3,0x00F7CA91,0x00F8BB69,0x00F7C072,0x00F7BA68,0x00F7BA65,0x00F6CA8C,0x00F7C991,0x00F8BC6D,0x00F7CB8F,0x00F7D2A6}; +dword goto_about_pal [] = {0x00E4DFE1,0x00C4CBDD,0x00C5CCDF,0x00CAD1E0,0x00C2CADC,0x00E7E1E3,0x00E3DFE2,0x00C1C9DB,0x00E4E9F1,0x00E4E9F0,0x00DAD6DD,0x00BEC5D8,0x00CAD2E2,0x00CBD2E2,0x00CBD3E2,0x00CBD2E3,0x00C9D1E0,0x00C8D1DF,0x00BBC2D6,0x00AFB9D2,0x00B5BED5,0x00B7C1D6,0x00B7C2D6,0x00B6BFD5,0x00B3BCD2,0x00ADB6CD,0x00E2DDE1,0x009098B0,0x00C1CCDE,0x00DCDADF,0x00ADB6D1,0x00ACB5D0,0x00AEBAD1,0x00AFBAD2,0x00ADB9D0,0x00AAB4CC,0x00A8B3CB,0x00E4E0E2,0x00FBFBFB,0x00FFFFFF,0x00F3F3F3,0x00E6E3E4,0x00C5CBDF,0x00AEB9D0,0x00B6BFD4,0x00B9C3D6,0x00BFC6D8,0x00E3DFE1,0x00C8C9C9,0x00B4BED5,0x00B4BED4,0x00B4BED3,0x00B2BBD3,0x00E5E0E2,0x00D8D7D8,0x00CBD0E1,0x00B9C2D6,0x00C8CDE0,0x00E4DFE2,0x00BFC5DA,0x00C8D0DF,0x00CBD2E1,0x00BDC5D6,0x00E0DAE0,0x007DB835,0x00DCDDE9,0x00B3BDD4,0x00F2F4F9,0x00BAC4D8,0x00D5D6E4,0x00B3DA82,0x0076AD32,0x00A5B2CD,0x00DBE0EC,0x00DCE1EC,0x00DCE1EB,0x00DBE0E9,0x00A7B4CD,0x00CBD0E2,0x00AAB4D0,0x00C8CEE1,0x00CAD1E2,0x00C8CEDD,0x00C5CDDD,0x00ACB6CE,0x00C3CADD,0x00A0D162,0x00B7C2DB,0x00AAB5CE,0x00B9C2D8,0x00B6BFD3,0x00A6B2CA,0x00B2BCD6,0x0097CD53,0x00A4AFCB,0x00ABB4CE,0x00AEB9D1,0x00ADB7D0,0x00A8B4CB,0x009FABC5,0x00B4BDD6,0x00E2DEE0,0x00D3D3D3,0x00E5DDDA,0x00F5CFA3,0x00F7C888,0x00F8CC8E,0x00F7C787,0x00F5CC9D,0x00E5DBD7,0x00A3AFCB,0x00B1BBD2,0x00B4BFD4,0x00B5BED3,0x00AFB9D0,0x00A3AEC9,0x00E1DDDE,0x0090C947,0x00DFDCDD,0x00F7C279,0x00FCDBAF,0x00FCE4C2,0x00F9D6A2,0x00F7C177,0x00E6D9D1,0x00A6B3D0,0x00AEBAD0,0x00BDC5D8,0x00BDC6D8,0x00A5B1CC,0x00E5E0E3,0x00DDDBDC,0x00F7C17A,0x00FBD197,0x00FCD7A2,0x00FBD6A3,0x00FCD4A2,0x00FBC885,0x00F7BE74,0x00E4DDDA,0x00DDDDEA,0x00AAB6D1,0x00BBC3D8,0x00BBC4D8,0x00ABB6D0,0x00D9DAE5,0x00D7D6D7,0x00F5DFC8,0x00F6B965,0x00F8C782,0x00F9C986,0x00F9C887,0x00F9C885,0x00F7C276,0x00F5B661,0x00F4D8BA,0x00C1C8DA,0x00B9C2D5,0x00BFC5D8,0x00E1DDE1,0x00F7D2A4,0x00F7BB6B,0x00F7BD6F,0x00F7BF6F,0x00F7BC6B,0x00F7B962,0x00F7B359,0x00F6CC95,0x00EFECEE,0x00DCDADB,0x00F7CD94,0x00F7B45B,0x00F7B459,0x00F7B65C,0x00F7B662,0x00F5B75F,0x00F7B254,0x00F7B454,0x00F6C689,0x00F7B967,0x00F7BC6F,0x00F7BC6A,0x00F7B964,0x00F7B55B,0x00F7B85C,0x00F6CF9A,0x00F8BD6B,0x00F7BC6D,0x00F8C072,0x00F7C076,0x00F8BA65,0x00F5DBC3,0x00F7CA91,0x00F8BB69,0x00F7C072,0x00F7BA68,0x00F7BA65,0x00F6CA8C,0x00F7C991,0x00F8BC6D,0x00F7CB8F,0x00F7D2A6}; unsigned char goto_about[1904] = FROM "imgs\goto_about.raw"; \ No newline at end of file diff --git a/programs/cmm/eolite/include/about.h b/programs/cmm/eolite/include/about.h index 322d1453f7..adeb174bb7 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -47,7 +47,7 @@ void about_dialog() break; case evReDraw: - DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,INTRO_TEXT_1); + DefineAndDrawWindow(600,150,181,228+GetSkinHeight(),0x34,sc.work,INTRO_TEXT_1); DrawBar(0,0,172,50,0x8494C4); PutPaletteImage(#logo,85,85,43,7,8,#logo_pal); WriteTextB(46,100,0x90,0xBF40BF,ABOUT_TITLE); @@ -66,6 +66,5 @@ void about_dialog() #endif DrawLink(71,170,0x80,23, "kolibri-n.org"); DrawFlatButton(85,190,70,22,10,0xE4DFE1, INTRO_TEXT_4); - DrawFilledBar(0, 216, 172, 12); } } \ No newline at end of file diff --git a/programs/cmm/eolite/include/copy.h b/programs/cmm/eolite/include/copy.h index 08924f2cca..c051b791fc 100644 --- a/programs/cmm/eolite/include/copy.h +++ b/programs/cmm/eolite/include/copy.h @@ -14,10 +14,10 @@ void Copy(dword pcth, char cut) } void copyf_Draw_Progress(dword filename) { - DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,col_work,T_PASTE_WINDOW); - WriteText(5,8, 0x80, 0, T_PASTE_WINDOW_TEXT); - DrawBar(5, 26, WIN_W-10, 10, col_work); - WriteText(5,26, 0x80, 0, filename); + DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW); + WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT); + DrawBar(5, 26, WIN_W-10, 10, sc.work); + WriteText(5,26, 0x80, sc.work_text, filename); if (CheckEvent()==evButton) { notify(T_CANCEL_PASTE); diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index d7dcc59742..2c236d0f5e 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -39,10 +39,10 @@ void Tip(int y, dword caption, id, arrow) int i; DrawBar(17,y,160,1,0xEFEDEE); DrawFilledBar(17, y+1, 160, 16); - WriteText(25,y+5,0x80,0,caption); + WriteText(25,y+5,0x80,sc.work_text,caption); IF (id<>0) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //кнопа для стрелки - WriteText(165,y+5,0x80,0,arrow); //стрелка вниз - DrawBar(17,y+17,160,1,col_border); //подчёркивание + WriteText(165,y+5,0x80,sc.work_text,arrow); //стрелка вниз + DrawBar(17,y+17,160,1,sc.work_graph); //подчёркивание } diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h index 80b54f6d77..484e3eb7b3 100644 --- a/programs/cmm/eolite/include/menu.h +++ b/programs/cmm/eolite/include/menu.h @@ -92,7 +92,7 @@ void FileMenu() case evReDraw: _MENU_DRAW: DefineAndDrawWindow(menu.x, menu.y,menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF); GetProcessInfo(#MenuForm, SelfInfo); - DrawRectangle(0,0,menu.w+1,menu.h+2,col_border); + DrawRectangle(0,0,menu.w+1,menu.h+2,sc.work_graph); DrawBar(1,1,menu.w,1,0xFFFfff); DrawPopupShadow(1,1,menu.w,menu.h,0); MenuListRedraw(); @@ -115,10 +115,10 @@ void MenuListRedraw() } else { - DrawBar(2,start_y+2,menu.w-1,menu.line_h,col_work); + DrawBar(2,start_y+2,menu.w-1,menu.line_h,sc.work); WriteText(8,start_y+texty+3,0x80,0xf2f2f2,file_captions[index*3]); } - WriteText(7,start_y+texty+2,0x80,0x000000,file_captions[index*3]); + WriteText(7,start_y+texty+2,0x80,sc.work_text,file_captions[index*3]); WriteText(-strlen(file_captions[index*3+1])*6-6+menu.w,start_y+texty+2,0x80,0x888888,file_captions[index*3+1]); start_y+=menu.line_h; } diff --git a/programs/cmm/eolite/include/open_with.h b/programs/cmm/eolite/include/open_with.h index 431358f746..a0e15dc56e 100644 --- a/programs/cmm/eolite/include/open_with.h +++ b/programs/cmm/eolite/include/open_with.h @@ -114,12 +114,12 @@ void OpenWith() DefineAndDrawWindow(files.w-WIN_W/2+files.x+Form.left+6, files.h-WIN_H/2+files.y+Form.top+GetSkinHeight(),WIN_W+1,WIN_H,0x01, 0, 0, 0x01fffFFF); GetProcessInfo(#MenuForm, SelfInfo); - DrawPopup(0,0,MenuForm.width-2,MenuForm.height-2,0, col_work, col_border); - DrawRectangle(app_list.x-1, app_list.y-2, app_list.w+1, app_list.h+2, col_border); + DrawPopup(0,0,MenuForm.width-2,MenuForm.height-2,0, sc.work, sc.work_graph); + DrawRectangle(app_list.x-1, app_list.y-2, app_list.w+1, app_list.h+2, sc.work_graph); - Put_icon(#file_name+_strrchr(#file_name,'.'), 10, 13, col_work, 0); - WriteText(35,10, 0x80, 0, T_SELECT_APP_TO_OPEN_WITH); - WriteText(35,23, 0x80, 0, #file_name); + Put_icon(#file_name+_strrchr(#file_name,'.'), 10, 13, sc.work, 0); + WriteText(35,10, 0x80, sc.work_text, T_SELECT_APP_TO_OPEN_WITH); + WriteText(35,23, 0x80, sc.work_text, #file_name); DrawAppList(); } diff --git a/programs/cmm/eolite/include/other.h b/programs/cmm/eolite/include/other.h index a1128a8e14..785eb35214 100644 --- a/programs/cmm/eolite/include/other.h +++ b/programs/cmm/eolite/include/other.h @@ -9,8 +9,8 @@ void ShowMessage(dword message, pause_duration) { int form_x=files.w-220/2+files.x; int form_y=160; - DrawPopup(form_x,form_y,220,80,1,col_work,col_border); - WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,0,message); + DrawPopup(form_x,form_y,220,80,1,sc.work,sc.work_graph); + WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,sc.work_text,message); pause(pause_duration); if (pause_duration) List_ReDraw(); } @@ -60,12 +60,12 @@ inline fastcall void Scroll() { // void DrawFlatButton(dword x,y,width,height,id,color,text) { int fill_h; - DrawRectangle(x,y,width,height,col_border); + DrawRectangle(x,y,width,height,sc.work_graph); DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding); - PutPixel(x+width-1, y+1, col_work); + PutPixel(x+width-1, y+1, col_padding); 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); - WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,0,text); + WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,sc.work_text,text); } void DrawFilledBar(dword x, y, w, h)