Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7805 → Rev 7806

/programs/cmm/eolite/include/about.h
33,17 → 33,17
break;
case evReDraw:
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,300+skin_height,0x34,system.color.work,T_ABOUT,0);
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,300+skin_height,0x34,sc.work,T_ABOUT,0);
GetProcessInfo(#about_form, SelfInfo);
if (about_form.status_window>2) break;
logo_pal[0] = system.color.work;
ESDWORD[#logo_pal+16] = system.color.work_dark;
logo_pal[0] = sc.work;
ESDWORD[#logo_pal+16] = sc.work_dark;
PutPaletteImage(#logo,86,86,about_form.cwidth-86/2,10,8,#logo_pal);
about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE);
DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light);
WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n2008 - 2019",20);
DrawRectangle3D(0,154,about_form.cwidth,1,sc.work_dark,sc.work_light);
WriteTextLines(7,163,0x90,sc.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n2008 - 2019",20);
#ifdef LANG_RUS
DrawStandartCaptButton(60,about_form.cheight-38,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
#endif
/programs/cmm/eolite/include/breadcrumbs.h
4,9 → 4,9
{
PathShow.area_size_x = Form.cwidth-300;
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,sc.work_graph);
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, sc.work_light);
 
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26");
 
46,7 → 46,7
//DrawFavButton(btn.x);
//btn.x+=20;
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,sc.work);
}
 
 
64,10 → 64,10
void DrawBreadcrumbButton(dword x,y,w,h,id,text)
{
int i;
DrawRectangle(x,y,w,h,col.graph);
DrawRectangle(x,y,w,h,sc.work_graph);
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);
DrawRectangle3D(x+1,y+1,w-2,h-2,sc.work_light, sc.work_dark);
DefineHiddenButton(x+1,y+1,w-2,h-2,id);
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, system.color.work_light);
WriteText(-strlen(text)*8+w/2+x,h/2+y-7,0x90,sc.work_text,text);
DrawBar(x, y+h+1, w+1, 1, sc.work_light);
}
/programs/cmm/eolite/include/gui.h
21,21 → 21,21
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
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);
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.work_graph);
DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2, sc.work_light , sc.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[i]);
 
sc_center = sc_slider_h / 2 + sc_slider_y;
 
DrawBar(sc_x+4, sc_center-3, 8, 1, col.graph);
DrawBar(sc_x+4+1, sc_center-2, 8, 1, system.color.work_light);
DrawBar(sc_x+4, sc_center-3, 8, 1, sc.work_graph);
DrawBar(sc_x+4+1, sc_center-2, 8, 1, sc.work_light);
 
DrawBar(sc_x+3, sc_center, 10, 1, col.graph);
DrawBar(sc_x+3+1, sc_center+1, 10, 1, system.color.work_light);
DrawBar(sc_x+3, sc_center, 10, 1, sc.work_graph);
DrawBar(sc_x+3+1, sc_center+1, 10, 1, sc.work_light);
 
DrawBar(sc_x+4, sc_center+3, 8, 1, col.graph);
DrawBar(sc_x+4+1, sc_center+4, 8, 1, system.color.work_light);
DrawBar(sc_x+4, sc_center+3, 8, 1, sc.work_graph);
DrawBar(sc_x+4+1, sc_center+4, 8, 1, sc.work_light);
 
//area before slider
if (sc_slider_y > sc_y + 1)
55,12 → 55,12
 
void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{
DrawRectangle(x,y,width,height,col.graph);
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);
DrawRectangle(x,y,width,height,sc.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2, sc.work_light, sc.work_dark);
PutPixel(x+width-1, y+1, sc.work_dark);
DrawFilledBar(x+2, y+2, width-3, height-3);
if (id) DefineHiddenButton(x+1,y+1,width-2,height-2,id);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,system.color.work_text,text);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text);
}
 
void DrawFilledBar(dword x, y, w, h)
71,15 → 71,15
{
int but_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, sc.work, sc.work_graph);
but_x = DrawStandartCaptButton(popin_x+23, 215, POPUP_BTN1, b1_text);
DrawStandartCaptButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text);
}
 
void DrawDot(dword x,y) {
dword col_pxl = MixColors(col.graph, col.work, 60);
DrawBar(x+1,y,2,4,col.graph);
DrawBar(x,y+1,4,2,col.graph);
dword col_pxl = MixColors(sc.work_graph, sc.work, 60);
DrawBar(x+1,y,2,4,sc.work_graph);
DrawBar(x,y+1,4,2,sc.work_graph);
PutPixel(x,y,col_pxl);
PutPixel(x+3,y,col_pxl);
PutPixel(x,y+3,col_pxl);
/programs/cmm/eolite/include/left_panel.h
161,9 → 161,8
{
strcat(#disc_name, #dev_name);
if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name); }
else
{
WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
} else {
if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#dev_name);
WriteText(draw_x+29,draw_y+5,0x80,0,#dev_name);
}
214,9 → 213,9
DrawFilledBarInner(17, y+1, 160, 16);
DrawBar(17,y+17,160,1,0x7E87A3);
} else {
DrawBar(17,y,160,1,col.graph);
DrawBar(17,y,160,1,sc.work_graph);
DrawBar(17,y+1,160,16,col.list_bg);
DrawBar(17,y+17,160,1,col.graph);
DrawBar(17,y+17,160,1,sc.work_graph);
}
WriteText(25,y+5,0x80,col.list_gb_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
/programs/cmm/eolite/include/progress_dialog.h
33,7 → 33,7
title = T_DELETE_WINDOW_TITLE;
copy_bar.progress_color = 0xF17A65;
}
copy_bar.frame_color = system.color.work_graph;
copy_bar.frame_color = sc.work_graph;
switch(CheckEvent())
{
case evButton:
42,12 → 42,12
break;
case evReDraw:
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W+9,skin_height+WIN_DIALOG_H,0x34,system.color.work,title,0);
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W+9,skin_height+WIN_DIALOG_H,0x34,sc.work,title,0);
GetProcessInfo(#Dialog_Form, SelfInfo);
DrawCaptButton(WIN_DIALOG_W-PR_LEFT-101, PR_TOP+PR_H+6, 100,26, 2,
system.color.work_button, system.color.work_button_text, T_ABORT_WINDOW_BUTTON);
sc.button, sc.button_text, T_ABORT_WINDOW_BUTTON);
 
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, system.color.work_dark, system.color.work_light);
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, sc.work_dark, sc.work_light);
//copying.draw_wrapper();
}
}
65,8 → 65,8
return;
}
DisplayOperationForm();
DrawBar(PR_LEFT, PR_TOP-20, WIN_DIALOG_W-PR_LEFT, 15, system.color.work);
WriteText(PR_LEFT, PR_TOP-20, 0x90, system.color.work_text, filename);
DrawBar(PR_LEFT, PR_TOP-20, WIN_DIALOG_W-PR_LEFT, 15, sc.work);
WriteText(PR_LEFT, PR_TOP-20, 0x90, sc.work_text, filename);
 
progressbar_draw stdcall (#copy_bar);
progressbar_progress stdcall (#copy_bar);
74,6 → 74,6
//pause(1);
//copying.draw_progress(copy_bar.value*copying.w/copy_bar.max, copy_bar.value, copy_bar.max-copy_bar.value, "");
 
WriteTextWithBg(PR_LEFT, PR_TOP+PR_H+5, 0xD0, system.color.work_text,
sprintf(#param, "%i/%i", copy_bar.value, copy_bar.max), system.color.work);
WriteTextWithBg(PR_LEFT, PR_TOP+PR_H+5, 0xD0, sc.work_text,
sprintf(#param, "%i/%i", copy_bar.value, copy_bar.max), sc.work);
}
/programs/cmm/eolite/include/properties.h
140,7 → 140,7
void ShowConfirmQuestionPopin()
{
apply_question_active = 1;
DrawPopup(15,80,250,90,1,system.color.work, system.color.work_graph);
DrawPopup(15,80,250,90,1,sc.work, sc.work_graph);
WriteText(35, 102, 0x90, 0x000000, QUEST_1);
WriteText(65, 117, 0x90, 0x000000, QUEST_2);
DrawStandartCaptButton(62,138,B_SETINGS_APPLY_SUBFOLDER,T_YES);
272,24 → 272,24
dword element_size;
incn y;
char temp_path[sizeof(file_path)];
DefineAndDrawWindow(Form.left + 150,150,315,360+skin_height,0x34,system.color.work,WINDOW_TITLE_PROPERTIES,0);
DefineAndDrawWindow(Form.left + 150,150,315,360+skin_height,0x34,sc.work,WINDOW_TITLE_PROPERTIES,0);
GetProcessInfo(#pform, SelfInfo);
 
DrawStandartCaptButton(pform.cwidth - 96, pform.cheight-34, B_CLOSE, T_CLOSE);
DrawStandartCaptButton(pform.cwidth -208, pform.cheight-34, B_APPLY, T_APPLY);
WriteText(10, 78, 0x90, system.color.work_text, PR_T_DEST);
WriteText(10, 78, 0x90, sc.work_text, PR_T_DEST);
edit_box_draw stdcall (#path_to_file_ed);
 
WriteText(10, 97, 0x90, system.color.work_text, PR_T_SIZE);
WriteText(10, 97, 0x90, sc.work_text, PR_T_SIZE);
if (selected_count)
{
PropertiesDrawIcon(NULL, "<lot>");
sprintf(#folder_info,"%s%d%s%d",SET_6,more_files_count.files,SET_7,more_files_count.folders);
WriteText(file_name_ed.left+4, 30, 0x90, system.color.work_text, #folder_info);
WriteText(file_name_ed.left+4, 30, 0x90, sc.work_text, #folder_info);
sprintf(#element_size_label,"%s (%d %s)",ConvertSize64(more_files_count.bytes, NULL),more_files_count.bytes,SET_BYTE_LANG);
WriteText(120, 97, 0x90, system.color.work_text, #element_size_label);
WriteText(120, 97, 0x90, sc.work_text, #element_size_label);
}
else
{
301,24 → 301,24
if (ext1) ext1 += #file_name2;
PropertiesDrawIcon(#temp_path, ext1);
}
WriteText(file_name_ed.left, file_name_ed.top-15, 0x80, system.color.work_text, PR_T_NAME);
WriteText(file_name_ed.left, file_name_ed.top-15, 0x80, sc.work_text, PR_T_NAME);
DrawEditBox(#file_name_ed);
if (!itdir) element_size = file_info_general.sizelo;
else
{
WriteText(10,116, 0x90, system.color.work_text, PR_T_CONTAINS);
WriteText(10,116, 0x90, sc.work_text, PR_T_CONTAINS);
sprintf(#folder_info,"%s%d%s%d",SET_6,dir_size.files,SET_7,dir_size.folders);
WriteText(120, 116, 0x90, system.color.work_text, #folder_info);
WriteText(120, 116, 0x90, sc.work_text, #folder_info);
element_size = dir_size.bytes;
}
WriteTextLines(10, 136, 0x90, system.color.work_text, CREATED_OPENED_MODIFIED, 20);
DrawDate(120, 136, system.color.work_text, #file_info_general.datecreate);
DrawDate(120, 156, system.color.work_text, #file_info_general.datelastaccess);
DrawDate(120, 176, system.color.work_text, #file_info_general.datelastedit);
WriteTextLines(10, 136, 0x90, sc.work_text, CREATED_OPENED_MODIFIED, 20);
DrawDate(120, 136, sc.work_text, #file_info_general.datecreate);
DrawDate(120, 156, sc.work_text, #file_info_general.datelastaccess);
DrawDate(120, 176, sc.work_text, #file_info_general.datelastedit);
 
sprintf(#element_size_label,"%s (%d %s)",ConvertSize64(element_size, NULL),element_size,SET_BYTE_LANG);
WriteText(120, 99, 0x90, system.color.work_text, #element_size_label);
WriteText(120, 99, 0x90, sc.work_text, #element_size_label);
}
DrawFrame(10, 212, -10*2 + pform.cwidth - 2, 92, FLAGS);
y.n = 212; //212 => attributes_frame.y
/programs/cmm/eolite/include/settings.h
108,7 → 108,7
case evReDraw:
DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 400,
435+skin_height,0x34,system.color.work,TITLE_SETT,0);
435+skin_height,0x34,sc.work,TITLE_SETT,0);
GetProcessInfo(#Settings, SelfInfo);
DrawSettingsCheckBoxes();
}
225,28 → 225,26
void SetAppColors()
{
int i;
dword bg_col, old_list_bg_color;
system.color.get();
if (col.work == system.color.work) return;
old_list_bg_color = col.list_bg;
bg_col = system.color.work;
static dword bg_col;
dword old_list_bg_color = col.list_bg;
sc.get();
if (bg_col == sc.work) return;
bg_col = sc.work;
if (skin_is_dark())
{
//use dark colors
col.def = false;
col.list_bg = system.color.work;
col.list_gb_text = system.color.work_text;
col.list_bg = sc.work;
col.list_gb_text = sc.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.list_vert_line = sc.work_graph;
col.lpanel = MixColors(sc.work_graph, sc.work, 65);
col.selec = col.selec_active = sc.button;
col.selec_text = sc.button_text;
sc.work_dark = MixColors(0, sc.work, 35);
if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins
col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35);
col.odd_line = MixColors(0xFFFfff, sc.work, 15);
}
else
{
256,18 → 254,16
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);
sc.work_dark = MixColors(0, sc.work, 35);
col.slider_bg_big = 0xCDCFCF;
col.odd_line = 0xF1F1F1;
}
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[i] = MixColors(system.color.work_light, system.color.work, i*5);
col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.work_light, sc.work, i*5);
if (old_list_bg_color!=col.list_bg) LoadIcons();
}
 
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager 4.23"
#define ABOUT_TITLE "EOLITE 4.23"
#define TITLE "Eolite File Manager 4.23a"
#define ABOUT_TITLE "EOLITE 4.23a"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"