menu.dat: updated for ENG and RUS

ICONS16.PNG: new icons 
Other small fixes

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

programs/cmm/browser/WebView.c

@@ -985,7 +985,7 @@ dword GetImg(bool _new)
 	for (i = 0; i < WB1.img_url.count; i++)
 	{
 		cur_img_url = WB1.img_url.get(i);
-		//if (debug_mode) 
+		if (debug_mode) 
 			{debug("get img: ");debugln(cur_img_url);}
 		if (cache.has(cur_img_url)==false) {
 			prbar.max = WB1.img_url.count;

programs/cmm/sysmon/sysmon.c

@@ -78,8 +78,6 @@ int proc_list[256];
 
 checkbox show_system = { T_SHOW_SYSTEM, false };
 
-char* shared_icons_16;
-
 sensor cpu;
 sensor ram;
 sensor rd;
@@ -104,7 +102,6 @@ void main()
 {
 	int btn;
 	load_lib();
-	shared_icons_16 = memopen("ICONS18W", NULL, SHM_READ);
 	@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
 	loop() switch(@WaitEventTimeout(50))
 	{
@@ -297,6 +294,8 @@ void MonitorTmp()
 
 void DrawIconWithText(dword _x, _y, _icon, _title)
 {
+	static dword shared_icons_16;
+	if (!shared_icons_16) shared_icons_16 = memopen("ICONS18W", NULL, SHM_READ);
 	if (shared_icons_16) {
 		PutPaletteImage(18*18*4*_icon + shared_icons_16, 18, 18,_x, _y, 32, 0);
 	} else {

programs/system/menu/trunk/menu.asm

@@ -21,7 +21,7 @@
 ;   Compile with FASM for Kolibri
 ;******************************************************************************
   BTN_HEIGHT         = 26
-  BTN_WIDTH          = 198 ; was 178
+  BTN_WIDTH          = 198 ; 178 for a small font
   TXT_Y              = (BTN_HEIGHT)/2-7
   FONT_TYPE          = 0x90000000
 
@@ -1000,6 +1000,7 @@ align 4
 	sub ebx, 2
 	shl eax, 16
 	add eax, ebx
+	add eax, 1 shl 16
 	mov [tmp], eax
 	mov ebx, [icon_number]
 	imul ebx, 18*18*4
@@ -1011,7 +1012,7 @@ align 4
  	mov ecx, [shared_icons_active_ptr]
 .not_active_icon:	
 	add ebx, ecx
-	mcall 65, ebx, (18 shl 16) + 18, [tmp], 32, 0, 0
+	mcall 65, ebx, <18,18>, [tmp], 32, 0, 0
 
 @@:
 	pop ebp edi esi ecx