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

 	?define T_DELETE_FILE "ë ¤¥©áâ¢¨â¥«ì® å®â¨â¥ ã¤ «¨âì"
 	?define T_YES " "
 	?define T_NO "¥â"
 	?define T_CANCEL "â¬¥ "
 	?define T_CREATE "®§¤ âì"
+	?define FILE_EXISTS " ©« á â ª¨¬ ¨¬¥¥¬ áãé¥áâ¢ã¥â"
+	?define FOLDER_EXISTS " ¯ª  á â ª¨¬ ¨¬¥¥¬ áãé¥áâ¢ã¥â"
 	?define T_DEL_ERROR_1 "è¨¡ª .  ¯ª  ¥ ¯ãáâ ï."
 	?define WAIT_DELETING_FOLDER "¤ «ï¥âáï ¯ ¯ª . ®¤®¦¨â¥..."
 	?define NOT_CREATE_FOLDER "¥ ã¤ «®áì á®§¤ âì ¯ ¯ªã."
 	?define NOT_CREATE_FILE "¥ ã¤ «®áì á®§¤ âì ä ©«."
 	?define ERROR_1 "è¨¡ª  ¯à¨ § £àã§ª¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_lib.obj"
 	?define T_DELETE_FILE "Kas sa tahad tõesti kustutada"
 	?define T_YES "Jah"
 	?define T_NO "Ei"
 	?define T_CANCEL "Cancel"
 	?define T_CREATE "Create"
+	?define FILE_EXISTS "The file with the same name exists"
+	?define FOLDER_EXISTS "A folder with the same name exists"
 	?define T_DEL_ERROR_1 "Viga. Kataloog ei ole tühi."
 	?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_DELETE_FILE "Do you really want to delete"
 	?define T_YES "Yes"
 	?define T_NO "No"
 	?define T_CANCEL "Cancel"
 	?define T_CREATE "Create"
+	?define FILE_EXISTS "The file with the same name exists"
+	?define FOLDER_EXISTS "A folder with the same name exists"
 	?define T_DEL_ERROR_1 "Error. Folder isn't empty."
 	?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 DEL_MORE_FILES_2 " pcs.)?"
 #endif
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
-#define TITLE "Eolite File Manager v2.77"
+#define TITLE "Eolite File Manager v2.78"
-#define ABOUT_TITLE "Eolite v2.77"
+#define ABOUT_TITLE "Eolite v2.78"
 dword col_padding, col_selec, col_lpanel;
 mouse gestures;
 signed x_old, y_old, dif_x, dif_y, adif_x, adif_y;
 byte stats;
-edit_box edit2 = {250,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,#mouse_dd,64,6,6};
+edit_box edit2 = {250,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xFFFFFF,0,248,#file_name,#mouse_dd,64,6,6};
-edit_box new_file_ed = {150,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#new_element_name,#mouse_dd,64,6,6};
+edit_box new_file_ed = {150,213,80,0xFFFFFF,0x94AECE,0x000000,0xFFFFFF,0,248,#new_element_name,#mouse_dd,100000000000010b,6,0};
 PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0};
 PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
 				break;
+			}
 			IF (new_element_active)
+			{
 				IF (key==027) NewElement(0);
+				IF (key==013) NewElement(1);
 				EAX=key<<8;
 				edit_box_key stdcall (#new_file_ed);
 				break;
+			}
 			IF (edit2.flags!=64) && (key!=13) && (key!=27)
 	DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),sc.work_graph); //line to the left from the scroll
 	DrawFlatButton(files.x+files.w,40,16,16,0,sc.work,"\x18");
 	DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,sc.work,"\x19");
 	Open_Dir(#path,ONLY_SHOW);
 	if (del_active) Del_Form();
-	if (new_element_active) NewElement_Form();
+	if (new_element_active) NewElement_Form(new_element_active);
 	if (rename_active) FnProcess(2);
+}
 	RunProgram("/sys/@open", #param);
+}
 void NewElement(byte newf)
+{
+	BDVK element_info;
+	//char edit_name[256];
 	//strcpy(#edit_name, #file_name);
 	if (newf)
+	{
+		strcpy(#temp, #path);
-		strcpy(#temp, #path);
+		//strcpy(#edit_name, new_file_ed.text);
 		strcat(#temp, new_file_ed.text);
 		if (new_element_active==1)
+		{
+			GetFileInfo(#temp, #element_info);
+			if (EAX==5)
+			{
-			WriteFile(0, 0, #temp);
+				WriteFile(0, 0, #temp);
-			if (EAX)
+				if (EAX)
+				{
-				Write_Error(EAX);
+					Write_Error(EAX);
-				ShowMessage(NOT_CREATE_FILE, 150);
+					ShowMessage(NOT_CREATE_FILE, 150);
+				}
+			}
-		else
+			else
+			{
+				notify(FILE_EXISTS);
+			}
+		}
+		else
+		{
+			GetFileInfo(#temp, #element_info);
+			if (EAX==5)
+			{
-			CreateDir(#temp);
+				CreateDir(#temp);
-			if (EAX)
+				if (EAX)
+				{
-				Write_Error(EAX);
+					Write_Error(EAX);
-				ShowMessage(NOT_CREATE_FOLDER, 150);
+					ShowMessage(NOT_CREATE_FOLDER, 150);
+				}
+			}
+			else
+			{
+				notify(FOLDER_EXISTS);
+			}
+		}
+		new_element_active = 0;
-	new_element_active = 0;
+		Open_Dir(#path,WITH_REDRAW);
-	SelectFile(new_file_ed.text);
+		SelectFile(new_file_ed.text);
+	}
+	new_element_active = 0;
+	Open_Dir(#path,WITH_REDRAW);
+}
 void NewElement_Form(byte crt)
+{
+	int dform_x=files.w-220/2+files.x;
 	if (!new_element_active)
 	int dform_x=files.w-220/2+files.x;
-	new_element_active = crt;
+		new_element_active = crt;
-	if (new_element_active==1)
+		if (new_element_active==1)
-	{
+		{
-		strcpy(#new_element_name, T_NEW_FILE);
+			strcpy(#new_element_name, T_NEW_FILE);
-		new_file_ed.size = strlen(T_NEW_FILE);
+			new_file_ed.size = new_file_ed.pos = strlen(T_NEW_FILE);
+		}
-	else
+		else
-	{
+		{
+			strcpy(#new_element_name, T_NEW_FOLDER);
-		strcpy(#new_element_name, T_NEW_FOLDER);
+			new_file_ed.size = new_file_ed.pos = strlen(T_NEW_FOLDER);
 		new_file_ed.size = strlen(T_NEW_FOLDER);
+	}
 	DrawPopup(dform_x,160,220,80,1,sc.work,sc.work_graph);
 	new_file_ed.left = dform_x+27;

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 5556 → 5557