From 3d6423b368f6b9ae23ba3a45390300344d607b95 Mon Sep 17 00:00:00 2001
From: Serhii Sakhno <sergei.sakhno@gmail.com>
Date: Mon, 9 Mar 2015 15:14:09 +0000
Subject: [PATCH] Eolite 2.63: optimize GUI; small change;

git-svn-id: svn://kolibrios.org@5512 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c       | 58 +++++++++++++++++++++++++-----
 programs/cmm/eolite/include/copy.h | 11 ++----
 programs/cmm/lib/copyf.h           |  8 +++++
 3 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index ceebc7fcec..a85235ac25 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -43,6 +43,8 @@
 	?define T_PASTE_WINDOW_TEXT "Копируется файл:"
 	?define T_CANCEL_PASTE "Копирование прекращено. Папка скопирована не полностью."
 	?define T_SELECT_APP_TO_OPEN_WITH "Выберите программу для открытия файла"
+	?define DEL_MORE_FILES_1 "эти элементы ("
+	?define DEL_MORE_FILES_2 " шт.)?"
 #elif LANG_EST
 	?define T_FILE "Fail"
 	?define T_TYPE "T№№p"
@@ -61,6 +63,8 @@
 	?define T_PASTE_WINDOW_TEXT "Kopeerin faili:"
 	?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
 	?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
+	?define DEL_MORE_FILES_1 "эти элементы ("
+	?define DEL_MORE_FILES_2 " шт.)?"
 #else
 	?define T_FILE "File"
 	?define T_TYPE "Type"
@@ -79,12 +83,14 @@
 	?define T_PASTE_WINDOW_TEXT "Copying file:"
 	?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
 	?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
+	?define DEL_MORE_FILES_1 "эти элементы ("
+	?define DEL_MORE_FILES_2 " шт.)?"
 #endif
 
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
-#define TITLE "Eolite File Manager v2.62"
-#define ABOUT_TITLE "Eolite v2.62"
+#define TITLE "Eolite File Manager v2.63"
+#define ABOUT_TITLE "Eolite v2.63"
 dword col_padding, col_selec, col_lpanel;
 
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
@@ -380,6 +386,24 @@ void main()
 					case 022: //Ctrl+V
 							CreateThread(#Paste,#copy_stak+4092);
 							break;
+					case 001: //Ctrl+A
+							debugln("press Ctrl+A");
+							for (i=0; i<files.count; i++) 
+							{
+								selected_offset = file_mas[i]*304 + buf+32 + 7;
+								ESBYTE[selected_offset] = 1;
+							}
+							List_ReDraw();
+							break;
+					case 021: //Ctrl+U
+							debugln("press Ctrl+A");
+							for (i=0; i<files.count; i++) 
+							{
+								selected_offset = file_mas[i]*304 + buf+32 + 7;
+								ESBYTE[selected_offset] = 0;
+							}
+							List_ReDraw();
+							break;
 					case ASCII_KEY_ESC:
 							IF (rename_active==1) ReName(false);
 							break;
@@ -728,6 +752,9 @@ inline Sorting()
 
 void Del_Form()
 {
+	dword selected_offset2;
+	int cont = 0;
+	byte f_count[128];
 	int dform_x=files.w-220/2+files.x;
 	if (strcmp(#file_name,".")==0) || (strcmp(#file_name,"..")==0) return;
 	if (del_active==2)
@@ -739,16 +766,31 @@ void Del_Form()
 		if (!files.count) return;
 		DrawPopup(dform_x,160,220,80,1,sc.work,sc.work_graph);
 		WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,sc.work_text,T_DELETE_FILE);
-		IF (strlen(#file_name)<28) 
+		for (i=0; i<files.count; i++) 
 		{
-			WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?");
-			WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name);
+			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+			if (ESBYTE[selected_offset2]) cont++;
+		}
+		if (cont)
+		{
+			strcpy(#f_count, DEL_MORE_FILES_1);
+			strcat(#f_count, itoa(cont));
+			strcat(#f_count, DEL_MORE_FILES_2);
+			WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,sc.work_text,#f_count);
 		}
 		else
 		{
-			WriteText(164+dform_x,190,0x80,0,"...?");
-			ESI = 24;
-			WriteText(dform_x+20,190,0,0,#file_name);
+			IF (strlen(#file_name)<28) 
+			{
+				WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?");
+				WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name);
+			}
+			else
+			{
+				WriteText(164+dform_x,190,0x80,0,"...?");
+				ESI = 24;
+				WriteText(dform_x+20,190,0,0,#file_name);
+			}
 		}
 		DrawFlatButton(dform_x+27,208,70,20,301,0xFFB6B5,T_YES);
 		DrawFlatButton(dform_x+120,208,70,20,302,0xC6DFC6,T_NO);		
diff --git a/programs/cmm/eolite/include/copy.h b/programs/cmm/eolite/include/copy.h
index 65f2c434fb..33bb2eae6f 100644
--- a/programs/cmm/eolite/include/copy.h
+++ b/programs/cmm/eolite/include/copy.h
@@ -61,17 +61,10 @@ void Copy(dword pcth, char cut)
 }
 
 void copyf_Draw_Progress(dword filename) {
-	#define WIN_W 300
-	#define WIN_H 50
-	DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW);
+	DrawRectangle(0,0,WIN_COPY_W-5, 15,sc.work);
 	WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT);
-	DrawBar(5, 26, WIN_W-10, 10, sc.work);
+	DrawBar(5, 26, WIN_COPY_W-10, 10, sc.work);
 	WriteText(5,26, 0x80, sc.work_text, filename);
-	if (CheckEvent()==evButton) 
-	{
-		notify(T_CANCEL_PASTE);
-		CopyExit();
-	} 
 }
 
 void Paste()
diff --git a/programs/cmm/lib/copyf.h b/programs/cmm/lib/copyf.h
index e721c1b959..d3a58936f3 100644
--- a/programs/cmm/lib/copyf.h
+++ b/programs/cmm/lib/copyf.h
@@ -1,8 +1,11 @@
 //copyf - copy file or folder with content
+#define WIN_COPY_W 300
+#define WIN_COPY_H 50
 :int copyf(dword from1, in1)
 {
 	dword error;
 	BDVK CopyFile_atr1;
+	DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H-1,0x34,sc.work,T_PASTE_WINDOW);
 	if (!from1) || (!in1)
 	{
 		notify("Error: too less copyf params!");
@@ -22,6 +25,11 @@
 		copyf_Draw_Progress(from1+strchr(from1, '/'));
 		return CopyFile(from1, in1);
 	}
+	if (CheckEvent()==evButton) 
+	{
+		notify(T_CANCEL_PASTE);
+		CopyExit();
+	} 
 }
 
 :int CopyFile(dword copy_from3, copy_in3)