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

 	?define T_NEW_FILE "®¢ë© ä ©«"
 	?define T_DELETE_FILE "ë ¤¥©áâ¢¨â¥«ì® å®â¨â¥ ã¤ «¨âì"
 	?define T_YES " "
 	?define T_NO "¥â"
 	?define T_DEL_ERROR_1 "è¨¡ª .  ¯ª  ¥ ¯ãáâ ï."
-	?define T_DEL_ERROR_2 "è¨¡ª .  ©«®¢ ï á¨áâ¥¬  â®«ìª® ¤«ï çâ¥¨ï."
+	?define WAIT_DELETING_FOLDER "¤ «ï¥âáï ¯ ¯ª . ®¤®¦¨â¥..."
 	?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_NEW_FILE "Uus fail"
 	?define T_DELETE_FILE "Kas sa tahad tõesti kustutada"
 	?define T_YES "Jah"
 	?define T_NO "Ei"
 	?define T_DEL_ERROR_1 "Viga. Kataloog ei ole tühi."
-	?define T_DEL_ERROR_2 "Viga. Failisüsteem ainult loetav."
+	?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
 	?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_NEW_FILE "New file"
 	?define T_DELETE_FILE "Do you really want to delete"
 	?define T_YES "Yes"
 	?define T_NO "No"
 	?define T_DEL_ERROR_1 "Error. Folder isn't empty."
-	?define T_DEL_ERROR_2 "Error. Filesystem read-only."
+	?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
 	?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:"
 #endif
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
-#define TITLE "Eolite File Manager v1.97.2"
+#define TITLE "Eolite File Manager v1.97.7"
-#define ABOUT_TITLE "Eolite v1.97.2"
+#define ABOUT_TITLE "Eolite v1.97.7"
 dword col_work    = 0xE4DFE1;
 dword col_border  = 0x9098B0; //A0A0B8; //0x819FC5;
 dword col_padding = 0xC8C9C9;
+}
 void Del_Form()
+{
-	int dform_x = files.w - 200 / 2 + files.x-3;
+	int dform_x = Form.width/2-13;
 	if (!files.count) return;
-	DrawPopup(dform_x,160,213,80,1,col_work,col_border);
+	DrawPopup(dform_x,160,220,80,1,col_work,col_border);
-	WriteText(-strlen(T_DELETE_FILE)*3+107+dform_x,175,0x80,0,T_DELETE_FILE);
+	WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,0,T_DELETE_FILE);
 	IF (strlen(#file_name)<28)
 	{
-		WriteText(strlen(#file_name)*3+107+dform_x+2,190,0x80,0,"?");
+		WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,0,"?");
-		WriteText(-strlen(#file_name)*3+107+dform_x,190,0x80,0,#file_name);
+		WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,0,#file_name);
+	}
 	else
+	{
 		WriteText(164+dform_x,190,0x80,0,"...?");
 		ESI = 24;
 		WriteText(dform_x+20,190,0,0,#file_name);
 	}
-	DrawFlatButton(dform_x+26,208,70,20,301,0xFFB6B5,T_YES);
+	DrawFlatButton(dform_x+27,208,70,20,301,0xFFB6B5,T_YES);
-	DrawFlatButton(dform_x+119,208,70,20,302,0xC6DFC6,T_NO);
+	DrawFlatButton(dform_x+120,208,70,20,302,0xC6DFC6,T_NO);
 	del_active=1;
+}
 void Del_File2(dword way)
-{
+void Del_File2(dword way)
-	int del_rezult;
 	dword dirbuf, fcount, i, filename;
-	char del_from[4096], error;
+	dword dirbuf, fcount, i, filename;
-	del_rezult = DeleteFile(way);
+	char del_from[4096], error;
-		if (del_rezult)
+	if (DeleteFile(way))
+	{
+		error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL);
+		for (i=0; i
+		{
 			//need redraw window during this process
-			error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL);
+			//like this:
-			for (i=0; i
+			//if CheckEvent()==Redraw DrawWindow();
 			//i'm too tired to code now...
-				filename = i*304+dirbuf+72;
+			filename = i*304+dirbuf+72;
+}
-void Del_File(byte dodel)
 void Del_File(byte dodel)
 	int del_rezult;
+	if (dodel==true)
+	{
-	if (dodel==true)
+		List_ReDraw();
 		if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
 		Del_File2(#file_path);
+ 	}
- 	}
+	del_active=0;
-	del_active=0;
+	DeleteButton(301);
-	DeleteButton(301); DeleteButton(302);
+	DeleteButton(302);
 	Open_Dir(#path,WITH_REDRAW);
+		{
 			del_rezult = DeleteFile(#file_path);
 			if (del_rezult!=0)
+			{
 				Write_Error(del_rezult);
-				ShowMessage(T_DEL_ERROR_1);
+				ShowMessage(T_DEL_ERROR_1, 150);
 				return;
+			}
 			ELSE CreateDir(#temp);
 			Open_Dir(#path,WITH_REDRAW);
+		}
 				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
-				ShowMessage(NOT_CREATE_FOLDER);
+				ShowMessage(NOT_CREATE_FOLDER, 150);
+			}
 			break;
 		case 7:
 			strcpy(#temp, #path);
 			strcat(#temp, T_NEW_FILE);
 				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
-				ShowMessage(NOT_CREATE_FILE);
+				ShowMessage(NOT_CREATE_FILE, 150);
+			}
 			break;
 		case 10: //F10
 			RunProgram(EDITOR_PATH, abspath("Eolite.ini"));
 			break;

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 3991 → 3997