From 21dcb2539ad318c0d705261a41726da658e0939b Mon Sep 17 00:00:00 2001
From: heavyiron <heavyiron@kolibrios.org>
Date: Thu, 22 Feb 2007 09:02:29 +0000
Subject: [PATCH] menu renamed to @menu, fixes in panel from 0.6.5.0

git-svn-id: svn://kolibrios.org@372 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/build_all.bat                  |  2 +-
 programs/system/menu/trunk/build_en.bat |  2 +-
 programs/system/menu/trunk/build_ru.bat |  2 +-
 programs/system/panel/trunk/@PANEL.ASM  | 26 +++++++++----------------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/programs/build_all.bat b/programs/build_all.bat
index 87e053487e..0f42252e1e 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -34,7 +34,7 @@ echo *
 @fasm system\icon\trunk\icon.asm bin\icon
 @fasm system\kbd\trunk\kbd.ASM bin\kbd
 @fasm system\launcher\trunk\launcher.asm bin\launcher
-@fasm system\menu\trunk\menu.asm bin\menu
+@fasm system\menu\trunk\menu.asm bin\@menu
 @fasm system\PANEL\trunk\@PANEL.ASM bin\@PANEL
 @fasm system\pcidev\trunk\pcidev.asm bin\pcidev
 @fasm system\RB\trunk\@RB.ASM bin\@RB
diff --git a/programs/system/menu/trunk/build_en.bat b/programs/system/menu/trunk/build_en.bat
index f3818cd144..900d8bcbe8 100644
--- a/programs/system/menu/trunk/build_en.bat
+++ b/programs/system/menu/trunk/build_en.bat
@@ -1,4 +1,4 @@
 @erase lang.inc
 @echo lang fix en >lang.inc
-@fasm menu.asm menu
+@fasm menu.asm @menu
 @pause
\ No newline at end of file
diff --git a/programs/system/menu/trunk/build_ru.bat b/programs/system/menu/trunk/build_ru.bat
index 404fe0266e..2c8c376c2c 100644
--- a/programs/system/menu/trunk/build_ru.bat
+++ b/programs/system/menu/trunk/build_ru.bat
@@ -1,4 +1,4 @@
 @erase lang.inc
 @echo lang fix ru >lang.inc
-@fasm menu.asm menu
+@fasm menu.asm @menu
 @pause
\ No newline at end of file
diff --git a/programs/system/panel/trunk/@PANEL.ASM b/programs/system/panel/trunk/@PANEL.ASM
index 309fffb741..7111c247a2 100644
--- a/programs/system/panel/trunk/@PANEL.ASM
+++ b/programs/system/panel/trunk/@PANEL.ASM
@@ -439,10 +439,6 @@ draw_running_applications:
     cmp  dword[0x8000+46],51
     je   norpl
   .noicon:
-    cmp  [0x8000+11],dword 'ENU '
-    je   norpl
-;    cmp  [0x8000+12],dword 'NEL '
-;    je   norpl
     cmp  [0x8000+10],dword '    '
     je   norpl
     dec  [draw_start_position]
@@ -1847,28 +1843,24 @@ no_bug:
 
     mov  eax,13
     mov  ebx,[maxx]
-    sub  ebx,60 ;;65
+    sub  ebx,60
     shl  ebx,16
-    mov  bx,8
-    push ebx
-    mov  eax,13
-    mov  ecx,5*65536
+    add  ebx,8
+    mov  ecx,5 shl 16
     add  ecx,[ysi]
-    mov  edx,0xff0000  ;[sc.work_button]
+    mov  edx,0xdd2222
     int  0x40
-    pop  ebx
-    pop  eax
 
-    mov  ecx,5*65536
-    mov  cx,ax
+    pop  eax
+    mov  ecx,5 shl 16
+    add  ecx,eax
     mov  eax,13
-    mov  edx,0x44aa44  ;[sc.work_button]
+    mov  edx,0x44aa44
     int  0x40
 
     popad
     ret
 
-
 ; DATA
 
 stripe:
@@ -1962,7 +1954,7 @@ exec_fileinfo:
 .name   dd      ?
 
 end_name        db      '/RD/1/END',0
-menu_name       db      '/RD/1/MENU',0
+menu_name       db      '/RD/1/@MENU',0
 calendar_name   db      '/RD/1/CALENDAR',0
 sysmeter_name   db      '/RD/1/GMON',0