WebSVN – Kolibri OS – Diff – /programs/fs/Eolite/trunk/Eolite.c--

 #define ONLY_SHOW	0
 #define WITH_REDRAW	1
 #define ONLY_OPEN	2
 //ïåðåìåííûå
-#define title "Eolite File Manager v1.28"
+#define title "Eolite File Manager v1.31"
-dword selection_col=0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+dword selection_col=0x94AECE;
 //
 /*
 int  f_visible,
+			{
 				case 21: //Back
 						GoBack();
 						break;
 				case 22: //Forward
-						HistoryPath(GO_FORWARD);
+						if (HistoryPath(GO_FORWARD))
+						{
-						za_kadrom=curbtn=0; //ââåðõ ñïèñêà
+							za_kadrom=curbtn=0; //ââåðõ ñïèñêà
-						Open_Dir(#path,WITH_REDRAW);
+							Open_Dir(#path,WITH_REDRAW);
+						}
 						break;
 				case 23: //up!
 						Dir_Up();
 						break;
 				case 24: //cut
+}
+inline fastcall void draw_window()
-inline fastcall void draw_window()
+{
+	if (GetScreenHeight()<480)
-{
+		DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0xE4DFE1,title);
-	if (GetScreenHeight()<480) DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0x10E4DFE1,0,0,title); else
+	else
-	DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title);
+		DefineAndDrawWindow(98,90,582,482,0x73,0xE4DFE1,title);
 	Form.GetInfo(#Form, SelfInfo);
 	IF (Form.status_window>2) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 void KEdit()
+{
 	edit1.size=edit1.pos=strlen(#edit_path);
-	edit1.size=edit1.pos=strlen(#edit_path);
+	edit1.offset=0;
 	edit_box_draw  stdcall (#edit1);
 	off=file_mas[filenum+za_kadrom]*304 + buf+72;
 	if (!TestBit(ESDWORD[off-40], 4))
+	{
 		copystr(off,#temp);
-		Put_icon(#temp+find_symbol(#temp,'.'), BUTTON_HEIGHT/2-7+y, color);
+		Put_icon(#temp+strchr(#temp,'.'), BUTTON_HEIGHT/2-7+y, color);
 		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),BUTTON_HEIGHT-6/2+y,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
+	}
 	else
 		if (!strcmp("..",off))
 		FOR(k=1;k
 		return;
+	}
 	FOR (j=count-1, off=count-1*304+buf+32; j>=0; j--, off-=304;)  //ïàïêè ââåðõ, ôàéëû âíèç
+	{
-		ChangeCase(off+40);
+		TitleCase(off+40);
 		if (TestBit(ESDWORD[off],4)) //ïàïêà?
+		{
 			file_mas[k]=j;
 			k++;
+		}
 	char new_copy_path[4096];
 	int copy_rezult;
 	IF (!copy_file) return; //îòìåíà, åøè åù¸ íè÷¸ íå ñêîïèðîâàëè
 	copystr(#path,#new_copy_path);
-	copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
+	copystr(#copy_file+strchr(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
 	if (!strcmp(#copy_file,#new_copy_path)) //åñëè ìû êîïèðóåì è âñòàâëÿåì â îäíîé è òîé æå ïàïêå
+	{
 		copystr(#path,#new_copy_path);
 		copystr("new_",#new_copy_path+strlen(#new_copy_path));
-		copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
+		copystr(#copy_file+strchr(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
+	}
 	copy_rezult=CopyFile(#copy_file,#new_copy_path);
 	IF (copy_rezult<>0) //îøèáêà
+	{
 			copystr(#copy_file,#file_path);
 			Del_File(true);
 			copy_file='';
 			cut_active=0;
+		}
-	SelectFile(#new_copy_path+find_symbol(#new_copy_path,'/'));
+	SelectFile(#new_copy_path+strchr(#new_copy_path,'/'));
+}
 void Actions()
+{
 	int actions_y=disc_num*16;
 	int actions_y=disc_num*16;
+	DrawBar(17,actions_y+75,160,15,0x00699C); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
+	DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),0x00699C); //ñèíåå â êîíöå
+	DeleteButton(80);
+	DeleteButton(81);
-	DrawBar(17,actions_y+75,160,15,0x00699C); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
+	DeleteButton(82);
+	if (!show_actions)
-	DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),0x00699C); //ñèíåå â êîíöå
+		Tip(actions_y+90, "Actions", 77, "\x18");
-	if (show_actions==1)
+	else
+	{
 		Tip(actions_y+90, "Actions", 77, "\x19"); //çàãîëîâîê
 		DrawBar(17,actions_y+108,160,51,0xFFFFFF); //áåëîå
 		PutImage(#factions,16,44,21,actions_y+113); //èêîíêè
 		//rename file
+		DefineButton(17,actions_y+108,159,16,80+BT_HIDE,0xE4DFE1);
-		DefineButton(17,actions_y+108,159,16,80+BT_HIDE,0xE4DFE1);
+		WriteText(42,actions_y+113,0x80,0,"Rename file",0);
-		WriteText(42,actions_y+113,0x80,0,"Rename file ",0);
+		WriteText(150,actions_y+113,0x80,0x999999,"[F2]",0);
 		//delete file
+		DefineButton(17,actions_y+125,159,16,81+BT_HIDE,0xE4DFE1);
-		DefineButton(17,actions_y+125,159,16,81+BT_HIDE,0xE4DFE1);
+		WriteText(42,actions_y+130,0x80,0,"Delete file",0);
-		WriteText(42,actions_y+130,0x80,0,"Delete file ",0);
+		WriteText(144,actions_y+130,0x80,0x999999,"[Del]",0);
 		//create folder
-		DefineButton(17,actions_y+142,159,16,82+BT_HIDE,0xE4DFE1);
-		WriteText(42,actions_y+147,0x80,0,"Create folder ",0);
-	}
-	else
-	{
-		DeleteButton(80);
-		DeleteButton(81);
+		DefineButton(17,actions_y+142,159,16,82+BT_HIDE,0xE4DFE1);
-		DeleteButton(82);
+		WriteText(42,actions_y+147,0x80,0,"Create folder",0);
-		Tip(actions_y+90, "Actions", 77, "\x18");
+		WriteText(150,actions_y+147,0x80,0x999999,"[F6]",0);
 void SelectFile(dword that_file)
+{
 	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
    	Open_Dir(#path,ONLY_OPEN);
-	ChangeCase(that_file);
+	TitleCase(that_file);
 	for (i=count-1; i>=0; i--;)
 		if (!strcmp(file_mas[i]*304+buf+72,that_file)) break;
 	FileList_ReDraw(i);
 	List_ReDraw();
 inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
+{
 	char cur_folder[4096];
 	copystr(GetCurrentFolder(), #cur_folder);
-	HistoryPath(GO_BACK);
+	if (HistoryPath(GO_BACK))
-	SelectFile(#cur_folder);
+		SelectFile(#cur_folder);
+}

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 2833 → 2875