From c991e634ef076eeea2b357b912ad048591359659 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 15 Oct 2013 10:30:46 +0000
Subject: [PATCH] Eolite 1.98.5: fix & update rename function

git-svn-id: svn://kolibrios.org@4029 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c          | 22 ++++++++++++++--------
 programs/cmm/installer/installation.c | 16 ++++++++++------
 programs/cmm/lib/figures.h            |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 92ce125578..118a2ed11d 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -76,8 +76,8 @@
 
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
-#define TITLE "Eolite File Manager v1.98.4"
-#define ABOUT_TITLE "Eolite v1.98.4"
+#define TITLE "Eolite File Manager v1.98.5"
+#define ABOUT_TITLE "Eolite v1.98.5"
 dword col_work    = 0xE4DFE1;
 dword col_border  = 0x9098B0; //A0A0B8; //0x819FC5;
 dword col_padding = 0xC8C9C9;
@@ -753,22 +753,28 @@ void ReName(byte rename)
 		if (strcmp(#file_path,#temp)!=0) && (file_name)
 		if (itdir)
 		{
-			del_rezult = DeleteFile(#file_path);
-			if (del_rezult!=0)
+			if (del_rezult = DeleteFile(#file_path))
 			{
 				Write_Error(del_rezult);
 				ShowMessage(T_DEL_ERROR_1, 150);
 				return;
 			}
-			ELSE CreateDir(#temp);
+			if (CreateDir(#temp)) CreateDir(#file_path);
 			Open_Dir(#path,WITH_REDRAW);
+			SelectFile(#edit_name);
 		}
 		else
 		{
-			copy_rezult = CopyFile(#file_path,#temp);
-			if (copy_rezult!=0) Write_Error(copy_rezult); else Del_File(true);
+			if (copy_rezult = CopyFile(#file_path,#temp))
+			{
+				Write_Error(copy_rezult);
+			}
+			else
+			{
+				Del_File(true);
+				SelectFile(#edit_name);
+			}
 		}
-		SelectFile(#edit_name);
 	}
 	Line_ReDraw(col_selec,files.current);
 }
diff --git a/programs/cmm/installer/installation.c b/programs/cmm/installer/installation.c
index c52569c3fc..b3edbbd181 100644
--- a/programs/cmm/installer/installation.c
+++ b/programs/cmm/installer/installation.c
@@ -45,24 +45,27 @@ void Install()
 	proc_info Process;
 
 	ShowProgress("Mounting virtual disk...");
-	if (TmpDiskAdd(9, 100)!=0) RunProgram("/sys/tmpdisk", "a9s100");
-	for (i=2; i<256; i++;)
+	//if (TmpDiskAdd(9, 100)!=0) RunProgram("/sys/tmpdisk", "a9s100");
+	for (i=0; i<256; i++;)
 	{
 		GetProcessInfo(#Process, i);
 		if (i==Form.ID) || (strcmp(#Process.name, "OS")==0) continue;
+		//debug(#Process.name);
 		KillProcess(i);
 	}
 	//RunProgram("/sys/develop/board", NULL); //temp============
 	RunProgram("/sys/REFRSCRN", NULL);
-	pause(100);
+	//pause(100);
 	ShowProgress("Copying files...");
-	copyf("/sys/docpack", "/tmp9/1/docpack");
+	copyf("/sys/docpack", "/kolibrios/docpack");
 	DeleteFile("/sys/docpack");
 	copyf(abspath("sys"), "/rd/1");
-	copyf(abspath("tmp"), "/tmp9/1");
+	//copyf(abspath("tmp"), "/tmp9/1");
+	SetAddApplDir("kolibrios", abspath("kolibrios"));
+
 	ShowProgress("Post install actions...");
 	RunProgram("/sys/launcher", NULL);
-	SetSystemSkin("/tmp9/1/skins/latte.skn");
+	SetSystemSkin("/kolibrios/skins/latte.skn");
 	EndLoop();
 }
 
@@ -102,3 +105,4 @@ void EndLoop()
 					DrawLink(TEXTX, BLACK_H*2+85, 0x80, 11, "http://kolibri-n.org/donate.php");
 	}
 }
+
diff --git a/programs/cmm/lib/figures.h b/programs/cmm/lib/figures.h
index d3673f4e56..cefd32d369 100644
--- a/programs/cmm/lib/figures.h
+++ b/programs/cmm/lib/figures.h
@@ -120,7 +120,7 @@
 {
 	DrawRectangle(x,y,w,h,col_border);
 	DrawBar(x+1,y+1,w-1,1,0xFFFfff);
-	DrawBar(x+1,y+2,1,h-3,0xFFFfff);
+	DrawBar(x+1,y+2,1,h-2,0xFFFfff);
 	if (col_work!=-1) DrawBar(x+2,y+2,w-2,h-2,col_work);
 	DrawPopupShadow(x,y,w,h-1,skinned);
 }