DRIVERS: update atikms and intel (by Serge), remove ver.txt

END: fix mixed up "Kernel" and "Reboot" buttons
DRVINST: translations (thanks to hidnplayr)

git-svn-id: svn://kolibrios.org@6662 a494cfbc-eb01-0410-851d-a64ba20cac60

data/common/drivers/ahci/ver.txt

@@ -1 +0,0 @@
-rc06

data/common/drivers/atikms/ver.txt

@@ -1 +0,0 @@
-4.4

data/common/drivers/drvinf.ini

@@ -1,22 +1,26 @@
 [AHCI]
 ver=ver rc06
-description=<EFBFBD>®¨áª ª®­â஫«¥à®¢ ¨ ®¯à¥¤¥«¥­¨¥ ¯®¤ª«îçñ­­ëå €’€ ¤¨áª®¢. ‚ á«ãç ¥ ãᯥå , ¤¥« ¥â ¢¨¤¨¬ë¬¨ ¢ Š«®¡¨à¨ ¦¥á⪨¥ ¤¨áª¨ ¯®¤ª«î祭­ë¥ ç¥à¥§ ACHI.
+description_ru=<EFBFBD>®¨áª ª®­â஫«¥à®¢ ¨ ®¯à¥¤¥«¥­¨¥ ¯®¤ª«îçñ­­ëå €’€ ¤¨áª®¢. ‚ á«ãç ¥ ãᯥå , ¤¥« ¥â ¢¨¤¨¬ë¬¨ ¢ Š®«¨¡à¨ ¤¨áª¨ ¯®¤ª«î祭­ë¥ ç¥à¥§ 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
+ver=ver 4.4.30
-description=„à ©¢¥à  ¤«ï ¢¨¤¥®ª àâ ATI Radeon. <20>®¤¤¥à¦¨¢ îâáï ¤¨áªà¥â­ë¥ ¨ ¨­â¥£à¨à®¢ ­­ë¥ 稯á¥âë ᥬ¥©á⢠ATI R100-R600, Evergreen, Northern Islands, Southern Islands. “áâ ­ ¢«¨¢ ¥â ¢¨¤¥®à¥¦¨¬  ¯à¨ ¯¥à¢®¬ § ¯ã᪥ ¨ ¤¥« ¥â ¤®áâã¯­ë¬ á¬¥­ã ¢¨¤¥®à¥¦¨¬  ¢ ¯à®æ¥áᥠࠡ®âë (SYSPANEL -> VideoMode).
+description_ru=„à ©¢¥à  ¤«ï ¢¨¤¥®ª àâ ATI Radeon. <20>®¤¤¥à¦¨¢ îâáï ¤¨áªà¥â­ë¥ ¨ ¨­â¥£à¨à®¢ ­­ë¥ 稯á¥âë ᥬ¥©á⢠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
+ver=ver 4.4.30
-description=„à ©¢¥à  ¤«ï ¢¨¤¥®ª àâ Intel. <20>®¤¤¥à¦¨¢ îâáï ¢á¥ PCI Express ¢¨¤¥®ï¤à  Intel ®â i915 ¤® Skylake. “áâ ­ ¢«¨¢ ¥â ¢¨¤¥®à¥¦¨¬  ¯à¨ ¯¥à¢®¬ § ¯ã᪥ ¨ ¤¥« ¥â ¤®áâã¯­ë¬ á¬¥­ã ¢¨¤¥®à¥¦¨¬  ¢ ¯à®æ¥áᥠࠡ®âë (SYSPANEL -> VideoMode).
+description_ru=„à ©¢¥à  ¤«ï ¢¨¤¥®ª àâ Intel. <20>®¤¤¥à¦¨¢ îâáï ¢á¥ 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

data/common/drivers/i915/readme.txt

@@ -7,9 +7,6 @@
 Запуск драйвера: <путь>/i915 <командная строка>
 
 Параметры командной строки:
- -f
- --fbsize <0-9> размер видеобуфера в мегабайтах. 16 по-умолчанию
-
  -l
  --log 	<полный путь к лог-файлу>
     	Файл должен распологаться на устройстве доступеном для записи.

data/common/drivers/i915/ver.txt

@@ -1 +0,0 @@
-4.4.1

data/common/drivers/vmware/ver.txt

@@ -1 +0,0 @@
-3.14-rc2

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, 
-	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);
+		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);
+	if (dir_exists(WALP_STANDART_PATH)) tabs.draw(strlen(T_SKINS)*8+TAB_PADDING+select_list.x+21, select_list.y, 
-	DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph);
+		WALLPAPERS, T_WALLPAPERS);
-
 	SelectList_Draw();
+	SelectList_DrawBorder();
 }
 
 

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)

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

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

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"
+#ifdef LANG_RUS
-#define T_CAUTION_TITLE "CAUTION"
+	#define WINDOW_TITLE "“áâ ­®¢é¨ª ¤à ©¢¥à®¢"
-#define T_CAUTION_PARAGRAPH "Installing additional drivers can be harmful to the stability of the operation system and potentionally can harm hardware."
+	#define T_CAUTION_TITLE "<22><>…„“<E2809E><E2809C>…†„…<E2809E>ˆ…"
-#define T_ASSEPT_RISK "I assept the risk"
+	#define T_CAUTION_PARAGRAPH "“áâ ­®¢ª  ¤®¯®«­¨â¥«ì­ëå ¤à ©¢¥à®¢ ¬®¦¥â ­ ­¥á⨠¢à¥¤ áâ ¡¨«ì­®á⨠®¯¥à æ¨®­­®© á¨áâ¥¬ë ¨ ¯®â¥­æ¨ «ì­® ¯à¨¢¥á⨠ª ¯®àç¥ ®¡®à㤮¢ ­¨ï."
-#define T_README "Readme"
+	#define T_ASSEPT_RISK "Ÿ ¯à¨­¨¬ î à¨áª"
-#define T_INSTALL "Install"
+	#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);
+	dword 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);
+	dword description_name;
-	ini_get_str stdcall (#drvinf_path, cur_section_name, "description", #cur_description, sizeof(cur_description), 0);
+	if (GetSystemLanguage() == SYS_LANG_RUS) description_name = "description_ru"; else description_name = "description_en";
-	ini_get_str stdcall (#drvinf_path, cur_section_name, "readme", #cur_readme_path, sizeof(cur_readme_path), 0);
+	ini_get_str stdcall (#drvinf_path, section_name, "ver", #cur_version, sizeof(cur_version), 0);
-	ini_get_str stdcall (#drvinf_path, cur_section_name, "install", #cur_install_path, sizeof(cur_install_path), 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);
 }
 
 //===================================================//

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, "|");
 		// }

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;

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()
 {

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
+HOME_BUTTON_ID equ 2
-REBOOT_BUTTON_ID equ 2
+REBOOT_BUTTON_ID equ 3
 POWEROFF_BUTTON_ID equ 4
 
 @use_library