From 2c6e64c7a01f967f274bfaca16f2c16532343d29 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 20 Feb 2016 22:09:50 +0000
Subject: [PATCH] app_plus: fix manual directory choose and fix running two
 SEARCHAP; remove debug information; make some vars and functions optional
 (decrease apps size)

git-svn-id: svn://kolibrios.org@6271 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/app_plus/app_plus.c     | 6 +++---
 programs/cmm/appearance/appearance.c | 1 -
 programs/cmm/lib/added_sysdir.c      | 2 --
 programs/cmm/lib/gui.h               | 8 ++++----
 programs/cmm/lib/patterns/rgb.h      | 6 +++---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/programs/cmm/app_plus/app_plus.c b/programs/cmm/app_plus/app_plus.c
index 9f362cf043..d5b24089ab 100644
--- a/programs/cmm/app_plus/app_plus.c
+++ b/programs/cmm/app_plus/app_plus.c
@@ -39,7 +39,6 @@ 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))	
@@ -52,7 +51,8 @@ void CheckKosMounted()
 
 void RunAutosearch()
 {
-	io.run("/sys/SEARCHAP",0);
+	if (!CheckProcessExists("SEARCHAP")) io.run("/sys/SEARCHAP",0);
+	while (CheckProcessExists("SEARCHAP")) pause(2);
 }
 
 void main()
@@ -75,7 +75,7 @@ void main()
 			if (id==10)
 			{
 				OpenDialog_start stdcall (#o_dialog);
-				if (o_dialog.status) SetAdditionalSystemDirectory("kolibrios", #openfile_path);
+				if (o_dialog.status) SetAdditionalSystemDirectory("kolibrios", #openfile_path+1);
 				pause(3);
 				CheckKosMounted();
 			}
diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c
index f7ae1a8c08..784e3bd00c 100644
--- a/programs/cmm/appearance/appearance.c
+++ b/programs/cmm/appearance/appearance.c
@@ -128,7 +128,6 @@ void main()
 			GetProcessInfo(#Form, SelfInfo);
 			IF (Form.status_window>=2) break;
 		 	DrawWindowContent();
-		 	debugi(menu.list.cur_y);
 	 		if (menu.list.cur_y) {
 				if (menu.list.cur_y == 10) EventOpenFile();
 				if (menu.list.cur_y == 11) EventDeleteFile();
diff --git a/programs/cmm/lib/added_sysdir.c b/programs/cmm/lib/added_sysdir.c
index ddcf914d26..5bdac1ceba 100644
--- a/programs/cmm/lib/added_sysdir.c
+++ b/programs/cmm/lib/added_sysdir.c
@@ -11,8 +11,6 @@ struct sysdir
 	int i;
 	strcpy(#sysdir.name, tName);
 	strcpy(#sysdir.path, tPath);
-	debugln(#sysdir.name);
-	debugln(#sysdir.path);
 	$mov eax, 30
 	$mov ebx, 3
 	ECX = #sysdir;
diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h
index 4b19c42da9..2e917c2239 100644
--- a/programs/cmm/lib/gui.h
+++ b/programs/cmm/lib/gui.h
@@ -68,7 +68,7 @@
 	}
 }
 
-unsigned char checkbox_flag[507] = {
+:unsigned char checkbox_flag[507] = {
 	0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 
 	0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 
 	0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xDC, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 
@@ -277,14 +277,14 @@ dword incn::inc(dword _addition)
 #define TAB_PADDING 25
 #define TAB_HEIGHT 25
 
-struct _tabs
+:struct _tabs
 {
 	int active_tab;
 	void draw();
 	int click();
 } tabs;
 
-void _tabs::draw(dword x,y, but_id, text)
+:void _tabs::draw(dword x,y, but_id, text)
 {
 	dword col_bg, col_text;
 	dword w=strlen(text)*8+TAB_PADDING, h=TAB_HEIGHT;
@@ -303,7 +303,7 @@ void _tabs::draw(dword x,y, but_id, text)
 	DrawCaptButton(x,y, w-1,h+1, but_id, col_bg, col_text, text);
 }
 
-int _tabs::click(int N)
+:int _tabs::click(int N)
 {
 	if (N==active_tab) return false;
 	active_tab = N;
diff --git a/programs/cmm/lib/patterns/rgb.h b/programs/cmm/lib/patterns/rgb.h
index 957b590993..4db4521830 100644
--- a/programs/cmm/lib/patterns/rgb.h
+++ b/programs/cmm/lib/patterns/rgb.h
@@ -2,21 +2,21 @@
 #define INCLUDE_RGB_H
 #print "[include <rgb.h>]\n"
 
-struct _rgb
+:struct _rgb
 {
 	byte b,g,r;
 	void DwordToRgb();
 	dword RgbToDword();
 } rgb;
 
-void _rgb::DwordToRgb(dword _dword)
+:void _rgb::DwordToRgb(dword _dword)
 {
 	r = _dword & 0xFF; _dword >>= 8;
 	g = _dword & 0xFF; _dword >>= 8;
 	b = _dword & 0xFF; _dword >>= 8;
 }
 
-dword _rgb::RgbToDword()
+:dword _rgb::RgbToDword()
 {
 	dword _b, _g;
 	_b = b << 16;