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

 	?define T_NEW_FOLDER "®¢ ï ¯ ¯ª "
 	?define T_NEW_FILE "®¢ë© ä ©«"
 	?define T_DELETE_FILE "ë ¤¥©áâ¢¨â¥«ì® å®â¨â¥ ã¤ «¨âì"
 	?define T_YES " "
 	?define T_NO "¥â"
+	?define T_CANCEL "â¬¥ "
+	?define T_CREATE "®§¤ âì"
 	?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 DEL_MORE_FILES_2 " pcs.)?"
 #endif
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
-#define TITLE "Eolite File Manager v2.75"
+#define TITLE "Eolite File Manager v2.77"
-#define ABOUT_TITLE "Eolite v2.75"
+#define ABOUT_TITLE "Eolite v2.77"
 dword col_padding, col_selec, col_lpanel;
 byte
 	path[4096],
 	file_path[4096],
+	file_name[256],
-	file_name[256],
+	new_element_name[256],
 	temp[4096];
 byte
 	rename_active=0,
+	del_active=0,
-	del_active=0,
+	new_element_active=0,
 	show_dev_name=1,
 	real_files_names_case=0,
 	use_big_fonts=0,
 	font_type,
 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};
 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};
     if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini");
 	eolite_ini_path = abspath("Eolite.ini");
 	LoadIniSettings();
 	GetSystemDiscs();
 	SetAppColors();
+	strcpy(#new_element_name, T_NEW_FILE);
+	new_file_ed.size = strlen(T_NEW_FILE);
 	if (param)
+	{
 		strcpy(#path, #param);
 		if (path[strlen(#path)-1]!='/') chrcat(#path, '/'); //add "/" to the end of the string
+	}
 	SetEventMask(0x27);
 	loop() switch(WaitEvent())
+	{
 		case evMouse:
 			if (del_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2) break;
+			if (new_element_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2)
+			{
+				edit_box_mouse stdcall(#new_file_ed);
+				break;
+			}
 			if (rename_active) { edit_box_mouse stdcall(#edit2); break; }
 			if (del_active)
+			{
 				IF (id==301) || (id==302) Del_File(302-id);
 				break;
+			}
+			if (new_element_active)
+			{
+				IF (id==301) || (id==302) NewElement(302-id);
+				break;
+			}
 			switch(id)
+			{
 				case 21: //Back
+			{
 				IF (key==013) Del_File(true);
 				IF (key==027) Del_File(false);
 				break;
+			}
+			IF (new_element_active)
+			{
+				IF (key==027) NewElement(0);
+				EAX=key<<8;
+				edit_box_key stdcall (#new_file_ed);
+				break;
+			}
 			IF (edit2.flags!=64) && (key!=13) && (key!=27)
+			{
 				EAX=key<<8;
 				edit_box_key stdcall (#edit2);
 				break;
 	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 (rename_active) FnProcess(2);
+}
 	param[1] = '\0';
 	strcat(#param, #file_path);
 	RunProgram("/sys/@open", #param);
+}
+void NewElement(byte newf)
+{
+	if (newf)
+	{
+		strcpy(#temp, #path);
+		strcat(#temp, new_file_ed.text);
+		if (new_element_active==1)
+		{
+			WriteFile(0, 0, #temp);
+			if (EAX)
+			{
+				Write_Error(EAX);
+				ShowMessage(NOT_CREATE_FILE, 150);
+			}
+		}
+		else
+		{
+			CreateDir(#temp);
+			if (EAX)
+			{
+				Write_Error(EAX);
+				ShowMessage(NOT_CREATE_FOLDER, 150);
+			}
+		}
+	}
+	new_element_active = 0;
+	SelectFile(new_file_ed.text);
+}
+void NewElement_Form(byte crt)
+{
+	int dform_x=files.w-220/2+files.x;
+	new_element_active = crt;
+	if (new_element_active==1)
+	{
+		strcpy(#new_element_name, T_NEW_FILE);
+		new_file_ed.size = strlen(T_NEW_FILE);
+	}
+	else
+	{
+		strcpy(#new_element_name, 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;
+	new_file_ed.top = 180;
+	edit_box_draw  stdcall (#new_file_ed);
+	DrawFlatButton(dform_x+27,208,70,20,301,0xFFB6B5,T_CREATE);
+	DrawFlatButton(dform_x+120,208,70,20,302,0xC6DFC6,T_CANCEL);
+}
 void FnProcess(char N)
+{
 	switch(N)
+	{
 			GetSystemDiscs();
 			Open_Dir(#path,WITH_REDRAW);
 			DrawLeftPanel();
 			break;
 		case 6:
-			strcpy(#temp, #path);
+			/*strcpy(#temp, #path);
 			strcat(#temp, T_NEW_FOLDER);
 			CreateDir(#temp);
 			if (!EAX){
 				SelectFile(T_NEW_FOLDER);
 				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
 				ShowMessage(NOT_CREATE_FOLDER, 150);
-			}
+			}*/
+			NewElement_Form(2);
 			break;
 		case 7:
-			strcpy(#temp, #path);
+			/*strcpy(#temp, #path);
 			strcat(#temp, T_NEW_FILE);
 			WriteFile(0, 0, #temp);
 			if (!EAX){
 				SelectFile(T_NEW_FILE);
 				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
 				ShowMessage(NOT_CREATE_FILE, 150);
-			}
+			}*/
+			NewElement_Form(1);
 			break;
 		case 8:
 			SwitchToAnotherThread();
 			CreateThread(#properties_dialog, #properties_stak+4092);
 			break;

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 5554 → 5555