app+: build image instead of using real image (-1 img sector)

diff: -1 img sector

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

programs/cmm/app_plus/app_plus.c

@@ -1,4 +1,4 @@
-#define MEMSIZE 4096*20
+#define MEMSIZE 1024*40
 #include "..\lib\strings.h" 
 #include "..\lib\mem.h" 
 #include "..\lib\gui.h"
@@ -13,15 +13,14 @@
 //                                                   //
 //===================================================//
 
-proc_info Form;
+#define WINW 570
+#define WINH 300
 #define CONX 30 //content X pos
+#define SCRX WINW-180
+#define SCRY 20
 
 char default_dir[] = "/rd/1";
-od_filter filter2 = {"",0};
+od_filter filter2;
-
-dword scr = FROM "scr.raw_8bit";
-dword scr_pal[] = {0xFFFFFF,0xBBDDFF,0x4166B5,0xE0E4E6,0xAFBEDD,0xC4D4E8,0x52ACDD,0x000000,
-0xE9DAB2,0xC99811,0xFDF9D4,0xF8B93C,0xFDEEBE,0xFBEBA6,0xDFAF4F,0xF3D57C};
 
 #define BTN_MANUAL_SEARCH 10
 #define BTN_OPEN_ANYWAY 11
@@ -42,7 +41,7 @@ dword scr_pal[] = {0xFFFFFF,0xBBDDFF,0x4166B5,0xE0E4E6,0xAFBEDD,0xC4D4E8,0x52ACD
 ª à⨭ª¥ á¯à ¢ . ‚ á«ãç ¥ ­¥¢¥à­® 
 ¢ë¡à ­­®© ¯ ¯ª¨ âॡã¥âáï ¢ë¯®«­¨âì 
 ¯¥à¥§ £à㧪ã <EFBFBD>Š ¨ ¯®¯à®¡®¢ âì á­®¢ ."
-?define MANUALLY_BUTTON_TEXT "<EFBFBD> ©â¨ /kolibrios/..."
+?define MANUALLY_BUTTON_TEXT "“ª § âì ¯ ¯ªã /kolibrios/..."
 ?define OPEN_ANYWAY_BUTTON_TEXT "‡ ¯ãáâ¨âì APP+ (­¥ª®â®àë¥ ¯à®£à ¬¬ë ¡ã¤ãâ ­¥¤®áâ㯭ë)"
 #else
 ?define WINDOW_TITLE_TEXT "Warning! It's important."
@@ -52,11 +51,13 @@ like image on the right.
 Note: this action can be done only once 
 per 1 session of the OS running. If you 
 will choose the wrong folder then you 
-need to reboot system to try again."
+need to reboot a system to try again."
 ?define MANUALLY_BUTTON_TEXT "Choose /kolibrios/ folder..."
-?define OPEN_ANYWAY_BUTTON_TEXT "Open APP+ anyway (some apps will be unavailable)"
+?define OPEN_ANYWAY_BUTTON_TEXT "Open APP+ anyway (some programs won't be available)  "
 #endif
 
+char kolibrios_dirs[] = "..\0     3D     \0demos  \0develop\0drivers\0emul   \0games  \0grafx2";
+
 //===================================================//
 //                                                   //
 //                       CODE                        //
@@ -101,25 +102,35 @@ void main()
 
 void draw_window()
 {
-	incn y;
 	sc.get();
-	DefineAndDrawWindow(screen.width-570/2, 100, 570, 300+skin_height, 0x34, sc.work, WINDOW_TITLE_TEXT,0);
+	DefineAndDrawWindow(screen.width-WINW/2, 100, WINW, WINH+skin_height, 0x34, sc.work, WINDOW_TITLE_TEXT,0);
-	GetProcessInfo(#Form, SelfInfo);
+	WriteTextB(CONX+2,SCRY+2,0x81,MixColors(sc.work, 0xB92234,220),CONTENT_HEADER_TEXT);
-	WriteTextB(CONX+2,y.set(20)+2,0x81,MixColors(sc.work, 0xB92234,220),CONTENT_HEADER_TEXT);
+	WriteTextB(CONX,SCRY,0x81,0xB92234,CONTENT_HEADER_TEXT);
-	WriteTextB(CONX,y.n,0x81,0xB92234,CONTENT_HEADER_TEXT);
+	draw_screen();
-	
+	WriteTextLines(CONX,SCRY+50,0x90,sc.work_text,DESCRIPTION_TEXT,20);
-	PutPaletteImage(#scr,144,171,Form.cwidth-180,y.n,8,#scr_pal);
-	DrawRectangle(Form.cwidth-180-1,y.n-1, 144+1,171+1, sc.work_graph);
-
-	WriteTextLines(CONX,y.inc(50),0x90,sc.work_text,DESCRIPTION_TEXT,20);
-
 	DrawButtons();	
 }
 
+void draw_screen()
+{
+	char i;
+	int icon_n=1;
+	DrawRectangle(WINW-180-1,SCRY-1, 145+1,170+1, sc.work_graph);
+	DrawBar(SCRX,SCRY,145,170,0xFFFfff);
+	DrawBar(SCRX+25,SCRY+5,144-25,20,0xBBDDFF);
+	for (i=0; i<8; i++) {
+		draw_icon_16(SCRX+5, i*20+SCRY+5, icon_n);
+		WriteText(SCRX+27, i*20+SCRY+11, 0x80, 0, i*8 + #kolibrios_dirs);
+		icon_n = 0;
+	}
+}
+
 void DrawButtons()
 {
-	DrawStandartCaptButton(CONX, Form.cheight-80, BTN_MANUAL_SEARCH, MANUALLY_BUTTON_TEXT);
+	DrawStandartCaptButton(CONX, WINH-80, BTN_MANUAL_SEARCH, MANUALLY_BUTTON_TEXT);
-	DrawStandartCaptButton(CONX, Form.cheight-42, BTN_OPEN_ANYWAY, OPEN_ANYWAY_BUTTON_TEXT);
+	DrawStandartCaptButton(CONX, WINH-42, BTN_OPEN_ANYWAY, OPEN_ANYWAY_BUTTON_TEXT);
+	//DrawCaptButton(CONX, WINH-80, 300, 25, BTN_MANUAL_SEARCH, sc.button, sc.button_text, MANUALLY_BUTTON_TEXT);
+	//DrawCaptButton(CONX, WINH-42, 500, 25, BTN_OPEN_ANYWAY, sc.button, sc.button_text, OPEN_ANYWAY_BUTTON_TEXT);
 }
 
 void CheckKosMounted()
@@ -161,7 +172,7 @@ void EventButton(dword id)
 {
 	if (id==CLOSE_BTN) ExitProcess();
 	else if (id==BTN_MANUAL_SEARCH) EventManualSearch();
-	else if (id==BTN_OPEN_ANYWAY) { EventOpenApp();	 ExitProcess(); }
+	else if (id==BTN_OPEN_ANYWAY) { EventOpenApp(); ExitProcess(); }
 }
 
 

programs/cmm/app_plus/compile_en.bat

@@ -1,4 +1,4 @@
-@c-- /D=LANG=ENG app_plus.c
+@c-- /D=LANG_ENG app_plus.c
 @del *.
 @rename *.com *.
 @del warning.txt

programs/cmm/app_plus/compile_ru.bat

@@ -1,4 +1,4 @@
-@c-- /D=LANG=RUS app_plus.c
+@c-- /D=LANG_RUS app_plus.c
 @del *.
 @rename *.com *.
 @del warning.txt

programs/cmm/diff/diff.c

@@ -1,7 +1,8 @@
 //visual text comparer 
 //by den po - jdp@bk.ru
 
-#define MEMSIZE 4096 * 60
+#define MEMSIZE 1024 * 60
+#define ENTRY_POINT #main
 #include "../lib/fs.h"
 #include "../lib/strings.h"
 #include "../lib/obj/console.h"
@@ -79,6 +80,7 @@ bool getparam()
 }
 
 main(){
+	mem_init();
 	if (param[0]) getparam();
 	if (!srcfilename) || (!dstfilename) gui(); else console();
 }
@@ -195,6 +197,7 @@ console() {
 		notify("'Nothing to compare' -E"); 
 	else ifinit();
 
+	con_exit stdcall (0);
 	diffs.DeleteAll();        delete diffs;
 	dstfilenums.DeleteAll();  delete dstfilenums;
 	srcfilenums.DeleteAll();  delete srcfilenums;

programs/cmm/diff/diff_gui.h

@@ -94,19 +94,19 @@ void gui()
 void draw_window()
 {
 	sc.get();
-	DefineAndDrawWindow(215, 100, WIN_W+9, 170 + skin_height, 0x34, sc.work, #window_title,0);
+	DefineAndDrawWindow(215, 100, WIN_W+9, 170 + GetSkinHeight(), 0x34, sc.work, #window_title,0);
 	//GetProcessInfo(#Form, SelfInfo);
 	if (READY==state) {
 		DrawFileBox(#src_box, T_FIRST, BID_SRC_OPEN);
 		DrawFileBox(#dst_box, T_SECOND, BID_DST_OPEN);
-		DrawStandartCaptButton(dst_box.left - 2, dst_box.top + 40, BID_GO, T_GO);
+		DrawCaptButton(dst_box.left - 2, dst_box.top + 40, 120, 25, BID_GO, sc.button, sc.button_text, T_GO);
 	}
 }
 
-void UpdateEditBoxes(dword f1, f2)
+void UpdateEditBoxes(dword flag1, flag2)
 {
-	EditBox_UpdateText(#src_box, f1);
+	EditBox_UpdateText(#src_box, flag1);
-	EditBox_UpdateText(#dst_box, f2);
+	EditBox_UpdateText(#dst_box, flag2);
 	edit_box_draw stdcall (#src_box);
 	edit_box_draw stdcall (#dst_box);
 }