/programs/cmm/browser/WebView.c |
---|
210,7 → 210,7 |
GetScreenHeight()-700/2-random(80),800,700,0x73,0,0,0); |
GetProcessInfo(#Form, SelfInfo); |
ProcessMenuClick(); |
system.color.get(); |
sc.get(); |
if (Form.status_window>2) break; |
if (Form.height<120) { MoveSize(OLD,OLD,OLD,120); break; } |
if (Form.width<280) { MoveSize(OLD,OLD,280,OLD); break; } |
307,19 → 307,19 |
int i; |
SetElementSizes(); |
DrawBar(0,0, Form.cwidth,PADDING, system.color.work); |
DrawBar(0,PADDING+TSZE+1, Form.cwidth,PADDING-1, system.color.work); |
DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(system.color.work_dark, system.color.work, 180)); |
DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, system.color.work_graph); |
DrawBar(0, PADDING, address_box.left-2, TSZE+1, system.color.work); |
DrawBar(address_box.left+address_box.width+18, PADDING, Form.cwidth-address_box.left-address_box.width-18, TSZE+1, system.color.work); |
DrawBar(0,0, Form.cwidth,PADDING, sc.work); |
DrawBar(0,PADDING+TSZE+1, Form.cwidth,PADDING-1, sc.work); |
DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(sc.work_dark, sc.work, 180)); |
DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, sc.work_graph); |
DrawBar(0, PADDING, address_box.left-2, TSZE+1, sc.work); |
DrawBar(address_box.left+address_box.width+18, PADDING, Form.cwidth-address_box.left-address_box.width-18, TSZE+1, sc.work); |
DrawTopPanelButton(BACK_BUTTON, PADDING-1, PADDING, 30); |
DrawTopPanelButton(FORWARD_BUTTON, PADDING+TSZE+PADDING-2, PADDING, 31); |
DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-3, PADDING, -1); |
for (i=0; i<=2; i++) DrawBar(Form.cwidth-PADDING-TSZE+3, i*5+PADDING+7, 15, 3, system.color.work_graph); |
for (i=0; i<=2; i++) DrawBar(Form.cwidth-PADDING-TSZE+3, i*5+PADDING+7, 15, 3, sc.work_graph); |
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, system.color.work_graph); |
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph); |
DrawRectangle(WB1.list.x + WB1.list.w, WB1.list.y, scroll_wv.size_x, |
WB1.list.h-1, scroll_wv.bckg_col); |
859,12 → 859,12 |
void DrawStatusBar(dword _status_text) |
{ |
status_text.font_color = system.color.work_text; |
status_text.font_color = sc.work_text; |
status_text.start_x = 10; |
status_text.start_y = Form.cheight - STATUSBAR_H + 4; |
status_text.area_size_x = Form.cwidth - status_text.start_x -3 - 70; |
//DrawBar(status_text.start_x, status_text.start_y, status_text.area_size_x, 9, system.color.work); |
DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, system.color.work); |
//DrawBar(status_text.start_x, status_text.start_y, status_text.area_size_x, 9, sc.work); |
DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, sc.work); |
if (_status_text) { |
status_text.text_pointer = _status_text; |
PathShow_prepare stdcall(#status_text); |
873,7 → 873,7 |
DefineHiddenButton(status_text.start_x+status_text.area_size_x+10, status_text.start_y-3, |
60, 12, CHANGE_ENCODING); |
WriteTextCenter(status_text.start_x+status_text.area_size_x+10, |
status_text.start_y, 60, system.color.work_text, WB1.cur_encoding*10+#charsets); |
status_text.start_y, 60, sc.work_text, WB1.cur_encoding*10+#charsets); |
} |
void DrawOmnibox() |
880,8 → 880,8 |
{ |
int imgxoff; |
DrawOvalBorder(address_box.left-2, address_box.top-3, address_box.width+18, 24, system.color.work_graph, |
system.color.work_graph, system.color.work_graph, system.color.work_dark); |
DrawOvalBorder(address_box.left-2, address_box.top-3, address_box.width+18, 24, sc.work_graph, |
sc.work_graph, sc.work_graph, sc.work_dark); |
DrawBar(address_box.left-1, address_box.top-2, address_box.width+18, 1, 0xD8DCD8); |
DrawBar(address_box.left-1, address_box.top-1, address_box.width+18, 1, address_box.color); |
DrawBar(address_box.left-1, address_box.top, 1, 22, address_box.color); |
/programs/cmm/browser/download_manager.h |
---|
40,8 → 40,8 |
downloader_opened = true; |
SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER + EVM_STACK); |
system.color.get(); |
pb.frame_color = system.color.work_dark; |
sc.get(); |
pb.frame_color = sc.work_dark; |
filepath[0] = NULL; |
66,7 → 66,7 |
break; |
case evReDraw: |
DefineAndDrawWindow(215, 100, 580, 130, 0x74, system.color.work, DL_WINDOW_HEADER, 0); |
DefineAndDrawWindow(215, 100, 580, 130, 0x74, sc.work, DL_WINDOW_HEADER, 0); |
GetProcessInfo(#DL_Form, SelfInfo); |
if (DL_Form.status_window>2) break; |
if (DL_Form.height<120) MoveSize(OLD,OLD,OLD,120); |
111,7 → 111,7 |
{ |
int but_x = 0; |
int but_y = 58; |
DrawBar(0,0, DL_Form.cwidth, DL_Form.cheight, system.color.work); |
DrawBar(0,0, DL_Form.cwidth, DL_Form.cheight, sc.work); |
DeleteButton(301); |
DeleteButton(302); |
DeleteButton(305); |
130,7 → 130,7 |
DrawStandartCaptButton(DL_Form.width - 190, but_y, 302, STOP_DOWNLOADING); |
DrawDownloading(); |
} |
WriteText(CONX, ed.top + 4, 0x90, system.color.work_text, "URL:"); |
WriteText(CONX, ed.top + 4, 0x90, sc.work_text, "URL:"); |
ed.width = DL_Form.cwidth - ed.left - CONX - 3; |
ed.offset=0; |
DrawEditBox(#ed); |
188,8 → 188,8 |
{ |
char bytes_received[70]; |
sprintf(#bytes_received, KB_RECEIVED, ConvertSizeToKb(downloader.httpd.content_received) ); |
DrawBar(CONX, pb.top + 22, pb.width, 16, system.color.work); |
WriteText(CONX, pb.top + 22, 0x90, system.color.work_text, #bytes_received); |
DrawBar(CONX, pb.top + 22, pb.width, 16, sc.work); |
WriteText(CONX, pb.top + 22, 0x90, sc.work_text, #bytes_received); |
//CalculateSpeed(); |
progressbar_draw stdcall(#pb); |
} |
/programs/cmm/browser/tabs.h |
---|
84,25 → 84,25 |
if (_id==tab.active) { |
tab.save_state(); |
bgcol = system.color.work_light; |
border_bottom_color = system.color.work_light; |
bgcol = sc.work_light; |
border_bottom_color = sc.work_light; |
} else { |
bgcol=system.color.work; |
border_bottom_color = system.color.work_graph; |
bgcol=sc.work; |
border_bottom_color = sc.work_graph; |
} |
if (data[_id].header) { |
strncpy(#header_no_version, #data[_id].header, strlen(#data[_id].header)-sizeof(version)-2); |
strncpy(#name, #header_no_version, tab_w-CLOSE_S/6-2); |
} |
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, system.color.work_dark); |
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.work_dark); |
DrawBar(xxx+1, TOOLBAR_H, tab_w-1, TAB_H-1, bgcol); |
DrawBar(xxx+1, TOOLBAR_H+TAB_H-1, tab_w-1, 1, border_bottom_color); |
DefineHiddenButton(xxx, TOOLBAR_H-1, tab_w, TAB_H, TAB_ID+_id); |
WriteTextCenter(xxx, TOOLBAR_H+6, tab_w-CLOSE_S, system.color.work_text, #name); |
WriteTextCenter(xxx, TOOLBAR_H+6, tab_w-CLOSE_S, sc.work_text, #name); |
DefineHiddenButton(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S-1, CLOSE_S-1, TAB_CLOSE_ID+_id); |
DrawBar(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S, CLOSE_S, system.color.work_dark); |
WriteText(xxx+tab_w-CLOSE_S+1, TOOLBAR_H+5, 0x80, system.color.work_light, "x"); |
DrawBar(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S, CLOSE_S, sc.work_dark); |
WriteText(xxx+tab_w-CLOSE_S+1, TOOLBAR_H+5, 0x80, sc.work_light, "x"); |
} |
void DrawActiveTab() |
113,17 → 113,17 |
int DrawNewTabButton() |
{ |
dword btn_light = MixColors(system.color.work_button, 0xFFFfff, 220); |
dword btn_dark = MixColors(system.color.work_button, 0, 180); |
dword btn_light = MixColors(sc.button, 0xFFFfff, 220); |
dword btn_dark = MixColors(sc.button, 0, 180); |
int xxx = tab.count * tab_w; |
if (tab.count < TABS_MAX) { |
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, system.color.work_graph); |
DrawBar(xxx+1, TOOLBAR_H, TAB_H, TAB_H-1, system.color.work_button); |
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.work_graph); |
DrawBar(xxx+1, TOOLBAR_H, TAB_H, TAB_H-1, sc.button); |
DrawRectangle3D(xxx+1, TOOLBAR_H, TAB_H, TAB_H-1, btn_light, btn_dark); |
PutPixel(xxx+1+TAB_H, TOOLBAR_H, btn_dark); |
DefineHiddenButton(xxx+1, TOOLBAR_H, TAB_H-1, TAB_H-1, NEW_TAB); |
WriteText(xxx+7, TOOLBAR_H+2, 0x90, system.color.work_button_text, "+"); |
WriteText(xxx+7, TOOLBAR_H+2, 0x90, sc.button_text, "+"); |
return xxx + TAB_H + 2; |
} else { |
return xxx; |
136,8 → 136,8 |
tab_w = GetTabWidth(); |
for (i=0; i<tab.count; i++) DrawTab(i); |
i = DrawNewTabButton(); |
DrawBar(i, TOOLBAR_H, Form.cwidth-i, TAB_H-1, MixColors(system.color.work_dark, system.color.work, 128)); |
DrawBar(i, TOOLBAR_H+TAB_H-1, Form.cwidth-i, 1, system.color.work_graph); |
DrawBar(i, TOOLBAR_H, Form.cwidth-i, TAB_H-1, MixColors(sc.work_dark, sc.work, 128)); |
DrawBar(i, TOOLBAR_H+TAB_H-1, Form.cwidth-i, 1, sc.work_graph); |
} |
void EventTabClose(int _id) |