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

 //Leency & Veliant -=- KolibriOS Team -=- 2008
-//ñòðîêà 258, êåéàï!
-//find_symbol íàäî ÷èòàòü ñ êîíöà
+//ñòðîêà 258, êåéàï!
-//DrawBar(sort_num[1],45,6,9,0xE4DFE1);
-//Open_Dir íàõðåí èñïàãàíåí èôàìè, ñäåëàòü äåôàéëû èëè åù¸ ÷òî-òî, ïîòîìó ÷òî ïîêà ýòî âûãëÿäèò íåêðàñèâî
+//DrawBar(sort_num[1],45,6,9,0xE4DFE1);
 #codesize
 #include "lib\kolibri.h--"
 #include "lib\memory.h--"
 #include "lib\edit_box_lib.h--"
 #include "lib\file_system.h--"
 #include "imgs\toolbar.txt"
 #include "imgs\left_p.txt"
-//ëîêàëèçàöèÿ è íàñòðîéêè
+//ïåðåìåííûå
-#define title "Eolite File Manager v0.98.3"
+#define title "Eolite File Manager v0.98.5"
-#define videlenie 0x94AECE //0x94AECE,0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+#define videlenie 0x94AECE //0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 byte toolbar_buttons_x[6]={9,46,85,134,167,203};
 //
-dword but_num,
+int  but_num,
      count,
      za_kadrom,
      copy_file[256],
      temp[256];
 byte PathHistory[2560];
 dword file_mas[6898];
-int temp_int, j, i;
+int j, i;
 dword stak[100]=0; //îêíî About
-edit_box edit1= {250,247,17,0xffffff,0x94AECE,0xD3DDEB,0xffffff,0,248,#edit_path,64,6,6};
+edit_box edit1= {250,247,13,0xffffff,videlenie,0xD3DDEB,0xffffff,0,248,#edit_path,64,6,6};
-edit_box edit2= {250,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,64,6,6};
+edit_box edit2= {250,213,80,0xFFFFCC,videlenie,0xFFFFCC,0xffffff,0,248,#file_name,64,6,6};
 proc_info Form;
-dword buf=0, off; //äëÿ òåêñòà è áóôåðà
+dword buf, off; //äëÿ òåêñòà è áóôåðà
+dword devbuf, dev_num;
-dword devbuf=0, dev_num;
+#include "include\LVabout.h--"
-#include "include\LVabout.h--"
+#include "include\sorting.h--"
-#include "include\sorting.h--"
+#include "include\icons_f.h--"
-#include "include\icons_f.h--"
+#include "include\ini.h--"
 void main()
-byte key, id;
+word key, id;
 mouse m;
 int pressed_y;
+{
 	load_editbox_lib();
-	load_editbox_lib();
+	devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
-	devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
+	ReadDir(10, devbuf, "/");
-	ReadDir(10, devbuf, "/");
+	dev_num=EBX;
-	dev_num=EBX;
+	IF (param[0]<>'') {copystr(#param,#edit_path); Goto_edit_path();} ELSE Open_Dir(#path,2); //áûë ëè çàïóñê ñ ïàðàìåòðîì
 					IF (m.vert==1) IF (curbtn==but_num-1) FileList_ReDraw(3); ELSE FileList_ReDraw(1);
 					//ñêðîëë
 					if (m.x>=Form.width-21) && (m.x<=Form.width-6) while (m.lkm)
+					{
 						IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
-						temp_int=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
+						id=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
 						j= scroll_size/2;
-						za_kadrom = m.y -j -57 * count / onTop(22,57);
+						za_kadrom = m.y -j -57 * count;	za_kadrom /= onTop(22,57);
 						IF (but_num+za_kadrom>count) za_kadrom=count-but_num;
-						IF (temp_int<>za_kadrom) List_ReDraw(); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
+						IF (id<>za_kadrom) List_ReDraw(); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
 						m.get();
+					}
 					break;
 //Button pressed-----------------------------------------------------------------------------
 			case evButton:
 					case 30: //about
 						CreateThread(#authors,#stak);
 						break;
 					case 78: //preview
 						IF (show_preview==1) show_preview=0; ELSE show_preview=1;
-						Preview();
+						Preview(ANIM);
 						break;
 					case 77: //actions
 						IF (show_actions==1) show_actions=0; ELSE show_actions=1;
 						Actions();
 						break;
 						GOTO OPEN_DEV;
 					default:
 						if (id<200) break; //êíîïêè èç ñïèñêà ôàéëîâ
 						IF (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
 						else OPEN_MARK:
-						if (!isdir) Run_File(#file_path); else
+						if (!isdir) GetIni("/sys/File managers/Eolite.ini"); ELSE //Run_File(#file_path); ELSE
-						if (strcmp(#file_name,"..")==0) Dir_Up(); else
+						IF (strcmp(#file_name,"..")==0) Dir_Up(); ELSE
 						{	OPEN_DEV:
 								copystr(#file_path, #path);
 								copystr("/", #path+strlen(#path));
 								za_kadrom=curbtn=0;
 								Open_Dir(#path,1);
+					{
 					IF (key==013) Del_File(true);
 					IF (key==027) Del_File(false);
 				 	break;
+				 	}
-				IF (edit1.flags<>64) && IF (edit1.flags<>0) && (key<>13) {EAX=key<<8; edit_box_key stdcall (#edit1); break;}
+				IF (edit1.flags<>64) && (edit1.flags<>0) && (key<>13) {EAX=key<<8; edit_box_key stdcall (#edit1); break;}
                 IF (edit2.flags<>64) && (key<>13) && (key<>27) {EAX=key<<8; edit_box_key stdcall (#edit2); break;}
 				switch (key)
+				{
 						case 209...217: id=key-109; GOTO DEVICE_MARK;
 						case 8: GoBack(); break; //Íàçàä
 								copystr(#file_path,#copy_file); //âû÷èñëÿåì êàêîé ôàéë êîïèðîâàòü
 								IF (key==24) cut_active=1; ELSE cut_active=0;
 								break;
 						case 022: Paste(); break;//Ctrl+V paste
 						case 027: //Esc
-								IF (rename_active==1) {Line_ReDraw(videlenie, 100);}
+								IF (rename_active==1) ReName(false);
 								break;
 						case 013: //Enter
-								IF (rename_active==1) {Line_ReDraw(videlenie, curbtn); break;}
+								IF (rename_active==1) {ReName(true); break;}
 								IF (strcmp(#path,#edit_path)<>0) Goto_edit_path();
 								ELSE GOTO OPEN_MARK;
 								break;
 						case 55: //F6 - new folder
 								goto NEW_FOLDER_MARK;
 inline fastcall void draw_window()
-{
 	WindowRedrawStatus(1);
+	WindowRedrawStatus(1);
-	skin_width = GetSkinWidth();
+	DefineAndDrawWindow(100,100,600,410,0x73,0x10E4DFE1,0,0,title);
-	DefineAndDrawWindow(100,100,600,410,0x73,0x10E4DFE1,0,0,title);
+	WindowRedrawStatus(2);
 	Form.GetInfo(SelfInfo);
-	IF (Form.height==skin_width+3) {WindowRedrawStatus(2); return;} //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
+	IF (Form.height==GetSkinWidth()+3) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 	  IF (Form.height<280) MoveSize(OLD,OLD,OLD,280);
 	  IF (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 	//toolbar buttons
 	PutPaletteImage(#toolbar,246,39,0,0,#toolbar_pal);
-	FOR (j=0; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,0xE4DFE1);
-	//ïîëîñà àäðåñà
+	FOR (j=0; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,0xE4DFE1);
-	DrawBar(246,0,onLeft(246,60),12,0xE4DFE1); //ôîí íàä ïîëîñîé àäðåñà
-	edit1.width=Form.width-314;
-	edit1.top=13;
+	//ïîëîñà àäðåñà
-	KEdit();
+	edit1.width=Form.width-314;
+	DrawBar(246,0,onLeft(246,60),12,0xE4DFE1); //ôîí íàä ïîëîñîé àäðåñà
-	DrawRegion_3D(246,12,onLeft(66,246),16,0x94AECE,0x94AECE);	//îáîäîê
+	DrawBar(246,29,onLeft(246,60),10,0xE4DFE1); //ôîí ïîä ïîëîñîé àäðåñà
-	DrawBar(246,29,onLeft(246,60),10,0xE4DFE1); //ôîí ïîä ïîëîñîé àäðåñà
+	DrawRegion_3D(246,12,onLeft(66,246),16,0x94AECE,0x94AECE);	//îáîäîê
 	DefineButton(onLeft(34,0),6,27,28,30+BT_HIDE+BT_NOFRAME,0xE4DFE1); //about
 	DefineButton(onLeft(66,0),12,18,16,27+BT_HIDE,0xE4DFE1); //êíîïêà ïåðåõîäà
 	PutPaletteImage(#goto_about,56,40,Form.width-65,0,#goto_about_pal);
 	//ïðÿìîóãîëüíèêè âíóòðè
-	DrawRegion_3D(1,40,Form.width-12,Form.height-skin_width-46,0x94AECE,0x94AECE); //ñèíèé îáîäîê
+	DrawRegion_3D(1,40,Form.width-12,onTop(46,0),0x94AECE,0x94AECE); //ñèíèé îáîäîê
-	DrawRegion_3D(0,39,Form.width-10,Form.height-skin_width-44,0xE4DFE1,0xE4DFE1); //ôîí
+	DrawRegion_3D(0,39,Form.width-10,onTop(44,0),0xE4DFE1,0xE4DFE1); //ôîí
     Devices(); //ïàíåëü ñëåâà íà ñèíåì ôîíå
 	//SortButtons
 	DrawFlatButton(192,40,onLeft(192,168),16,31,0xE4DFE1,"File");
-	DrawFlatButton(onLeft(168,0),40,73,16,32,0xE4DFE1,"Type");
-	DrawFlatButton(onLeft(95,0),40,68,16,33,0xE4DFE1,"Size");
+	DrawFlatButton(onLeft(168,0),40,73,16,32,0xE4DFE1,"Type");
-	//
-	//sort_type[1]=onLeft(192,168)/2+210;
+	DrawFlatButton(onLeft(95,0),40,68,16,33,0xE4DFE1,"Size");
-	//sort_type[2]=onLeft(115,0);
+	//Ïåðåðèñîâûâàåì ñïèñîê
-	//sort_type[3]=onLeft(44,0);
+	Open_Dir(#path,ONLY_SHOW);
 	//ïðîêðóòêà
 	DrawBar(onLeft(27,0),57,1,onTop(22,57),0x94AECE); //ëèíèÿ ñëåâà îò ïðîêðóòêè
-	DrawFlatButton(onLeft(27,0),40,16,16,0,0xE4DFE1,"\x18");		//ïðîêðóòêà ââåðõ
-	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,0xE4DFE1,"\x19");//ïðîêðóòêà âíèç
-	//
-	Open_Dir(#path,3);
-	//
+	DrawFlatButton(onLeft(27,0),40,16,16,0,0xE4DFE1,"\x18");		//ïðîêðóòêà ââåðõ
-	WindowRedrawStatus(2);
+	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,0xE4DFE1,"\x19");//ïðîêðóòêà âíèç
+}
-void KEdit()
-{
-	edit1.size=edit1.pos=strlen(#edit_path);
-	edit_box_draw  stdcall (#edit1);
-	/*edit2.flags=66; //äåëàåì êîìïîíåíò àêòèâíûì
-	edit2.width=onLeft(24,217);
+void KEdit()
 	edit2.top=curbtn*18+59;
-	edit2.size=edit2.pos=strlen(#file_name);
+	edit1.size=edit1.pos=strlen(#edit_path);
 void FileList_ReDraw(int curbtn_)
+{
 	if (curbtn_<=0) //ââåðõ
 	{
-		IF (za_kadrom==0) && (curbtn==0) return;
+		IF (za_kadrom==0) && (curbtn<=0) return;
 		IF (-curbtn_-1
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
+}
+void List_ReDraw()
 void List_ReDraw()
 	int paint_x=but_num*18+57;
 	IF (count-za_kadrombut_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
 	{ za_kadrom=count-but_num; curbtn=but_num-1; } //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
-	//
-	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(videlenie, curbtn);
+	//
-		temp_int=but_num*18+57;
+	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(videlenie, curbtn);
-		DrawBar(192,temp_int,onLeft(27,192),onTop(temp_int,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
+		DrawBar(192,paint_x,onLeft(27,192),onTop(paint_x,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
-		DrawBar(onLeft(168,0),temp_int,1,onTop(temp_int,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
+		DrawBar(onLeft(168,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
-		DrawBar(onLeft(95,0),temp_int,1,onTop(temp_int,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+		DrawBar(onLeft(95,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+	TVScroll();
 	TVScroll();
-}
-void Line_ReDraw(dword color, filenum){
-	dword text_col, y;//ïîëîæåíèå òåêñòà ïî Y;
-	if (rename_active==1) //âñ¸ ýòî ïîëíûé ïèïåö, è íàäî âûíåñòè â îòäåëüíóþ ïðîöåäóðó
-	{
-		rename_active=0;
-		edit2.flags=64;
-		DefineButton(192,curbtn*18+57,onLeft(27,192),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
-		IF (filenum==100) filenum=curbtn; else
-		{
-			copystr(#path,#temp);
-			copystr(#file_name,#temp+strlen(#temp));
-			if (strcmp(#file_path,#temp)<>0) && (strlen(#file_name)>0)
+//puticon+icon_fairing!!!
-			IF (isdir)
-			{
-				//Del_File(true);
-				DeleleFile(#file_path);
-				IF (EAX) {DrawFlatButton(Form.width-200+192/2,160,200,80,0,0xFFB6B5, "Error. Folder isn't empty."); Pause(200);}
-				ELSE CreateFolder(#temp);
-				Open_Dir(#path,1);
-			}
-			ELSE { CopyFile(#file_path,#temp);	Del_File(true); }
+void Line_ReDraw(dword color, filenum){
 	dword text_col=0, temp_int,
 	y=filenum*18+57; //ïîëîæåíèå òåêñòà ïî Y
-	y=filenum*18+57;
-	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
+	IF (rename_active==1) ReName(false);
-	DrawBar(192,y,3,18,color); DrawBar(195,y,16,2,color);
-	DrawBar(192+19,y,onLeft(46,192),18,color); DrawBar(195,y+17,16,1,color);
+	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
-	off=file_mas[filenum+za_kadrom]*304 + buf+72;
-	//
+	DrawBar(192,y,3,18,color); DrawBar(195,y,16,2,color);
-	EBX=EAX=ESDWORD[off-40];
-	$shr ebx,2 //ôàéë ñêðûòûé?
-	$and ebx,1
+	DrawBar(192+19,y,onLeft(46,192),18,color); DrawBar(195,y+17,16,1,color);
-	IF (!EBX) text_col=0; ELSE text_col=0xA6A6B7;
-	$shr eax,4 //ýòî ïàïêà?
+	//
-	$and eax,1
+	off=file_mas[filenum+za_kadrom]*304 + buf+72;
-	IF (color==videlenie) isdir=EAX;
+	if (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7;
-	if (!EAX)
+	if (!TestBit(ESDWORD[off-40],4))
+	{
 		temp_int = Put_icon(off+strlen(off)-4, y+2);
+		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),y+6,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
-		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),y+6,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
+	} ELSE IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
-	} ELSE IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
+	if (color==videlenie)
 	if (color==videlenie)
 		isdir=TestBit(ESDWORD[off-40], 4);
 		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
 		copystr(off,#file_name);
-		copystr(#path,#file_path);
-		copystr(#file_name,#file_path+strlen(#file_path)); //ïîëíûé ïóòü ê ôàéëó
-		Preview();
-		IF (text_col==0xA6A6B7) text_col=0xFFFFFF;
-		/*IF (show_preview) && (!isdir)
-		{
-			GetImage(#file_path);
-			j=dev_num*16+123;
+		copystr(#path,#file_path);
-			j+=show_actions*51;
+		copystr(#file_name,#file_path+strlen(#file_path)); //ïîëíûé ïóòü ê ôàéëó
-			IF (pLoadedImage<>0) DrawImage(#CurrentImage, 22*65536+j+skin_width+18);
+		Preview(NOTIP);
-		}*/
+		IF (text_col==0xA6A6B7) text_col=0xFFFFFF;
+	}
+}
 void Open_Dir(dword temp_, redraw){
 	byte path_[256], somelen=strlen(temp_)-1;
-	if (redraw<>3)
+	if (redraw<>ONLY_SHOW)
+	{
 		copystr(temp_, #path_);
 		IF (somelen) path_[somelen]=0x00;
     	buf = realloc(count * 304 + 32, buf);
 		ReadDir(count, buf, #path_);
 		IF (EBX>6897) && (EBX<>-1) EBX=6897; //1 íà óäà÷ó ;)
 		count=EBX;
+	}
-	if (count<>-1) && (redraw>0)
+	if (count<>-1)
+	{
-		IF (!strcmp(".",buf+72)) {memmov(buf,buf+304,count-1*304); count--; } //ôèëüòðóåì ýëåìåíò "."
+		IF (!strcmp(".",buf+72)) {memmov(buf,buf+304,count-1*304); count--;} //ôèëüòðóåì ýëåìåíò "."
 		FOR (j=0;j
 		but_num=onTop(6,57)/18;
-		IF (but_num>100) but_num=1; ELSE //ýòà ñòðàííàÿ ñòðî÷êà äëÿ òîãî åñëè ðàçìåðû îêíà ñëèøêîì ìàëåíüêèå
 		IF (count
 		FOR (j=0;j
-		IF (redraw<>3) Sorting();
+		//ñòðåëî÷êà ñîðòèðîâêè
+		IF (sort_num==1) WriteText(Form.width+60/2,45,0x80,0x4E78AC,"\x19",0);
+		IF (sort_num==2) WriteText(Form.width-115,45,0x80,0x4E78AC,"\x19",0);
+		IF (sort_num==3) WriteText(Form.width-44,45,0x80,0x4E78AC,"\x19",0);
+		IF (redraw<>ONLY_SHOW) Sorting(); //äëÿ áîëüøèõ ïàïîê ïðè ðåïåèíòå îêíà
-		IF (redraw==1) || (redraw==3) List_ReDraw();
+		IF (redraw<>ONLY_OPEN) List_ReDraw();
 		copystr(temp_,#edit_path);
 		KEdit();
 		HistoryPath(add_new_path);
-		//ñòðåëî÷êà ñîðòèðîâêè
-		IF (sort_num==1) WriteText(onLeft(192,168)/2+210,45,0x80,0x4E78AC,"\x19",0);
-		IF (sort_num==2) WriteText(onLeft(115,0),45,0x80,0x4E78AC,"\x19",0);
-		IF (sort_num==3) WriteText(onLeft(44,0),45,0x80,0x4E78AC,"\x19",0);
+	}
-	IF (count==-1) {but_num=count=0; List_ReDraw();}
+	IF (count==-1) && (redraw<>ONLY_OPEN) {but_num=count=0; List_ReDraw();}
+}
 	dword k=0, l=1;
 	IF (!strcmp(#path,"/")) {FOR(k=1;k
 	FOR (j=count-1, off=count-1*304+buf+32; j>=0; j--, off-=304;)  //ïàïêè ââåðõ, ôàéëû âíèç
+	{
 		ChangeCase(off+40);
-		EAX=ESDWORD[off];
-		$shr eax,4
-		$and eax,1
-		IF (EAX) {file_mas[k]=j; k++;} ELSE
+		IF (TestBit(ESDWORD[off],4)) {file_mas[k]=j; k++;}
-			 {file_mas[count-l]=j; l++;}
+			ELSE {file_mas[count-l]=j; l++;}
+	}
-	//Ñîáñòâåííî ñîðòèðîâêà
+	//Ñîáñòâåííî ñîðòèðîâêà: âíà÷àëå ïàïêè, ïîòîì ôàéëû
-	Sort_by_Name(0,k-1); //ñîðòèðóåì ïàïêè, íèæå - ôàéëû
+	Sort_by_Name(0,k-1);
 	IF (sort_num==1) Sort_by_Name(k,count-1);
 	IF (sort_num==2) Sort_by_Type(k, count-1);
 	IF (sort_num==3) Sort_by_Size(k,count-1);
 	//åñëè ïàïêà ".." íå ïåðâàÿ, ñòàâèì å¸ òóäà
-	IF (strcmp(file_mas[0]*304+buf+72,"..")<>0) FOR(k=k-1; k>0; k--;) IF (!strcmp(file_mas[k]*304+buf+72,"..")) file_mas[k]>
+	IF (k>0) && (strcmp(file_mas[0]*304+buf+72,"..")<>0) FOR(k=k-1; k>0; k--;) IF (!strcmp(file_mas[k]*304+buf+72,"..")) file_mas[k]>
+}
 	WriteText(165,y+5,0x80,0,arrow,0); //ñòðåëêà âíèç
 	DrawBar(17,y+17,160,1,0x94AECE);		//ïîä÷¸ðêèâàíèå
+}
+void ReName(byte rename)
+{
+	rename_active=0;
+	edit2.flags=64;
+	DefineButton(192,curbtn*18+57,onLeft(27,192),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
+	if (rename==true)
+	{
+		copystr(#path,#temp);
+		copystr(#file_name,#temp+strlen(#temp));
+		if (strcmp(#file_path,#temp)<>0) && (file_name)
+		IF (isdir)
+		{
+			DeleleFile(#file_path);
+			IF (EAX) {DrawFlatButton(Form.width-8/2,160,200,80,0,0xFFB6B5, "Error. Folder isn't empty."); Pause(200);}
+			ELSE CreateFolder(#temp);
+			Open_Dir(#path,1);
+		}
+		ELSE
+		{
+			CopyFile(#file_path,#temp);
+			Del_File(true);
+		}
+		SelectFile(#temp+find_symbol(#path,'/'));
+	}
+	Line_ReDraw(videlenie,curbtn);
+}
 void Devices()
+{
 	byte dev_icon; dword drive_name[30]; char dev_name[4];
 	DrawBar(2,41,190,15,0x00699C);		//ñèíèé ïðÿìîóãîëüíèê - ñâåðõó
 	DrawBar(2,56,15,onTop(21,41),0x00699C);	//ñèíèé ïðÿìîóãîëüíèê - ñëåâà
 	DrawBar(177,56,15,onTop(21,41),0x00699C);	//ñèíèé ïðÿìîóãîëüíèê - ñïðàâà
-	//ñïèñîê äèñêîâ
-	Tip(56, "Goto:", 0, "");
+	//ñïèñîê äèñêîâ
-	DrawBar(17,74,160,dev_num*16+1,0xFFFFFF);	//áåëîå
+	Tip(56, "Goto:", 0, "");
+	for (i=0;i
-	for (i=0;i
+	{
 		DrawBar(17,i*16+74,160,17,0xFFFFFF); //áåëîå
-		DefineButton(17,i*16+74,159,16,100+i+BT_HIDE,0xE4DFE1); //ñîçäà¸ì êíîïêè, à ïîòîì âûâîäèì íàçâàíèÿ äèñêîâ
+		DefineButton(17,i*16+74,159,16,100+i+BT_HIDE,0xFFFFFF); //ñîçäà¸ì êíîïêè, à ïîòîì âûâîäèì íàçâàíèÿ äèñêîâ
 		copystr("Unknown drive",#drive_name); //èçíà÷àëüíî íåèçâåñíûé íîñèòåëü
 		dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê
 		copystr(i*304+ devbuf+72, #dev_name);
+	{
 		DeleteButton(80);	DeleteButton(81);	DeleteButton(82);
 		Tip(dev_num*16+90, "Actions", 77, "\x18");
 		DrawBar(17,dev_num*16+108,160,51,0x00699C); //ñèíåå
+	}
-	Preview();
+	Preview(REDRAW);
+}
-void Preview()
+void Preview(byte param)
+{
-	dword top_pr=dev_num*16+123;
+	dword ti, text_buf, top_pr=dev_num*16+123;
 	top_pr+=show_actions*51; //íà÷èíàåì íèæå, åñëè Ýêøíñ âèäèìû
-	DeleteButton(78);
+	IF (param<>NOTIP) DeleteButton(78);
 	if (show_preview==1)
 	{
-		Tip(top_pr,"Preview",78,"\x19");
+		IF (param<>NOTIP) Tip(top_pr,"Preview",78,"\x19");
+		DrawBar(17,top_pr+18,160,5,0xFFFFFF); //áåëîå
+		DrawBar(17,top_pr+113,160,onTop(top_pr+113,6),0x00699C); //ñèíåå
+		//
+		text_buf = malloc(256);
+		ReadFile(0, 256, text_buf, #file_path);
+		FOR (ti=0;ti<9; ti++)
+		{
+			DrawBar(17,ti*10+top_pr+23,160,10,0xFFFFFF); //áåëîå
+			WriteText(22,ti*10+top_pr+23,0x00,0,ti*25+text_buf,25);
-		DrawBar(17,top_pr+18,160,100,0xFFFFFF); //áåëîå
+			IF (param==ANIM) Pause(2);
+		}
+		//
+		/*WriteDebug("");
-		DrawBar(17,top_pr+118,160,onTop(top_pr+118,6),0x00699C); //ñèíåå
+		WriteDebug("");
-		//
+		WriteDebug(#path);
-		WriteText(25,top_pr+30,0x80,0,"Number of files:",0); WriteText(135,top_pr+30,0x80,0,IntToStr(count),0);
+		WriteDebug("Number of files:"); WriteDebug(IntToStr(count));
-		WriteText(30,top_pr+40,0x80,0,"but_num:",0);	 WriteText(105,top_pr+40,0x80,0,IntToStr(but_num),0);
+		WriteDebug("but_num:");	 		WriteDebug(IntToStr(but_num));
-		WriteText(30,top_pr+50,0x80,0,"curbtn",0);		 WriteText(105,top_pr+50,0x80,0,IntToStr(curbtn),0);
-		WriteText(30,top_pr+60,0x80,0,"ra_kadrom:",0);	 WriteText(105,top_pr+60,0x80,0,IntToStr(za_kadrom),0);
-		WriteText(30,top_pr+70,0x80,0,#file_path,0);
+		WriteDebug("curbtn");		 	WriteDebug(IntToStr(curbtn));
-		WriteText(30,top_pr+80,0x80,0,IntToStr(edit1.flags),0); WriteText(30,top_pr+90,0x80,0,IntToStr(edit2.flags),0);
+		WriteDebug("ra_kadrom:");	 	WriteDebug(IntToStr(za_kadrom));*/
+	}
 	ELSE
+	{
-		Tip(top_pr,"Preview",78,"\x18");
+		IF (param<>NOTIP) Tip(top_pr,"Preview",78,"\x18");
 		DrawBar(17,top_pr+18,160,onTop(top_pr+18,6),0x00699C); //ñèíåå
+	}
+}
 void Goto_edit_path()
+{
 	IF (strcmp(#path,#edit_path)==0) return; //ïðîâåðêà íå â ýòîé ëè ìû ïàïêå
  	IF (strcmp(#edit_path+strlen(#edit_path)-1,"/")<>0) copystr("/",#edit_path+strlen(#edit_path)); //åñëè íåò, + "/"
-	Open_Dir(#edit_path,0); //ïðîâåðÿåì åñëè ôàéëû â ïàïêå, òàê ìû óçíà¸ì ñóùåñòâóåò ëè îíà
+	Open_Dir(#edit_path,2); //ïðîâåðÿåì åñëè ôàéëû â ïàïêå, òàê ìû óçíà¸ì ñóùåñòâóåò ëè îíà
+}
 void Dir_Up()
+{
-	char temp_[256];
+	byte temp_[256];
 	i=strlen(#path)-1;
 	path[i]=0x00;
 	do i--; while (path[i]<>'/'); copystr(#path+i+1,#temp_);
 	path[i+1]=0x00;
-	SelectFile(#temp_);
-}
-/*inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
-{
-	i=strlen(#PathHistory)-1;
-	PathHistory[i]=0x00;
-	copystr(#PathHistory+find_symbol(#PathHistory,'/'),#temp); //ïàïêà â êîòîðîé áûëè
-	HistoryPath(go_back);
+	SelectFile(#temp_);
 	SelectFile(#temp);
 }*/
 inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
+{
 	i=strlen(#PathHistory)-1;
-	IF (i<7) return;
+	IF (i<7) RETURN;
 	PathHistory[i]=0x00;

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 977 → 984