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         ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢
   dd     0x0         ; § à¥§¥à¢¨à®¢ ­®
 
-include 'lang.inc'
+include "macros.inc" ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
-include 'macros.inc' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
 
 ;---------------------------------------------------------------------
 ;---  <20>€—€‹Ž <20><>Žƒ<C5BD>€ŒŒ›  ----------------------------------------------
@@ -100,43 +99,38 @@ still:
     mcall -1            ; ¨­ ç¥ ª®­¥æ ¯à®£à ¬¬ë
 
 
-
 ;---------------------------------------------------------------------
 ;---  Ž<><C5BD>…„…‹…<E280B9>ˆ… ˆ Ž’<C5BD>ˆ‘Ž‚Š€ ŽŠ<C5BD>€  ----------------------------------
 ;---------------------------------------------------------------------
 
 draw_window:
 
-    mcall 12, 1                    ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ®¡ ®âà¨á®¢ª¥ ®ª­ 
+    mcall 12, 1       ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ® ­ ç «¥ ®âà¨á®¢ª¨
-                                   ; 1 - ­ ç¨­ ¥¬ à¨á®¢ âì
+	
+    mcall 48, 3, sc,sizeof.system_colors
 	
     ; ¤ «¥¥: á­ ç «  ¤«¨­­ë© ¢ à¨ ­â (§ ª®¬¬¥­â¨à®¢ ­­ë©)
     ; § â¥¬ ª®à®âª¨©  ­ «®£ á ¨á¯®«ì§®¢ ­¨¥¬ ¬ ªà®á®¢
 
-
+;   mov  eax,0                   ; äã­ªæ¨ï 0: ®¯à¥¤¥«¨âì ®ª­®
-                                   ; ‘Ž‡„€ðŒ ŽŠ<C5BD>Ž
+;   mov  ebx,200*65536+300       ; [x áâ àâ] *65536 + [x à §¬¥à]
-;   mov  eax,0                     ; äã­ªæ¨ï 0 : ®¯à¥¤¥«¨âì ¨ ®âà¨á®¢ âì ®ª­®
+;   mov  ecx,200*65536+150       ; [y áâ àâ] *65536 + [y à §¬¥à]
-;   mov  ebx,200*65536+200         ; [x áâ àâ] *65536 + [x à §¬¥à]
+;   mov  edx, [sc.work]          ; 梥â ä®­ 
-;   mov  ecx,200*65536+50          ; [y áâ àâ] *65536 + [y à §¬¥à]
+;   or   edx, 0x33000000         ; ¨ ⨯ ®ª­  3
-;   mov  edx,0x33aabbcc            ; 梥â à ¡®ç¥© ®¡« á⨠ RRGGBB,8->color gl
 ;   mov  edi,header              ; ‡€ƒŽ‹Ž‚ŽŠ ŽŠ<C5BD>€
 ;   int  0x40
 
-    mcall 0, <200,200>, <200,50>, 0x33AABBCC,,title
+    mov   edx, [sc.work]         ; 梥â ä®­ 
+    or    edx, 0x33000000        ; ¨ ⨯ ®ª­  3
+    mcall 0, <200,300>, <200,150>, , ,title
+
+    ; ¢ë¢®¤ ⥪á⮢®© áâப¨
+    mov   ecx, [sc.work_text]    ; 梥â ä®­ 
+    or    ecx, 0x90000000        ; ¨ ⨯ áâப¨
+    mcall 4, <10, 20>, 0x90000000, message
 
 	
-
+    mcall 12, 2                  ; äã­ªæ¨ï 12.2, § ª®­ç¨«¨ à¨á®¢ âì
-;   mov  eax,4
-;   mov  ebx,3 shl 16 + 8
-;   mov  ecx,0
-;   mov  edx,message
-;   mov  esi,message.size
-;   int  0x40
-
-    mcall 4, <3, 8>, 0, message, message.size
-
-    mcall 12, 2                    ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ®¡ ®âà¨á®¢ª¥ ®ª­ 
-                                   ; 2, § ª®­ç¨«¨ à¨á®¢ âì
 
     ret                          ; ¢ë室¨¬ ¨§ ¯à®æ¥¤ãàë
 
@@ -151,21 +145,10 @@ draw_window:
 Music:
   db  0x90, 0x30, 0
 
+sc system_colors
 
-;---------------------------------------------------------------------
+message db '<27> ¦¬¨â¥ «î¡ãî ª« ¢¨èã...',0
-
+title db '<27>ਬ¥à ¯à®£à ¬¬ë',0
-; ¨­â¥àä¥©á ¯à®£à ¬¬ë ¬­®£®ï§ëç­ë©
-;  ‚ë ¬®¦¥â¥ § ¤ âì ï§ëª ¢ MACROS.INC (lang fix ï§ëª)
-
-lsz message,\
-  ru,'<27> ¦¬¨â¥ «î¡ãî ª« ¢¨èã...',\
-  en,'Press any key...',\
-  fr,'Pressez une touche...'
-
-lsz title,\
-  ru,'<27><>ˆŒ…<C592> <20><>Žƒ<C5BD>€ŒŒ›',\
-  en,'EXAMPLE APPLICATION',\
-  fr,"L'exemplaire programme"
 
 ;---------------------------------------------------------------------
 

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