diff --git a/data/common/drivers/ahci/ver.txt b/data/common/drivers/ahci/ver.txt deleted file mode 100644 index a524630fc1..0000000000 --- a/data/common/drivers/ahci/ver.txt +++ /dev/null @@ -1 +0,0 @@ -rc06 \ No newline at end of file diff --git a/data/common/drivers/atikms/atikms.dll b/data/common/drivers/atikms/atikms.dll index 38bb332e45..850d1c26f0 100644 Binary files a/data/common/drivers/atikms/atikms.dll and b/data/common/drivers/atikms/atikms.dll differ diff --git a/data/common/drivers/atikms/ver.txt b/data/common/drivers/atikms/ver.txt deleted file mode 100644 index 30a59a8b7a..0000000000 --- a/data/common/drivers/atikms/ver.txt +++ /dev/null @@ -1 +0,0 @@ -4.4 \ No newline at end of file diff --git a/data/common/drivers/drvinf.ini b/data/common/drivers/drvinf.ini index 0e8c3a86f4..0462717f02 100644 --- a/data/common/drivers/drvinf.ini +++ b/data/common/drivers/drvinf.ini @@ -1,22 +1,26 @@ [AHCI] ver=ver rc06 -description=Поиск контроллеров и определение подключённых АТА дисков. В случае успеха, делает видимыми в Клобири жесткие диски подключенные через ACHI. +description_ru=Поиск контроллеров и определение подключённых АТА дисков. В случае успеха, делает видимыми в Колибри диски подключенные через ACHI. +description_en=The driver searches for ATA disks connected to the AHCI controller. Found disks are identified and made available to the user. install=/kolibrios/drivers/ahci/ahci [Video ATI KMS] -ver=ver 4.4 -description=Драйвера для видеокарт ATI Radeon. Поддерживаются дискретные и интегрированные чипсеты семейств ATI R100-R600, Evergreen, Northern Islands, Southern Islands. Устанавливает видеорежима при первом запуске и делает доступным смену видеорежима в процессе работы (SYSPANEL -> VideoMode). +ver=ver 4.4.30 +description_ru=Драйвера для видеокарт ATI Radeon. Поддерживаются дискретные и интегрированные чипсеты семейств ATI R100-R600, Evergreen, Northern Islands, Southern Islands. Устанавливает видеорежим при первом запуске и делает доступным смену видеорежима в процессе работы через SYSPANEL -> VideoMode. +description_en=The driver for ATI Radeon video cards supports all discrete and integrated chipsets from the ATI R100-R600, Evergreen, Northern Islands and Southern Islands families. The driver sets the video mode on the first load and allows to change the video mode via SYSPANEL -> VideoMode. readme=/kolibrios/drivers/atikms/readme.txt install=/kolibrios/drivers/atikms/atikms [Video Intel i915] -ver=ver 4.4.1 -description=Драйвера для видеокарт Intel. Поддерживаются все PCI Express видеоядра Intel от i915 до Skylake. Устанавливает видеорежима при первом запуске и делает доступным смену видеорежима в процессе работы (SYSPANEL -> VideoMode). +ver=ver 4.4.30 +description_ru=Драйвера для видеокарт Intel. Поддерживаются все PCI Express видеоядра Intel от i915 до Skylake. Устанавливает видеорежим при первом запуске и делает доступным смену видеорежима в процессе работы через SYSPANEL -> VideoMode. +description_en=The driver for Intel video cards supports all Intel PCI Express video cores from i915 till Skylake. The driver sets the video mode on the first load and allows to change the video mode via SYSPANEL -> VideoMode. readme=/kolibrios/drivers/i915/readme.txt install=/kolibrios/drivers/i915/i915 [Video VmWare] ver=ver 3.14-rc2 -description=Драйвер для VMware SVGA II. +description_ru=Драйвер для VMware SVGA II. +description_en=The driver for VMware SVGA II. readme=/kolibrios/drivers/vmware/readme.txt install=/kolibrios/drivers/vmware/vmwgfx \ No newline at end of file diff --git a/data/common/drivers/i915/i915.dll b/data/common/drivers/i915/i915.dll index 09a0f43120..b46f5c3ebb 100644 Binary files a/data/common/drivers/i915/i915.dll and b/data/common/drivers/i915/i915.dll differ diff --git a/data/common/drivers/i915/readme.txt b/data/common/drivers/i915/readme.txt index ed45bea31a..d3f694e1f9 100644 --- a/data/common/drivers/i915/readme.txt +++ b/data/common/drivers/i915/readme.txt @@ -7,9 +7,6 @@ ╟ряєёъ фЁрщтхЁр: <яєЄ№>/i915 <ъюьрэфэр  ёЄЁюър> ╧рЁрьхЄЁ√ ъюьрэфэющ ёЄЁюъш: - -f - --fbsize <0-9> ЁрчьхЁ тшфхюсєЇхЁр т ьхурсрщЄрї. 16 яю-єьюыўрэш■ - -l --log <яюыэ√щ яєЄ№ ъ ыюу-Їрщыє> ╘рщы фюыцхэ ЁрёяюыюурЄ№ё  эр єёЄЁющёЄтх фюёЄєяхэюь фы  чряшёш. diff --git a/data/common/drivers/i915/ver.txt b/data/common/drivers/i915/ver.txt deleted file mode 100644 index 4f3470c166..0000000000 --- a/data/common/drivers/i915/ver.txt +++ /dev/null @@ -1 +0,0 @@ -4.4.1 \ No newline at end of file diff --git a/data/common/drivers/vmware/ver.txt b/data/common/drivers/vmware/ver.txt deleted file mode 100644 index e48343c2ac..0000000000 --- a/data/common/drivers/vmware/ver.txt +++ /dev/null @@ -1 +0,0 @@ -3.14-rc2 \ No newline at end of file diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index bbe7c02d1a..c4887c1a3b 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -127,15 +127,14 @@ void DrawWindowContent() false ); select_list.cur_y = id; - DrawBar(0,0, Form.cwidth, PANEL_H-LIST_PADDING, system.color.work); - DrawRectangle3D(select_list.x-2, select_list.y-2, select_list.w+3+scroll1.size_x, select_list.h+3, system.color.work_dark, system.color.work_light); - DrawWideRectangle(select_list.x-LIST_PADDING, select_list.y-LIST_PADDING, LIST_PADDING*2+select_list.w+scroll1.size_x, LIST_PADDING*2+select_list.h, LIST_PADDING-2, system.color.work); + DrawWideRectangle(select_list.x-LIST_PADDING, select_list.y-LIST_PADDING, LIST_PADDING*2+select_list.w+scroll1.size_x, + LIST_PADDING*2+select_list.h, LIST_PADDING-2, system.color.work); tabs.draw(select_list.x+10, select_list.y, SKINS, T_SKINS); - if (dir_exists(WALP_STANDART_PATH)) tabs.draw(strlen(T_SKINS)*8+TAB_PADDING+select_list.x+21, select_list.y, WALLPAPERS, T_WALLPAPERS); - DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph); - + if (dir_exists(WALP_STANDART_PATH)) tabs.draw(strlen(T_SKINS)*8+TAB_PADDING+select_list.x+21, select_list.y, + WALLPAPERS, T_WALLPAPERS); SelectList_Draw(); + SelectList_DrawBorder(); } diff --git a/programs/cmm/clipview/clipview.c b/programs/cmm/clipview/clipview.c index d91037701e..dae851986a 100644 --- a/programs/cmm/clipview/clipview.c +++ b/programs/cmm/clipview/clipview.c @@ -95,7 +95,6 @@ void main() true ); DrawWindowContent(); - ClipViewSelectListDraw(); break; default: @@ -110,14 +109,14 @@ void DrawWindowContent() int button_x = select_list.x; DrawBar(0,0, Form.cwidth, PANEL_TOP_H, system.color.work); DrawBar(0,Form.cheight-PANEL_BOTTOM_H, Form.cwidth, PANEL_BOTTOM_H, system.color.work); - DrawRectangle3D(select_list.x-2, select_list.y-2, select_list.w+3+scroll1.size_x, select_list.h+3, system.color.work_dark, system.color.work_light); DrawWideRectangle(select_list.x-LIST_PADDING, select_list.y-LIST_PADDING, LIST_PADDING*2+select_list.w+scroll1.size_x, LIST_PADDING*2+select_list.h, LIST_PADDING-2, system.color.work); button_x += DrawStandartCaptButton(button_x, select_list.y + select_list.h + 8, BT_DELETE_LAST_SLOT, T_DELETE_LAST_SLOT); button_x += DrawStandartCaptButton(button_x, select_list.y + select_list.h + 8, BT_DELETE_ALL_SLOTS, T_DELETE_ALL_SLOTS); button_x += DrawStandartCaptButton(button_x, select_list.y + select_list.h + 8, BT_UNLOCK, T_RESET_BUFFER_LOCK); - DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph); WriteText(select_list.x+12, select_list.y - 23, select_list.font_type, system.color.work_text, T_COLUMNS_TITLE); WriteText(select_list.x+select_list.w-68, select_list.y - 23, select_list.font_type, system.color.work_text, T_COLUMN_VIEW); + ClipViewSelectListDraw(); + SelectList_DrawBorder(); } void SelectList_DrawLine(dword i) diff --git a/programs/cmm/drvinst/compile_en.bat b/programs/cmm/drvinst/compile_en.bat index f857d78b4a..6a5f225e5b 100644 --- a/programs/cmm/drvinst/compile_en.bat +++ b/programs/cmm/drvinst/compile_en.bat @@ -1,9 +1,10 @@ +@del lang.h-- +@echo #define LANG_ENG 1 >lang.h-- + @del *.kex - @c-- drvinst.c - @rename *.com *.kex - @del warning.txt +@del lang.h-- @pause \ No newline at end of file diff --git a/programs/cmm/drvinst/compile_ru.bat b/programs/cmm/drvinst/compile_ru.bat new file mode 100644 index 0000000000..5654a0793c --- /dev/null +++ b/programs/cmm/drvinst/compile_ru.bat @@ -0,0 +1,10 @@ +@del lang.h-- +@echo #define LANG_RUS 1 >lang.h-- + +@del *.kex +@c-- drvinst.c +@rename *.com *.kex +@del warning.txt +@del lang.h-- + +@pause \ No newline at end of file diff --git a/programs/cmm/drvinst/drvinst.c b/programs/cmm/drvinst/drvinst.c index 4e930950eb..5b1f070a96 100644 --- a/programs/cmm/drvinst/drvinst.c +++ b/programs/cmm/drvinst/drvinst.c @@ -1,5 +1,9 @@ #define MEMSIZE 4096*20 +#ifndef AUTOBUILD +#include "lang.h--" +#endif + //===================================================// // // // LIB // @@ -23,12 +27,21 @@ proc_info Form; -#define WINDOW_TITLE "Driver Installer" -#define T_CAUTION_TITLE "CAUTION" -#define T_CAUTION_PARAGRAPH "Installing additional drivers can be harmful to the stability of the operation system and potentionally can harm hardware." -#define T_ASSEPT_RISK "I assept the risk" -#define T_README "Readme" -#define T_INSTALL "Install" +#ifdef LANG_RUS + #define WINDOW_TITLE "Установщик драйверов" + #define T_CAUTION_TITLE "ПРЕДУПРЕЖДЕНИЕ" + #define T_CAUTION_PARAGRAPH "Установка дополнительных драйверов может нанести вред стабильности операционной системы и потенциально привести к порче оборудования." + #define T_ASSEPT_RISK "Я принимаю риск" + #define T_README "Readme" + #define T_INSTALL "Установить" +#else + #define WINDOW_TITLE "Driver Installer" + #define T_CAUTION_TITLE "CAUTION" + #define T_CAUTION_PARAGRAPH "Installing additional drivers can be harmful to the stability of the operation system and potentionally can harm hardware." + #define T_ASSEPT_RISK "I accept the risk" + #define T_README "Readme" + #define T_INSTALL "Install" +#endif #define BUTTON_ID_ASSEPT_RISK 10 #define BUTTON_ID_README 11 @@ -124,6 +137,7 @@ void draw_driver_list_window() Form.cheight - PADDING - PADDING, false); SelectList_Draw(); + SelectList_DrawBorder(); //RIGHT FRAME GetCurrentSectionData(); DrawBar(right_frame_x, PADDING+3, Form.cwidth - right_frame_x - PADDING, 80, system.color.work); @@ -158,13 +172,16 @@ void SelectList_LineChanged() draw_driver_list_window(); } + void GetCurrentSectionData() { - dword cur_section_name = ini_sections.get(select_list.cur_y); - ini_get_str stdcall (#drvinf_path, cur_section_name, "ver", #cur_version, sizeof(cur_version), 0); - ini_get_str stdcall (#drvinf_path, cur_section_name, "description", #cur_description, sizeof(cur_description), 0); - ini_get_str stdcall (#drvinf_path, cur_section_name, "readme", #cur_readme_path, sizeof(cur_readme_path), 0); - ini_get_str stdcall (#drvinf_path, cur_section_name, "install", #cur_install_path, sizeof(cur_install_path), 0); + dword section_name = ini_sections.get(select_list.cur_y); + dword description_name; + if (GetSystemLanguage() == SYS_LANG_RUS) description_name = "description_ru"; else description_name = "description_en"; + ini_get_str stdcall (#drvinf_path, section_name, "ver", #cur_version, sizeof(cur_version), 0); + ini_get_str stdcall (#drvinf_path, section_name, description_name, #cur_description, sizeof(cur_description), 0); + ini_get_str stdcall (#drvinf_path, section_name, "readme", #cur_readme_path, sizeof(cur_readme_path), 0); + ini_get_str stdcall (#drvinf_path, section_name, "install", #cur_install_path, sizeof(cur_install_path), 0); } //===================================================// diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 81e6be196b..7b83610435 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -316,7 +316,7 @@ TODO: scroll if (end_found != true) write_length = label_length_max; //no white space, so we write label_length_max } ESI = write_length; //set text length attribute for WriteText() - WriteText(x+1, y, 0x10, text_col, write_start); + WriteText(x, y, 0x10, text_col, write_start); // if (editpos >= write_start-buf_start) && (editpos <= write_start-buf_start + write_length) { // WriteTextB(-write_start+buf_start+editpos * 8 + x - 5 +1, y, 0x90, 0xFF0000, "|"); // } diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 3bd95d73b0..1bf51e5a7c 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -256,6 +256,10 @@ inline fastcall void SetCurDir( ECX) //eax =  ч√ъ ёшёЄхь√ (1=eng, 2=fi, 3=ger, 4=rus) +#define SYS_LANG_ENG 1 +#define SYS_LANG_FIN 2 +#define SYS_LANG_GER 3 +#define SYS_LANG_RUS 4 inline fastcall int GetSystemLanguage() { EAX = 26; diff --git a/programs/cmm/lib/patterns/select_list.h b/programs/cmm/lib/patterns/select_list.h index 7b243dd187..9f65929e72 100644 --- a/programs/cmm/lib/patterns/select_list.h +++ b/programs/cmm/lib/patterns/select_list.h @@ -51,6 +51,10 @@ void SelectList_ProcessMouse() else if (mouse.down)&&(mouse.lkm) && (select_list.MouseOver(mouse.x, mouse.y)) mouse_clicked=true; } +void SelectList_DrawBorder() { + DrawRectangle3D(select_list.x-2, select_list.y-2, select_list.w+3+scroll1.size_x, select_list.h+3, system.color.work_dark, system.color.work_light); + DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph); +} void SelectList_DrawScroller() { diff --git a/programs/system/end/light/end.asm b/programs/system/end/light/end.asm index ff5342a50d..ea5aab62c4 100644 --- a/programs/system/end/light/end.asm +++ b/programs/system/end/light/end.asm @@ -30,8 +30,8 @@ WIN_H equ 200 BOT_PANEL_H equ 70 CANCEL_BUTTON_ID equ 1+BT_HIDE -HOME_BUTTON_ID equ 3 -REBOOT_BUTTON_ID equ 2 +HOME_BUTTON_ID equ 2 +REBOOT_BUTTON_ID equ 3 POWEROFF_BUTTON_ID equ 4 @use_library