WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 6661 → Rev 6662

/data/common/drivers/ahci/ver.txt
File deleted
\ No newline at end of file

/data/common/drivers/atikms/ver.txt
File deleted
\ No newline at end of file

/data/common/drivers/atikms/atikms.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /data/common/drivers/drvinf.ini
 ,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

/data/common/drivers/i915/ver.txt
File deleted
\ No newline at end of file

/data/common/drivers/i915/i915.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /data/common/drivers/i915/readme.txt
 ,9 → 7,6
 Çàïóñê äðàéâåðà: <ïóòü>/i915 <êîìàíäíàÿ ñòðîêà>
 Ïàðàìåòðû êîìàíäíîé ñòðîêè:
- -f
- --fbsize <0-9> ðàçìåð âèäåîáóôåðà â ìåãàáàéòàõ. 16 ïî-óìîë÷àíèþ
  -l
  --log  <ïîëíûé ïóòü ê ëîã-ôàéëó>
         Ôàéë äîëæåí ðàñïîëîãàòüñÿ íà óñòðîéñòâå äîñòóïåíîì äëÿ çàïèñè.

/data/common/drivers/vmware/ver.txt
File deleted
\ No newline at end of file

 /programs/cmm/appearance/appearance.c
 ,15 → 127,14
                 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();
 }

 /programs/cmm/clipview/clipview.c
 ,7 → 95,6
                                 true
                                 );
                         DrawWindowContent();
-                        ClipViewSelectListDraw();
                         break;
                 default:
 ,14 → 109,14
         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
 ,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 → 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
 ,5 → 1,9
 #define MEMSIZE 4096*20
+#ifndef AUTOBUILD
+#include "lang.h--"
+#endif
 //===================================================//
 //                                                   //
 //                       LIB                         //
 ,12 → 27,21
 proc_info Form;
+#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 assept the risk"
+        #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
 ,6 → 137,7
                 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);
 ,13 → 172,16
         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);
 }
 //===================================================//

 /programs/cmm/lib/gui.h
 ,7 → 316,7
                         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
 ,6 → 256,10
 //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
 ,6 → 51,10
         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
 ,8 → 30,8
 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

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6661 → Rev 6662