app_plus faster start; replace email by voxel icon; various small fixes

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

data/common/settings/app_plus.ini

@@ -11,7 +11,7 @@ FPlay=/kolibrios/media/fplay,40
 [3D Tools]
 Info3DsPro=/kolibrios/3d/info3ds/info3ds,75
 Info3DsUser=/kolibrios/3d/info3ds/info3ds_u,75
-voxel_editor=/kolibrios/3d/voxel_editor/voxel_editor
+VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor
 
 [3D Demos]
 3dsHeart=/kolibrios/3d/3dsheart,78

programs/cmm/app_plus/app_plus.c

@@ -9,8 +9,10 @@
 #include "..\lib\gui.h"
 #include "..\lib\obj\proc_lib.h"
 #include "..\lib\patterns\simple_open_dialog.h"
+#include "..\lib\patterns\restart_process.h"
 #include "..\lib\added_sysdir.c"
 
+
 char default_dir[] = "/rd/1";
 od_filter filter2 = {"",0};
 
@@ -37,6 +39,7 @@ need to reboot system to try again."
 
 void CheckKosMounted()
 {
+	while (CheckProcessExists("SEARCHAP")) pause(2);
 	if (dir_exists("/kolibrios/")) 
 	{
 		if (file_exists(APP_PLUS_INI_PATH))	
@@ -49,9 +52,7 @@ void CheckKosMounted()
 
 void RunAutosearch()
 {
-	dword searchap_run_id;
+	io.run("/sys/SEARCHAP",0);
-	searchap_run_id = io.run("/sys/searchap",0);
-	while (GetProcessSlot(searchap_run_id)) pause(10);
 }
 
 void main()

programs/develop/examples/example/trunk/rus/build_en.bat

@@ -1,5 +0,0 @@
-@erase lang.inc
-@echo lang fix en >lang.inc
-@fasm example.asm example
-@erase lang.inc
-@pause

programs/develop/examples/example/trunk/rus/example.asm

@@ -37,8 +37,7 @@
   dd     0x0         ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC>஢
   dd     0x0         ; <20><>१<EFBFBD>ࢨ஢<E0A2A8><E0AEA2><EFBFBD>
 
-include 'lang.inc'
+include "macros.inc" ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ᥬ<EFBFBD><E1A5AC><EFBFBD><EFBFBD>騪<EFBFBD><E9A8AA>!
-include 'macros.inc' ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ᥬ<EFBFBD><E1A5AC><EFBFBD><EFBFBD>騪<EFBFBD><E9A8AA>!
 
 ;---------------------------------------------------------------------
 ;---  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  ----------------------------------------------
@@ -100,45 +99,40 @@ still:
     mcall -1            ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
 
 
-
 ;---------------------------------------------------------------------
 ;---  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>  ----------------------------------
 ;---------------------------------------------------------------------
 
 draw_window:
 
-    mcall 12, 1                    ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12: ᮮ<><E1AEAE><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> <20><><EFBFBD><EFBFBD>
+    mcall 12, 1       ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12: ᮮ<><E1AEAE><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2>
-                                   ; 1 - <20><>稭<EFBFBD><E7A8AD><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD>
+	
-
+    mcall 48, 3, sc,sizeof.system_colors
+	
     ; <20><><EFBFBD><EFBFBD><EFBFBD>: ᭠砫<E1ADA0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ਠ<EFBFBD><E0A8A0> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD>)
-    ;        <20><>⥬ <20><><EFBFBD><EFBFBD>⪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ᮢ
+    ; <20><>⥬ <20><><EFBFBD><EFBFBD>⪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ᮢ
 
-
+;   mov  eax,0                   ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 0: <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
-                                   ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD>
+;   mov  ebx,200*65536+300       ; [x <20><><EFBFBD><EFBFBD><EFBFBD>] *65536 + [x ࠧ<EFBFBD><EFBFBD><EFBFBD>]
-;   mov  eax,0                     ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 0 : <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD>
+;   mov  ecx,200*65536+150       ; [y <20><><EFBFBD><EFBFBD><EFBFBD>] *65536 + [y ࠧ<EFBFBD><EFBFBD><EFBFBD>]
-;   mov  ebx,200*65536+200         ; [x <20><><EFBFBD><EFBFBD><EFBFBD>] *65536 + [x ࠧ<><E0A0A7><EFBFBD>]
+;   mov  edx, [sc.work]          ; 梥<> 䮭<>
-;   mov  ecx,200*65536+50          ; [y <20><><EFBFBD><EFBFBD><EFBFBD>] *65536 + [y ࠧ<><E0A0A7><EFBFBD>]
+;   or   edx, 0x33000000         ; <20> ⨯ <20><><EFBFBD><EFBFBD> 3
-;   mov  edx,0x33aabbcc            ; 梥<EFBFBD> ࠡ<>祩 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  RRGGBB,8->color gl
+;   mov  edi,header              ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-;   mov  edi,header                ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 ;   int  0x40
 
-    mcall 0, <200,200>, <200,50>, 0x33AABBCC,,title
+    mov   edx, [sc.work]         ; 梥<> 䮭<>
+    or    edx, 0x33000000        ; <20> ⨯ <20><><EFBFBD><EFBFBD> 3
+    mcall 0, <200,300>, <200,150>, , ,title
 
-                                   
+    ; <20>뢮<EFBFBD> ⥪<>⮢<EFBFBD><E2AEA2> <20><>ப<EFBFBD>
+    mov   ecx, [sc.work_text]    ; 梥<> 䮭<>
+    or    ecx, 0x90000000        ; <20> ⨯ <20><>ப<EFBFBD>
+    mcall 4, <10, 20>, 0x90000000, message
 
-;   mov  eax,4
+	
-;   mov  ebx,3 shl 16 + 8
+    mcall 12, 2                  ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12.2, <20><><EFBFBD><EFBFBD><EFBFBD>稫<EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD>
-;   mov  ecx,0
-;   mov  edx,message
-;   mov  esi,message.size
-;   int  0x40
 
-    mcall 4, <3, 8>, 0, message, message.size
+    ret                          ; <20><>室<EFBFBD><E5AEA4> <20><> <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD>
-
-    mcall 12, 2                    ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 12: ᮮ<><E1AEAE><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> <20><><EFBFBD><EFBFBD>
-                                   ; 2, <20><><EFBFBD><EFBFBD><EFBFBD>稫<EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD>
-
-    ret                            ; <20><>室<EFBFBD><E5AEA4> <20><> <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD>
 
 
 ;---------------------------------------------------------------------
@@ -151,22 +145,11 @@ draw_window:
 Music:
   db  0x90, 0x30, 0
 
+sc system_colors
+
+message db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...',0
+title db '<27>ਬ<EFBFBD><E0A8AC> <20>ணࠬ<E0AEA3><E0A0AC>',0
 
 ;---------------------------------------------------------------------
 
-; <20><><EFBFBD><EFBFBD><EFBFBD>䥩<EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+I_END:                           ; <20><>⪠ <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
-;  <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> MACROS.INC (lang fix <20><><EFBFBD><EFBFBD>)
-
-lsz message,\
-  ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...',\
-  en,'Press any key...',\
-  fr,'Pressez une touche...'
-
-lsz title,\
-  ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',\
-  en,'EXAMPLE APPLICATION',\
-  fr,"L'exemplaire programme"
-
-;---------------------------------------------------------------------
-
-I_END:                             ; <20><>⪠ <20><><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>

programs/system/menu/trunk/menu.asm

@@ -793,7 +793,7 @@ draw_one_button:
 	movzx	ecx,dl
 	imul	ecx,BTN_HEIGHT
 	shl	ecx,16
-	add	ecx,BTN_HEIGHT-1
+	add	ecx,BTN_HEIGHT
 ; edx = button identifier
 	mov	esi,[sc.work]
 	cmp	esi,0xdfdfdf