Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6677 → Rev 6678

/programs/cmm/eolite/include/about.h
45,7 → 45,7
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\n(c) 2008 - 2016",20);
#ifdef LANG_RUS
DrawFlatButton(about_form.cwidth-180/2,about_form.cheight-38,180,26,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
DrawFlatButton(60,about_form.cheight-38,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
#endif
}
}
/programs/cmm/eolite/include/gui.h
42,7 → 42,7
}
}
 
void DrawFlatButton(dword x,y,width,height,id,text)
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,0xFEFEFE,col_padding);
49,14 → 49,25
PutPixel(x+width-1, y+1, col_padding);
DrawFilledBar(x+2, y+2, width-3, height-3);
if (id) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
if (height<18) {
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,0x333333,text);
}
else {
DrawRectangle3D(x-1,y-1,width+2,height+2,system.color.work,MixColors(system.color.work,col_graph,200));
WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,0x333333,text);
 
int DrawFlatButton(dword x, y, id, text)
{
int padding_w = 15;
int width = strlen(text) * 8 + padding_w + padding_w;
int height = 25;
dword border_3d_light = MixColors(system.color.work_button,0xFFFfff,140);
dword border_3d_dark = MixColors(system.color.work_button,0x111111,220);
dword border_light = MixColors(system.color.work_button,0x111111,140);
dword border_dark = MixColors(system.color.work_button,0x111111,100);
DrawRectangle3D(x,y,width,height,border_light, border_dark);
DrawRectangle3D(x+1,y+1,width-2,height-2, border_3d_light, border_3d_dark);
DrawBar(x+2, y+2, width-3, height-3, system.color.work_button);
if (id) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
WriteText(x+padding_w,height/2+y-6,0x90,system.color.work_button_text,text);
return width + padding_w;
}
}
 
 
void DrawFilledBar(dword x, y, w, h)
67,17 → 78,12
DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]);
}
 
int popin_w=250;
int popin_w=260;
void DrawEolitePopup(dword b1_text, b2_text)
{
int button_padding=30;
int b1_len = strlen(b1_text) * 8 + button_padding;
int b2_len = strlen(b2_text) * 8 + button_padding;
int but_x;
int popin_x = files.w - popin_w / 2 + files.x ;
int button_margin = popin_w - b1_len - b2_len / 3;
int b1_x = popin_x + button_margin;
int b2_x = popin_x + button_margin + b1_len + button_margin;
DrawPopup(popin_x, 160, popin_w, 90, 1, system.color.work, col_graph);
DrawFlatButton(b1_x, 210, b1_len, 24, POPUP_BTN1, b1_text);
DrawFlatButton(b2_x, 210, b2_len, 24, POPUP_BTN2, b2_text);
DrawPopup(popin_x, 160, popin_w, 95, 1, system.color.work, col_graph);
but_x = DrawFlatButton(popin_x+23, 215, POPUP_BTN1, b1_text);
DrawFlatButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text);
}
/programs/cmm/eolite/include/properties.h
157,8 → 157,8
DrawPopup(15,80,250,90,1,system.color.work, system.color.work_graph);
WriteText(35, 102, 0x90, 0x000000, QUEST_1);
WriteText(65, 117, 0x90, 0x000000, QUEST_2);
DrawFlatButton(62,138,70,20,301,T_YES);
DrawFlatButton(155,138,70,20,302,T_NO);
DrawFlatButton(62,138,301,T_YES);
DrawFlatButton(155,138,302,T_NO);
}
 
void GetSizeDir(dword way)
367,25 → 367,25
file_name_ed.color = 0xffffff;
}
GetProcessInfo(#settings_form, SelfInfo);
DrawFlatButton(10, 5, 80, 24, 12, TAB_T_BASIC);
if (exif_load==1) DrawFlatButton(92, 5, 80, 24, 13, TAB_T_DETAILS);
DrawFlatButton(settings_form.cwidth - 93, settings_form.cheight-34, 80, 24, 10, BTN_CLOSE);
DrawFlatButton(settings_form.cwidth -183, settings_form.cheight-34, 80, 24, 11, BTN_APPLY);
DrawFlatButton(10, 5, 12, TAB_T_BASIC);
if (exif_load==1) DrawFlatButton(92, 5, 13, TAB_T_DETAILS);
DrawFlatButton(settings_form.cwidth - 96, settings_form.cheight-34, 10, BTN_CLOSE);
DrawFlatButton(settings_form.cwidth -208, settings_form.cheight-34, 11, BTN_APPLY);
if (active_tab == TAB_BASIC)
{
WriteText(10, 78, 0x90, 0x000000, PR_T_DEST);
WriteText(10, 78, 0x90, system.color.work_text, PR_T_DEST);
edit_box_draw stdcall (#path_to_file_ed);
WriteText(10, 97, 0x90, 0x000000, PR_T_SIZE);
WriteText(10, 97, 0x90, system.color.work_text, PR_T_SIZE);
if (selected_count)
{
DrawIconByExtension(NULL, 18, 49, system.color.work);
sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
WriteText(50, 49, 0x90, 0x000000, #folder_info);
WriteText(50, 49, 0x90, system.color.work_text, #folder_info);
sprintf(#element_size_label,"%s (%d %s)",ConvertSize(size_dir),size_dir,SET_BYTE_LANG);
WriteText(120, 97, 0x90, 0x000000, #element_size_label);
WriteText(120, 97, 0x90, system.color.work_text, #element_size_label);
}
else
{
394,24 → 394,24
else
DrawIconByExtension(#file_name2+strrchr(#file_name2,'.'), 18, 49, system.color.work);
WriteText(50, 40, 0x90, 0x000000, PR_T_NAME);
WriteText(50, 40, 0x90, system.color.work_text, PR_T_NAME);
edit_box_draw stdcall (#file_name_ed);
if (!itdir) element_size = file_info_general.sizelo;
else
{
WriteText(10,116, 0x90, 0x000000, PR_T_CONTAINS);
WriteText(10,116, 0x90, system.color.work_text, PR_T_CONTAINS);
sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
WriteText(120, 116, 0x90, 0x000000, #folder_info);
WriteText(120, 116, 0x90, system.color.work_text, #folder_info);
element_size = size_dir;
}
WriteTextLines(10, 136, 0x90, 0x000000, CREATED_OPENED_MODIFIED, 20);
DrawDate(120, 136, 0, #file_info_general.datecreate);
DrawDate(120, 156, 0, #file_info_general.datelastaccess);
DrawDate(120, 176, 0, #file_info_general.datelastedit);
WriteTextLines(10, 136, 0x90, system.color.work_text, CREATED_OPENED_MODIFIED, 20);
DrawDate(120, 136, system.color.work, #file_info_general.datecreate);
DrawDate(120, 156, system.color.work, #file_info_general.datelastaccess);
DrawDate(120, 176, system.color.work, #file_info_general.datelastedit);
sprintf(#element_size_label,"%s (%d %s)",ConvertSize(element_size),element_size,SET_BYTE_LANG);
WriteText(120, 99, 0x90, 0x000000, #element_size_label);
WriteText(120, 99, 0x90, system.color.work_text, #element_size_label);
}
flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2;
flags_frame.font_color = system.color.work_text;
422,7 → 422,7
}
else
{
WriteText(10, 78, 0x90, 0x000000, "EXIF");
WriteText(10, 78, 0x90, system.color.work_text, "EXIF");
}
}
 
/programs/cmm/eolite/include/settings.h
34,7 → 34,7
 
dword set_mouse_dd;
char path_start[4096]="\0";
edit_box path_start_ed = {230,50,57,0xffffff,0x94AECE,0xffffff,0xffffff,2,4098,#path_start,#set_mouse_dd, 100000000000010b,0,0};
edit_box path_start_ed = {290,50,57,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,4098,#path_start,#set_mouse_dd, 100000000000010b,0,0};
 
void settings_dialog()
{
91,7 → 91,7
break;
case evReDraw:
DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 357+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 370+skin_height,0x34,system.color.work,TITLE_SETT);
DrawSettingsCheckBoxes();
}
}
108,7 → 108,7
void DrawSettingsCheckBoxes()
{
incn y;
int x=11;
int x=11, but_x;
y.n = 0;
CheckBox(x, y.inc(14), 20, SHOW_DEVICE_CLASS, show_dev_name);
CheckBox(x, y.inc(25), 21, SHOW_REAL_NAMES, real_files_names_case);
122,9 → 122,9
path_start_ed.top = y.inc(23);
path_start_ed.left = x;
DrawEditBox(#path_start_ed);
DrawFlatButton(x-1, y.inc(26), strlen(SAVE_PATH_AS_DEFAULT)+3*8, 24, 6, SAVE_PATH_AS_DEFAULT);
DrawFlatButton(x-1+strlen(SAVE_PATH_AS_DEFAULT)+3*8, y.inc(0), strlen(SAVE_START_PATH_AS_DEFAULT)+3*8, 24, 7, SAVE_START_PATH_AS_DEFAULT);
DrawFlatButton(x-1, y.inc(36), strlen(EDIT_FILE_ASSOCIATIONS)+3*8, 24, 5, EDIT_FILE_ASSOCIATIONS);
but_x = DrawFlatButton(x-1, y.inc(34), 6, SAVE_PATH_AS_DEFAULT);
DrawFlatButton(x-1+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT);
DrawFlatButton(x-1, y.inc(38), 5, EDIT_FILE_ASSOCIATIONS);
}
 
 
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.71"
#define ABOUT_TITLE "EOLITE 3.71"
#define TITLE "Eolite File Manager v3.72"
#define ABOUT_TITLE "EOLITE 3.72"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"