Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

Eolite 4.2: dark skins support

Browse Source 
git-svn-id: svn://kolibrios.org@7634 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-04-17 12:11:31 +00:00
parent 14d8adaa7a
commit 59530bcfc4
8 changed files with 150 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,24 @@ enum {
ONLY_OPEN ONLY_OPEN
}; };
dword col_selec, col_lpanel, col_work, col_graph, col_list_line=0xDDD7CF; struct Eolite_colors
{
dword lpanel;
dword list_vert_line; //vertical line between columns in list
dword selec;
dword selec_active;
dword selec_inactive;
dword selec_text;
dword work;
dword graph;
dword list_bg;
dword list_gb_text;
dword list_text_hidden;
dword work_gradient[24];
dword slider_bg_big;
dword slider_bg_left;
dword odd_line;
} col;
int toolbar_buttons_x[7]={9,46,85,134,167,203}; int toolbar_buttons_x[7]={9,46,85,134,167,203};
@ -150,8 +167,12 @@ void main()
Libimg_LoadImage(#icons16_default, "/sys/icons16.png"); Libimg_LoadImage(#icons16_default, "/sys/icons16.png");
Libimg_LoadImage(#icons16_selected, "/sys/icons16.png"); Libimg_LoadImage(#icons16_selected, "/sys/icons16.png");
Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col_selec); Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col.selec);
Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col_selec, 0, 200)); Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col.selec, 0, 200));
if (col.list_bg!=0xFFFfff) {
Libimg_ReplaceColor(icons16_default.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col.list_bg);
Libimg_ReplaceColor(icons16_default.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col.list_bg, 0, 200));
}
//-p just show file/folder properties dialog //-p just show file/folder properties dialog
if (param) && (param[0]=='-') && (param[1]=='p') if (param) && (param[0]=='-') && (param[1]=='p')
@ -552,7 +573,7 @@ void main()
void draw_window() void draw_window()
{ {
int i; dword i;
if (show_status_bar.checked) status_bar_h = STATUS_BAR_H; else status_bar_h = 0; if (show_status_bar.checked) status_bar_h = STATUS_BAR_H; else status_bar_h = 0;
DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,TITLE,0); DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,TITLE,0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
@ -561,21 +582,21 @@ void draw_window()
if (!two_panels.checked) && (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; } if (!two_panels.checked) && (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; }
if ( two_panels.checked) && (Form.width < 573) { MoveSize(OLD,OLD,573,OLD); return; } if ( two_panels.checked) && (Form.width < 573) { MoveSize(OLD,OLD,573,OLD); return; }
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
ESDWORD[#toolbar_pal] = col_work; ESDWORD[#toolbar_pal] = col.work;
ESDWORD[#toolbar_pal+4] = MixColors(0, col_work, 35); ESDWORD[#toolbar_pal+4] = MixColors(0, col.work, 35);
PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal); PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal);
DrawBar(127, 8, 1, 25, col_graph); DrawBar(127, 8, 1, 25, col.graph);
for (i=0; i<3; i++) DefineHiddenButton(toolbar_buttons_x[i]+2,7,31-5,29-5,21+i); for (i=0; i<3; i++) DefineHiddenButton(toolbar_buttons_x[i]+2,7,31-5,29-5,21+i);
for (i=3; i<6; i++) DefineHiddenButton(toolbar_buttons_x[i], 5,31, 29, 21+i); for (i=3; i<6; i++) DefineHiddenButton(toolbar_buttons_x[i], 5,31, 29, 21+i);
DrawBar(246,0, Form.cwidth - 246, 34, col_work); DrawBar(246,0, Form.cwidth - 246, 34, col.work);
DrawDot(Form.cwidth-17,12); DrawDot(Form.cwidth-17,12);
DrawDot(Form.cwidth-17,12+6); DrawDot(Form.cwidth-17,12+6);
DrawDot(Form.cwidth-17,12+12); DrawDot(Form.cwidth-17,12+12);
DefineHiddenButton(Form.cwidth-24,7,20,25,51+BT_NOFRAME); //dots DefineHiddenButton(Form.cwidth-24,7,20,25,51+BT_NOFRAME); //dots
//main rectangles //main rectangles
DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,col_graph); DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,col.graph);
DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col_work_gradient[4]); //bg DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col.work_gradient[4]); //bg
for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_work_gradient[11-i]); for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col.work_gradient[11-i]);
llist_copy(#files_active, #files); llist_copy(#files_active, #files);
strcpy(#active_path, #path); strcpy(#active_path, #path);
DrawStatusBar(); DrawStatusBar();
@ -597,8 +618,8 @@ void DrawList()
if (sort_type==2) sorting_arrow_x = files.x + files.w - 90; if (sort_type==2) sorting_arrow_x = files.x + files.w - 90;
if (sort_type==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w; if (sort_type==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
WriteText(sorting_arrow_x,files.y-12,0x80, system.color.work_text, sorting_arrow_t); WriteText(sorting_arrow_x,files.y-12,0x80, system.color.work_text, sorting_arrow_t);
DrawBar(files.x+files.w,files.y,1,files.h,col_graph); DrawBar(files.x+files.w,files.y,1,files.h,col.graph);
if (two_panels.checked) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,col_graph); if (two_panels.checked) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,col.graph);
} }
void DrawStatusBar() void DrawStatusBar()
@ -627,7 +648,7 @@ void DrawFilePanels()
SystemDiscs.Get(); SystemDiscs.Get();
llist_copy(#files, #files_inactive); llist_copy(#files, #files_inactive);
strcpy(#path, #inactive_path); strcpy(#path, #inactive_path);
col_selec = 0xCCCccc; col.selec = col.selec_inactive;
SystemDiscs.Draw(); SystemDiscs.Draw();
files_y = files.y; files_y = files.y;
@ -635,13 +656,13 @@ void DrawFilePanels()
{ {
llist_copy(#files, #files_inactive); llist_copy(#files, #files_inactive);
strcpy(#path, #inactive_path); strcpy(#path, #inactive_path);
col_selec = 0xCCCccc; //this is a bad code: need to use some var to set inactive panel for DrawList(); col.selec = col.selec_inactive; //this is a bad code: need to use some var to set inactive panel for DrawList();
files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h); files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col_selec = 0x94AECE; col.selec = col.selec_active;
files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h); files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
@ -653,7 +674,7 @@ void DrawFilePanels()
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
llist_copy(#files, #files_active); llist_copy(#files, #files_active);
strcpy(#path, #active_path); strcpy(#path, #active_path);
col_selec = 0x94AECE; col.selec = col.selec_active;
files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h); files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
DrawList(); DrawList();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
@ -679,24 +700,27 @@ void List_ReDraw()
} }
if (old_cur_y != files.cur_y) if (old_cur_y != files.cur_y)
{ {
if (old_cur_y-files.first<files.visible) Line_ReDraw(0xFFFFFF, old_cur_y-files.first); if (old_cur_y-files.first<files.visible) Line_ReDraw(col.list_bg, old_cur_y-files.first);
Line_ReDraw(col_selec, files.cur_y-files.first); Line_ReDraw(col.selec, files.cur_y-files.first);
old_cur_y = files.cur_y; old_cur_y = files.cur_y;
return; return;
} }
_ALL_LIST_REDRAW: _ALL_LIST_REDRAW:
for (j=0; j<files.visible; j++) if (files.cur_y-files.first!=j) Line_ReDraw(0xFFFFFF, j); else Line_ReDraw(col_selec, files.cur_y-files.first); for (j=0; j<files.visible; j++) {
if (files.cur_y-files.first!=j) Line_ReDraw(col.list_bg, j);
else Line_ReDraw(col.selec, files.cur_y-files.first);
}
//in the bottom //in the bottom
all_lines_h = j * files.item_h; all_lines_h = j * files.item_h;
DrawBar(files.x,all_lines_h + files.y,files.w,files.h - all_lines_h,0xFFFFFF); DrawBar(files.x,all_lines_h + files.y,files.w,files.h - all_lines_h, col.list_bg);
DrawBar(files.x+files.w-141,all_lines_h + files.y,1,files.h - all_lines_h,col_list_line); DrawBar(files.x+files.w-141,all_lines_h + files.y,1,files.h - all_lines_h,col.list_vert_line);
DrawBar(files.x+files.w-68,all_lines_h + files.y,1,files.h - all_lines_h,col_list_line); DrawBar(files.x+files.w-68,all_lines_h + files.y,1,files.h - all_lines_h,col.list_vert_line);
Scroll(); Scroll();
if (del_active) Del_Form(); if (del_active) Del_Form();
if (new_element_active) && (col_selec != 0xCCCccc) NewElement_Form(new_element_active, #new_element_name); if (new_element_active) && (col.selec != 0xCCCccc) NewElement_Form(new_element_active, #new_element_name);
} }
bool file_name_is_8_3(dword name) bool file_name_is_8_3(dword name)
@ -717,7 +741,7 @@ bool file_name_is_8_3(dword name)
} }
void Line_ReDraw(dword bgcol, filenum){ void Line_ReDraw(dword bgcol, filenum){
dword text_col=0, dword text_col=col.list_gb_text,
ext1, attr, ext1, attr,
file_offet, file_offet,
file_name_off, file_name_off,
@ -731,7 +755,7 @@ void Line_ReDraw(dword bgcol, filenum){
DrawBar(files.x,y,4,files.item_h,bgcol); DrawBar(files.x,y,4,files.item_h,bgcol);
DrawBar(files.x+4,y,icon_size,icon_y-y,bgcol); DrawBar(files.x+4,y,icon_size,icon_y-y,bgcol);
if (files.item_h>icon_size) DrawBar(files.x+4,icon_y+icon_size-1,icon_size,y+files.item_h-icon_y-icon_size+1,bgcol); if (files.item_h>icon_size) DrawBar(files.x+4,icon_y+icon_size-1,icon_size,y+files.item_h-icon_y-icon_size+1,bgcol);
if (colored_lines.checked) && (bgcol!=col_selec) && (filenum%2) bgcol=0xF1F1F1; if (colored_lines.checked) && (bgcol!=col.selec) && (filenum%2) bgcol=col.odd_line;
DrawBar(files.x+icon_size+4,y,files.w-icon_size-4,files.item_h,bgcol); DrawBar(files.x+icon_size+4,y,files.w-icon_size-4,files.item_h,bgcol);
file_offet = file_mas[filenum+files.first]*304 + buf+32; file_offet = file_mas[filenum+files.first]*304 + buf+32;
@ -747,29 +771,31 @@ void Line_ReDraw(dword bgcol, filenum){
ext1 = strrchr(file_name_off,'.') + file_name_off; ext1 = strrchr(file_name_off,'.') + file_name_off;
if (ext1==file_name_off) ext1 = NULL; //if no extension then show nothing if (ext1==file_name_off) ext1 = NULL; //if no extension then show nothing
file_size = ConvertSize64(file.sizelo, file.sizehi); file_size = ConvertSize64(file.sizelo, file.sizehi);
if (ext1) && (strlen(ext1)<9) WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1); if (ext1) && (strlen(ext1)<9) WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, col.list_gb_text, ext1);
} }
else else
{ {
if (!strcmp(file_name_off,"..")) ext1="<up>"; else { if (!strcmp(file_name_off,"..")) ext1="<up>"; else {
ext1="<DIR>"; ext1="<DIR>";
WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1); WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, col.list_gb_text, ext1);
} }
if (chrnum(#path, '/')==1) file_size = GetDeviceSizeLabel(#temp_path); if (chrnum(#path, '/')==1) file_size = GetDeviceSizeLabel(#temp_path);
} }
if (file_size) WriteText(7-strlen(file_size)*6+files.x+files.w-58, if (file_size) WriteText(7-strlen(file_size)*6+files.x+files.w-58,
files.text_y+y+1, files.font_type, 0, file_size); files.text_y+y+1, files.font_type, col.list_gb_text, file_size);
DrawIconByExtension(#temp_path, ext1, files.x+4, icon_y, bgcol); DrawIconByExtension(#temp_path, ext1, files.x+4, icon_y, bgcol);
if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=0xA6A6B7; //system or hiden? if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=col.list_text_hidden; //system or hiden?
if (bgcol==col_selec) if (bgcol==col.selec)
{ {
file_name_is_8_3(file_name_off); file_name_is_8_3(file_name_off);
itdir = TestBit(attr, 4); itdir = TestBit(attr, 4);
strcpy(#file_name, file_name_off); strcpy(#file_name, file_name_off);
if (!strcmp(#path,"/")) sprintf(#file_path,"%s%s",#path,file_name_off); if (!strcmp(#path,"/")) sprintf(#file_path,"%s%s",#path,file_name_off);
else sprintf(#file_path,"%s/%s",#path,file_name_off); else sprintf(#file_path,"%s/%s",#path,file_name_off);
if (text_col==0xA6A6B7) text_col=0xFFFFFF; if (text_col==col.list_text_hidden) {
text_col=MixColors(col.selec_text, col.list_text_hidden, 65);
} else text_col=col.selec_text;
} }
if (file.selected) text_col=0xFF0000; if (file.selected) text_col=0xFF0000;
if (kfont.size.pt==9) || (!kfont.font) if (kfont.size.pt==9) || (!kfont.font)
@ -795,10 +821,11 @@ void Line_ReDraw(dword bgcol, filenum){
} }
strcpy(#label_file_name+strlen(#label_file_name)-2, "..."); strcpy(#label_file_name+strlen(#label_file_name)-2, "...");
} }
kfont.WriteIntoWindow(files.x + icon_size+7, files.item_h - kfont.height / 2 + y, bgcol, text_col, kfont.size.pt, #label_file_name); kfont.WriteIntoWindow(files.x + icon_size+7, files.item_h - kfont.height / 2 + y,
bgcol, text_col, kfont.size.pt, #label_file_name);
} }
DrawBar(files.x+files.w-141,y,1,files.item_h,col_list_line); //gray line 1 DrawBar(files.x+files.w-141,y,1,files.item_h,col.list_vert_line); //gray line 1
DrawBar(files.x+files.w-68,y,1,files.item_h,col_list_line); //gray line 2 DrawBar(files.x+files.w-68,y,1,files.item_h,col.list_vert_line); //gray line 2
} }

21
programs/cmm/eolite/include/breadcrumbs.h
View File

@ -3,13 +3,15 @@ PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp,
void DrawPathBar() void DrawPathBar()
{ {
PathShow.area_size_x = Form.cwidth-300; PathShow.area_size_x = Form.cwidth-300;
DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, 0xFFFfff); DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,col_graph); DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,col.graph);
DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,PATH_BTN); DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,PATH_BTN);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, system.color.work_light); DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, system.color.work_light);
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26"); DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26");
PathShow.background_color = col.odd_line;
PathShow.font_color = col.list_gb_text;
PathShow_prepare stdcall(#PathShow); PathShow_prepare stdcall(#PathShow);
PathShow_draw stdcall(#PathShow); PathShow_draw stdcall(#PathShow);
} }
@ -44,7 +46,7 @@ void DrawBreadCrumbs()
//DrawFavButton(btn.x); //DrawFavButton(btn.x);
//btn.x+=20; //btn.x+=20;
btn.x++; btn.x++;
DrawBar(btn.x,btn.y-1,Form.cwidth-btn.x-25,btn.h+3,col_work); DrawBar(btn.x,btn.y-1,Form.cwidth-btn.x-25,btn.h+3,col.work);
} }
@ -59,16 +61,13 @@ void ClickOnBreadCrumb(unsigned clickid)
} }
dword col_palette_br[14] = {0xFFFfff,0xF3EDF0,0xF3EDF0,0xF3EDF0,0xF3EDF0,
0xF2EBEF,0xF2EBEF,
0xF0EAEC,0xEFE9EB,0xEDE6E9,0xEAE6E8,0xE9E4E6,0xE5E0E3,0xE3DDDE,0xE0DBDB,
0xDFDADA,0xDBD9DA,0xD2D0D2,0xC2C6C6};
void DrawBreadcrumbButton(dword x,y,w,h,id,text) void DrawBreadcrumbButton(dword x,y,w,h,id,text)
{ {
int i; int i;
DrawRectangle(x,y,w,h,col_graph); DrawRectangle(x,y,w,h,col.graph);
for (i=0; i<h-1; i++) DrawBar(x+1, y+i+1, w-1, 1, col_palette_br[i]); for (i=0; (i<h-1) & (i<20); i++) DrawBar(x+1, y+i+1, w-1, 1, col.work_gradient[20-i]);
DrawRectangle3D(x+1,y+1,w-2,h-2,system.color.work_light, system.color.work_dark);
DefineHiddenButton(x+1,y+1,w-2,h-2,id); DefineHiddenButton(x+1,y+1,w-2,h-2,id);
WriteText(-strlen(text)*8+w/2+x,h/2+y-7,0x90,0x444444,text); WriteText(-strlen(text)*8+w/2+x,h/2+y-7,0x90,system.color.work_text,text);
DrawBar(x, y+h+1, w+1, 1, MixColors(col_work,0xFFFfff,120)); DrawBar(x, y+h+1, w+1, 1, system.color.work_light);
} }

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

@ -1,6 +1,4 @@
dword col_work_gradient[14];
void Scroll() { void Scroll() {
dword i; dword i;
@ -22,29 +20,29 @@ void Scroll() {
if (sc_slider_h > sc_h-sc_slider_y+56) || (files.first+files.visible>=files.count) sc_slider_y= sc_y + sc_h - sc_slider_h - 1; //äëÿ áîëüøîãî ñïèñêà if (sc_slider_h > sc_h-sc_slider_y+56) || (files.first+files.visible>=files.count) sc_slider_y= sc_y + sc_h - sc_slider_h - 1; //äëÿ áîëüøîãî ñïèñêà
} }
//slider //slider
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,col_graph); DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,col.graph);
DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2, system.color.work_light , system.color.work_dark); DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2, system.color.work_light , system.color.work_dark);
if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_work_gradient[13-i]); if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col.work_gradient[13-i]);
if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_work_gradient[i]); if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col.work_gradient[i]);
//area before slider //area before slider
if (sc_slider_y > sc_y + 1) if (sc_slider_y > sc_y + 1)
{ {
DrawBar(sc_x+1, sc_y, 15, 1, 0xC7C9C9); DrawBar(sc_x+1, sc_y, 15, 1, col.slider_bg_left);
DrawBar(sc_x+1, sc_y+1, 1, sc_slider_y-sc_y-1, 0xC7C9C9); DrawBar(sc_x+1, sc_y+1, 1, sc_slider_y-sc_y-1, col.slider_bg_left);
DrawBar(sc_x+2, sc_y+1, 14, sc_slider_y-sc_y-1, 0xCED0D0); DrawBar(sc_x+2, sc_y+1, 14, sc_slider_y-sc_y-1, col.slider_bg_big);
} }
//area after slider //area after slider
if (sc_h-sc_slider_h+sc_y-2>sc_slider_y) if (sc_h-sc_slider_h+sc_y-2>sc_slider_y)
{ {
DrawBar(sc_x+1, sc_slider_y + sc_slider_h+1, 15, 1, 0xC7C9C9); DrawBar(sc_x+1, sc_slider_y + sc_slider_h+1, 15, 1, col.slider_bg_left);
DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2, 1, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xC7C9C9); DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2, 1, sc_h-sc_slider_h-sc_slider_y+sc_y-2, col.slider_bg_left);
DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xCED0D0); DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+sc_y-2, col.slider_bg_big);
} }
} }
void DrawFlatButtonSmall(dword x,y,width,height,id,text) void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{ {
DrawRectangle(x,y,width,height,col_graph); DrawRectangle(x,y,width,height,col.graph);
DrawRectangle3D(x+1,y+1,width-2,height-2, system.color.work_light, system.color.work_dark); DrawRectangle3D(x+1,y+1,width-2,height-2, system.color.work_light, system.color.work_dark);
PutPixel(x+width-1, y+1, system.color.work_dark); PutPixel(x+width-1, y+1, system.color.work_dark);
DrawFilledBar(x+2, y+2, width-3, height-3); DrawFilledBar(x+2, y+2, width-3, height-3);
@ -55,9 +53,11 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text)
void DrawFilledBar(dword x, y, w, h) void DrawFilledBar(dword x, y, w, h)
{ {
int i, fill_h; int i, fill_h;
if (h <= 14) fill_h = h; else fill_h = 14; if (h < 12) {
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_work_gradient[14-i]); for (i=0; i<h; i++) DrawBar(x, y+i, w, 1, col.work_gradient[12-i]);
DrawBar(x, y+i, w, h-fill_h, col_work_gradient[14-i]); } else {
DrawBar(x, y, w, h, col.work_gradient[12]);
}
} }
int popin_w=260; int popin_w=260;
@ -65,15 +65,15 @@ void DrawEolitePopup(dword b1_text, b2_text)
{ {
int but_x; int but_x;
int popin_x = files.w - popin_w / 2 + files.x ; int popin_x = files.w - popin_w / 2 + files.x ;
DrawPopup(popin_x, 160, popin_w, 95, 1, system.color.work, col_graph); DrawPopup(popin_x, 160, popin_w, 95, 1, system.color.work, col.graph);
but_x = DrawStandartCaptButton(popin_x+23, 215, POPUP_BTN1, b1_text); but_x = DrawStandartCaptButton(popin_x+23, 215, POPUP_BTN1, b1_text);
DrawStandartCaptButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text); DrawStandartCaptButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text);
} }
void DrawDot(dword x,y) { void DrawDot(dword x,y) {
dword col_pxl = MixColors(col_graph, col_work, 60); dword col_pxl = MixColors(col.graph, col.work, 60);
DrawBar(x+1,y,2,4,col_graph); DrawBar(x+1,y,2,4,col.graph);
DrawBar(x,y+1,4,2,col_graph); DrawBar(x,y+1,4,2,col.graph);
PutPixel(x,y,col_pxl); PutPixel(x,y,col_pxl);
PutPixel(x+3,y,col_pxl); PutPixel(x+3,y,col_pxl);
PutPixel(x,y+3,col_pxl); PutPixel(x,y+3,col_pxl);

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

@ -35,7 +35,7 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
IF(DSDWORD[#BYTE_HEAD_FILE]=='KCPK')||(DSDWORD[#BYTE_HEAD_FILE]=='UNEM') IF(DSDWORD[#BYTE_HEAD_FILE]=='KCPK')||(DSDWORD[#BYTE_HEAD_FILE]=='UNEM')
icon_n = icons_ini.GetInt("kex", 2); icon_n = icons_ini.GetInt("kex", 2);
} }
if (fairing_color==col_selec) if (fairing_color==col.selec)
{ {
img_draw stdcall(selected_image, xx, yy, icon_size, icon_size, 0, icon_n*icon_size); img_draw stdcall(selected_image, xx, yy, icon_size, icon_size, 0, icon_n*icon_size);
} }

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

@ -237,22 +237,25 @@ void DrawLeftPanelBg()
int actions_y = SystemDiscs.list.count*16; int actions_y = SystemDiscs.list.count*16;
int start_y = actions_y+156; int start_y = actions_y+156;
int area_h; int area_h;
DrawBar(2,41,190,15,col_lpanel); //ñèíèé ïðÿìîóãîëüíèê - íàä äåâàéñàìè DrawBar(2,41,190,15,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - íàä äåâàéñàìè
DrawBar(17,actions_y+75,160,15,col_lpanel); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè DrawBar(17,actions_y+75,160,15,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
PutShadow(17,actions_y+75,160,1,1,3); PutShadow(17,actions_y+75,160,1,1,3);
PutShadow(18,actions_y+75+1,158,1,1,1); PutShadow(18,actions_y+75+1,158,1,1,1);
DrawBar(2,56,15,actions_y+103,col_lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñëåâà DrawBar(2,56,15,actions_y+103,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñëåâà
DrawBar(177,56,15,actions_y+103,col_lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñïðàâà DrawBar(177,56,15,actions_y+103,col.lpanel); //ñèíèé ïðÿìîóãîëüíèê - ñïðàâà
area_h = Form.cheight-start_y-2 - status_bar_h; area_h = Form.cheight-start_y-2 - status_bar_h;
if (area_h < 268) if (col.lpanel == 0x00699C)
{ {
if (area_h < 268){
PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #blue_hl_pal); PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #blue_hl_pal);
} } else {
else DrawBar(2,start_y,190, area_h-268, col.lpanel);
{
DrawBar(2,start_y,190, area_h-268, col_lpanel);
PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #blue_hl_pal); PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #blue_hl_pal);
} }
}
else {
DrawBar(2,start_y,190, area_h, col.lpanel);
}
PutShadow(17,start_y,160,1,1,3); PutShadow(17,start_y,160,1,1,3);
PutShadow(18,start_y+1,158,1,1,1); PutShadow(18,start_y+1,158,1,1,1);
} }

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

@ -93,7 +93,7 @@ void FileMenu()
else else
DefineAndDrawWindow(Form.left+files.x+15, files.item_h*files.cur_y+files.y+Form.top+30,rbmenu.w+3,rbmenu.h+6,0x01, 0, 0, 0x01fffFFF); DefineAndDrawWindow(Form.left+files.x+15, files.item_h*files.cur_y+files.y+Form.top+30,rbmenu.w+3,rbmenu.h+6,0x01, 0, 0, 0x01fffFFF);
GetProcessInfo(#MenuForm, SelfInfo); GetProcessInfo(#MenuForm, SelfInfo);
DrawRectangle(0,0,rbmenu.w+1,rbmenu.h+2,col_graph); DrawRectangle(0,0,rbmenu.w+1,rbmenu.h+2,col.graph);
DrawBar(1,1,rbmenu.w,1,0xFFFfff); DrawBar(1,1,rbmenu.w,1,0xFFFfff);
DrawPopupShadow(1,1,rbmenu.w,rbmenu.h,0); DrawPopupShadow(1,1,rbmenu.w,rbmenu.h,0);
MenuListRedraw(); MenuListRedraw();
@ -126,7 +126,7 @@ void MenuListRedraw()
} }
else else
{ {
m_col_bg = col_work; m_col_bg = col.work;
m_col_text = system.color.work_text; m_col_text = system.color.work_text;
m_col_sh_text = system.color.work_light; m_col_sh_text = system.color.work_light;
} }

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

@ -207,19 +207,45 @@ void Write_Error(int error_number)
void SetAppColors() void SetAppColors()
{ {
int i; int i;
dword bg_col;
system.color.get(); system.color.get();
bg_col = system.color.work;
for (i=0; i<=14; i++) col_work_gradient[14-i]= MixColors(0, system.color.work, i); if (GrayScaleImage(#bg_col,1,1)>=65)
col_work = system.color.work; {
col_graph = system.color.work_graph; //use light colors
col.list_bg = 0xFFFfff;
col.list_gb_text = 0x000000;
col.list_text_hidden = 0xA6A6B7;
col.list_vert_line = 0xDDD7CF;
col.work = system.color.work;
col.graph = system.color.work_graph;
col.lpanel = 0x00699C;
col.selec = col.selec_active = 0x94AECE;
col.selec_text = 0x000000;
system.color.work_dark = MixColors(0, system.color.work, 35); system.color.work_dark = MixColors(0, system.color.work, 35);
col.slider_bg_big = 0xCDCFCF;
/* col.odd_line = 0xF1F1F1;
col_work = 0xE4DFE1; }
col_graph = 0x7E87A3; else
*/ {
col_lpanel = 0x00699C; //use dark colors
col_selec = 0x94AECE; col.list_bg = system.color.work;
col.list_gb_text = system.color.work_text;
col.list_text_hidden = 0xA6A6B7;
col.list_vert_line = system.color.work_graph;
col.work = system.color.work;
col.graph = system.color.work_graph;
col.lpanel = MixColors(system.color.work_graph, system.color.work, 65);
col.selec = col.selec_active = system.color.work_button;
col.selec_text = system.color.work_button_text;
system.color.work_dark = MixColors(0, system.color.work, 35);
if (col.list_bg==col.selec) col.selec = system.color.work_graph; //for fucking skins
col.slider_bg_big = MixColors(0xCED0D0, system.color.work, 35);
col.odd_line = MixColors(0xFFFfff, system.color.work, 15);
}
col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
col.slider_bg_left = MixColors(col.graph, col.slider_bg_big, 10);
for (i=0; i<=20; i++) col.work_gradient[20-i] = MixColors(0, system.color.work, i);
} }
@ -244,9 +270,9 @@ void BigIconsSwitch()
Libimg_LoadImage(#icons32_default, "/sys/icons32.png"); Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
Libimg_LoadImage(#icons32_selected, "/sys/icons32.png"); Libimg_LoadImage(#icons32_selected, "/sys/icons32.png");
Libimg_ReplaceColor(icons32_default.image, icons32_selected.w, Libimg_ReplaceColor(icons32_default.image, icons32_selected.w,
icons32_selected.h, 0x00000000, 0xffFFFfff); icons32_selected.h, 0x00000000, col.list_bg);
Libimg_ReplaceColor(icons32_selected.image, icons32_selected.w, Libimg_ReplaceColor(icons32_selected.image, icons32_selected.w,
icons32_selected.h, 0x00000000, col_selec); icons32_selected.h, 0x00000000, col.selec);
} }
} }
else { else {

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager 4.1" #define TITLE "Eolite File Manager 4.2"
#define ABOUT_TITLE "EOLITE 4.1" #define ABOUT_TITLE "EOLITE 4.2"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"