From a2a3d28523fba28c50427fc1ab5a5c8ab4195fe2 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 21 Feb 2016 21:57:22 +0000 Subject: [PATCH] Eolite: fix tricky issue with double click, big fonts in progress dialog; tones of minor fixes; git-svn-id: svn://kolibrios.org@6278 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/aelia/_compile.bat | 2 +- programs/cmm/app_plus/compile_en.bat | 2 +- programs/cmm/app_plus/compile_ru.bat | 2 +- programs/cmm/appearance/compile_en.bat | 2 +- programs/cmm/appearance/compile_ru.bat | 2 +- programs/cmm/browser/WebView.c | 10 +- programs/cmm/browser/compile_en.bat | 2 +- programs/cmm/browser/compile_ru.bat | 2 +- programs/cmm/browser/download_manager.h | 7 +- programs/cmm/dicty/compile_en.bat | 3 +- programs/cmm/dicty/compile_ru.bat | 5 +- programs/cmm/end/compile_en.bat | 2 +- programs/cmm/end/compile_ru.bat | 5 +- programs/cmm/eolite/Eolite.c | 200 +++++------------- programs/cmm/eolite/compile_en.bat | 2 +- programs/cmm/eolite/compile_ru.bat | 2 +- programs/cmm/eolite/include/about.h | 2 +- programs/cmm/eolite/include/delete.h | 90 ++++++++ programs/cmm/eolite/include/gui.h | 17 +- programs/cmm/eolite/include/icons.h | 6 +- programs/cmm/eolite/include/progress_dialog.h | 61 +++--- programs/cmm/eolite/include/properties.h | 26 +-- programs/cmm/eolite/include/settings.h | 2 +- programs/cmm/eolite/include/translations.h | 4 +- programs/cmm/kf_font_viewer/compile_en.bat | 2 +- programs/cmm/lib/copyf.h | 2 +- programs/cmm/lib/debug.h | 7 + programs/cmm/lib/gui.h | 18 +- .../cmm/liza/{compile.bat => compile_en.bat} | 3 +- programs/cmm/liza/login.c | 6 +- programs/cmm/liza/settings.c | 31 ++- programs/cmm/mouse_cfg/compile_en.bat | 2 +- programs/cmm/mouse_cfg/compile_ru.bat | 2 +- programs/cmm/mouse_cfg/mouse_cfg.c | 1 - programs/cmm/panels_cfg/compile_en.bat | 2 +- programs/cmm/panels_cfg/compile_ru.bat | 2 +- programs/cmm/pixie/compile_en.bat | 2 +- programs/cmm/textreader/compile.bat | 2 +- programs/cmm/tmpdisk/compile_en.bat | 2 +- programs/cmm/tmpdisk/compile_ru.bat | 2 +- programs/cmm/tmpdisk/t_console.c | 6 +- programs/cmm/tmpdisk/t_gui.c | 5 +- 42 files changed, 282 insertions(+), 273 deletions(-) create mode 100644 programs/cmm/eolite/include/delete.h rename programs/cmm/liza/{compile.bat => compile_en.bat} (66%) diff --git a/programs/cmm/aelia/_compile.bat b/programs/cmm/aelia/_compile.bat index d8f9d30424..d6a397af3b 100644 --- a/programs/cmm/aelia/_compile.bat +++ b/programs/cmm/aelia/_compile.bat @@ -1,4 +1,4 @@ -C-- "aelia.c" +@C-- "aelia.c" @del "aelia" @rename "aelia.com" "aelia" @del warning.txt diff --git a/programs/cmm/app_plus/compile_en.bat b/programs/cmm/app_plus/compile_en.bat index 3d04d83600..796beec49b 100644 --- a/programs/cmm/app_plus/compile_en.bat +++ b/programs/cmm/app_plus/compile_en.bat @@ -3,7 +3,7 @@ @del app_plus cls -c-- app_plus.c +@c-- app_plus.c @rename app_plus.com app_plus @del warning.txt @del lang.h-- diff --git a/programs/cmm/app_plus/compile_ru.bat b/programs/cmm/app_plus/compile_ru.bat index 769dda8ca2..cabb2df27e 100644 --- a/programs/cmm/app_plus/compile_ru.bat +++ b/programs/cmm/app_plus/compile_ru.bat @@ -3,7 +3,7 @@ @del app_plus cls -c-- app_plus.c +@c-- app_plus.c @rename app_plus.com app_plus @del warning.txt @del lang.h-- diff --git a/programs/cmm/appearance/compile_en.bat b/programs/cmm/appearance/compile_en.bat index 5a34205586..49d50ca716 100644 --- a/programs/cmm/appearance/compile_en.bat +++ b/programs/cmm/appearance/compile_en.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -C-- appearance.c +@C-- appearance.c @del appearance @rename appearance.com appearance @del warning.txt diff --git a/programs/cmm/appearance/compile_ru.bat b/programs/cmm/appearance/compile_ru.bat index b082f2491b..0d4d4df49c 100644 --- a/programs/cmm/appearance/compile_ru.bat +++ b/programs/cmm/appearance/compile_ru.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -C-- appearance.c +@C-- appearance.c @del appearance @rename appearance.com appearance @del warning.txt diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 1afb258663..8adddc72ac 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -237,7 +237,7 @@ void main() GetAbsoluteURL(#URL); history.back(); strcpy(#editURL, #URL); - DrawEditBox(); + DrawEditBoxWebView(); OpenPage(); } else @@ -290,7 +290,7 @@ void Draw_Window() img_draw stdcall(skin.image, Form.cwidth-22, address_box.top-3, 16, skin.h, 85, 0); DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg); DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color); - if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBox(); } + if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); } DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col); DrawProgress(); @@ -426,7 +426,7 @@ void OpenPage() SetPageDefaults(); if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.LoadInternalPage(#homepage, sizeof(homepage)); else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory(); - DrawEditBox(); + DrawEditBoxWebView(); return; } if (!strncmp(#URL,"http:",5)) @@ -458,7 +458,7 @@ void OpenPage() } } -DrawEditBox() +DrawEditBoxWebView() { DrawWideRectangle(address_box.left-2, address_box.top-2, address_box.width+3, 19, 2, address_box.color); address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#editURL); @@ -471,7 +471,7 @@ DrawEditBox() void ShowPage() { - DrawEditBox(); + DrawEditBoxWebView(); if (!bufsize) { if (http_transfer) WB1.LoadInternalPage(#loading, sizeof(loading)); diff --git a/programs/cmm/browser/compile_en.bat b/programs/cmm/browser/compile_en.bat index 1171726991..20e50b8c5a 100644 --- a/programs/cmm/browser/compile_en.bat +++ b/programs/cmm/browser/compile_en.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -c-- WebView.c +@c-- WebView.c @del WebView @rename WebView.com WebView @del warning.txt diff --git a/programs/cmm/browser/compile_ru.bat b/programs/cmm/browser/compile_ru.bat index ceae4f0280..666163c681 100644 --- a/programs/cmm/browser/compile_ru.bat +++ b/programs/cmm/browser/compile_ru.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -c-- WebView.c +@c-- WebView.c @del WebView @rename WebView.com WebView @del warning.txt diff --git a/programs/cmm/browser/download_manager.h b/programs/cmm/browser/download_manager.h index 34093761e8..5520a52987 100644 --- a/programs/cmm/browser/download_manager.h +++ b/programs/cmm/browser/download_manager.h @@ -128,9 +128,10 @@ void DL_Draw_Window() ed.left = strlen("URL:")*6 + 10 + cleft; ed.width = DL_Form.cwidth - ed.left - cleft - 3; ed.offset=0; - edit_box_draw stdcall(#ed); - DrawRectangle(ed.left-1, ed.top-1, ed.width+2, 16, ed.blur_border_color); - DrawRectangle(ed.left-2, ed.top-2, ed.width+4, 18, border_color); + //edit_box_draw stdcall(#ed); + DrawEditBox(#ed); + //DrawRectangle(ed.left-1, ed.top-1, ed.width+2, 16, ed.blur_border_color); + //DrawRectangle(ed.left-2, ed.top-2, ed.width+4, 18, border_color); } void StartDownloading() diff --git a/programs/cmm/dicty/compile_en.bat b/programs/cmm/dicty/compile_en.bat index bb7ba94a05..e0096c7a7c 100644 --- a/programs/cmm/dicty/compile_en.bat +++ b/programs/cmm/dicty/compile_en.bat @@ -6,5 +6,4 @@ C-- dicty.c @rename dicty.com dicty @del warning.txt @del lang.h-- -@pause -kpack dicty \ No newline at end of file +@pause \ No newline at end of file diff --git a/programs/cmm/dicty/compile_ru.bat b/programs/cmm/dicty/compile_ru.bat index d8096b41fb..8a706bd136 100644 --- a/programs/cmm/dicty/compile_ru.bat +++ b/programs/cmm/dicty/compile_ru.bat @@ -1,10 +1,9 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -C-- dicty.c +@C-- dicty.c @del dicty @rename dicty.com dicty @del warning.txt @del lang.h-- -@pause -kpack dicty \ No newline at end of file +@pause \ No newline at end of file diff --git a/programs/cmm/end/compile_en.bat b/programs/cmm/end/compile_en.bat index 2042e60989..b6f606d7b1 100644 --- a/programs/cmm/end/compile_en.bat +++ b/programs/cmm/end/compile_en.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -c-- end.c +@c-- end.c @del end @rename end.com end @del warning.txt diff --git a/programs/cmm/end/compile_ru.bat b/programs/cmm/end/compile_ru.bat index 0c52539668..0e3b710adb 100644 --- a/programs/cmm/end/compile_ru.bat +++ b/programs/cmm/end/compile_ru.bat @@ -1,10 +1,9 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -c-- end.c +@c-- end.c @del end @rename end.com end @del warning.txt @del lang.h-- -@pause -kpack end \ No newline at end of file +@pause \ No newline at end of file diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 6dbe99e0b7..ba134b76dd 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -1,4 +1,4 @@ -//Leency, Veliant, Punk_Joker & KolibriOS Team 2008-2015 +//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2016 //GNU GPL licence. #ifndef AUTOBUILD @@ -16,10 +16,8 @@ #include "..\lib\random.h" #include "..\lib\font.h" #include "..\lib\collection.h" -//obj #include "..\lib\obj\libini.h" #include "..\lib\obj\box_lib.h" -//patterns #include "..\lib\patterns\history.h" //images @@ -27,8 +25,25 @@ #include "imgs\left_p.txt" #include "imgs\icons.txt" -enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -enum {CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement +//Button IDs +enum { + POPUP_BTN1 = 201, + POPUP_BTN2 = 202 +}; + +//NewElement options +enum { + CREATE_FILE=1, + CREATE_FOLDER, + RENAME_ITEM +}; + +//OpenDir options +enum { + ONLY_SHOW, + WITH_REDRAW, + ONLY_OPEN +}; dword col_padding, col_selec, col_lpanel, col_work, col_graph; @@ -104,6 +119,7 @@ char *fd_path_eolite_ini_path; #include "include\icons.h" #include "include\left_panel.h" #include "include\menu.h" +#include "include\delete.h" #include "include\about.h" #include "include\properties.h" @@ -193,33 +209,19 @@ void main() } if (files.MouseOver(mouse.x, mouse.y)) { - //open - if (mouse.key&MOUSE_LEFT)&&(mouse.dblclick) - { - if (mouse.y - files.y / files.item_h + files.first < files.count) - { - files.ProcessMouse(mouse.x, mouse.y); - List_ReDraw(); - Open(0); - } - } //select file - else if (mouse.key&MOUSE_LEFT)&&((mouse.down) + if (mouse.key&MOUSE_LEFT) && (mouse.up) { if (files.ProcessMouse(mouse.x, mouse.y)) List_ReDraw(); + else if (mouse.dblclick)) Open(0); } //file menu - else if (mouse.key&MOUSE_RIGHT)&&(mouse.up) + if (mouse.key&MOUSE_RIGHT) { menu_call_mouse = 1; - - if (files.MouseOver(mouse.x, mouse.y)) - { - files.cur_y = mouse.y - files.y / files.item_h + files.first; - List_ReDraw(); - menu_stak = malloc(4096); - CreateThread(#FileMenu,menu_stak+4092); - } + if (files.ProcessMouse(mouse.x, mouse.y)) List_ReDraw(); + menu_stak = malloc(4096); + CreateThread(#FileMenu,menu_stak+4092); break; } } @@ -293,26 +295,13 @@ void main() break; //Button pressed----------------------------------------------------------------------------- case evButton: - id=GetButtonID(); - if (id==1) - { - KillProcess(about_window); - SaveIniSettings(); - ExitProcess(); - } - if (del_active) - { - if (id==301) || (id==302) Del_File(302-id); - break; - } - if (new_element_active) - { - if (id==301) || (id==302) NewElement(302-id); - break; - } - + id=GetButtonID(); switch(id) { + case 01: + KillProcess(about_window); + SaveIniSettings(); + ExitProcess(); case 21: //Back GoBack(); break; @@ -347,6 +336,13 @@ void main() case 100...120: SystemDiscs.Click(id-100); break; + case POPUP_BTN1: + case POPUP_BTN2: + if (del_active) Del_File(id-POPUP_BTN2); + if (new_element_active) NewElement(id-POPUP_BTN2); + DeleteButton(POPUP_BTN1); + DeleteButton(POPUP_BTN2); + break; } break; //Key pressed----------------------------------------------------------------------------- @@ -411,7 +407,7 @@ void main() case 050: //Ctrl+M Open_Dir(#inactive_path,WITH_REDRAW); break; - case 028: //Ctrl+Enter + case SCAN_CODE_ENTER: //Ctrl+Enter if (!itdir) ShowOpenWithDialog(); else Open(1); break; @@ -683,15 +679,18 @@ void Line_ReDraw(dword bgcol, filenum){ if (! TestBit(attr, 4) ) //file or folder? { ext1 = strrchr(file_name_off,'.') + file_name_off; - if (ext1==file_name_off) ext1 = " \0"; //if no extension then show nothing - Put_icon(ext1, files.x+3, files.item_h/2-7+y, bgcol, 0); - WriteText(7-strlen(ConvertSize(file.sizelo))*6+files.x+files.w - 58, files.text_y + y +1,files.font_type,0,ConvertSize(file.sizelo)); + if (ext1==file_name_off) ext1 = NULL; //if no extension then show nothing + WriteText(7-strlen(ConvertSize(file.sizelo))*6+files.x+files.w - 58, files.text_y+y+1, files.font_type, 0, ConvertSize(file.sizelo)); + if (ext1) && (strlen(ext1)<9) WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1); } else { - if (!strncmp(file_name_off,"..",3)) ext1=".."; else ext1=""; - Put_icon(ext1, files.x+3, files.item_h/2-7+y, bgcol, 0); + if (!strncmp(file_name_off,"..",3)) ext1=".."; else { + ext1=""; + WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1); + } } + DrawIconByExtension(ext1, files.x+3, files.item_h/2-7+y, bgcol); if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=0xA6A6B7; //system or hiden? if (bgcol!=0xFFFfff) @@ -814,7 +813,7 @@ inline Sorting() void Del_Form() { dword selected_offset2; - int cont = 0; + int selected_count = 0; byte f_count[128]; int dform_x = files.w - 220 / 2 + files.x; if (!strncmp(#file_name,".",2)) || (!strncmp(#file_name,"..",2)) return; @@ -826,11 +825,11 @@ void Del_Form() for (i=0; i", 18, 19, 0xFFFfff, 0); + DrawIconByExtension("", 18, 19, 0xFFFfff); else - Put_icon(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff, 0); + DrawIconByExtension(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff); WriteText(50, 13, 0x80, 0x000000, PR_T_NAME); edit_box_draw stdcall (#file_name_ed); @@ -367,6 +368,7 @@ void DrawPropertiesWindow() flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2; flags_frame.font_color = system.color.work_text; flags_frame.ext_col = system.color.work_graph; + flags_frame.font_backgr_color = system.color.work; frame_draw stdcall (#flags_frame); DrawPropertiesCheckBoxes(); } diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index eccbe3041e..214b51462b 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -14,7 +14,7 @@ ?define EDIT_FILE_ASSOCIATIONS "Edit file associations" ?define TITLE_SETT "Settings" ?define SHOW_DEVICE_CLASS "Show device class name" - ?define SHOW_REAL_NAMES "Show real file names without changing case" + ?define SHOW_REAL_NAMES "Show file names in original case" ?define FONT_SIZE_LABEL "Font size" ?define USE_TWO_PANELS "Two panels" ?define smooth_FONT "Use smooth font" diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index f637c71c46..dd85b72c7e 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.4" -#define ABOUT_TITLE "EOLITE 3.4" +#define TITLE "Eolite File Manager v3.43" +#define ABOUT_TITLE "EOLITE 3.43" #ifdef LANG_RUS ?define T_FILE "Файл" diff --git a/programs/cmm/kf_font_viewer/compile_en.bat b/programs/cmm/kf_font_viewer/compile_en.bat index 8201eb2113..38a9b64a72 100644 --- a/programs/cmm/kf_font_viewer/compile_en.bat +++ b/programs/cmm/kf_font_viewer/compile_en.bat @@ -1,4 +1,4 @@ -C-- "font_viewer.c" +@C-- "font_viewer.c" @del "font_viewer" @rename "font_viewer.com" "font_viewer" @del warning.txt diff --git a/programs/cmm/lib/copyf.h b/programs/cmm/lib/copyf.h index 8962fbaa09..5280aa6b2a 100644 --- a/programs/cmm/lib/copyf.h +++ b/programs/cmm/lib/copyf.h @@ -92,7 +92,7 @@ } else { - Operation_Draw_Progress(filename); + Operation_Draw_Progress(filename+strchr(filename, '/')); if (error=CopyFile(#copy_from2, #copy_in2)) { if (fabs(error)==8) { debugln("Stop copying."); break;} //TODO: may be need grobal var like stop_all diff --git a/programs/cmm/lib/debug.h b/programs/cmm/lib/debug.h index 01a308fea7..e67bc8268a 100644 --- a/programs/cmm/lib/debug.h +++ b/programs/cmm/lib/debug.h @@ -51,6 +51,13 @@ inline void debugi(dword d_int) debugln(#tmpch); } +:void debugval(dword text,number) +{ + debug(text); + debug(": "); + debugi(number); +} + :void assert(dword _type, _actual, _expected) { char r[4096]; diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 2e917c2239..18deb872ad 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -107,7 +107,8 @@ { byte w=14, h=14; DefineButton(x-1, y-1, strlen(text)*8 + w + 17, h+2, bt_id+BT_HIDE+BT_NOFRAME, 0); - WriteText(x+w+8, h / 2 + y -7, 0x90, system.color.work_text, text); + EDI = system.color.work; + WriteText(x+w+8, h / 2 + y -7, 0xD0, system.color.work_text, text); DrawRectangle(x, y, w, h, system.color.work_graph); if (is_checked == 0) { @@ -136,26 +137,29 @@ DrawRectangle(x, y, VALUE_FIELD_W, SIZE, system.color.work_graph); DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xDDDddd, 0xffffff); DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xffffff); - WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, 0x000000, value_text); + WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, system.color.work_text, value_text); DrawCaptButton(VALUE_FIELD_W + x, y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+"); DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-"); - WriteText(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -7, 0x90, system.color.work_text, text); + EDI = system.color.work; + WriteText(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -7, 0xD0, system.color.work_text, text); DrawRectangle3D(x-1,y-1,VALUE_FIELD_W+SIZE+SIZE+2,SIZE+2,system.color.work_dark,system.color.work_light); } -:void EditBox(dword edit_box_pointer) +:void DrawEditBox(dword edit_box_pointer) { - dword x,y,w,h; + dword x,y,w,h,bg; ESI = edit_box_pointer; x = ESI.edit_box.left; y = ESI.edit_box.top; w = ESI.edit_box.width+1; + if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff; h = 15; - DrawRectangle(x-1, y-1, w+2, h+2, 0xFFFfff); - DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, 0xffffff); + DrawRectangle(x-1, y-1, w+2, h+2, bg); + DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, bg); DrawRectangle(x-3, y-3, w+6, h+6, system.color.work_graph); DrawRectangle3D(x-4, y-4, w+8, h+8, 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) diff --git a/programs/cmm/liza/compile.bat b/programs/cmm/liza/compile_en.bat similarity index 66% rename from programs/cmm/liza/compile.bat rename to programs/cmm/liza/compile_en.bat index 88971448f7..64b5417d11 100644 --- a/programs/cmm/liza/compile.bat +++ b/programs/cmm/liza/compile_en.bat @@ -1,6 +1,5 @@ -C-- liza.c +@C-- liza.c @del liza @rename liza.com liza -@kpack liza @del warning.txt @pause \ No newline at end of file diff --git a/programs/cmm/liza/login.c b/programs/cmm/liza/login.c index c8c0a10248..0e4169075b 100644 --- a/programs/cmm/liza/login.c +++ b/programs/cmm/liza/login.c @@ -183,14 +183,12 @@ void DrawLoginScreen() WriteText(panel_x,panel_y,0x80,system.color.work_text,"Your Email:"); login_box.left = panel_x+3; login_box.top = panel_y+15; - edit_box_draw stdcall(#login_box); - EditBox(#login_box); + DrawEditBox(#login_box); WriteText(panel_x,panel_y+40,0x80,system.color.work_text,"Password:"); pass_box.left = panel_x+3; pass_box.top = panel_y+55; - edit_box_draw stdcall(#pass_box); - EditBox(#pass_box); + DrawEditBox(#pass_box); if (!aim) { diff --git a/programs/cmm/liza/settings.c b/programs/cmm/liza/settings.c index fb7c48038a..0fd6089c6b 100644 --- a/programs/cmm/liza/settings.c +++ b/programs/cmm/liza/settings.c @@ -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,190,90 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b}; -edit_box POP_server_port_box = {210,190,115,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#POP_server_port1,#mouse_opt,100000000000b}; -edit_box SMTP_server_box = {210,190,140,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b}; -edit_box SMTP_server_port_box = {210,190,165,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#SMTP_server_port1,#mouse_opt,100000000000b}; +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}; void SettingsDialog() @@ -97,20 +97,19 @@ void OptionsWindow() { #define ELEM_X 25 int i; + incn y; + y.n=0; DrawBar(0, Form.cheight - 40, Form.cwidth, 1, system.color.work_graph); DrawBar(0, Form.cheight - 40+1, Form.cwidth, 1, LBUMP); DrawCaptButton(Form.cwidth-79, Form.cheight-32, 70, 25, 19, system.color.work_button, system.color.work_button_text,"Apply"); - WriteTextB(ELEM_X, 20, 0x90, system.color.work_text, "Network settings"); - CheckBox(ELEM_X, 45, 17, "Use custom settings", checked[0]); - CheckBox(ELEM_X, 65, 18, "Manual configuration", checked[1]); - for (i=0; i<4; i++) - { - WriteText(ELEM_X+40, i*25+4+POP_server_box.top, 0x80, system.color.work_text, text1[i]); - DrawRectangle(POP_server_box.left-1, i*25+POP_server_box.top-1, POP_server_box.width+2, 16, system.color.work_graph); - } - edit_box_draw stdcall(#POP_server_box); - edit_box_draw stdcall(#POP_server_port_box); - edit_box_draw stdcall(#SMTP_server_box); - edit_box_draw stdcall(#SMTP_server_port_box); + WriteText(ELEM_X, y.inc(20), 0x81, system.color.work_text, "Network settings"); + 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]); + DrawEditBox(#POP_server_box); + DrawEditBox(#POP_server_port_box); + DrawEditBox(#SMTP_server_box); + DrawEditBox(#SMTP_server_port_box); } \ No newline at end of file diff --git a/programs/cmm/mouse_cfg/compile_en.bat b/programs/cmm/mouse_cfg/compile_en.bat index d2f82a9e83..493ce16f5d 100644 --- a/programs/cmm/mouse_cfg/compile_en.bat +++ b/programs/cmm/mouse_cfg/compile_en.bat @@ -3,7 +3,7 @@ @del mouse_cfg cls -c-- mouse_cfg.c +@c-- mouse_cfg.c @rename mouse_cfg.com mouse_cfg @kpack mouse_cfg @del warning.txt diff --git a/programs/cmm/mouse_cfg/compile_ru.bat b/programs/cmm/mouse_cfg/compile_ru.bat index 3aa53d8596..46fa601a11 100644 --- a/programs/cmm/mouse_cfg/compile_ru.bat +++ b/programs/cmm/mouse_cfg/compile_ru.bat @@ -3,7 +3,7 @@ @del mouse_cfg cls -c-- mouse_cfg.c +@c-- mouse_cfg.c @rename mouse_cfg.com mouse_cfg @kpack mouse_cfg @del warning.txt diff --git a/programs/cmm/mouse_cfg/mouse_cfg.c b/programs/cmm/mouse_cfg/mouse_cfg.c index a8bfbfe03c..127802ffb4 100644 --- a/programs/cmm/mouse_cfg/mouse_cfg.c +++ b/programs/cmm/mouse_cfg/mouse_cfg.c @@ -162,7 +162,6 @@ void DrawMouseImage() { } void DrawControls() { - DrawBar(pos_x, mouse_frame.start_y + 142, Form.cwidth - pos_x, 285-142, system.color.work); MoreLessBox(pos_x, mouse_frame.start_y + 142, 120, 121, mouse_cfg.pointer_speed, POINTER_SPEED); MoreLessBox(pos_x, mouse_frame.start_y + 172, 122, 123, mouse_cfg.acceleration, ACCELERATION_TEXT); MoreLessBox(pos_x, mouse_frame.start_y + 202, 124, 125, mouse_cfg.double_click_delay, DOUBLE_CLICK_TEXT); diff --git a/programs/cmm/panels_cfg/compile_en.bat b/programs/cmm/panels_cfg/compile_en.bat index 9043d853eb..dc862f046e 100644 --- a/programs/cmm/panels_cfg/compile_en.bat +++ b/programs/cmm/panels_cfg/compile_en.bat @@ -3,7 +3,7 @@ @del panels_cfg cls -c-- panels_cfg.c +@c-- panels_cfg.c @pause @echo off @rename panels_cfg.com panels_cfg diff --git a/programs/cmm/panels_cfg/compile_ru.bat b/programs/cmm/panels_cfg/compile_ru.bat index ef233514ba..f6fdfeac19 100644 --- a/programs/cmm/panels_cfg/compile_ru.bat +++ b/programs/cmm/panels_cfg/compile_ru.bat @@ -3,7 +3,7 @@ @del panels_cfg cls -c-- panels_cfg.c +@c-- panels_cfg.c @pause @rename panels_cfg.com panels_cfg @kpack panels_cfg diff --git a/programs/cmm/pixie/compile_en.bat b/programs/cmm/pixie/compile_en.bat index 1423d35710..5466fa8d8e 100644 --- a/programs/cmm/pixie/compile_en.bat +++ b/programs/cmm/pixie/compile_en.bat @@ -1,7 +1,7 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -C-- pixie.c +@C-- pixie.c @del pixie @kpack pixie.com @rename pixie.com pixie diff --git a/programs/cmm/textreader/compile.bat b/programs/cmm/textreader/compile.bat index 09979a1c57..596df77a6c 100644 --- a/programs/cmm/textreader/compile.bat +++ b/programs/cmm/textreader/compile.bat @@ -1,4 +1,4 @@ -C-- "textreader.c" +@C-- "textreader.c" @del "textreader" @rename "textreader.com" "textreader" @del warning.txt diff --git a/programs/cmm/tmpdisk/compile_en.bat b/programs/cmm/tmpdisk/compile_en.bat index fc772ccfb4..f258be2e66 100644 --- a/programs/cmm/tmpdisk/compile_en.bat +++ b/programs/cmm/tmpdisk/compile_en.bat @@ -1,6 +1,6 @@ @echo #define LANG_ENG 1 >lang.h-- -C-- tmpdisk.c +@C-- tmpdisk.c @del tmpdisk @rename tmpdisk.com tmpdisk @del warning.txt diff --git a/programs/cmm/tmpdisk/compile_ru.bat b/programs/cmm/tmpdisk/compile_ru.bat index ee2714af35..f3b43449b4 100644 --- a/programs/cmm/tmpdisk/compile_ru.bat +++ b/programs/cmm/tmpdisk/compile_ru.bat @@ -1,6 +1,6 @@ @echo #define LANG_RUS 1 >lang.h-- -C-- tmpdisk.c +@C-- tmpdisk.c @del tmpdisk @rename tmpdisk.com tmpdisk @del warning.txt diff --git a/programs/cmm/tmpdisk/t_console.c b/programs/cmm/tmpdisk/t_console.c index 34c6aead79..3207d47a33 100644 --- a/programs/cmm/tmpdisk/t_console.c +++ b/programs/cmm/tmpdisk/t_console.c @@ -5,7 +5,7 @@ #ifdef LANG_RUS ?define ADD_DISK_TEXT "пробую добавить виртуальный диск" ?define DELETE_DISK_TEXT "пробую удалить виртуальный диск" - ?define DONT_KNOW_DISK_SIZE_TEXT "его размер не указан, 10% свободной ОЗУ будет использовано" + ?define DONT_KNOW_DISK_SIZE_TEXT "его размер не указан, 20% свободной ОЗУ будет использовано" ?define NEW_DISK_TEXT "размер диска будет: " char *rezult_text[]={ "операция успешно завершена", @@ -19,7 +19,7 @@ #else ?define ADD_DISK_TEXT "trying to add disk" ?define DELETE_DISK_TEXT "trying to delete virtual disk" - ?define DONT_KNOW_DISK_SIZE_TEXT "its size is not specified, 10% from free RAM will be used" + ?define DONT_KNOW_DISK_SIZE_TEXT "its size is not specified, 20% from free RAM will be used" ?define NEW_DISK_TEXT "new DiskSize: " char *rezult_text[]={ "operation completed successfully", @@ -64,7 +64,7 @@ char Console_Work() disk_size= strchr(#param, 's'); if (!disk_size) { - add_disk.DiskSize = GetFreeRAM() / 5; + add_disk.DiskSize = GetFreeRAM() / 5 * 2; debugln(DONT_KNOW_DISK_SIZE_TEXT); } else diff --git a/programs/cmm/tmpdisk/t_gui.c b/programs/cmm/tmpdisk/t_gui.c index f4a90e1186..c9c1e8aa95 100644 --- a/programs/cmm/tmpdisk/t_gui.c +++ b/programs/cmm/tmpdisk/t_gui.c @@ -137,8 +137,7 @@ void Main_Window() 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."); - edit_box_draw stdcall (#edit_disk_size); - EditBox(#edit_disk_size); + 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); @@ -155,7 +154,7 @@ void Main_Window() void GetSizeDisk() { int fr; - fr = GetFreeRAM() / 5; + fr = GetFreeRAM() / 5 * 2; fr = itoa(fr / 2048); strcpy(#new_disk_size, fr); edit_disk_size.size = edit_disk_size.pos = strlen(#new_disk_size);