WebSVN – Kolibri OS – Diff – /programs/cmm/eolite/Eolite.c

 //Leency & Veliant 2008-2013
 //GNU GPL licence.
+#ifndef AUTOBUILD
+#include "lang.h--"
+#endif
 //libraries
 #define MEMSIZE 0xA0000
 #include "..\lib\kolibri.h"
 #include "..\lib\strings.h"
 #include "..\lib\copyf.h"
 //images
 #include "imgs\toolbar.txt"
 #include "imgs\left_p.txt"
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
 #ifdef LANG_RUS
 	?define T_FILE " ©«"
 	?define T_TYPE "¨¯"
 	?define T_SIZE " §¬¥à"
 	?define NOT_CREATE_FOLDER "¥ ã¤ «®áì á®§¤ âì ¯ ¯ªã."
 	?define NOT_CREATE_FILE "¥ ã¤ «®áì á®§¤ âì ä ©«."
 	?define ERROR_1 "è¨¡ª  ¯à¨ § £àã§ª¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_lib.obj"
 	?define T_PASTE_WINDOW "®¯¨àãî..."
 	?define T_PASTE_WINDOW_TEXT "®¯¨àã¥âáï ä ©«:"
+	?define T_CANCEL_PASTE "®¯¨à®¢ ¨¥ ¯à¥ªà é¥®.  ¯ª  áª®¯¨à®¢   ¥ ¯®«®áâìî."
 #elif LANG_EST
 	?define T_FILE "Fail"
 	?define T_TYPE "Tüüp"
 	?define T_SIZE "Suurus"
 	?define T_NEW_FOLDER "Uus kataloog"
 	?define NOT_CREATE_FOLDER "Kataloogi ei saa luua."
 	?define NOT_CREATE_FILE "Faili ei saa luua."
 	?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_lib.obj"
 	?define T_PASTE_WINDOW "Kopeerin..."
 	?define T_PASTE_WINDOW_TEXT "Kopeerin faili:"
+	?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
 #else
 	?define T_FILE "File"
 	?define T_TYPE "Type"
 	?define T_SIZE "Size"
 	?define T_NEW_FOLDER "New folder"
 	?define NOT_CREATE_FOLDER "Folder can not be created."
 	?define NOT_CREATE_FILE "File can not be created."
 	?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj"
 	?define T_PASTE_WINDOW "Copying..."
 	?define T_PASTE_WINDOW_TEXT "Copying file:"
+	?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
 #endif
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
-#define TITLE "Eolite File Manager v1.98"
+#define TITLE "Eolite File Manager v1.98.3"
-#define ABOUT_TITLE "Eolite v1.98"
+#define ABOUT_TITLE "Eolite v1.98.3"
 dword col_work    = 0xE4DFE1;
 dword col_border  = 0x9098B0; //A0A0B8; //0x819FC5;
 dword col_padding = 0xC8C9C9;
 	sort_num=2,
 	itdir;
 proc_info Form;
 mouse m;
-int mouse_dd, scroll_used, scroll_size;
+int mouse_dd, scroll_used, scroll_size, sorting_arrow_x;
 dword buf, off;
 dword file_mas[6898];
 int j, i;
 						break;
 				case 26: //paste
 						CreateThread(#Paste,#copy_stak);
 						break;
 				case 31...33: //sort
-						IF(sort_num==1) DrawFilledBar(onLeft(192,168)/2+210,42,6,10);
+						IF(sort_num==1) DrawFilledBar(sorting_arrow_x,42,6,10);
-						IF(sort_num==2) DrawFilledBar(onLeft(115,0),42,6,10);
+						IF(sort_num==2) DrawFilledBar(sorting_arrow_x,42,6,10);
-						IF(sort_num==3) DrawFilledBar(onLeft(44,0),42,6,10);
+						IF(sort_num==3) DrawFilledBar(sorting_arrow_x,42,6,10);
 						sort_num=id-30;
 						Open_Dir(#path,WITH_REDRAW);
 						break;
 				case 50...60: //Actions
 						FnProcess(id-50);
+	{
 		KEdit();
 		HistoryPath(ADD_NEW_PATH);
 		files.visible = files.h / files.line_h;
 		IF (files.count < files.visible) files.visible = files.count;
-		IF (sort_num==1) WriteText(Form.width+60/2,45,0x80,col_border,"\x19");
+		IF (sort_num==1) sorting_arrow_x = Form.width+60/2;
-		IF (sort_num==2) WriteText(Form.width-115,45,0x80,col_border,"\x19");
+		IF (sort_num==2) sorting_arrow_x = Form.width-115;
+		IF (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
-		IF (sort_num==3) WriteText(Form.width-44,45,0x80,col_border,"\x19");
+		WriteText(sorting_arrow_x,45,0x80,col_border,"\x19");
 		IF (redraw!=ONLY_SHOW) Sorting();
 		IF (redraw!=ONLY_OPEN) List_ReDraw();
+	}
 	IF (files.count==-1) && (redraw!=ONLY_OPEN) {files.visible=files.count=0; List_ReDraw();}
+}
 void Del_Form()
+{
 	int dform_x=files.w-220/2+files.x;
-	int dform_x=files.w-220/2+files.x;
+	if (strcmp(#file_name,".")==0) || (strcmp(#file_name,"..")==0) return;
 	if (del_active==2)
+	{
 		if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
 		DrawFlatButton(dform_x+120,208,70,20,302,0xC6DFC6,T_NO);
 		del_active=1;
+	}
+}
+int del_error;
-void Del_File2(dword way)
+int Del_File2(dword way)
+{
+	dword dirbuf, fcount, i, filename;
-	dword dirbuf, fcount, i, filename;
+	int error;
-	char del_from[4096], error;
+	char del_from[4096];
-	if (DeleteFile(way))
+	if (isdir(way))
 	{
-		error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL);
+		if (error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL)) del_error = error;
 		for (i=0; i
+		{
 			if (CheckEvent()==evReDraw) draw_window();
 			filename = i*304+dirbuf+72;
 			strcpy(#del_from, way);
 			chrcat(#del_from, '/');
 			strcat(#del_from, filename);
 			if ( TestBit(ESDWORD[filename-40], 4) )
 				Del_File2(#del_from);
+			else
-			else
+			{
+				if (error = DeleteFile(#del_from)) del_error = error;
 				DeleteFile(#del_from);
-		}
 		DeleteFile(way);
+	}
 	if (error = DeleteFile(way)) del_error = error;
+}
 void Del_File(byte dodel)
+{
-	if (dodel==true)
 	if (dodel==true)
+	{
 		del_active=2;
+		if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
-		List_ReDraw();
+		del_error = 0;
-		if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
+		Del_File2(#file_path);
-		Del_File2(#file_path);
+		if (del_error) Write_Error(del_error);
+ 	}
 	del_active=0;

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c @ 5506 – Rev 4002 → 4022