sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

New libs (CMM): system.h, mouse.h

Browse Source 
git-svn-id: svn://kolibrios.org@5674 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pavelyakov 2015-08-04 14:36:07 +00:00
parent 1a537e6e27
commit 36e0e0420d
29 changed files with 458 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/cmm/Calypte/Calypte.c
View File

@ -65,7 +65,7 @@ struct menu_text_struct
#define TITLE "Calypte v0.12" #define TITLE "Calypte v0.12"
char win_title[4096] = TITLE; char win_title[4096] = TITLE;
proc_info Form; proc_info Form;
system_colors sc;
dword old_width,old_height; dword old_width,old_height;
llist tview; llist tview;
@ -221,15 +221,15 @@ void main()
void draw_window() void draw_window()
{ {
sc.get(); system.color.get();
DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title); DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) return; if (Form.status_window>2) return;
tview.SetSizes(0, TOPPANELH, Form.cwidth, Form.cheight-BOTPANELH-TOPPANELH, 200, 12); tview.SetSizes(0, TOPPANELH, Form.cwidth, Form.cheight-BOTPANELH-TOPPANELH, 200, 12);
DrawBar(0, 0, Form.cwidth, TOPPANELH, sc.work); DrawBar(0, 0, Form.cwidth, TOPPANELH, system.color.work);
DrawBar(0, Form.cheight-BOTPANELH, Form.cwidth, BOTPANELH, sc.work); DrawBar(0, Form.cheight-BOTPANELH, Form.cwidth, BOTPANELH, system.color.work);
menudata1.bckg_col = sc.work; menudata1.bckg_col = system.color.work;
menu_bar_draw stdcall (#menudata1); menu_bar_draw stdcall (#menudata1);
if (old_width!=Form.width) || (old_height!=Form.height) if (old_width!=Form.width) || (old_height!=Form.height)

4
programs/cmm/Calypte/include/gui.h
View File

@ -6,12 +6,12 @@ dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
void DrawFlatButton(dword x,y,width,height,id,color,text) void DrawFlatButton(dword x,y,width,height,id,color,text)
{ {
int fill_h; int fill_h;
DrawRectangle(x,y,width,height,sc.work_graph); DrawRectangle(x,y,width,height,system.color.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,COL_PADDING); DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,COL_PADDING);
PutPixel(x+width-1, y+1, COL_PADDING); PutPixel(x+width-1, y+1, COL_PADDING);
if (color!=-1) DrawFilledBar(x+2, y+2, width-3, height-3); 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); 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,sc.work_text,text); WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,system.color.work_text,text);
} }
void DrawFilledBar(dword x, y, w, h) void DrawFilledBar(dword x, y, w, h)

4
programs/cmm/Calypte/include/properties.h
View File

@ -44,7 +44,7 @@ char folder_info[200];
BDVK file_info_general; BDVK file_info_general;
BDVK file_info_dirsize; BDVK file_info_dirsize;
byte readonly, hidden, system; byte readonly, hidden, System;
void properties_dialog() void properties_dialog()
{ {
@ -85,7 +85,7 @@ void properties_dialog()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE_PROPERTIES); DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,system.color.work,WINDOW_TITLE_PROPERTIES);
GetProcessInfo(#settings_form, SelfInfo); GetProcessInfo(#settings_form, SelfInfo);
DrawFlatButton(settings_form.cwidth - 70 - 13, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE); DrawFlatButton(settings_form.cwidth - 70 - 13, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE);
} }

31
programs/cmm/appearance/appearance.c
View File

@ -41,7 +41,6 @@ int files_mas[100];
int cur; int cur;
system_colors sc;
proc_info Form; proc_info Form;
scroll_bar scroll1 = { 18,200,398, 44,18,0,115,15,0,0xeeeeee,0xD2CED0,0x555555,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1}; scroll_bar scroll1 = { 18,200,398, 44,18,0,115,15,0,0xeeeeee,0xD2CED0,0x555555,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
@ -83,15 +82,15 @@ void Draw_List()
if (list[active].current-list[active].first==i) if (list[active].current-list[active].first==i)
{ {
if (sc.work_button!=sc.work) if (system.color.work_button!=system.color.work)
{ {
DrawBar(0, yyy, list[active].w, list[active].line_h, sc.work_button); DrawBar(0, yyy, list[active].w, list[active].line_h, system.color.work_button);
if (i<list[active].count) WriteText(12,yyy+list[active].text_y,0x80,sc.work_button_text, #temp_filename); if (i<list[active].count) WriteText(12,yyy+list[active].text_y,0x80,system.color.work_button_text, #temp_filename);
} }
else else
{ {
DrawBar(0, yyy, list[active].w, list[active].line_h, sc.grab_button); DrawBar(0, yyy, list[active].w, list[active].line_h, system.color.grab_button);
if (i<list[active].count) WriteText(12,yyy+list[active].text_y,0x80,sc.grab_button_text, #temp_filename); if (i<list[active].count) WriteText(12,yyy+list[active].text_y,0x80,system.color.grab_button_text, #temp_filename);
} }
} }
else else
@ -208,7 +207,7 @@ void main()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(30,80,list[active].w+9,list[active].h+4+GetSkinHeight(),0x73,0xE4DFE1,WINDOW_HEADER,0); DefineAndDrawWindow(30,80,list[active].w+9,list[active].h+4+GetSkinHeight(),0x73,0xE4DFE1,WINDOW_HEADER,0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
IF (Form.status_window>=2) break; IF (Form.status_window>=2) break;
@ -227,15 +226,15 @@ void DrawTab(dword x,y, but_id, is_active, text)
if (is_active) if (is_active)
{ {
col_bg=sc.work_button; col_bg=system.color.work_button;
col_text=sc.work_button_text; col_text=system.color.work_button_text;
} }
else else
{ {
col_bg=sc.work; col_bg=system.color.work;
col_text=sc.work_text; col_text=system.color.work_text;
} }
DrawRectangle(x,y, w,h, sc.work_graph); DrawRectangle(x,y, w,h, system.color.work_graph);
DrawCaptButton(x+1,y+1, w-2,h-1, but_id, col_bg, col_text, text); DrawCaptButton(x+1,y+1, w-2,h-1, but_id, col_bg, col_text, text);
_PutImage(x+6,y+4, 16,15, but_id-2*16*15*3+#icons); _PutImage(x+6,y+4, 16,15, but_id-2*16*15*3+#icons);
} }
@ -243,10 +242,10 @@ void DrawTab(dword x,y, but_id, is_active, text)
void DrawTabs() void DrawTabs()
{ {
DrawBar(0,0, Form.cwidth, PANEL_H-1, sc.work); DrawBar(0,0, Form.cwidth, PANEL_H-1, system.color.work);
DrawTab(10,7, 2, list[WALLPAPERS].active, T_WALLPAPERS); DrawTab(10,7, 2, list[WALLPAPERS].active, T_WALLPAPERS);
DrawTab(strlen(T_WALLPAPERS)*6+BT_PADDING+21,7, 3, list[SKINS].active, T_SKINS); DrawTab(strlen(T_WALLPAPERS)*6+BT_PADDING+21,7, 3, list[SKINS].active, T_SKINS);
DrawBar(0,PANEL_H-2, Form.cwidth, 1, sc.work_graph); DrawBar(0,PANEL_H-2, Form.cwidth, 1, system.color.work_graph);
DrawBar(0,PANEL_H-1, Form.cwidth, 1, 0xEEEeee); DrawBar(0,PANEL_H-1, Form.cwidth, 1, 0xEEEeee);
} }
@ -272,8 +271,8 @@ void TabClick(int N)
void DrawScroller() void DrawScroller()
{ {
scroll1.bckg_col = 0xBBBbbb; scroll1.bckg_col = 0xBBBbbb;
scroll1.frnt_col = sc.work; scroll1.frnt_col = system.color.work;
scroll1.line_col = sc.work_graph; scroll1.line_col = system.color.work_graph;
scroll1.max_area = list[active].count; scroll1.max_area = list[active].count;
scroll1.cur_area = list[active].visible; scroll1.cur_area = list[active].visible;

21
programs/cmm/browser/downloader.h
View File

@ -17,7 +17,6 @@
#endif #endif
proc_info DL_Form; proc_info DL_Form;
system_colors sc;
char DL_URL[10000]; char DL_URL[10000];
dword DL_bufpointer, DL_bufsize, DL_http_transfer, DL_http_buffer; dword DL_bufpointer, DL_bufsize, DL_http_transfer, DL_http_buffer;
char filepath[4096]; char filepath[4096];
@ -77,8 +76,8 @@ void Downloader()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(215, 100, 420, 120, 0x74, sc.work, DL_WINDOW_HEADER, 0); DefineAndDrawWindow(215, 100, 420, 120, 0x74, system.color.work, DL_WINDOW_HEADER, 0);
GetProcessInfo(#DL_Form, SelfInfo); GetProcessInfo(#DL_Form, SelfInfo);
if (DL_Form.status_window>2) break; if (DL_Form.status_window>2) break;
if (DL_Form.height<120) MoveSize(OLD,OLD,OLD,120); if (DL_Form.height<120) MoveSize(OLD,OLD,OLD,120);
@ -136,24 +135,24 @@ void Downloader()
void DL_Draw_Window() void DL_Draw_Window()
{ {
DrawBar(0,0, DL_Form.cwidth, DL_Form.cheight, sc.work); DrawBar(0,0, DL_Form.cwidth, DL_Form.cheight, system.color.work);
DeleteButton(305); DeleteButton(305);
DeleteButton(306); DeleteButton(306);
if (download_state == STATE_NOT_STARTED) || (download_state == STATE_COMPLETED) if (download_state == STATE_NOT_STARTED) || (download_state == STATE_COMPLETED)
{ {
DrawCaptButton(cleft, 50, 130, 27, 301, sc.work_button, sc.work_button_text, START_DOWNLOADING); DrawCaptButton(cleft, 50, 130, 27, 301, system.color.work_button, system.color.work_button_text, START_DOWNLOADING);
} }
if (download_state == STATE_IN_PROGRESS) if (download_state == STATE_IN_PROGRESS)
{ {
DrawCaptButton(cleft, 50, 140, 27, 302, sc.work_button, sc.work_button_text, STOP_DOWNLOADING); DrawCaptButton(cleft, 50, 140, 27, 302, system.color.work_button, system.color.work_button_text, STOP_DOWNLOADING);
DrawDownloading(); DrawDownloading();
} }
if (download_state == STATE_COMPLETED) if (download_state == STATE_COMPLETED)
{ {
DrawCaptButton(cleft+140, 50, 110, 27, 305, sc.work_button, sc.work_button_text, SHOW_IN_FOLDER); DrawCaptButton(cleft+140, 50, 110, 27, 305, system.color.work_button, system.color.work_button_text, SHOW_IN_FOLDER);
DrawCaptButton(cleft+260, 50, 120, 27, 306, sc.work_button, sc.work_button_text, OPEN_FILE); DrawCaptButton(cleft+260, 50, 120, 27, 306, system.color.work_button, system.color.work_button_text, OPEN_FILE);
} }
WriteText(cleft, DL_address_box.top + 4, 0x80, sc.work_text, "URL:"); WriteText(cleft, DL_address_box.top + 4, 0x80, system.color.work_text, "URL:");
DL_address_box.left = strlen("URL:")*6 + 10 + cleft; DL_address_box.left = strlen("URL:")*6 + 10 + cleft;
DL_address_box.width = DL_Form.cwidth - DL_address_box.left - cleft - 3; DL_address_box.width = DL_Form.cwidth - DL_address_box.left - cleft - 3;
DL_address_box.offset=0; DL_address_box.offset=0;
@ -171,8 +170,8 @@ void DrawDownloading()
tmp = ConvertSizeToKb(downloaded_size); tmp = ConvertSizeToKb(downloaded_size);
strcpy(#bytes_received, tmp); strcpy(#bytes_received, tmp);
strcat(#bytes_received, KB_RECEIVED); strcat(#bytes_received, KB_RECEIVED);
DrawBar(DL_progress_bar.left, DL_progress_bar.top + 17, DL_Form.cwidth - DL_progress_bar.left, 9, sc.work); DrawBar(DL_progress_bar.left, DL_progress_bar.top + 17, DL_Form.cwidth - DL_progress_bar.left, 9, system.color.work);
WriteText(DL_progress_bar.left, DL_progress_bar.top + 17, 0x80, sc.work_text, #bytes_received); WriteText(DL_progress_bar.left, DL_progress_bar.top + 17, 0x80, system.color.work_text, #bytes_received);
progressbar_draw stdcall(#DL_progress_bar); progressbar_draw stdcall(#DL_progress_bar);
} }

26
programs/cmm/dicty/dicty.c
View File

@ -16,8 +16,6 @@ char dict_not_found[] = "Dictionary not found";
char dict_opened[] = "Dictionary loaded"; char dict_opened[] = "Dictionary loaded";
char empty_word[] = "Type a word to translate"; char empty_word[] = "Type a word to translate";
system_colors sc;
proc_info Form; proc_info Form;
char edword[256], search_word[256], translate_result[4096], cur_dict[256]; char edword[256], search_word[256], translate_result[4096], cur_dict[256];
@ -107,24 +105,24 @@ void main()
void DrawWindowContent() void DrawWindowContent()
{ {
sc.get(); system.color.get();
DefineAndDrawWindow(215,120,400,250,0x73,sc.work,#title); DefineAndDrawWindow(215,120,400,250,0x73,system.color.work,#title);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) return; if (Form.status_window>2) return;
if (Form.height<140) MoveSize(OLD,OLD,OLD,140); if (Form.height<140) MoveSize(OLD,OLD,OLD,140);
if (Form.width<400) MoveSize(OLD,OLD,400,OLD); if (Form.width<400) MoveSize(OLD,OLD,400,OLD);
edit1.focus_border_color=sc.work_graph; edit1.focus_border_color=system.color.work_graph;
edit1.width=Form.width-edit1.left-edit1.left-9; edit1.width=Form.width-edit1.left-edit1.left-9;
DrawBar(0, 0, Form.width-9, 69, sc.work); DrawBar(0, 0, Form.width-9, 69, system.color.work);
edit_box_draw stdcall(#edit1); edit_box_draw stdcall(#edit1);
DrawCaptButton(edit1.left+edit1.width-80,35, 80,20, 10, sc.work_button, sc.work_button_text,#translate_caption); DrawCaptButton(edit1.left+edit1.width-80,35, 80,20, 10, system.color.work_button, system.color.work_button_text,#translate_caption);
DrawBar(0, 69, Form.width-9, 1, sc.work_graph); DrawBar(0, 69, Form.width-9, 1, system.color.work_graph);
WriteText(edit1.left,35+7,0x80,sc.work_text,#direction); WriteText(edit1.left,35+7,0x80,system.color.work_text,#direction);
DefineButton(edit1.left+130,35, 120,20, 11, sc.work_button); DefineButton(edit1.left+130,35, 120,20, 11, system.color.work_button);
DrawBar(edit1.left+130+1,36, 107,19, 0xFFFFFF); DrawBar(edit1.left+130+1,36, 107,19, 0xFFFFFF);
WriteText(edit1.left+130+112,35+7,0x80,sc.work_button_text,"\x19"); WriteText(edit1.left+130+112,35+7,0x80,system.color.work_button_text,"\x19");
WriteText(edit1.left+130+8,35+7,0x80,0x000000,#cur_dict); WriteText(edit1.left+130+8,35+7,0x80,0x000000,#cur_dict);
DrawTranslation(); DrawTranslation();
@ -236,11 +234,11 @@ void ShowDictList()
error = GetDir(#dir_buf, #fcount, dict_folder, DIRS_ONLYREAL); error = GetDir(#dir_buf, #fcount, dict_folder, DIRS_ONLYREAL);
if (!error) if (!error)
{ {
DefineButton(0,0, Form.width,Form.height, 12+BT_HIDE+BT_NOFRAME, sc.work_button); DefineButton(0,0, Form.width,Form.height, 12+BT_HIDE+BT_NOFRAME, system.color.work_button);
for (j=0; j<fcount; j++;) for (j=0; j<fcount; j++;)
{ {
DefineButton(edit1.left+130,j+1*20+35, 107,20, 20+j, sc.work_button); DefineButton(edit1.left+130,j+1*20+35, 107,20, 20+j, system.color.work_button);
WriteText(edit1.left+130+8,j+1*20+35+7,0x80,sc.work_button_text, j*304+dir_buf+72); WriteText(edit1.left+130+8,j+1*20+35+7,0x80,system.color.work_button_text, j*304+dir_buf+72);
} }
} }
} }

24
programs/cmm/downloader/Downloader.c
View File

@ -25,7 +25,7 @@ char header[]="New Downloader v0.6";
proc_info Form; proc_info Form;
#define WIN_W 400 #define WIN_W 400
#define WIN_H 220 #define WIN_H 220
system_colors sc;
#define URL param #define URL param
int mouse_twb; int mouse_twb;
@ -82,8 +82,8 @@ void main()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(215,100,WIN_W,WIN_H,0x73,sc.work,#header,0); DefineAndDrawWindow(215,100,WIN_W,WIN_H,0x73,system.color.work,#header,0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
if (Form.height<120) MoveSize(OLD,OLD,OLD,120); if (Form.height<120) MoveSize(OLD,OLD,OLD,120);
@ -156,34 +156,34 @@ void DrawSpeed()
speed_string = ConvertSize(speed[speed_position-1]); speed_string = ConvertSize(speed[speed_position-1]);
strcat(#bytes_received, speed_string); strcat(#bytes_received, speed_string);
strcat(#bytes_received, " received."); strcat(#bytes_received, " received.");
DrawBar(diagram.bufx, diagram.bufy + diagram.bufh + 10, diagram.bufw, 9, sc.work); DrawBar(diagram.bufx, diagram.bufy + diagram.bufh + 10, diagram.bufw, 9, system.color.work);
WriteText(diagram.bufx, diagram.bufy + diagram.bufh + 10, 0x80, sc.work_text, #bytes_received); WriteText(diagram.bufx, diagram.bufy + diagram.bufh + 10, 0x80, system.color.work_text, #bytes_received);
} }
void Draw_Window() void Draw_Window()
{ {
DrawBar(0,0,Form.cwidth,Form.cheight,sc.work); //bg DrawBar(0,0,Form.cwidth,Form.cheight,system.color.work); //bg
if (http_transfer <= 0) if (http_transfer <= 0)
{ {
DrawCaptButton(diagram.bufx, 50, 120, 20, 301, sc.work_button, sc.work_button_text, "Start downloading"); DrawCaptButton(diagram.bufx, 50, 120, 20, 301, system.color.work_button, system.color.work_button_text, "Start downloading");
} }
else else
{ {
DrawCaptButton(diagram.bufx, 50, 120, 20, 302, sc.work_button, sc.work_button_text, "Stop downloading"); DrawCaptButton(diagram.bufx, 50, 120, 20, 302, system.color.work_button, system.color.work_button_text, "Stop downloading");
} }
if (http_transfer <= 0) && (speed_position>0) if (http_transfer <= 0) && (speed_position>0)
{ {
DrawCaptButton(diagram.bufx+130, 50, 120, 20, 305, sc.work_button, sc.work_button_text, "Show in folder"); DrawCaptButton(diagram.bufx+130, 50, 120, 20, 305, system.color.work_button, system.color.work_button_text, "Show in folder");
} }
WriteText(diagram.bufx, address_box.top + 4, 0x80, sc.work_text, "URL:"); WriteText(diagram.bufx, address_box.top + 4, 0x80, system.color.work_text, "URL:");
address_box.left = strlen("URL:")*6 + 10 + diagram.bufx; address_box.left = strlen("URL:")*6 + 10 + diagram.bufx;
address_box.width = Form.cwidth - address_box.left - diagram.bufx - 3; address_box.width = Form.cwidth - address_box.left - diagram.bufx - 3;
address_box.offset=0; address_box.offset=0;
edit_box_draw stdcall(#address_box); edit_box_draw stdcall(#address_box);
DrawRectangle(address_box.left-1, address_box.top-1, address_box.width+2, 16,address_box.color); DrawRectangle(address_box.left-1, address_box.top-1, address_box.width+2, 16,address_box.color);
DrawRectangle(address_box.left-2, address_box.top-2, address_box.width+4, 18,sc.work_graph); DrawRectangle(address_box.left-2, address_box.top-2, address_box.width+4, 18,system.color.work_graph);
DrawRectangle(diagram.bufx-2, diagram.bufy-2, diagram.bufw+2, diagram.bufh+2, sc.work_graph); DrawRectangle(diagram.bufx-2, diagram.bufy-2, diagram.bufw+2, diagram.bufh+2, system.color.work_graph);
DrawSpeed(); DrawSpeed();
} }

10
programs/cmm/end/end.c
View File

@ -22,8 +22,6 @@
0}; 0};
#endif #endif
system_colors sc;
unsigned char moon[6*6] = FROM "moon.raw"; unsigned char moon[6*6] = FROM "moon.raw";
int WIN_SIZE_X, WIN_SIZE_Y; int WIN_SIZE_X, WIN_SIZE_Y;
@ -102,7 +100,7 @@ void main()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(0,0,WIN_SIZE_X, WIN_SIZE_Y, 0x01, 0, 0, 0x01fffFFF); DefineAndDrawWindow(0,0,WIN_SIZE_X, WIN_SIZE_Y, 0x01, 0, 0, 0x01fffFFF);
//_PutImage(0,0,WIN_SIZE_X,WIN_SIZE_Y,shadow_buf); //_PutImage(0,0,WIN_SIZE_X,WIN_SIZE_Y,shadow_buf);
_PutImage(0,0,WIN_SIZE_X, PANEL_Y,s1); _PutImage(0,0,WIN_SIZE_X, PANEL_Y,s1);
@ -123,12 +121,12 @@ void draw_main_area()
int i=0; int i=0;
DrawRectangle(PANEL_X, PANEL_Y, PANEL_SIZE_X, PANEL_SIZE_Y, 0); DrawRectangle(PANEL_X, PANEL_Y, PANEL_SIZE_X, PANEL_SIZE_Y, 0);
DrawBar(PANEL_X+1, PANEL_Y+NIGHT_PALEL_HEIGHT+1, PANEL_SIZE_X-1, PANEL_SIZE_Y-NIGHT_PALEL_HEIGHT-1, sc.work); DrawBar(PANEL_X+1, PANEL_Y+NIGHT_PALEL_HEIGHT+1, PANEL_SIZE_X-1, PANEL_SIZE_Y-NIGHT_PALEL_HEIGHT-1, system.color.work);
for (i=0; i<3; i++) for (i=0; i<3; i++)
{ {
DefineButton(PANEL_X+33, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+16, 190,19, BUTTONS_CAPTIONS[i*2+1],sc.work_button); DefineButton(PANEL_X+33, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+16, 190,19, BUTTONS_CAPTIONS[i*2+1],system.color.work_button);
WriteText(PANEL_X+59, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+22, 0x80,sc.work_button_text, BUTTONS_CAPTIONS[i*2]); WriteText(PANEL_X+59, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+22, 0x80,system.color.work_button_text, BUTTONS_CAPTIONS[i*2]);
} }
draw_stars(); draw_stars();

53
programs/cmm/eolite/Eolite.c
View File

@ -141,7 +141,6 @@ dword eolite_ini_path;
dword menu_stak,about_stak,properties_stak,settings_stak,copy_stak; dword menu_stak,about_stak,properties_stak,settings_stak,copy_stak;
proc_info Form; proc_info Form;
system_colors sc;
int mouse_dd, scroll_used, sc_slider_h, sorting_arrow_x, kolibrios_drive; int mouse_dd, scroll_used, sc_slider_h, sorting_arrow_x, kolibrios_drive;
dword buf; dword buf;
dword file_mas[6898]; dword file_mas[6898];
@ -603,7 +602,7 @@ void menu_action(dword id)
void draw_window() void draw_window()
{ {
DefineAndDrawWindow(GetScreenWidth()-550/4+rand_n,rand_n+30,550,500,0x73,sc.work,TITLE,0); DefineAndDrawWindow(GetScreenWidth()-550/4+rand_n,rand_n+30,550,500,0x73,system.color.work,TITLE,0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) return; if (Form.status_window>2) return;
files.SetSizes(192, 57, Form.cwidth - 210, onTop(57,6), disc_num*16+195,files.line_h); files.SetSizes(192, 57, Form.cwidth - 210, onTop(57,6), disc_num*16+195,files.line_h);
@ -612,26 +611,26 @@ void draw_window()
GetProcessInfo(#Form, SelfInfo); //if win_size changed GetProcessInfo(#Form, SelfInfo); //if win_size changed
PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal); PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal);
DrawBar(127, 8, 1, 25, sc.work_graph); DrawBar(127, 8, 1, 25, system.color.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=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,system.color.work);
for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,sc.work); for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,system.color.work);
DrawBar(246,0,Form.cwidth - 297,12, sc.work); //upper editbox DrawBar(246,0,Form.cwidth - 297,12, system.color.work); //upper editbox
DrawBar(246,29,Form.cwidth - 297,5,sc.work); //under editbox DrawBar(246,29,Form.cwidth - 297,5,system.color.work); //under editbox
DrawRectangle(246,12,Form.cwidth - 303,16,sc.work_graph); DrawRectangle(246,12,Form.cwidth - 303,16,system.color.work_graph);
DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about
PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal); PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal);
//main rectangles //main rectangles
DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),sc.work_graph); DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),system.color.work_graph);
DrawRectangle(0,39,Form.cwidth-1,onTop(44,0),col_palette[4]); //bg 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]); for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
DrawLeftPanel(); DrawLeftPanel();
//ListBox //ListBox
DrawFlatButton(files.x,40,Form.cwidth - files.x - 159,16,31,sc.work,T_FILE); DrawFlatButton(files.x,40,Form.cwidth - files.x - 159,16,31,system.color.work,T_FILE);
DrawFlatButton(Form.cwidth - 159,40,73,16,32,sc.work,T_TYPE); DrawFlatButton(Form.cwidth - 159,40,73,16,32,system.color.work,T_TYPE);
DrawFlatButton(Form.cwidth - 86,40,68,16,33,sc.work,T_SIZE); DrawFlatButton(Form.cwidth - 86,40,68,16,33,system.color.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 DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),system.color.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,40,16,16,0,system.color.work,"\x18");
DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,sc.work,"\x19"); DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,system.color.work,"\x19");
Open_Dir(#path,ONLY_SHOW); Open_Dir(#path,ONLY_SHOW);
if (del_active) Del_Form(); if (del_active) Del_Form();
if (new_element_active) NewElement_Form(new_element_active, #new_element_name); if (new_element_active) NewElement_Form(new_element_active, #new_element_name);
@ -715,8 +714,8 @@ void List_ReDraw()
//in the bottom //in the bottom
paint_y = j * files.line_h + files.y; paint_y = j * files.line_h + files.y;
DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF); DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF);
DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),sc.work); DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),system.color.work);
DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),sc.work); DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),system.color.work);
Scroll(); Scroll();
} }
@ -771,8 +770,8 @@ void Line_ReDraw(dword color, filenum){
PathShow_prepare stdcall(#FileShow); PathShow_prepare stdcall(#FileShow);
PathShow_draw stdcall(#FileShow); PathShow_draw stdcall(#FileShow);
} }
DrawBar(Form.cwidth-159,y,1,files.line_h,sc.work); //gray line 1 DrawBar(Form.cwidth-159,y,1,files.line_h,system.color.work); //gray line 1
DrawBar(Form.cwidth-86,y,1,files.line_h,sc.work); //gray line 2 DrawBar(Form.cwidth-86,y,1,files.line_h,system.color.work); //gray line 2
} }
@ -805,7 +804,7 @@ void Open_Dir(dword dir_path, redraw){
if (sort_num==1) sorting_arrow_x = Form.width+60/2; if (sort_num==1) sorting_arrow_x = Form.width+60/2;
if (sort_num==2) sorting_arrow_x = Form.width-115; 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; if (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\x19"); WriteText(sorting_arrow_x,45,0x80,system.color.work_graph,"\x19");
if (redraw!=ONLY_SHOW) Sorting(); if (redraw!=ONLY_SHOW) Sorting();
if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw(); if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw();
DrawSystemDiscs(); DrawSystemDiscs();
@ -863,8 +862,8 @@ void Del_Form()
else else
{ {
if (!files.count) return; if (!files.count) return;
DrawPopup(dform_x,160,220,85,1,sc.work,sc.work_graph); DrawPopup(dform_x,160,220,85,1,system.color.work,system.color.work_graph);
WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,sc.work_text,T_DELETE_FILE); WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,system.color.work_text,T_DELETE_FILE);
for (i=0; i<files.count; i++) for (i=0; i<files.count; i++)
{ {
selected_offset2 = file_mas[i]*304 + buf+32 + 7; selected_offset2 = file_mas[i]*304 + buf+32 + 7;
@ -873,14 +872,14 @@ void Del_Form()
if (cont) if (cont)
{ {
sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,cont,DEL_MORE_FILES_2); sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,cont,DEL_MORE_FILES_2);
WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,sc.work_text,#f_count); WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,system.color.work_text,#f_count);
} }
else else
{ {
if (strlen(#file_name)<28) if (strlen(#file_name)<28)
{ {
WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?"); WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,system.color.work_text,"?");
WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name); WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,system.color.work_text,#file_name);
} }
else else
{ {
@ -1115,11 +1114,11 @@ void NewElement_Form(byte crt, dword strng)
strcpy(#new_element_name, strng); strcpy(#new_element_name, strng);
new_file_ed.size = new_file_ed.pos = strlen(strng); new_file_ed.size = new_file_ed.pos = strlen(strng);
} }
DrawPopup(dform_x,160,220,85,1,sc.work,sc.work_graph); DrawPopup(dform_x,160,220,85,1,system.color.work,system.color.work_graph);
new_file_ed.left = dform_x+24; new_file_ed.left = dform_x+24;
edit_box_draw stdcall (#new_file_ed); edit_box_draw stdcall (#new_file_ed);
DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff); DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff);
DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, sc.work_graph); DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, system.color.work_graph);
if (new_element_active==3) DrawFlatButton(dform_x+22,208,85,22,301,0xFFB6B5,T_RENAME); if (new_element_active==3) DrawFlatButton(dform_x+22,208,85,22,301,0xFFB6B5,T_RENAME);
else DrawFlatButton(dform_x+27,208,70,22,301,0xFFB6B5,T_CREATE); else DrawFlatButton(dform_x+27,208,70,22,301,0xFFB6B5,T_CREATE);
DrawFlatButton(dform_x+120,208,70,22,302,0xC6DFC6,T_CANCEL); DrawFlatButton(dform_x+120,208,70,22,302,0xC6DFC6,T_CANCEL);

2
programs/cmm/eolite/include/about.h
View File

@ -50,7 +50,7 @@ void about_dialog()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,228+GetSkinHeight(),0x34,sc.work,INTRO_TEXT_1); DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,228+GetSkinHeight(),0x34,system.color.work,INTRO_TEXT_1);
GetProcessInfo(#about_form, SelfInfo); GetProcessInfo(#about_form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
DrawBar(0,0,about_form.cwidth,50,0x8494C4); DrawBar(0,0,about_form.cwidth,50,0x8494C4);

10
programs/cmm/eolite/include/copy.h
View File

@ -114,10 +114,10 @@ void DisplayCopyfForm()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,sc.work,T_PASTE_WINDOW_TITLE); DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,system.color.work,T_PASTE_WINDOW_TITLE);
GetProcessInfo(#Copy_Form, SelfInfo); GetProcessInfo(#Copy_Form, SelfInfo);
WriteText(45, 11, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT); WriteText(45, 11, 0x80, system.color.work_text, T_PASTE_WINDOW_TEXT);
DrawFlatButton(Copy_Form.cwidth - 90, Copy_Form.cheight - 32, 80, 22, 10, sc.work_button, T_PASTE_WINDOW_BUTTON); DrawFlatButton(Copy_Form.cwidth - 90, Copy_Form.cheight - 32, 80, 22, 10, system.color.work_button, T_PASTE_WINDOW_BUTTON);
DrawBar(8, 10, 32, 32, 0xFFFfff); DrawBar(8, 10, 32, 32, 0xFFFfff);
break; break;
} }
@ -134,6 +134,6 @@ void copyf_Draw_Progress(dword copying_filename) {
if (Copy_Form.cwidth==0) return; if (Copy_Form.cwidth==0) return;
DisplayCopyfForm(); DisplayCopyfForm();
Put_icon(copying_filename+strrchr(copying_filename,'.'), 16, 19, 0xFFFfff, 0); Put_icon(copying_filename+strrchr(copying_filename,'.'), 16, 19, 0xFFFfff, 0);
DrawBar(45, 29, Copy_Form.cwidth-40, 10, sc.work); DrawBar(45, 29, Copy_Form.cwidth-40, 10, system.color.work);
WriteText(45, 29, 0x80, sc.work_text, copying_filename); WriteText(45, 29, 0x80, system.color.work_text, copying_filename);
} }

8
programs/cmm/eolite/include/gui.h
View File

@ -45,12 +45,12 @@ void Scroll() {
void DrawFlatButton(dword x,y,width,height,id,color,text) void DrawFlatButton(dword x,y,width,height,id,color,text)
{ {
int fill_h; int fill_h;
DrawRectangle(x,y,width,height,sc.work_graph); DrawRectangle(x,y,width,height,system.color.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding); DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding);
PutPixel(x+width-1, y+1, col_padding); PutPixel(x+width-1, y+1, col_padding);
if (color!=-1) DrawFilledBar(x+2, y+2, width-3, height-3); 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); 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,sc.work_text,text); WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,system.color.work_text,text);
} }
void DrawFilledBar(dword x, y, w, h) void DrawFilledBar(dword x, y, w, h)
@ -65,8 +65,8 @@ void ShowMessage(dword message, pause_duration)
{ {
int form_x=files.w-220/2+files.x; int form_x=files.w-220/2+files.x;
int form_y=160; int form_y=160;
DrawPopup(form_x,form_y,220,80,1,sc.work,sc.work_graph); DrawPopup(form_x,form_y,220,80,1,system.color.work,system.color.work_graph);
WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,sc.work_text,message); WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,system.color.work_text,message);
pause(pause_duration); pause(pause_duration);
if (pause_duration) List_ReDraw(); if (pause_duration) List_ReDraw();
} }

6
programs/cmm/eolite/include/left_panel.h
View File

@ -62,10 +62,10 @@ void Tip(int y, dword caption, id, arrow)
int i; int i;
DrawBar(17,y,160,1,0xEFEDEE); DrawBar(17,y,160,1,0xEFEDEE);
DrawFilledBar(17, y+1, 160, 16); DrawFilledBar(17, y+1, 160, 16);
WriteText(25,y+5,0x80,sc.work_text,caption); WriteText(25,y+5,0x80,system.color.work_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,sc.work_text,arrow); //arrow WriteText(165,y+5,0x80,system.color.work_text,arrow); //arrow
DrawBar(17,y+17,160,1,sc.work_graph); DrawBar(17,y+17,160,1,system.color.work_graph);
} }

6
programs/cmm/eolite/include/menu.h
View File

@ -88,7 +88,7 @@ void FileMenu()
if (menu_call_mouse) DefineAndDrawWindow(mouse.x+Form.left+5, mouse.y+Form.top+GetSkinHeight(),menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF); if (menu_call_mouse) DefineAndDrawWindow(mouse.x+Form.left+5, mouse.y+Form.top+GetSkinHeight(),menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF);
else DefineAndDrawWindow(Form.left+files.x+15, files.line_h*files.current+files.y+Form.top+30,menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF); else DefineAndDrawWindow(Form.left+files.x+15, files.line_h*files.current+files.y+Form.top+30,menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF);
GetProcessInfo(#MenuForm, SelfInfo); GetProcessInfo(#MenuForm, SelfInfo);
DrawRectangle(0,0,menu.w+1,menu.h+2,sc.work_graph); DrawRectangle(0,0,menu.w+1,menu.h+2,system.color.work_graph);
DrawBar(1,1,menu.w,1,0xFFFfff); DrawBar(1,1,menu.w,1,0xFFFfff);
DrawPopupShadow(1,1,menu.w,menu.h,0); DrawPopupShadow(1,1,menu.w,menu.h,0);
MenuListRedraw(); MenuListRedraw();
@ -110,10 +110,10 @@ void MenuListRedraw()
} }
else else
{ {
DrawBar(2,start_y+2,menu.w-1,menu.line_h,sc.work); DrawBar(2,start_y+2,menu.w-1,menu.line_h,system.color.work);
WriteText(8,start_y+menu.text_y+3,0x80,0xf2f2f2,file_captions[index*3]); WriteText(8,start_y+menu.text_y+3,0x80,0xf2f2f2,file_captions[index*3]);
} }
WriteText(7,start_y+menu.text_y+2,0x80,sc.work_text,file_captions[index*3]); WriteText(7,start_y+menu.text_y+2,0x80,system.color.work_text,file_captions[index*3]);
WriteText(-strlen(file_captions[index*3+1])*6-6+menu.w,start_y+menu.text_y+2,0x80,0x888888,file_captions[index*3+1]); WriteText(-strlen(file_captions[index*3+1])*6-6+menu.w,start_y+menu.text_y+2,0x80,0x888888,file_captions[index*3+1]);
start_y+=menu.line_h; start_y+=menu.line_h;
} }

8
programs/cmm/eolite/include/properties.h
View File

@ -192,7 +192,7 @@ void properties_dialog()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE_PROPERTIES); DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,system.color.work,WINDOW_TITLE_PROPERTIES);
GetProcessInfo(#settings_form, SelfInfo); GetProcessInfo(#settings_form, SelfInfo);
DrawFlatButton(settings_form.cwidth - 70 - 13, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE); DrawFlatButton(settings_form.cwidth - 70 - 13, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE);
DrawBar(10, 10, 32, 32, 0xFFFfff); DrawBar(10, 10, 32, 32, 0xFFFfff);
@ -239,9 +239,9 @@ void properties_dialog()
WriteText(100, 65, 0x80, 0x000000, #element_size_label); WriteText(100, 65, 0x80, 0x000000, #element_size_label);
flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2; flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2;
flags_frame.font_color = sc.work_text; flags_frame.font_color = system.color.work_text;
flags_frame.font_backgr_color = sc.work; flags_frame.font_backgr_color = system.color.work;
flags_frame.ext_col = sc.work_graph; flags_frame.ext_col = system.color.work_graph;
frame_draw stdcall (#flags_frame); frame_draw stdcall (#flags_frame);
DrawPropertiesCheckBoxes(); DrawPropertiesCheckBoxes();
} }

18
programs/cmm/eolite/include/settings.h
View File

@ -106,7 +106,7 @@ void settings_dialog()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left + Form.width/2, Form.top + Form.height/2 - 75, 300, 234+GetSkinHeight(),0x34,sc.work,TITLE_SETT); DefineAndDrawWindow(Form.left + Form.width/2, Form.top + Form.height/2 - 75, 300, 234+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
GetProcessInfo(#settings_form, SelfInfo); GetProcessInfo(#settings_form, SelfInfo);
DrawSettingsCheckBoxes(); DrawSettingsCheckBoxes();
DrawFlatButton(9, 166, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS); DrawFlatButton(9, 166, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
@ -122,8 +122,8 @@ void DrawSettingsCheckBoxes()
CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case); CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case);
CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy); CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy);
CheckBox2(10, 77, 23, USE_BIG_FONTS, use_big_fonts); CheckBox2(10, 77, 23, USE_BIG_FONTS, use_big_fonts);
MoreLessBox(10, 104, 18, 25, 26, #sc, files.line_h, LIST_LINE_HEIGHT); MoreLessBox(10, 104, 18, 25, 26, #system.color, files.line_h, LIST_LINE_HEIGHT);
MoreLessBox(10, 134, 18, 27, 28, #sc, MOUSE_TIME, T_DOUBLE_CLICK); MoreLessBox(10, 134, 18, 27, 28, #system.color, MOUSE_TIME, T_DOUBLE_CLICK);
} }
@ -176,11 +176,11 @@ void Write_Error(int error_number)
void SetAppColors() void SetAppColors()
{ {
sc.work = 0xE4DFE1; system.color.work = 0xE4DFE1;
sc.work_text = 0; system.color.work_text = 0;
sc.work_graph = 0x9098B0; //A0A0B8; //0x819FC5; system.color.work_graph = 0x9098B0; //A0A0B8; //0x819FC5;
sc.work_button = 0xD2D3D3; system.color.work_button = 0xD2D3D3;
sc.work_button_text = 0x000000; system.color.work_button_text = 0x000000;
col_padding = 0xC8C9C9; col_padding = 0xC8C9C9;
//col_selec = 0x94AECE; //col_selec = 0x94AECE;
col_lpanel = 0x00699C; col_lpanel = 0x00699C;
@ -188,5 +188,5 @@ void SetAppColors()
void CheckBox2(dword x, y, id, text, byte value) { void CheckBox2(dword x, y, id, text, byte value) {
CheckBox(x, y, 14, 14, id, text, sc.work_graph, sc.work_text, value); CheckBox(x, y, 14, 14, id, text, system.color.work_graph, system.color.work_text, value);
} }

17
programs/cmm/lib/gui.h
View File

@ -77,21 +77,20 @@
:void MoreLessBox(dword x,y,s, bt_id_more, bt_id_less, colors_pointer, value, text) :void MoreLessBox(dword x,y,s, bt_id_more, bt_id_less, colors_pointer, value, text)
{ {
#define VALUE_FIELD_W 26; #define VALUE_FIELD_W 26;
system_colors colors;
ESI = colors_pointer; ESI = colors_pointer;
colors.work_graph = ESI.system_colors.work_graph; system.color.work_graph = ESI.COLORS.work_graph;
colors.work_text = ESI.system_colors.work_text; system.color.work_text = ESI.COLORS.work_text;
colors.work_button = ESI.system_colors.work_button; system.color.work_button = ESI.COLORS.work_button;
colors.work_button_text = ESI.system_colors.work_button_text; system.color.work_button_text = ESI.COLORS.work_button_text;
DrawRectangle(x, y, VALUE_FIELD_W, s, colors.work_graph); DrawRectangle(x, y, VALUE_FIELD_W, s, system.color.work_graph);
DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, s-2, 0xDDDddd, 0xffffff); 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); DrawBar(x+2, y+2, VALUE_FIELD_W-3, s-3, 0xffffff);
WriteText(x+6, s / 2 + y -3, 0x80, 0x000000, itoa(value)); WriteText(x+6, s / 2 + y -3, 0x80, 0x000000, itoa(value));
DrawCaptButton(VALUE_FIELD_W + x + 1, y, s, s, bt_id_more, colors.work_button, colors.work_button_text, "+"); DrawCaptButton(VALUE_FIELD_W + x + 1, y, s, s, bt_id_more, system.color.work_button, system.color.work_button_text, "+");
DrawCaptButton(VALUE_FIELD_W + x + s + 2, y, s, s, bt_id_less, colors.work_button, colors.work_button_text, "-"); DrawCaptButton(VALUE_FIELD_W + x + s + 2, y, s, s, bt_id_less, system.color.work_button, system.color.work_button_text, "-");
WriteText(x+VALUE_FIELD_W+s+s+10, s / 2 + y -3, 0x80, colors.work_text, text); WriteText(x+VALUE_FIELD_W+s+s+10, s / 2 + y -3, 0x80, system.color.work_text, text);
} }
:void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent) :void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent)

244
programs/cmm/lib/kolibri.h
View File

@ -37,12 +37,6 @@ char program_path[4096];
#define BT_HIDE 0x40000000 #define BT_HIDE 0x40000000
#define BT_NOFRAME 0x20000000 #define BT_NOFRAME 0x20000000
//Button MOUSE
#define MOUSE_LEFT 001b
#define MOUSE_RIGHT 010b
#define MOUSE_LR 011b
#define MOUSE_CENTER 100b
//ASCII KEYS //ASCII KEYS
#define ASCII_KEY_BS 008 #define ASCII_KEY_BS 008
#define ASCII_KEY_TAB 009 #define ASCII_KEY_TAB 009
@ -75,241 +69,19 @@ char program_path[4096];
#define END_ARGS 0xFF00FF #define END_ARGS 0xFF00FF
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#ifndef INCLUDE_SYSTEM_H
#include "../lib/system.h"
#endif
#ifndef INCLUDE_MOUSE_H
#include "../lib/mouse.h"
#endif
:struct raw_image { :struct raw_image {
dword w, h, data; dword w, h, data;
}; };
/**
* The structure of the MOUSE
* x - coordinate X
* y - coordinate Y
* xx and yy - time coordinates
* lkm - left MOUSE button
* pkm - right MOUSE button
* mkm - MOUSE wheel
* key - keycode button
* tmp - time keycode
* down - key event press
* up - key release events
* move - event MOUSE movements
* click - when clicked
* dblclick - double-click the default 50 (500 ms)
* drag - drag the element event
*/
:dword __TMP_TIME,MOUSE_TIME;
:struct MOUSE
{
signed x,y,xx,yy,lkm,mkm,pkm,key,tmp,tmp_time,hor,vert,down,up,move,click,dblclick,drag,left,top;
dword handle,_;
byte cmd;
void clearTime();
void get();
void set();
void center();
dword hide();
void slider();
void show();
} mouse;
:void MOUSE::clearTime()
{
tmp_time = GetStartTime()+MOUSE_TIME;
}
:void MOUSE::show()
{
if(!handle)return;
ECX = handle;
EAX = 37;
EBX = 5;
$int 0x40;
}
:dword MOUSE::hide()
{
if(!_)
{
EAX = 68;
EBX = 12;
ECX = 32*32*4;
$int 0x40
ECX = EAX;
_ = EAX;
} else ECX = _;
EAX = 37;
EBX = 4;
DX = 2;
$int 0x40;
handle = EAX;
ECX = EAX;
EAX = 37;
EBX = 5;
$int 0x40;
handle = EAX;
}
//set new attributes MOUSE
:void MOUSE::set()
{
if((xx!=x)||(yy!=y))
{
EAX = 18;
EBX = 19;
ECX = 4;
EDX = (x<<16)+y;
$int 0x40
//move = true;
}
if((key)||(lkm|mkm|pkm))&&(down|up|click|dblclick|move)
{
if(lkm|mkm|pkm)key=(lkm)|(pkm<<1)|(2<<mkm);
EAX = 18;
EBX = 19;
ECX = key;
EDX = (x<<16)+y;
$int 0x40
}
}
:void MOUSE::center()
{
EAX = 18;
EBX = 15;
$int 0x40
}
//get new attributes MOUSE
:void MOUSE::get()
{
EAX = 37;
EBX = 1;
$int 0x40
$mov ebx, eax
$shr eax, 16
$and ebx,0x0000FFFF
x = EAX;
y = EBX;
if (x>6000) x-=65535;
if (y>6000) y-=65535;
EAX = 37;
EBX = 2;
$int 0x40
$mov ebx, eax
$mov ecx, eax
key = EAX;
$and eax, 0x00000001
$shr ebx, 1
$and ebx, 0x00000001
$shr ecx, 2
$and ecx, 0x00000001
lkm = EAX;
pkm = EBX;
mkm = ECX;
//when you release the MOUSE button
// Mouse Move Event
if(xx!=x)||(yy!=y)
{
move = true;
xx = x;
yy = y;
}
else move = false;
// Mouse Up Event
if(cmd)&&(!key){
up = true;
down = false;
drag = false;
if(!move) click = true;
__TMP_TIME = GetStartTime();
if(__TMP_TIME-tmp_time<=MOUSE_TIME)
{
dblclick = true;
click = false;
}
tmp_time = __TMP_TIME;
//returns the key code
key = tmp;
lkm = 1&tmp;
pkm = 2&tmp;
pkm >>= 1;
mkm = 4&tmp;
mkm >>= 2;
cmd = false;
}
//when you press the MOUSE button
// Mouse Down Event/Move Event
else
{
up = false;
click = false;
dblclick = false;
down = false;
// Mouse Move Event
if(key)if(!cmd)
{
down = true;
if(move)drag = true;
cmd = true;
tmp=key;
}
}
//scroll
EAX = 37;
EBX = 7;
$int 0x40
$mov ebx, eax
$shr eax, 16
$and ebx,0x0000FFFF
//hor = EAX;
vert = EBX;
}
:void MOUSE::slider()
{
signed _x,_y;
if(!handle)hide();
get();
_x = x;_y = y;
pause(5);
get();
left = _x - x;
top = _y - y;
center();
get();
_x = x;_y = y;
pause(5);
}
:struct keyboard
{
signed key;
byte down,up,press;
void get(void);
};
:void keyboard::get(void)
{
}
: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()
{
EAX = 48;
EBX = 3;
ECX = #frame;
EDX = 40;
$int 0x40
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
:dword wait_event_code; :dword wait_event_code;

214
programs/cmm/lib/mouse.h Normal file
View File

@ -0,0 +1,214 @@
#ifndef INCLUDE_MOUSE_H
#define INCLUDE_MOUSE_H
//Button MOUSE
#define MOUSE_LEFT 001b
#define MOUSE_RIGHT 010b
#define MOUSE_LR 011b
#define MOUSE_CENTER 100b
/**
* The structure of the MOUSE
* x - coordinate X
* y - coordinate Y
* xx and yy - time coordinates
* lkm - left MOUSE button
* pkm - right MOUSE button
* mkm - MOUSE wheel
* key - keycode button
* tmp - time keycode
* down - key event press
* up - key release events
* move - event MOUSE movements
* click - when clicked
* dblclick - double-click the default 50 (500 ms)
* drag - drag the element event
*/
:dword __TMP_TIME,MOUSE_TIME;
:struct MOUSE
{
signed x,y,xx,yy,lkm,mkm,pkm,key,tmp,tmp_time,hor,vert,down,up,move,click,dblclick,drag,left,top;
dword handle,_;
byte cmd;
void clearTime();
void get();
void set();
void center();
dword hide();
void slider();
void show();
} mouse;
:void MOUSE::clearTime()
{
tmp_time = GetStartTime()+MOUSE_TIME;
}
:void MOUSE::show()
{
if(!handle)return;
ECX = handle;
EAX = 37;
EBX = 5;
$int 0x40;
}
:dword MOUSE::hide()
{
if(!_)
{
EAX = 68;
EBX = 12;
ECX = 32*32*4;
$int 0x40
ECX = EAX;
_ = EAX;
} else ECX = _;
EAX = 37;
EBX = 4;
DX = 2;
$int 0x40;
handle = EAX;
ECX = EAX;
EAX = 37;
EBX = 5;
$int 0x40;
handle = EAX;
}
//set new attributes MOUSE
:void MOUSE::set()
{
if((xx!=x)||(yy!=y))
{
EAX = 18;
EBX = 19;
ECX = 4;
EDX = (x<<16)+y;
$int 0x40
//move = true;
}
if((key)||(lkm|mkm|pkm))&&(down|up|click|dblclick|move)
{
if(lkm|mkm|pkm)key=(lkm)|(pkm<<1)|(2<<mkm);
EAX = 18;
EBX = 19;
ECX = key;
EDX = (x<<16)+y;
$int 0x40
}
}
:void MOUSE::center()
{
EAX = 18;
EBX = 15;
$int 0x40
}
//get new attributes MOUSE
:void MOUSE::get()
{
EAX = 37;
EBX = 1;
$int 0x40
$mov ebx, eax
$shr eax, 16
$and ebx,0x0000FFFF
x = EAX;
y = EBX;
if (x>6000) x-=65535;
if (y>6000) y-=65535;
EAX = 37;
EBX = 2;
$int 0x40
$mov ebx, eax
$mov ecx, eax
key = EAX;
$and eax, 0x00000001
$shr ebx, 1
$and ebx, 0x00000001
$shr ecx, 2
$and ecx, 0x00000001
lkm = EAX;
pkm = EBX;
mkm = ECX;
//when you release the MOUSE button
// Mouse Move Event
if(xx!=x)||(yy!=y)
{
move = true;
xx = x;
yy = y;
}
else move = false;
// Mouse Up Event
if(cmd)&&(!key){
up = true;
down = false;
drag = false;
if(!move) click = true;
__TMP_TIME = GetStartTime();
if(__TMP_TIME-tmp_time<=MOUSE_TIME)
{
dblclick = true;
click = false;
}
tmp_time = __TMP_TIME;
//returns the key code
key = tmp;
lkm = 1&tmp;
pkm = 2&tmp;
pkm >>= 1;
mkm = 4&tmp;
mkm >>= 2;
cmd = false;
}
//when you press the MOUSE button
// Mouse Down Event/Move Event
else
{
up = false;
click = false;
dblclick = false;
down = false;
// Mouse Move Event
if(key)if(!cmd)
{
down = true;
if(move)drag = true;
cmd = true;
tmp=key;
}
}
//scroll
EAX = 37;
EBX = 7;
$int 0x40
$mov ebx, eax
$shr eax, 16
$and ebx,0x0000FFFF
//hor = EAX;
vert = EBX;
}
:void MOUSE::slider()
{
signed _x,_y;
if(!handle)hide();
get();
_x = x;_y = y;
pause(5);
get();
left = _x - x;
top = _y - y;
center();
get();
_x = x;_y = y;
pause(5);
}
#endif

25
programs/cmm/lib/system.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef INCLUDE_SYSTEM_H
#define INCLUDE_SYSTEM_H
:struct COLORS
{
dword frame,grab,grab_button,grab_button_text,grab_text,
work,work_button,work_button_text,work_text,work_graph;
void get();
};
:void COLORS::get()
{
EAX = 48;
EBX = 3;
ECX = #frame;
EDX = 40;
$int 0x40
}
:struct SYSTEM
{
COLORS color;
} system;
#endif

5
programs/cmm/liza/liza.c
View File

@ -52,7 +52,6 @@ enum {
#define MAILBOX_HEADER "Mail Box - Email client Liza 0.9.3" #define MAILBOX_HEADER "Mail Box - Email client Liza 0.9.3"
#define BUFFERSIZE 512 #define BUFFERSIZE 512
proc_info Form; proc_info Form;
system_colors sc;
#define LBUMP 0xFFFfff #define LBUMP 0xFFFfff
//progress_bar definitions //progress_bar definitions
@ -115,8 +114,8 @@ void main() {
int DefineWindow(dword wtitle) { int DefineWindow(dword wtitle) {
sc.get(); system.color.get();
DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2, WIN_W, WIN_H, 0x73,sc.work); DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2, WIN_W, WIN_H, 0x73,system.color.work);
DrawTitle(wtitle); DrawTitle(wtitle);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) return 0; //rolled_up if (Form.status_window>2) return 0; //rolled_up

18
programs/cmm/liza/login.c
View File

@ -178,18 +178,18 @@ void DrawLoginScreen()
panel_x = Form.cwidth - PANEL_W /2; panel_x = Form.cwidth - PANEL_W /2;
panel_y = Form.cheight - PANEL_H /2 - 5; panel_y = Form.cheight - PANEL_H /2 - 5;
DrawBar(0,0, Form.cwidth, Form.cheight, sc.work); DrawBar(0,0, Form.cwidth, Form.cheight, system.color.work);
WriteText(panel_x,panel_y,0x80,sc.work_text,"Your Email:"); WriteText(panel_x,panel_y,0x80,system.color.work_text,"Your Email:");
DrawRectangle(panel_x, panel_y+12, PANEL_W,20, sc.work_graph); //border DrawRectangle(panel_x, panel_y+12, PANEL_W,20, system.color.work_graph); //border
DrawRectangle3D(panel_x+1, panel_y+13, PANEL_W-2,18, 0xDDDddd, 0xFFFfff); //shadow DrawRectangle3D(panel_x+1, panel_y+13, PANEL_W-2,18, 0xDDDddd, 0xFFFfff); //shadow
DrawRectangle(panel_x+2, panel_y+14, PANEL_W-4,16, 0xFFFfff); DrawRectangle(panel_x+2, panel_y+14, PANEL_W-4,16, 0xFFFfff);
login_box.left = panel_x+3; login_box.left = panel_x+3;
login_box.top = panel_y+15; login_box.top = panel_y+15;
edit_box_draw stdcall(#login_box); edit_box_draw stdcall(#login_box);
WriteText(panel_x,panel_y+40,0x80,sc.work_text,"Password:"); WriteText(panel_x,panel_y+40,0x80,system.color.work_text,"Password:");
DrawRectangle(panel_x, panel_y+52, PANEL_W,20, sc.work_graph); //border DrawRectangle(panel_x, panel_y+52, PANEL_W,20, system.color.work_graph); //border
DrawRectangle3D(panel_x+1, panel_y+53, PANEL_W-2,18, 0xDDDddd, 0xFFFfff); //shadow DrawRectangle3D(panel_x+1, panel_y+53, PANEL_W-2,18, 0xDDDddd, 0xFFFfff); //shadow
DrawRectangle(panel_x+2, panel_y+54, PANEL_W-4,16, 0xFFFfff); DrawRectangle(panel_x+2, panel_y+54, PANEL_W-4,16, 0xFFFfff);
pass_box.left = panel_x+3; pass_box.left = panel_x+3;
@ -198,10 +198,10 @@ void DrawLoginScreen()
if (!aim) if (!aim)
{ {
DrawCaptButton(panel_x,panel_y+90,100,20,11,sc.work_button, sc.work_button_text,"Settings"); DrawCaptButton(panel_x,panel_y+90,100,20,11,system.color.work_button, system.color.work_button_text,"Settings");
DrawCaptButton(panel_x+120,panel_y+90,100,20,12,sc.work_button, sc.work_button_text,"Enter >"); DrawCaptButton(panel_x+120,panel_y+90,100,20,12,system.color.work_button, system.color.work_button_text,"Enter >");
} }
else DrawCaptButton(panel_x+120,panel_y+90,100,20,12,sc.work_button, sc.work_button_text,"Stop"); else DrawCaptButton(panel_x+120,panel_y+90,100,20,12,system.color.work_button, system.color.work_button_text,"Stop");
SetLoginStatus(cur_st_text); SetLoginStatus(cur_st_text);
} }
@ -228,6 +228,6 @@ void GetSettings()
void SetLoginStatus(dword text1) void SetLoginStatus(dword text1)
{ {
if (text1) WriteText(10, Form.cheight-22, 0x80, sc.work_text, text1); if (text1) WriteText(10, Form.cheight-22, 0x80, system.color.work_text, text1);
cur_st_text = text1; cur_st_text = text1;
} }

56
programs/cmm/liza/mail_box.c
View File

@ -62,7 +62,7 @@ void MailBoxNetworkProcess() {
break; break;
case SEND_NLIST: case SEND_NLIST:
WriteText(5, Form.cheight-11, 0x80, sc.work_text, "Send LIST, awaiting answer..."); WriteText(5, Form.cheight-11, 0x80, system.color.work_text, "Send LIST, awaiting answer...");
request_len = GetRequest("LIST", NULL); request_len = GetRequest("LIST", NULL);
Send(socketnum, #request, request_len, 0); Send(socketnum, #request, request_len, 0);
if (EAX == 0xffffffff) {debugln("Error while sending LIST. Retry..."); break;} if (EAX == 0xffffffff) {debugln("Error while sending LIST. Retry..."); break;}
@ -234,12 +234,12 @@ void MailBoxLoop() {
if (id==CHANGE_CHARSET) if (id==CHANGE_CHARSET)
{ {
DefineButton(0,0,Form.cwidth,Form.cheight, CLOSE_CHANGE_CHARSET+BT_HIDE+BT_NOFRAME); DefineButton(0,0,Form.cwidth,Form.cheight, CLOSE_CHANGE_CHARSET+BT_HIDE+BT_NOFRAME);
DrawRectangle(Form.cwidth-100, Form.cheight-status_bar_h- 70, 70, 82, sc.work_graph); DrawRectangle(Form.cwidth-100, Form.cheight-status_bar_h- 70, 70, 82, system.color.work_graph);
DrawRectangle3D(Form.cwidth-99, Form.cheight-status_bar_h- 69, 68, 80, 0xFFFfff, sc.work); DrawRectangle3D(Form.cwidth-99, Form.cheight-status_bar_h- 69, 68, 80, 0xFFFfff, system.color.work);
for (id=0; id<5; id++) for (id=0; id<5; id++)
{ {
if (cur_charset==id+1) { line_col=sc.work_button; text_col=sc.work_button_text; } if (cur_charset==id+1) { line_col=system.color.work_button; text_col=system.color.work_button_text; }
else { line_col=sc.work; text_col=sc.work_text; } else { line_col=system.color.work; text_col=system.color.work_text; }
DrawBar(Form.cwidth-98, id*16+Form.cheight-status_bar_h- 68, 67, 16, line_col); DrawBar(Form.cwidth-98, id*16+Form.cheight-status_bar_h- 68, 67, 16, line_col);
DrawCaptButton(Form.cwidth-100, id*16+Form.cheight-status_bar_h- 68, 70,16, 10+id+BT_HIDE, DrawCaptButton(Form.cwidth-100, id*16+Form.cheight-status_bar_h- 68, 70,16, 10+id+BT_HIDE,
0, text_col, charsets[id+1]); 0, text_col, charsets[id+1]);
@ -261,8 +261,8 @@ void MailBoxLoop() {
case evReDraw: _MB_DRAW: case evReDraw: _MB_DRAW:
if !(DefineWindow(MAILBOX_HEADER)) break; if !(DefineWindow(MAILBOX_HEADER)) break;
scroll1.bckg_col = scroll_wv.bckg_col = 0xBBBbbb; scroll1.bckg_col = scroll_wv.bckg_col = 0xBBBbbb;
scroll1.frnt_col = scroll_wv.frnt_col = sc.work; scroll1.frnt_col = scroll_wv.frnt_col = system.color.work;
scroll1.line_col = scroll_wv.line_col = sc.work_graph; scroll1.line_col = scroll_wv.line_col = system.color.work_graph;
DrawToolbar(); DrawToolbar();
DrawMailBox(); DrawMailBox();
@ -291,12 +291,12 @@ void DrawToolbar() {
int toolbar_w = BUT_Y + BUT_H + BUT_Y + 3; int toolbar_w = BUT_Y + BUT_H + BUT_Y + 3;
mail_list.SetSizes(0, toolbar_w, Form.cwidth - scroll1.size_x - 1, mail_list.h, 60,18); mail_list.SetSizes(0, toolbar_w, Form.cwidth - scroll1.size_x - 1, mail_list.h, 60,18);
DrawBar(0,0, Form.cwidth,toolbar_w-3, sc.work); DrawBar(0,0, Form.cwidth,toolbar_w-3, system.color.work);
DrawCaptButton(10 , BUT_Y, BUT_W, BUT_H, GET_MAIL, sc.work_button, sc.work_button_text,"Get mail"); DrawCaptButton(10 , BUT_Y, BUT_W, BUT_H, GET_MAIL, system.color.work_button, system.color.work_button_text,"Get mail");
DrawCaptButton(BUT_W+ 20, BUT_Y, BUT_W+10, BUT_H, SAVE_LETTER, sc.work_button, sc.work_button_text,"Save letter"); DrawCaptButton(BUT_W+ 20, BUT_Y, BUT_W+10, BUT_H, SAVE_LETTER, system.color.work_button, system.color.work_button_text,"Save letter");
DrawCaptButton(Form.cwidth-BUT_W - 10, BUT_Y, BUT_W, BUT_H, EXIT_MAIL, sc.work_button, sc.work_button_text,"< Exit"); DrawCaptButton(Form.cwidth-BUT_W - 10, BUT_Y, BUT_W, BUT_H, EXIT_MAIL, system.color.work_button, system.color.work_button_text,"< Exit");
DrawBar(0, mail_list.y-3, mail_list.w,1, sc.work_graph); DrawBar(0, mail_list.y-3, mail_list.w,1, system.color.work_graph);
DrawBar(0, mail_list.y-2, mail_list.w,1, 0xdfdfdf); DrawBar(0, mail_list.y-2, mail_list.w,1, 0xdfdfdf);
DrawBar(0, mail_list.y-1, mail_list.w,1, 0xf0f0f0); DrawBar(0, mail_list.y-1, mail_list.w,1, 0xf0f0f0);
} }
@ -328,22 +328,22 @@ void DrawMailList() {
void DrawLetterInfo() { void DrawLetterInfo() {
int lt_y = mail_list.y+mail_list.h; int lt_y = mail_list.y+mail_list.h;
DrawBar(0, lt_y, mail_list.w, 1, sc.work_graph); DrawBar(0, lt_y, mail_list.w, 1, system.color.work_graph);
DrawBar(0, lt_y+1, Form.cwidth, 1, LBUMP); DrawBar(0, lt_y+1, Form.cwidth, 1, LBUMP);
DrawBar(0, lt_y+2, Form.cwidth, LIST_INFO_H-4, sc.work); DrawBar(0, lt_y+2, Form.cwidth, LIST_INFO_H-4, system.color.work);
WriteText(mail_list.w-30/2, lt_y, 0x80, 0x888888, "= = ="); WriteText(mail_list.w-30/2, lt_y, 0x80, 0x888888, "= = =");
WriteText(mail_list.w-30/2, lt_y+1, 0x80, 0xEeeeee, "= = ="); WriteText(mail_list.w-30/2, lt_y+1, 0x80, 0xEeeeee, "= = =");
DrawBar(0, lt_y+LIST_INFO_H-2, Form.cwidth, 1, sc.work_graph); //bottom DrawBar(0, lt_y+LIST_INFO_H-2, Form.cwidth, 1, system.color.work_graph); //bottom
DrawBar(0, lt_y+LIST_INFO_H-1, Form.cwidth, 1, 0xdfdfdf); DrawBar(0, lt_y+LIST_INFO_H-1, Form.cwidth, 1, 0xdfdfdf);
DrawBar(0, lt_y+LIST_INFO_H , Form.cwidth, 1, 0xf0f0f0); DrawBar(0, lt_y+LIST_INFO_H , Form.cwidth, 1, 0xf0f0f0);
WriteTextB(10, lt_y+8 , 0x80, sc.work_text, "From:"); WriteTextB(10, lt_y+8 , 0x80, system.color.work_text, "From:");
WriteText (45, lt_y+8 , 0x80, sc.work_text, #from); WriteText (45, lt_y+8 , 0x80, system.color.work_text, #from);
WriteTextB(10, lt_y+20, 0x80, sc.work_text, "To:"); WriteTextB(10, lt_y+20, 0x80, system.color.work_text, "To:");
WriteText (45, lt_y+20, 0x80, sc.work_text, #to); WriteText (45, lt_y+20, 0x80, system.color.work_text, #to);
WriteTextB(10, lt_y+32, 0x80, sc.work_text, "Date:"); WriteTextB(10, lt_y+32, 0x80, system.color.work_text, "Date:");
WriteText (45, lt_y+32, 0x80, sc.work_text, #date); WriteText (45, lt_y+32, 0x80, system.color.work_text, #date);
WriteTextB(10, lt_y+44, 0x80, sc.work_text, "Subj:"); WriteTextB(10, lt_y+44, 0x80, system.color.work_text, "Subj:");
WriteText (45, lt_y+44, 0x80, sc.work_text, #subj); WriteText (45, lt_y+44, 0x80, system.color.work_text, #subj);
} }
@ -383,19 +383,19 @@ void DrawScroller1() {
void DrawStatusBar() { void DrawStatusBar() {
int st_y = Form.cheight -status_bar_h; int st_y = Form.cheight -status_bar_h;
DrawBar(0, st_y, Form.cwidth, status_bar_h, sc.work); DrawBar(0, st_y, Form.cwidth, status_bar_h, system.color.work);
if (aim) { if (aim) {
SetMailBoxStatus(cur_st_percent, cur_st_text); SetMailBoxStatus(cur_st_percent, cur_st_text);
DrawCaptButton(240, st_y+1, 36, status_bar_h-3, STOP_LOADING, sc.work_button, sc.work_button_text,"Stop"); DrawCaptButton(240, st_y+1, 36, status_bar_h-3, STOP_LOADING, system.color.work_button, system.color.work_button_text,"Stop");
} }
DrawCaptButton(Form.cwidth - 100, st_y+1, 70, status_bar_h-2, CHANGE_CHARSET+BT_HIDE, sc.work, sc.work_text,charsets[cur_charset]); DrawCaptButton(Form.cwidth - 100, st_y+1, 70, status_bar_h-2, CHANGE_CHARSET+BT_HIDE, system.color.work, system.color.work_text,charsets[cur_charset]);
} }
void SetMailBoxStatus(dword percent1, text1) { void SetMailBoxStatus(dword percent1, text1) {
DrawProgressBar(3, Form.cheight -status_bar_h + 1, 220, 12, sc.work, 0xC3C3C3, 0x54B1D6, sc.work_text, percent1); DrawProgressBar(3, Form.cheight -status_bar_h + 1, 220, 12, system.color.work, 0xC3C3C3, 0x54B1D6, system.color.work_text, percent1);
WriteText(3, Form.cheight -status_bar_h + 1, 0x80, sc.work_text, text1); WriteText(3, Form.cheight -status_bar_h + 1, 0x80, system.color.work_text, text1);
cur_st_percent = percent1; cur_st_percent = percent1;
cur_st_text = text1; cur_st_text = text1;
} }

20
programs/cmm/liza/settings.c
View File

@ -84,7 +84,7 @@ void SettingsDialog()
case evReDraw: _OPT_WIN: case evReDraw: _OPT_WIN:
if !(DefineWindow(OPTIONS_HEADER)) break; if !(DefineWindow(OPTIONS_HEADER)) break;
DrawBar(0,0, Form.cwidth, Form.cheight, sc.work); DrawBar(0,0, Form.cwidth, Form.cheight, system.color.work);
OptionsWindow(); OptionsWindow();
break; break;
} }
@ -95,23 +95,23 @@ void OptionsWindow()
{ {
#define ELEM_X 25 #define ELEM_X 25
int i; int i;
DrawBar(0, Form.cheight - 40, Form.cwidth, 1, sc.work_graph); DrawBar(0, Form.cheight - 40, Form.cwidth, 1, system.color.work_graph);
DrawBar(0, Form.cheight - 40+1, Form.cwidth, 1, LBUMP); DrawBar(0, Form.cheight - 40+1, Form.cwidth, 1, LBUMP);
DrawCaptButton(Form.cwidth-79, Form.cheight-32, 70, 25, 19, sc.work_button, sc.work_button_text,"Apply"); DrawCaptButton(Form.cwidth-79, Form.cheight-32, 70, 25, 19, system.color.work_button, system.color.work_button_text,"Apply");
WriteTextB(ELEM_X, 20, 0x90, sc.work_text, "Network settings"); WriteTextB(ELEM_X, 20, 0x90, system.color.work_text, "Network settings");
CheckBox(ELEM_X, 45, 12, 12, 17, "Use custom settings", sc.work_graph, sc.work_text, checked[0]); CheckBox(ELEM_X, 45, 12, 12, 17, "Use custom settings", system.color.work_graph, system.color.work_text, checked[0]);
CheckBox(ELEM_X, 65, 12, 12, 18, "Manual configuration", sc.work_graph, sc.work_text, checked[1]); CheckBox(ELEM_X, 65, 12, 12, 18, "Manual configuration", system.color.work_graph, system.color.work_text, checked[1]);
for (i=0; i<4; i++) for (i=0; i<4; i++)
{ {
WriteText(ELEM_X+40, i*25+4+POP_server_box.top, 0x80, sc.work_text, text1[i]); WriteText(ELEM_X+40, i*25+4+POP_server_box.top, 0x80, system.color.work_text, text1[i]);
DrawRectangle(POP_server_box.left-1, i*25+POP_server_box.top-1, POP_server_box.width+2, 16, sc.work_graph); DrawRectangle(POP_server_box.left-1, i*25+POP_server_box.top-1, POP_server_box.width+2, 16, system.color.work_graph);
} }
edit_box_draw stdcall(#POP_server_box); edit_box_draw stdcall(#POP_server_box);
edit_box_draw stdcall(#POP_server_port_box); edit_box_draw stdcall(#POP_server_port_box);
edit_box_draw stdcall(#SMTP_server_box); edit_box_draw stdcall(#SMTP_server_box);
edit_box_draw stdcall(#SMTP_server_port_box); edit_box_draw stdcall(#SMTP_server_port_box);
WriteTextB(ELEM_X, 205, 0x90, sc.work_text, "MailBox settings"); WriteTextB(ELEM_X, 205, 0x90, system.color.work_text, "MailBox settings");
CheckBox(ELEM_X, 230,12, 12, 20, "Use iconv library for converting text charsets", sc.work_graph, sc.work_text, use_iconv); CheckBox(ELEM_X, 230,12, 12, 20, "Use iconv library for converting text charsets", system.color.work_graph, system.color.work_text, use_iconv);
} }

19
programs/cmm/mouse_cfg/mouse_cfg.c
View File

@ -3,11 +3,9 @@
#endif #endif
#define MEMSIZE 0x23E80 #define MEMSIZE 0x23E80
#include "..\lib\kolibri.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\dll.h"
#include "..\lib\gui.h" #include "..\lib\gui.h"
#include "..\lib\obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\box_lib.h" #include "..\lib\obj\box_lib.h"
@ -31,7 +29,7 @@
?define POINTER_DELAY "Mouse pointer delay" ?define POINTER_DELAY "Mouse pointer delay"
?define MOUSE_EMULATION "Enable mouse emulation using keyboard NumPad" ?define MOUSE_EMULATION "Enable mouse emulation using keyboard NumPad"
?define MADMOUSE "Through screen sides for pointer" ?define MADMOUSE "Through screen sides for pointer"
#endif #endif
frame mouse_frame = { 0, 000, 14, 130, 14, 0x000111, 0xFFFfff, 0, 0, 0, 0, 6, 0x000111, 0xCCCccc }; frame mouse_frame = { 0, 000, 14, 130, 14, 0x000111, 0xFFFfff, 0, 0, 0, 0, 6, 0x000111, 0xCCCccc };
char pos_x = 22; char pos_x = 22;
@ -40,7 +38,6 @@ char pos_x = 22;
unsigned char panels_img_data[] = FROM "mouse_image.raw"; unsigned char panels_img_data[] = FROM "mouse_image.raw";
raw_image panels_img = { 59, 101, #panels_img_data }; raw_image panels_img = { 59, 101, #panels_img_data };
system_colors sc;
proc_info Form; proc_info Form;
@ -127,8 +124,8 @@ void main() {
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(430, 150, 360, 280+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE); DefineAndDrawWindow(430, 150, 360, 280+GetSkinHeight(),0x34,system.color.work,WINDOW_TITLE);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
SetFrameColors(); SetFrameColors();
@ -143,12 +140,12 @@ void main() {
} }
void PanelCfg_CheckBox(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); CheckBox(x, y, 14, 14, id, text, system.color.work_graph, system.color.work_text, value);
} }
void PanelCfg_MoreLessBox(dword x, y, id_more, id_less; byte value; dword text) { void PanelCfg_MoreLessBox(dword x, y, id_more, id_less; byte value; dword text) {
MoreLessBox(x, y, 18, id_more, id_less, #sc, value, text); MoreLessBox(x, y, 18, id_more, id_less, #system.color, value, text);
} }
void DrawMouseImage() { void DrawMouseImage() {
@ -165,9 +162,9 @@ void DrawControls() {
void SetFrameColors() { void SetFrameColors() {
mouse_frame.size_x = - mouse_frame.start_x * 2 + Form.cwidth; mouse_frame.size_x = - mouse_frame.start_x * 2 + Form.cwidth;
mouse_frame.font_color = sc.work_text; mouse_frame.font_color = system.color.work_text;
mouse_frame.font_backgr_color = sc.work; mouse_frame.font_backgr_color = system.color.work;
mouse_frame.ext_col = sc.work_graph; mouse_frame.ext_col = system.color.work_graph;
} }
void LoadCfg() { void LoadCfg() {

19
programs/cmm/panels_cfg/panels_cfg.c
View File

@ -66,7 +66,6 @@ char docky_ini_path[] = "/sys/settings/docky.ini";
unsigned char panels_img_data[] = FROM "panels_image.raw"; unsigned char panels_img_data[] = FROM "panels_image.raw";
raw_image panels_img = { 37, 27, #panels_img_data }; raw_image panels_img = { 37, 27, #panels_img_data };
system_colors sc;
proc_info Form; proc_info Form;
struct docky_cfg { struct docky_cfg {
@ -149,14 +148,14 @@ void main()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(130, 150, 400, 300+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE); DefineAndDrawWindow(130, 150, 400, 300+GetSkinHeight(),0x34,system.color.work,WINDOW_TITLE);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
taskbar_frame.size_x = docky_frame.size_x = - taskbar_frame.start_x * 2 + Form.cwidth; 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_color = docky_frame.font_color = system.color.work_text;
taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = sc.work; taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = system.color.work;
taskbar_frame.ext_col = docky_frame.ext_col = sc.work_graph; taskbar_frame.ext_col = docky_frame.ext_col = system.color.work_graph;
DrawWindowContent(ALL); DrawWindowContent(ALL);
} }
} }
@ -175,7 +174,7 @@ void DrawWindowContent(byte panel_type)
{ {
DefineButton(22, taskbar_frame.start_y + 12, panels_img.w-1, 27-1, 100 + BT_HIDE, 0); 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); _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, sc.work_text, CHANGE_POS); WriteText(68, taskbar_frame.start_y + 20, 0x80, system.color.work_text, CHANGE_POS);
PanelCfg_CheckBox(22, taskbar_frame.start_y + 48, 105, SOFTEN_UP, taskbar_cfg.SoftenUp); 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 + 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 + 88, 107, MIN_LEFT_BUTTON, taskbar_cfg.MinLeftButton);
@ -193,7 +192,7 @@ void DrawWindowContent(byte panel_type)
{ {
DefineButton(22, docky_frame.start_y + 12, panels_img.w-1, 27-1, 200 + BT_HIDE, 0); 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); _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, sc.work_text, CHANGE_POS); WriteText(68, docky_frame.start_y + 20, 0x80, system.color.work_text, CHANGE_POS);
PanelCfg_CheckBox(22, docky_frame.start_y + 48, 201, FSIZE, docky_cfg.fsize); PanelCfg_CheckBox(22, docky_frame.start_y + 48, 201, FSIZE, docky_cfg.fsize);
PanelCfg_CheckBox(win_center_x, docky_frame.start_y + 48, 202, ASHOW, docky_cfg.ashow); PanelCfg_CheckBox(win_center_x, docky_frame.start_y + 48, 202, ASHOW, docky_cfg.ashow);
} }
@ -267,11 +266,11 @@ void RestartProcess(byte panel_type)
void PanelCfg_CheckBox(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); CheckBox(x, y, 14, 14, id, text, system.color.work_graph, system.color.work_text, value);
} }
void PanelCfg_MoreLessBox(dword x, y, id_more, id_less; byte value; dword text) { void PanelCfg_MoreLessBox(dword x, y, id_more, id_less; byte value; dword text) {
MoreLessBox(x, y, 18, id_more, id_less, #sc, value, text); MoreLessBox(x, y, 18, id_more, id_less, #system.color, value, text);
} }

11
programs/cmm/software_widget/software_widget.c
View File

@ -14,7 +14,6 @@ SOFTWARE CENTER v2.32
#include "..\lib\patterns\libimg_load_skin.h" #include "..\lib\patterns\libimg_load_skin.h"
system_colors sc;
proc_info Form; proc_info Form;
byte kolibrios_mounted; byte kolibrios_mounted;
@ -97,8 +96,8 @@ void main()
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(GetScreenWidth()-window_width/2,GetScreenHeight()-window_height/2,window_width,window_height,0x74,sc.work,""); DefineAndDrawWindow(GetScreenWidth()-window_width/2,GetScreenHeight()-window_height/2,window_width,window_height,0x74,system.color.work,"");
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) { DrawTitle(#window_title); break; } else DrawTitle(""); if (Form.status_window>2) { DrawTitle(#window_title); break; } else DrawTitle("");
kolibrios_mounted = isdir("/kolibrios"); kolibrios_mounted = isdir("/kolibrios");
@ -187,9 +186,9 @@ byte process_sections(dword sec_name, f_name)
void draw_top_bar() void draw_top_bar()
{ {
int top_position = 25; int top_position = 25;
DrawBar(0,0,Form.cwidth, top_position-1, sc.work); DrawBar(0,0,Form.cwidth, top_position-1, system.color.work);
DrawBar(0,top_position-1, Form.cwidth, 1, sc.work_graph); DrawBar(0,top_position-1, Form.cwidth, 1, system.color.work_graph);
WriteTextB(Form.cwidth/2-70, 9, 0x90, sc.work_text, #window_title); WriteTextB(Form.cwidth/2-70, 9, 0x90, system.color.work_text, #window_title);
list_top = top_position; list_top = top_position;
list_pos = list_top; list_pos = list_top;
row = -1; row = -1;

27
programs/cmm/tmpdisk/t_gui.c
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
///////////////////////// GUI //////////////////// ///////////////////////// GUI ////////////////////
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
#include "..\lib\gui.h" #include "..\lib\gui.h"
@ -45,7 +45,6 @@ dword devbuf;
char disk_num; char disk_num;
char selected; char selected;
system_colors sc;
proc_info Form; proc_info Form;
unsigned char icons[] = FROM "icons.raw"; unsigned char icons[] = FROM "icons.raw";
@ -131,21 +130,21 @@ void Main_Window()
edit_box_key stdcall(#edit_disk_size); edit_box_key stdcall(#edit_disk_size);
break; break;
case evReDraw: case evReDraw:
sc.get(); system.color.get();
DefineAndDrawWindow(170,150,314,270,0x74,sc.work,"Virtual Disk Manager 0.62",0); DefineAndDrawWindow(170,150,314,270,0x74,system.color.work,"Virtual Disk Manager 0.62",0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
DrawBar(0,0, Form.cwidth,TOPPANELH, sc.work); DrawBar(0,0, Form.cwidth,TOPPANELH, system.color.work);
DrawBar(0,TOPPANELH, Form.cwidth,1, sc.work_graph); DrawBar(0,TOPPANELH, Form.cwidth,1, system.color.work_graph);
WriteText(6, 9, 0x80, sc.work_text, INTRO_TEXT_4); WriteText(6, 9, 0x80, system.color.work_text, INTRO_TEXT_4);
WriteText(edit_disk_size.left + edit_disk_size.width + 8, 9, 0x80, sc.work_text, "MB."); WriteText(edit_disk_size.left + edit_disk_size.width + 8, 9, 0x80, system.color.work_text, "MB.");
edit_box_draw stdcall (#edit_disk_size); edit_box_draw stdcall (#edit_disk_size);
for (i=0, x=6; i<2; i++, x+=strlen(but_text[i])*6+37) for (i=0, x=6; i<2; i++, x+=strlen(but_text[i])*6+37)
{ {
DefineButton(x,25, strlen(but_text[i])*6+28,19, 10+i, sc.work_button); DefineButton(x,25, strlen(but_text[i])*6+28,19, 10+i, system.color.work_button);
_PutImage(x+3,28, 14,14, i*14*14*3+#icons); _PutImage(x+3,28, 14,14, i*14*14*3+#icons);
WriteText(x+22,31, 0x80, sc.work_button_text, but_text[i]); WriteText(x+22,31, 0x80, system.color.work_button_text, but_text[i]);
} }
GetDisks(); GetDisks();
DrawTmpDisks(); DrawTmpDisks();
@ -210,12 +209,12 @@ void DrawTmpDisks()
int FreeRAM=GetFreeRAM()/1024; int FreeRAM=GetFreeRAM()/1024;
DrawBar(0,51, Form.cwidth,Form.cheight-TOPPANELH-BOTPANELH-2, 0xFFFFFF); DrawBar(0,51, Form.cwidth,Form.cheight-TOPPANELH-BOTPANELH-2, 0xFFFFFF);
DrawBar(0,Form.cheight-BOTPANELH-1, Form.cwidth,1, sc.work_graph); DrawBar(0,Form.cheight-BOTPANELH-1, Form.cwidth,1, system.color.work_graph);
DrawBar(0,Form.cheight-BOTPANELH, Form.cwidth,BOTPANELH, sc.work); DrawBar(0,Form.cheight-BOTPANELH, Form.cwidth,BOTPANELH, system.color.work);
strcpy(#free_ram_text, FREE_RAM_TEXT); strcpy(#free_ram_text, FREE_RAM_TEXT);
strcat(#free_ram_text, itoa(FreeRAM)); strcat(#free_ram_text, itoa(FreeRAM));
strcat(#free_ram_text, " MB"); strcat(#free_ram_text, " MB");
WriteText(10, Form.cheight-13, 0x80, sc.work_text, #free_ram_text); WriteText(10, Form.cheight-13, 0x80, system.color.work_text, #free_ram_text);
if (disk_num==0) if (disk_num==0)
{ {
WriteText(17,65, 0x90, 0x777777, INTRO_TEXT_1); WriteText(17,65, 0x90, 0x777777, INTRO_TEXT_1);

7
programs/cmm/ttf_viewer/ttf_viewer.c
View File

@ -3,11 +3,9 @@
#endif #endif
#define MEMSIZE 397113 #define MEMSIZE 397113
#include "..\lib\kolibri.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\dll.h"
#include "..\lib\gui.h" #include "..\lib\gui.h"
#include "..\lib\obj\truetype.h" #include "..\lib\obj\truetype.h"
#include "..\lib\obj\proc_lib.h" #include "..\lib\obj\proc_lib.h"
@ -20,7 +18,6 @@ dword font_data;
stbtt_fontinfo font_info; stbtt_fontinfo font_info;
dword font_mem; dword font_mem;
system_colors sc;
proc_info Form; proc_info Form;
char test_text[] = "The quick brown fox jumps over the lazy dog"; char test_text[] = "The quick brown fox jumps over the lazy dog";
char win_title[4096] = "TTF Viewer v0.1 - "; char win_title[4096] = "TTF Viewer v0.1 - ";
@ -71,7 +68,7 @@ void main()
void draw_window() void draw_window()
{ {
sc.get(); system.color.get();
DefineAndDrawWindow(30, 100, 800, 250+GetSkinHeight(), 0x34, 0xFFFfff, #win_title); DefineAndDrawWindow(30, 100, 800, 250+GetSkinHeight(), 0x34, 0xFFFfff, #win_title);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
DrawFonts(); DrawFonts();
@ -83,7 +80,7 @@ word DrawFonts()
if (!font_data) if (!font_data)
{ {
WriteTextCenter(0,85,Form.cwidth,0x555555, T_INTRO); WriteTextCenter(0,85,Form.cwidth,0x555555, T_INTRO);
DrawCaptButton(Form.cwidth - 140 / 2, Form.cheight - 30 / 2, 140, 30, 10, sc.work_button, sc.work_button_text, T_INTRO_BUTTON_TEXT); DrawCaptButton(Form.cwidth - 140 / 2, Form.cheight - 30 / 2, 140, 30, 10, system.color.work_button, system.color.work_button_text, T_INTRO_BUTTON_TEXT);
return; return;
} }
text_out stdcall (#test_text, #font_info, 10, 0x000000, 0xFFFfff, 3, 4); text_out stdcall (#test_text, #font_info, 10, 0x000000, 0xFFFfff, 3, 4);