CMM: use big fonts, fix several issues
git-svn-id: svn://kolibrios.org@6678 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency)
parent
1a8eec51d6
commit
b33939e2fb
@ -44,7 +44,7 @@ char rmb_menu[] =
|
||||
Žç¨áâ¨âì ªíè ª à⨮ª
|
||||
Œ¥¥¤¦¥à § £à㧮ª";
|
||||
#else
|
||||
char version[]=" Text-based Browser 1.48";
|
||||
char version[]=" Text-based Browser 1.49";
|
||||
?define IMAGES_CACHE_CLEARED "Images cache cleared"
|
||||
?define T_LAST_SLIDE "This slide is the last"
|
||||
char loading[] = "Loading...<br>";
|
||||
|
||||
@ -21,7 +21,7 @@ proc_info DL_Form;
|
||||
char downloader_edit[10000];
|
||||
char filepath[4096];
|
||||
int mouse_twbi;
|
||||
edit_box ed = {250,20,20,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(downloader_edit),#downloader_edit,#mouse_twbi,2,19,19};
|
||||
edit_box ed = {250,20,20,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,sizeof(downloader_edit),#downloader_edit,#mouse_twbi,2,19,19};
|
||||
progress_bar pb = {0, 170, 51, 225, 12, 0, 0, 100, 0xFFFfff, 0x74DA00, 0x9F9F9F};
|
||||
|
||||
byte downloader_opened;
|
||||
@ -65,7 +65,7 @@ void Downloader()
|
||||
|
||||
case evReDraw:
|
||||
system.color.get();
|
||||
DefineAndDrawWindow(215, 100, 420, 120, 0x74, system.color.work, DL_WINDOW_HEADER, 0);
|
||||
DefineAndDrawWindow(215, 100, 580, 120, 0x74, system.color.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);
|
||||
@ -121,26 +121,27 @@ void Key_Scan(int id)
|
||||
|
||||
void DL_Draw_Window()
|
||||
{
|
||||
byte cleft = 15;
|
||||
int cleft = 15;
|
||||
int but_x;
|
||||
DrawBar(0,0, DL_Form.cwidth, DL_Form.cheight, system.color.work);
|
||||
DeleteButton(305);
|
||||
DeleteButton(306);
|
||||
if (downloader.state == STATE_NOT_STARTED) || (downloader.state == STATE_COMPLETED)
|
||||
{
|
||||
DrawCaptButton(cleft, 50, 140, 27, 301, system.color.work_button, system.color.work_button_text, START_DOWNLOADING);
|
||||
but_x = cleft + DrawStandartCaptButton(cleft, 55, 301, START_DOWNLOADING);
|
||||
}
|
||||
if (downloader.state == STATE_IN_PROGRESS)
|
||||
{
|
||||
DrawCaptButton(cleft, 50, 140, 27, 302, system.color.work_button, system.color.work_button_text, STOP_DOWNLOADING);
|
||||
DrawStandartCaptButton(cleft, 55, 302, STOP_DOWNLOADING);
|
||||
DrawDownloading();
|
||||
}
|
||||
if (downloader.state == STATE_COMPLETED)
|
||||
if (filepath[0])
|
||||
{
|
||||
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, system.color.work_button, system.color.work_button_text, OPEN_FILE_TEXT);
|
||||
but_x += DrawStandartCaptButton(but_x, 55, 305, SHOW_IN_FOLDER);
|
||||
DrawStandartCaptButton(but_x, 55, 306, OPEN_FILE_TEXT);
|
||||
}
|
||||
WriteText(cleft, ed.top + 4, 0x80, system.color.work_text, "URL:");
|
||||
ed.left = strlen("URL:")*6 + 10 + cleft;
|
||||
WriteText(cleft, ed.top + 4, 0x90, system.color.work_text, "URL:");
|
||||
ed.left = strlen("URL:")*8 + 10 + cleft;
|
||||
ed.width = DL_Form.cwidth - ed.left - cleft - 3;
|
||||
ed.offset=0;
|
||||
//edit_box_draw stdcall(#ed);
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset='dos'>
|
||||
<title>Homepage</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
proc_info Form;
|
||||
char edword[256], search_word[256], translate_result[4096];
|
||||
#define TOPH 44
|
||||
#define TOPH 45
|
||||
|
||||
#define TEXT_ENG_RUS "ENG\26RUS"
|
||||
#define TEXT_RUS_ENG "RUS\26ENG"
|
||||
@ -35,7 +35,7 @@ char edword[256], search_word[256], translate_result[4096];
|
||||
int active_dict=2;
|
||||
|
||||
int mouse_dd;
|
||||
edit_box edit1= {200,16,16,0xffffff,0x94AECE,0xffffff,0x94AECE,0,248,#edword,#mouse_dd,100000000000010b};
|
||||
edit_box edit1= {200,13,13,0xffffff,0x94AECE,0xffffff,0x94AECE,0x10000000,248,#edword,#mouse_dd,100000000000010b};
|
||||
|
||||
|
||||
void main()
|
||||
@ -84,9 +84,9 @@ void main()
|
||||
DrawBar(0, TOPH, Form.width-9, 1, system.color.work_graph);
|
||||
edit1.width=Form.width-edit1.left-edit1.left-9 - 116;
|
||||
edit_box_draw stdcall(#edit1);
|
||||
DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 19, 2, 0xffffff);
|
||||
DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 20, system.color.work_graph);
|
||||
WriteText(Form.width-120, edit1.top, 0x90, system.color.work_text, TEXT_VOCABULARIES);
|
||||
DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 25, 2, 0xffffff);
|
||||
DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 26, system.color.work_graph);
|
||||
WriteText(Form.width-120, edit1.top+3, 0x90, system.color.work_text, TEXT_VOCABULARIES);
|
||||
DrawTranslation();
|
||||
DrawLangButtons();
|
||||
}
|
||||
@ -97,9 +97,9 @@ void main()
|
||||
void DrawLangButtons()
|
||||
{
|
||||
dword direction;
|
||||
DefineButton(Form.width-88, edit1.top-4, 20, 20, BUTTON_CHANGE_LANGUAGE, system.color.work_button);
|
||||
DefineButton(Form.width-88, edit1.top-4+3, 20, 20, BUTTON_CHANGE_LANGUAGE, system.color.work_button);
|
||||
if (active_dict == ENG_RUS) direction = "\26"; else direction = "\27";
|
||||
WriteText(Form.width-82, edit1.top-1, 10000001b, system.color.work_button_text, direction);
|
||||
WriteText(Form.width-82, edit1.top-1+3, 10000001b, system.color.work_button_text, direction);
|
||||
}
|
||||
|
||||
void Translate()
|
||||
@ -161,7 +161,8 @@ void DrawTranslation()
|
||||
strttl(#draw_buf);
|
||||
WriteTextB(10+1, y_pos+8, 10000001b, 0x800080, #search_word);
|
||||
|
||||
DrawTextViewArea(10, y_pos+31, Form.cwidth-20, Form.cheight-30, 15,
|
||||
debugln(#draw_buf);
|
||||
DrawTextViewArea(10, y_pos+31, Form.cwidth-20, Form.cheight-30,
|
||||
#draw_buf, -1, 0x000000);
|
||||
}
|
||||
|
||||
|
||||
@ -107,7 +107,7 @@ bool show_dev_name=true,
|
||||
#define STATUS_BAR_H 16;
|
||||
int status_bar_h = 0;
|
||||
|
||||
edit_box new_file_ed = {171,213,180,0xFFFFFF,0x94AECE,0xFFFFFF,0xFFFFFF,0,248,#new_element_name,#mouse_dd,100000000000010b,6,0};
|
||||
edit_box new_file_ed = {200,213,180,0xFFFFFF,0x94AECE,0xFFFFFF,0xFFFFFF,0x10000000,248,#new_element_name,#mouse_dd,100000000000010b,6,0};
|
||||
PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
|
||||
byte cmd_free=0;
|
||||
#include "include\translations.h"
|
||||
@ -555,11 +555,11 @@ void draw_window()
|
||||
void DrawList()
|
||||
{
|
||||
word sorting_arrow_x;
|
||||
DrawFlatButton(files.x, files.y-17, files.w - 141,16,31,T_FILE);
|
||||
DrawFlatButton(files.x + files.w - 141, files.y-17,73,16,32,T_TYPE);
|
||||
DrawFlatButton(files.x + files.w - 68, files.y-17,68,16,33,T_SIZE);
|
||||
DrawFlatButton(files.x + files.w, files.y-17,16,16, 0,"\x18");
|
||||
DrawFlatButton(files.x + files.w,files.y+files.h-16,16,16,0,"\x19");
|
||||
DrawFlatButtonSmall(files.x, files.y-17, files.w - 141,16,31,T_FILE);
|
||||
DrawFlatButtonSmall(files.x + files.w - 141, files.y-17,73,16,32,T_TYPE);
|
||||
DrawFlatButtonSmall(files.x + files.w - 68, files.y-17,68,16,33,T_SIZE);
|
||||
DrawFlatButtonSmall(files.x + files.w, files.y-17,16,16, 0,"\x18");
|
||||
DrawFlatButtonSmall(files.x + files.w,files.y+files.h-16,16,16,0,"\x19");
|
||||
if (sort_num==1) sorting_arrow_x = files.w - 141 / 2 + files.x + 18;
|
||||
if (sort_num==2) sorting_arrow_x = files.x + files.w - 90;
|
||||
if (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
|
||||
@ -1007,7 +1007,7 @@ void NewElement_Form(byte crt, dword strng)
|
||||
}
|
||||
if (new_element_active==3) DrawEolitePopup(T_RENAME, T_CANCEL);
|
||||
else DrawEolitePopup(T_CREATE, T_CANCEL);
|
||||
new_file_ed.left = dform_x+24;
|
||||
new_file_ed.left = dform_x+10;
|
||||
DrawEditBox(#new_file_ed);
|
||||
}
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ void about_dialog()
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,20 +42,31 @@ void Scroll() {
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@ -67,17 +78,12 @@ void DrawFilledBar(dword x, y, w, h)
|
||||
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);
|
||||
}
|
||||
@ -157,8 +157,8 @@ void ShowConfirmQuestionPopin()
|
||||
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 @@ void DrawPropertiesWindow()
|
||||
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 @@ void DrawPropertiesWindow()
|
||||
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 @@ void DrawPropertiesWindow()
|
||||
}
|
||||
else
|
||||
{
|
||||
WriteText(10, 78, 0x90, 0x000000, "EXIF");
|
||||
WriteText(10, 78, 0x90, system.color.work_text, "EXIF");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ int WinX, WinY, WinW, WinH;
|
||||
|
||||
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 @@ void settings_dialog()
|
||||
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 ExitSettings()
|
||||
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 @@ void DrawSettingsCheckBoxes()
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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 "” ©«"
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
int padding_h = 15;
|
||||
int right_margin = 12;
|
||||
int tx = x + padding_h;
|
||||
int ty = y + padding_v;
|
||||
int ty = y + padding_v+1;
|
||||
int h = padding_v + padding_v + 16; //16 font height
|
||||
int w = strlen(text)*8 + padding_h + padding_h;
|
||||
|
||||
@ -170,12 +170,12 @@
|
||||
y = ESI.edit_box.top;
|
||||
w = ESI.edit_box.width+1;
|
||||
if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff;
|
||||
h = 15;
|
||||
edit_box_draw stdcall (edit_box_pointer);
|
||||
h = ESI.edit_box.ed_height+2;
|
||||
DrawRectangle(x-1, y-1, w+1, h+1, bg);
|
||||
DrawRectangle3D(x-2, y-2, w+3, h+3, 0xDDDddd, bg);
|
||||
DrawRectangle(x-3, y-3, w+5, h+5, system.color.work_graph);
|
||||
DrawRectangle3D(x-4, y-4, w+7, h+7, system.color.work_dark, system.color.work_light);
|
||||
edit_box_draw stdcall (edit_box_pointer);
|
||||
}
|
||||
|
||||
:void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent)
|
||||
|
||||
@ -163,7 +163,9 @@ dword width,
|
||||
cl_curs_x,
|
||||
cl_curs_y,
|
||||
shift,
|
||||
shift_old;
|
||||
shift_old,
|
||||
ed_height,
|
||||
ed_char_width;
|
||||
};
|
||||
|
||||
struct checkbox2
|
||||
|
||||
@ -9,8 +9,8 @@ int panel_x, panel_y;
|
||||
int mouse_dd;
|
||||
unsigned char email_text[128];
|
||||
unsigned char pass_text[32];
|
||||
edit_box login_box= {PANEL_W-6,207,16,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(email_text)+2,#email_text,#mouse_dd,0b10};
|
||||
edit_box pass_box= {PANEL_W-6,207,16,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(pass_text)+2,#pass_text,#mouse_dd,0b1};
|
||||
edit_box login_box= {PANEL_W-6,207,16,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,sizeof(email_text)+2,#email_text,#mouse_dd,0b10};
|
||||
edit_box pass_box= {PANEL_W-6,207,16,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,sizeof(pass_text)+2,#pass_text,#mouse_dd,0b1};
|
||||
|
||||
|
||||
void LoginNetworkProcess()
|
||||
@ -180,22 +180,22 @@ void DrawLoginScreen()
|
||||
|
||||
DrawBar(0,0, Form.cwidth, Form.cheight, system.color.work);
|
||||
|
||||
WriteText(panel_x,panel_y,0x80,system.color.work_text,"Your Email:");
|
||||
WriteText(panel_x,panel_y-3,0x80,system.color.work_text,"Your Email:");
|
||||
login_box.left = panel_x+3;
|
||||
login_box.top = panel_y+15;
|
||||
login_box.top = panel_y+12;
|
||||
DrawEditBox(#login_box);
|
||||
|
||||
WriteText(panel_x,panel_y+40,0x80,system.color.work_text,"Password:");
|
||||
WriteText(panel_x,panel_y+45,0x80,system.color.work_text,"Password:");
|
||||
pass_box.left = panel_x+3;
|
||||
pass_box.top = panel_y+55;
|
||||
pass_box.top = panel_y+60;
|
||||
DrawEditBox(#pass_box);
|
||||
|
||||
if (!aim)
|
||||
{
|
||||
DrawCaptButton(panel_x,panel_y+90,100,22,11,system.color.work_button, system.color.work_button_text,"Settings");
|
||||
DrawCaptButton(panel_x+120,panel_y+90,100,22,12,system.color.work_button, system.color.work_button_text,"Enter >");
|
||||
DrawCaptButton(panel_x,panel_y+100,100,26,11,system.color.work_button, system.color.work_button_text,"Settings");
|
||||
DrawCaptButton(panel_x+120,panel_y+100,100,26,12,system.color.work_button, system.color.work_button_text,"Enter >");
|
||||
}
|
||||
else DrawCaptButton(panel_x+120,panel_y+90,100,22,12,system.color.work_button, system.color.work_button_text,"Stop");
|
||||
else DrawCaptButton(panel_x+120,panel_y+100,100,26,12,system.color.work_button, system.color.work_button_text,"Stop");
|
||||
|
||||
SetLoginStatus(cur_st_text);
|
||||
}
|
||||
|
||||
@ -11,10 +11,10 @@ unsigned char POP_server1[128]="pop.server.com";
|
||||
unsigned char POP_server_port1[5]="110";
|
||||
unsigned char SMTP_server1[128]="smtp.server.com";
|
||||
unsigned char SMTP_server_port1[5]="25";
|
||||
edit_box POP_server_box = {210,230,125 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b};
|
||||
edit_box POP_server_port_box = {210,230,160,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#POP_server_port1,#mouse_opt,100000000000b};
|
||||
edit_box SMTP_server_box = {210,230,195,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b};
|
||||
edit_box SMTP_server_port_box = {210,230,230,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#SMTP_server_port1,#mouse_opt,100000000000b};
|
||||
edit_box POP_server_box = {210,230,125 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0x10000000,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b};
|
||||
edit_box POP_server_port_box = {210,230,160,0xffffff,0x94AECE,0xffc90E,0xCACACA,0x10000000,5,#POP_server_port1,#mouse_opt,100000000000b};
|
||||
edit_box SMTP_server_box = {210,230,195,0xffffff,0x94AECE,0xffc90E,0xCACACA,0x10000000,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b};
|
||||
edit_box SMTP_server_port_box = {210,230,230,0xffffff,0x94AECE,0xffc90E,0xCACACA,0x10000000,5,#SMTP_server_port1,#mouse_opt,100000000000b};
|
||||
|
||||
|
||||
void SettingsDialog()
|
||||
@ -107,7 +107,7 @@ void OptionsWindow()
|
||||
CheckBox(ELEM_X, y.inc(35), 17, "Use custom settings", checked[0]);
|
||||
CheckBox(ELEM_X, y.inc(30), 18, "Manual configuration", checked[1]);
|
||||
EDI = system.color.work;
|
||||
for (i=0; i<4; i++) WriteText(ELEM_X+40, i*35+POP_server_box.top, 0xD0, system.color.work_text, text1[i]);
|
||||
for (i=0; i<4; i++) WriteText(ELEM_X+40, i*35+POP_server_box.top + 3, 0xD0, system.color.work_text, text1[i]);
|
||||
DrawEditBox(#POP_server_box);
|
||||
DrawEditBox(#POP_server_port_box);
|
||||
DrawEditBox(#SMTP_server_box);
|
||||
|
||||
@ -6,12 +6,8 @@
|
||||
#include "..\lib\obj\box_lib.h"
|
||||
|
||||
#ifdef LANG_RUS
|
||||
unsigned char *but_text[]={
|
||||
"„®¡ ¢¨âì ¤¨áª [Ins]",
|
||||
"“¤ «¨âì ¤¨áª [Del]",
|
||||
"„®¡ ¢¨âì [Ctrl+Enter]",
|
||||
0};
|
||||
|
||||
?define T_ADD_DISK " „®¡ ¢¨âì ¤¨áª [Ins]"
|
||||
?define T_DELETE_DISK " “¤ «¨âì ¤¨áª [Del]"
|
||||
?define INTRO_TEXT_1 "‡¤¥áì ¡ã¤¥â ®â®¡à ¦ âìáï ᯨ᮪"
|
||||
?define INTRO_TEXT_2 "¢¨àâã «ìëå ¤¨áª®¢ ¢ á¨á⥬¥."
|
||||
?define INTRO_TEXT_3 "<EFBFBD>®¯à®¡ã©â¥ ¤®¡ ¢¨âì ®¤¨..."
|
||||
@ -21,12 +17,8 @@
|
||||
?define FREE_RAM_TEXT "<EFBFBD> §¬¥à ᢮¡®¤®© ®¯¥à ⨢®© ¯ ¬ïâ¨: "
|
||||
|
||||
#else
|
||||
unsigned char *but_text[]={
|
||||
"Add disk [Ins]",
|
||||
"Delete disk [Del]",
|
||||
"Add [Ctrl+Enter]",
|
||||
0};
|
||||
|
||||
?define T_ADD_DISK " Add disk [Ins]"
|
||||
?define T_DELETE_DISK " Delete disk [Del]"
|
||||
?define INTRO_TEXT_1 " There will be list of mounted"
|
||||
?define INTRO_TEXT_2 " virtual disks."
|
||||
?define INTRO_TEXT_3 " Try to add one..."
|
||||
@ -46,19 +38,18 @@ char selected;
|
||||
proc_info Form;
|
||||
|
||||
unsigned char icons[] = FROM "icons.raw";
|
||||
#define TOPPANELH 54
|
||||
#define BOTPANELH 20
|
||||
#define TOPPANELH 68
|
||||
#define BOTPANELH 26
|
||||
|
||||
int mouse_dd;
|
||||
char new_disk_size[5];
|
||||
edit_box edit_disk_size= {50,0,7,0xffffff,0x94AECE,0xFFFfff,0xffffff,0,4,#new_disk_size,#mouse_dd, 1000000000000010b};
|
||||
edit_box edit_disk_size= {50,0,7,0xffffff,0x94AECE,0xFFFfff,0xffffff,0x10000000,4,#new_disk_size,#mouse_dd, 1000000000000010b};
|
||||
|
||||
void Main_Window()
|
||||
{
|
||||
word id;
|
||||
int i, x;
|
||||
int x;
|
||||
|
||||
mem_Init();
|
||||
load_dll(boxlib, #box_lib_init,0);
|
||||
GetSizeDisk();
|
||||
edit_disk_size.left = strlen(SIZE_TEXT)*9 + 10;
|
||||
@ -144,21 +135,20 @@ void Main_Window()
|
||||
break;
|
||||
case evReDraw:
|
||||
system.color.get();
|
||||
DefineAndDrawWindow(170,150,314,270,0x74,system.color.work,"Virtual Disk Manager 0.65",0);
|
||||
DefineAndDrawWindow(170,150,405,290,0x74,system.color.work,"Virtual Disk Manager 0.66",0);
|
||||
GetProcessInfo(#Form, SelfInfo);
|
||||
if (Form.status_window>2) break;
|
||||
|
||||
DrawBar(0,0, Form.cwidth,TOPPANELH, system.color.work);
|
||||
DrawBar(0,TOPPANELH, Form.cwidth,1, system.color.work_graph);
|
||||
WriteText(6, 6, 0x90, system.color.work_text, SIZE_TEXT);
|
||||
WriteText(edit_disk_size.left + edit_disk_size.width + 12, 6, 0x90, system.color.work_text, "MB.");
|
||||
WriteText(6, 9, 0x90, system.color.work_text, SIZE_TEXT);
|
||||
WriteText(edit_disk_size.left + edit_disk_size.width + 12, 9, 0x90, system.color.work_text, "MB.");
|
||||
DrawEditBox(#edit_disk_size);
|
||||
for (i=0, x=6; i<2; i++, x+=strlen(but_text[i])*6+37)
|
||||
{
|
||||
DefineButton(x,29, strlen(but_text[i])*6+28,19, 10+i, system.color.work_button);
|
||||
_PutImage(x+3,32, 14,14, i*14*14*3+#icons);
|
||||
WriteText(x+22,35, 0x80, system.color.work_button_text, but_text[i]);
|
||||
}
|
||||
x = 6;
|
||||
x = 6 + DrawStandartCaptButton(6, 36, 10, T_ADD_DISK);
|
||||
DrawStandartCaptButton(x, 36, 11, T_DELETE_DISK);
|
||||
_PutImage(6+6, 42, 14,14, #icons);
|
||||
_PutImage(x+6, 42, 14,14, 1*14*14*3+#icons);
|
||||
GetDisks();
|
||||
DrawTmpDisks();
|
||||
}
|
||||
@ -212,8 +202,8 @@ void GetDisks()
|
||||
}
|
||||
|
||||
|
||||
unsigned int disk_pos_x[]={13,13,13,85,85,85,157,157,157,229,229,229};
|
||||
unsigned int disk_pos_y[]={60,95,130, 60, 95, 130, 60, 95,130, 60, 85,130};
|
||||
unsigned int disk_pos_x[]={13,13,13,102,102,102,191,191,191,279,279,279};
|
||||
unsigned int disk_pos_y[]={79,127,175, 79,127,175, 79,127,175, 79,127,175};
|
||||
|
||||
void DrawTmpDisks()
|
||||
{
|
||||
@ -227,29 +217,27 @@ void DrawTmpDisks()
|
||||
DrawBar(0,TOPPANELH+1, Form.cwidth,Form.cheight-TOPPANELH-BOTPANELH-2, 0xFFFFFF);
|
||||
DrawBar(0,Form.cheight-BOTPANELH-1, Form.cwidth,1, system.color.work_graph);
|
||||
DrawBar(0,Form.cheight-BOTPANELH, Form.cwidth,BOTPANELH, system.color.work);
|
||||
strcpy(#free_ram_text, FREE_RAM_TEXT);
|
||||
strcat(#free_ram_text, itoa(FreeRAM));
|
||||
strcat(#free_ram_text, " MB");
|
||||
WriteText(10, Form.cheight-13, 0x80, system.color.work_text, #free_ram_text);
|
||||
sprintf(#free_ram_text, "%s%i MB", FREE_RAM_TEXT, FreeRAM);
|
||||
WriteText(10, Form.cheight-20, 0x90, system.color.work_text, #free_ram_text);
|
||||
if (disk_num==0)
|
||||
{
|
||||
WriteText(17,65, 0x90, 0x777777, INTRO_TEXT_1);
|
||||
WriteText(17,65+15, 0x90, 0x777777, INTRO_TEXT_2);
|
||||
WriteText(17,65+42, 0x90, 0x777777, INTRO_TEXT_3);
|
||||
WriteText(17,TOPPANELH+15, 0x90, 0x777777, INTRO_TEXT_1);
|
||||
WriteText(17,TOPPANELH+15+15, 0x90, 0x777777, INTRO_TEXT_2);
|
||||
WriteText(17,TOPPANELH+15+42, 0x90, 0x777777, INTRO_TEXT_3);
|
||||
return;
|
||||
};
|
||||
if (selected>=disk_num) selected=disk_num-1; //restore selected
|
||||
for (i=0; i<10; i++) DeleteButton(20+i);
|
||||
for (i=0; i<disk_num; i++)
|
||||
{
|
||||
DefineButton(disk_pos_x[i], disk_pos_y[i], 65, 30, 20+i, 0xFFFfff);
|
||||
WriteText(disk_pos_x[i]+25,disk_pos_y[i]+2, 10110000b, 0, #disk_list[i].Item);
|
||||
DefineButton(disk_pos_x[i], disk_pos_y[i], 80, 40, 20+i, 0xFFFfff);
|
||||
WriteText(disk_pos_x[i]+26,disk_pos_y[i]+6, 10110000b, 0x222222, #disk_list[i].Item);
|
||||
real_id = disk_list[i].Item[3] - '0';
|
||||
WriteText(disk_pos_x[i]+25,disk_pos_y[i]+19, 0x80, 0x888888, ConvertSize(disk_sizes[real_id]));
|
||||
_PutImage(disk_pos_x[i]+5,disk_pos_y[i]+4, 14,14, 2*14*14*3+#icons);
|
||||
WriteText(disk_pos_x[i]+27,disk_pos_y[i]+24, 0x80, 0x555555, ConvertSize(disk_sizes[real_id]));
|
||||
_PutImage(disk_pos_x[i]+6,disk_pos_y[i]+6, 14,14, 2*14*14*3+#icons);
|
||||
if (selected==i) {
|
||||
if ( !asm test edit_disk_size.flags, 2) selection_color = selection_active; else selection_color = selection_inactive;
|
||||
DrawWideRectangle(disk_pos_x[i], disk_pos_y[i], 65, 30, 2, selection_color);
|
||||
DrawWideRectangle(disk_pos_x[i], disk_pos_y[i], 80, 40, 2, selection_color);
|
||||
PutPixel(disk_pos_x[i], disk_pos_y[i], 0xFFFfff);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user