From a612dc8dfb3dd896c3d9670cc3b786aa4b8beb7a Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 8 Apr 2012 22:01:35 +0000
Subject: [PATCH] Eolite 1.2: path history. Forward button should work now.

git-svn-id: svn://kolibrios.org@2591 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/fs/Eolite/trunk/Eolite.c--           | 13 +++---
 .../fs/Eolite/trunk/include/about_dialog.h    |  4 +-
 programs/fs/Eolite/trunk/include/history.h    | 43 ++++++++++---------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c--
index 9e011aee59..a5e934a41f 100644
--- a/programs/fs/Eolite/trunk/Eolite.c--
+++ b/programs/fs/Eolite/trunk/Eolite.c--
@@ -3,6 +3,7 @@
 
 //копировать через поток
 //IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //если нет, + "/" перенестив опендир
+//3. Думаю будет флаг отображать подписи или нет. И да, иконка действительно нужна другая.
 
 #include "lib\kolibri.h"
 #include "lib\memory.h"
@@ -19,7 +20,7 @@ int BUTTON_HEIGHT=18;
 #define ONLY_OPEN	2
 
 //переменные
-#define title "Eolite File Manager v1.15"
+#define title "Eolite File Manager v1.2"
 dword videlenie=0x94AECE; //цвет выделенного элемента из списка файлов
 //
 int  but_num,
@@ -163,8 +164,8 @@ int pressed_y;
 					case 21: //Back
 							GoBack();
 							break;
-					case 22: //Forvard
-							HistoryPath(go_forvard);
+					case 22: //Forward
+							HistoryPath(go_forward);
 							break;
 					case 23: //up!
 							IF (strcmp(#path,"/")<>0) Dir_Up();
@@ -787,12 +788,12 @@ void SelectFile(dword that_file)
 
 void Dir_Up()
 {
-	byte temp_[4096];
+	char cur_folder[4096];
 	i=strlen(#path)-1;
 	path[i]=0x00;
-	do i--; while (path[i]<>'/'); copystr(#path+i+1,#temp_); 
+	do i--; while (path[i]<>'/'); copystr(#path+i+1,#cur_folder); 
 	path[i+1]=0x00;
-	SelectFile(#temp_);
+	SelectFile(#cur_folder);
 }
 
 
diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h
index 4e938bc4f7..84d1972931 100644
--- a/programs/fs/Eolite/trunk/include/about_dialog.h
+++ b/programs/fs/Eolite/trunk/include/about_dialog.h
@@ -37,10 +37,10 @@ void authors()
 				DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,0,0,"About Eolite");
 				DrawBar(0,0,172,50,0x8494C4); //голубое сзади
 				PutPaletteImage(#logo,85,85,43,7,#logo_pal);
-				WriteText(54-3,100,0x80,0xBF40BF,"Eolite v1.15",0);
+				WriteText(54,100,0x80,0xBF40BF,"Eolite v1.2",0);
 				WriteText(55,120,0x80,0,"Developers:",0); 
 				WriteText(39,130,0x80,0,"Leency & Veliant",0); 
-				WriteText(30,140,0x80,0,"Diamond, Lrz, Nable",0);
+				WriteText(45,140,0x80,0,"KolibriOS Team",0);
 				WriteText(55,150,0x80,0," 2008-2012 ",0);
 				WriteText(12,170,0x80,0,"Visit",0);
 				DrawLink(48,170,23, "kolibri-os.narod.ru"); //ссылкa
diff --git a/programs/fs/Eolite/trunk/include/history.h b/programs/fs/Eolite/trunk/include/history.h
index db54292830..b6a128b134 100644
--- a/programs/fs/Eolite/trunk/include/history.h
+++ b/programs/fs/Eolite/trunk/include/history.h
@@ -6,9 +6,7 @@ int history_current;
 
 #define add_new_path 1
 #define go_back 2
-#define go_forvard 3
-
-//history_current
+#define go_forward 3
 
 dword GetCurrentFolder()
 {
@@ -21,33 +19,36 @@ dword GetCurrentFolder()
 
 void HistoryPath(byte action)
 {
+	/*WriteDebug("");
+	WriteDebug(IntToStr(history_current));
+	for (i=0; i<history_num; i++;)
+	{
+		WriteDebug(#history_list[i].Item);
+		WriteDebug(IntToStr(history_num));
+	}*/
+	
 	if (action==add_new_path)
 	{
-		if (history_num>0) && (strcmp(#path,#history_list[history_num-1].Item)==0) return;
-		
-		copystr(#path,#history_list[history_num].Item);
-		history_num++;
+		if (history_num>0) && (strcmp(#path,#history_list[history_current].Item)==0) return;
+		history_current++;
+		copystr(#path,#history_list[history_current].Item);
+		history_num=history_current;
 	}
 	
 	if (action==go_back)
 	{
-		if (history_num<=2) return;
-		history_num--;
-		copystr(#history_list[history_num-1].Item,#path);
+		if (history_current<=2) return;
+		WriteDebug("");
+		WriteDebug("Fuck!");
+		history_current--;
+		copystr(#history_list[history_current].Item,#path);
 	}
 
-	if (action==go_forvard)
+	if (action==go_forward)
 	{
-		WriteDebug("");
-		for (i=0; i<history_num; i++;)
-		{
-			WriteDebug(#history_list[i].Item);
-			WriteDebug(IntToStr(history_num));
-		}
-		if (strcmp("",#history_list[history_num].Item)==0) return;
-		history_num++;
-		copystr(#history_list[history_num-1].Item,#path);
+		if (history_current==history_num) return;
+		history_current++;
+		copystr(#history_list[history_current].Item,#path);
 		SelectFile("");
-		return;
 	}	
 }
\ No newline at end of file