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

 //Leency & Veliant -=- KolibriOS Team -=- 2008
 //ñòðîêà 258, êåéàï!
 //âîçìîæíî, áàã â KEdit
-//find_symbol íàäî ÷èòàòü ñ êîíöà
-//335 ñòðîêà
-//PathHistory  áëÿ íàäî API äëÿ ðàáîòû ñ èñòîðèåé, â ò.÷. ïðîâåðÿòü íå ðàâíà ëè íîâàÿ ïàïêà ïðåäûäóùåé
+//find_symbol íàäî ÷èòàòü ñ êîíöà
+//DrawBar(sort_num[1],45,6,9,0xE4DFE1);
-//DrawBar(sort_num[1],45,6,9,0xE4DFE1);
+//Open_Dir íàõðåí èñïàãàíåí èôàìè, ñäåëàòü äåôàéëû èëè åù¸ ÷òî-òî, ïîòîìó ÷òî ïîêà ýòî âûãëÿäèò íåêðàñèâî
 #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 header "Eolite File Manager v0.98.2"
+#define title "Eolite File Manager v0.98.3"
 #define videlenie 0x94AECE //0x94AECE,0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 byte toolbar_buttons_x[6]={9,46,85,134,167,203};
 //
 dword but_num,
-     kolichestvo,
+     count,
      za_kadrom,
      curbtn,
-     razm_scrl;
+     scroll_size;
 byte cut_active,
      rename_active,
      del_active;
 byte show_actions=1,
      show_preview=0,
      sort_num=2,
      isdir;
-char path[256]="/rd/1/",
+byte path[256]="/rd/1/",
      edit_path[256],
      file_path[256],
      file_name[256],
      copy_file[256],
      temp[256];
-char PathHistory[2560];
+byte PathHistory[2560];
+					}
 					if (m.x>=Form.width-21) && (m.x<=Form.width-6) && (m.y>onTop(22,0)+1) && (m.y
+					{
 						IF (m.lkm==1) DrawRegion_3D(onLeft(26,0),onTop(21,0),14,14,0xC7C7C7,0xFFFFFF);
 						while (m.lkm==1) && (za_kadrom
+						{
 							Pause(10);
 							za_kadrom++;
 							List_ReDraw();
 							m.get();
+						}
 						DrawRegion_3D(onLeft(26,0),onTop(21,0),14,14,0xFFFFFF,0xC7C7C7);
+					}
 					//êîë¸ñèêî ìûøè
-					IF (vert==65535) IF (curbtn==0) FileList_ReDraw(-3); ELSE FileList_ReDraw(-1);
+					IF (m.vert==65535) IF (curbtn==0) FileList_ReDraw(-3); ELSE FileList_ReDraw(-1);
-					IF (vert==1) IF (curbtn==but_num-1) FileList_ReDraw(3); ELSE FileList_ReDraw(1);
+					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 (razm_scrl/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=razm_scrl/2+57; //åñëè êóðñîð íàä îêíîì
+						IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
 						temp_int=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
-						j= razm_scrl/2;
+						j= scroll_size/2;
-						za_kadrom = m.y -j -57 * kolichestvo / onTop(22,57);
+						za_kadrom = m.y -j -57 * count / onTop(22,57);
-						IF (but_num+za_kadrom>kolichestvo) za_kadrom=kolichestvo-but_num;
+						IF (but_num+za_kadrom>count) za_kadrom=count-but_num;
 						IF (temp_int<>za_kadrom) List_ReDraw(); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
 						m.get();
+					}
 						IF (show_preview==1) show_preview=0; ELSE show_preview=1;
 						Preview();
 						break;
 					case 77: //actions
 						IF (show_actions==1) show_actions=0; ELSE show_actions=1;
-						Actions();	Preview();
+						Actions();
 						break;
 					case 80: //rename
 						goto REN_MARK;
 					case 81: //Delete file
 						Del_Form();
 					case 82: //create folder
 						NEW_FOLDER_MARK:
 						copystr(#path, #temp);
 						copystr("New folder", #temp+strlen(#temp));
 						CreateFolder(#temp);
-						za_kadrom=curbtn=0;
-						Open_Dir(#path,1);
+						SelectFile("New folder");
-						FOR (i=0; i
-							IF (strcmp("New folder",file_mas[i]*304+buf+72)==0) {FileList_ReDraw(i); break;}
 						goto REN_MARK;
 					case 100...120:
 						DEVICE_MARK:
 						copystr(id-100*304+ devbuf+72, #path);
 						IF (path[0]=='r') copystr("/rd/1",#file_path);
 								break;
 						case 180: //home
 								FileList_ReDraw(-za_kadrom-curbtn);
 								break;
 						case 181: //end
-								FileList_ReDraw(kolichestvo-za_kadrom-curbtn+but_num-1);
+								FileList_ReDraw(count-za_kadrom-curbtn+but_num-1);
 								break;
 						case 183: //Page Down
 								FileList_ReDraw(but_num-1);
 								break;
 						case 184: //Page Up
 								break;
 						case 182: //delete file
 								Del_Form();
 								break;
 						default:
 								FOR (i=curbtn+za_kadrom+1; i
+								{
 									copystr(file_mas[i]*304+buf+72,#temp);
 									AL=DSBYTE[#temp];
 									IF(AL>='A')&&(AL<='Z')DSBYTE[#temp]=AL|0x20;
 									IF (temp[0]==key) {FileList_ReDraw(i-curbtn-za_kadrom); break;}
 inline fastcall void draw_window()
+{
 	WindowRedrawStatus(1);
 	skin_width = GetSkinWidth();
-	DefineAndDrawWindow(100,100,600,410,0x73,0x10E4DFE1,0,0,header);
+	DefineAndDrawWindow(100,100,600,410,0x73,0x10E4DFE1,0,0,title);
 	Form.GetInfo(SelfInfo);
 	IF (Form.height==skin_width+3) {WindowRedrawStatus(2); return;} //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 	  IF (Form.height<280) MoveSize(OLD,OLD,OLD,280);
 	  IF (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 	edit1.top=13;
 	KEdit();
 	DrawRegion_3D(246,12,onLeft(66,246),16,0x94AECE,0x94AECE);	//îáîäîê
 	DrawBar(246,29,onLeft(246,60),10,0xE4DFE1); //ôîí ïîä ïîëîñîé àäðåñà
 	DefineButton(onLeft(34,0),6,27,28,30+BT_HIDE+BT_NOFRAME,0xE4DFE1); //about
-	DefineButton(onLeft(61,0),12,18,16,27+BT_HIDE,0xE4DFE1); //êíîïêà ïåðåõîäà
+	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(0,39,Form.width-10,Form.height-skin_width-44,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");
+	//
+	//sort_type[1]=onLeft(192,168)/2+210;
+	//sort_type[2]=onLeft(115,0);
+	//sort_type[3]=onLeft(44,0);
 	//ïðîêðóòêà
 	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");//ïðîêðóòêà âíèç
 	//
+}
 void KEdit()
+{
+	edit1.size=edit1.pos=strlen(#edit_path);
+	edit_box_draw  stdcall (#edit1);
+	/*edit2.flags=66; //äåëàåì êîìïîíåíò àêòèâíûì
+	edit2.width=onLeft(24,217);
+	edit2.top=curbtn*18+59;
-	edit1.size=strlen(#edit_path); edit1.pos=strlen(#edit_path);
+	edit2.size=edit2.pos=strlen(#file_name);
-	edit_box_draw  stdcall (#edit1);
+	edit_box_draw  stdcall (#edit2);*/
+}
 inline fastcall void TVScroll() { //Ïðîêðóòêà
 	dword on_y;
-	IF (kolichestvo<=0) {DrawFlatButton(onLeft(27,0),57,16,onTop(22,58),0,0xE4DFE1,""); return;}
+	IF (count<=0) {DrawFlatButton(onLeft(27,0),57,16,onTop(22,58),0,0xE4DFE1,""); return;}
-	on_y = za_kadrom * onTop(22,57) / kolichestvo +57;
+	on_y = za_kadrom * onTop(22,57) / count +57;
-	razm_scrl=onTop(22,57) * but_num - but_num / kolichestvo;
+	scroll_size=onTop(22,57) * but_num - but_num / count;
-	IF (razm_scrl<20) razm_scrl = 20; //óñòàíàâëèâàåì ìèíèìàëüíûé ðàçìåð ñêðîëëà
+	IF (scroll_size<20) scroll_size = 20; //óñòàíàâëèâàåì ìèíèìàëüíûé ðàçìåð ñêðîëëà
-	IF (razm_scrl>onTop(22,57)-on_y+56) || (za_kadrom+but_num>=kolichestvo) on_y=onTop(23+razm_scrl,0); //äëÿ áîëüøîãî ñïèñêà
+	IF (scroll_size>onTop(22,57)-on_y+56) || (za_kadrom+but_num>=count) on_y=onTop(23+scroll_size,0); //äëÿ áîëüøîãî ñïèñêà
-	DrawFlatButton(onLeft(27,0),on_y,16,razm_scrl,0,0xE4DFE1,"");//ïîëçóíîê
+	DrawFlatButton(onLeft(27,0),on_y,16,scroll_size,0,0xE4DFE1,"");//ïîëçóíîê
 	DrawBar(onLeft(26,0),57,15,on_y-57,0xCED0D0);//ïîëå äî ïîëçóíêà
 			return;
+		}
+	}
 	else  //âíèç
+	{
-		IF (za_kadrom==kolichestvo-but_num) && (curbtn==but_num-1) return;
+		IF (za_kadrom==count-but_num) && (curbtn==but_num-1) return;
 		IF (but_num-curbtn>curbtn_)
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
 			Line_ReDraw(videlenie, curbtn); //âûäåëåíèå
 			return;
+		}
 		ELSE
+		{
-			IF(but_num+za_kadrom+curbtn_>=kolichestvo) za_kadrom=kolichestvo-but_num;  ELSE za_kadrom+=curbtn_+curbtn-but_num+1;
+			IF(but_num+za_kadrom+curbtn_>=count) za_kadrom=count-but_num;  ELSE za_kadrom+=curbtn_+curbtn-but_num+1;
 			curbtn=but_num-1;
 			List_ReDraw();
+		}
+	}
+}
 void List_ReDraw()
 {
-	IF (kolichestvo-za_kadrombut_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
+	IF (count-za_kadrombut_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
-	{ za_kadrom=kolichestvo-but_num; curbtn=but_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;
+}
 void Line_ReDraw(dword color, filenum){
 	dword y;//ïîëîæåíèå òåêñòà ïî Y;
-	if (rename_active==1)
+	if (rename_active==1) //âñ¸ ýòî ïîëíûé ïèïåö, è íàäî âûíåñòè â îòäåëüíóþ ïðîöåäóðó
+	{
 		rename_active=0;
 		edit2.flags=64;
 	$and eax,1
 	IF (color==videlenie) isdir=EAX;
 	if (!EAX)
+	{
 		temp_int = Put_icon(off+strlen(off)-4, y+2);
-		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(70,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);
 	if (color==videlenie)
+	{
 		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
 		copystr(off,#file_name);
 	temp_int = onLeft(215,160)/6;
 	IF (strlen(off)
 		WriteText(215,y+6,0,0,off,temp_int);  //èìÿ ôàéëà
 	DrawBar(onLeft(168,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
 	DrawBar(onLeft(95,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+	//Preview();
+}
 		IF (somelen) path_[somelen]=0x00;
 		//
 		IF (buf) free(buf);
     	buf = malloc(32);
 		ReadDir(0, buf, #path_);
-    	kolichestvo = ESDWORD[buf+8];
+    	count = ESDWORD[buf+8];
-    	buf = realloc(kolichestvo * 304 + 32, buf);
+    	buf = realloc(count * 304 + 32, buf);
-		ReadDir(kolichestvo, buf, #path_);
+		ReadDir(count, buf, #path_);
-		IF (EBX>6898) && (EBX<>-1) EBX=6898;
+		IF (EBX>6897) && (EBX<>-1) EBX=6897; //1 íà óäà÷ó ;)
-		kolichestvo=EBX;
+		count=EBX;
+	}
-	if (kolichestvo<>-1) && (redraw>0)
+	if (count<>-1) && (redraw>0)
+	{
-		IF (!strcmp(".",buf+72)) {memmov(buf,buf+304,kolichestvo-1*304); kolichestvo--; } //ôèëüòðóåì ýëåìåíò "."
+		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 (kolichestvo
+		IF (count
 		FOR (j=0;j
 		IF (redraw<>3) Sorting();
 		IF (redraw==1) || (redraw==3) List_ReDraw();
 		copystr(temp_,#edit_path);
 		KEdit();
-		copystr("|",#PathHistory+strlen(#PathHistory));
+		HistoryPath(add_new_path);
-		copystr(#path,#PathHistory+strlen(#PathHistory));
 		//ñòðåëî÷êà ñîðòèðîâêè
 		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 (kolichestvo==-1) {but_num=kolichestvo=0; List_ReDraw();}
+	IF (count==-1) {but_num=count=0; List_ReDraw();}
+}
 inline Sorting()
 {
 	dword k=0, l=1;
 	IF (!strcmp(#path,"/")) {FOR(k=1;k
-	FOR (j=kolichestvo-1, off=kolichestvo-1*304+buf+32; j>=0; j--, off-=304;)  //ïàïêè ââåðõ, ôàéëû âíèç
+	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
-			 {file_mas[kolichestvo-l]=j; l++;}
+			 {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,kolichestvo-1);
+	IF (sort_num==1) Sort_by_Name(k,count-1);
-	IF (sort_num==2) Sort_by_Type(k, kolichestvo-1);
+	IF (sort_num==2) Sort_by_Type(k, count-1);
-	IF (sort_num==3) Sort_by_Size(k,kolichestvo-1);
+	IF (sort_num==3) Sort_by_Size(k,count-1);
 			copystr(#copy_file,#file_path);
 			Del_File(true);
 			copy_file='';
 			cut_active=0;
+		}
-	Open_Dir(#path,1);
+	SelectFile(#copy_file+find_symbol(#copy_file,'/'));
+}
+	{
 		DefineButton(17,i*16+74,159,16,100+i+BT_HIDE,0xE4DFE1); //ñîçäà¸ì êíîïêè, à ïîòîì âûâîäèì íàçâàíèÿ äèñêîâ
 		copystr("Unknown drive",#drive_name); //èçíà÷àëüíî íåèçâåñíûé íîñèòåëü
 		dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê
 		copystr(i*304+ devbuf+72, #dev_name);
+		IF (dev_name[0]=='r')  { dev_icon=0; copystr("RAM-disk /rd/1",#drive_name); }
+		IF (dev_name[0]=='c')  { dev_icon=1; copystr("CD-drive /",#drive_name); }
-		IF (dev_name[0]=='f')  { copystr("Floppy disk /",#drive_name); dev_icon=2; }
+		IF (dev_name[0]=='f')  { dev_icon=2; copystr("Floppy disk /",#drive_name); }
-		IF (dev_name[0]=='h')  copystr("Hard disk drive /",#drive_name);
+		IF (dev_name[0]=='h')   copystr("Hard disk drive /",#drive_name);
-		IF (dev_name[0]=='b')  copystr("SATA disk drive /",#drive_name);
+		IF (dev_name[0]=='b')   copystr("SATA disk drive /",#drive_name);
-		IF (dev_name[0]=='c')  {copystr("CD-drive /",#drive_name); dev_icon=1;}
+		//
-		copystr(#dev_name,#drive_name+strlen(#drive_name));
+		IF (dev_icon<>0) copystr(#dev_name,#drive_name+strlen(#drive_name));
 		copystr("/",#drive_name+strlen(#drive_name));
-		IF (dev_name[0]=='r')  { copystr("RAM-disk /rd/1/",#drive_name); dev_icon=0; }
+		//
-	  WriteText(45,i*16+79,0x80,0,#drive_name,0);
+		WriteText(45,i*16+79,0x80,0,#drive_name,0);
-	  PutImage(dev_icon*14*13*3+#devices,14,13,21,i*16+76);
+		PutImage(dev_icon*14*13*3+#devices,14,13,21,i*16+76);
+	}
 	Actions();  //ôóíêöèè ôàéëîâ è ïàïîê
-	Preview();
+}
+	{
-	DeleteButton(80);	DeleteButton(81);	DeleteButton(82);
+		DeleteButton(80);	DeleteButton(81);	DeleteButton(82);
-	Tip(dev_num*16+90, "Actions", 77, "\x18");
+		Tip(dev_num*16+90, "Actions", 77, "\x18");
-	DrawBar(17,dev_num*16+108,160,51,0x00699C); //ñèíåå
+		DrawBar(17,dev_num*16+108,160,51,0x00699C); //ñèíåå
+	}
-}
-void Dir_Up()
-{
-	char temp_[256];
-	i=strlen(#path)-1;
-	path[i]=0x00;
-	do i--; while (path[i]<>'/'); copystr(#path+i+1,#temp_);
-	path[i+1]=0x00;
-	ChangeCase(#temp_);
-	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
-   	Open_Dir(#path,2);
-	FOR (i=kolichestvo-1; i>0; i--;) IF(strcmp(file_mas[i]*304+buf+72,#temp_)==0) BREAK;
-	//
-	if (i>kolichestvo-but_num)
-	{
-		za_kadrom=kolichestvo-but_num;
-		curbtn=i-kolichestvo+but_num;
-	}
-	ELSE FileList_ReDraw(i);
-	List_ReDraw();
+	Preview();
+}
 	DeleteButton(78);
 	if (show_preview==1)
+	{
 		Tip(top_pr,"Preview",78,"\x19");
 		DrawBar(17,top_pr+18,160,100,0xFFFFFF); //áåëîå
+		DrawBar(17,top_pr+118,160,onTop(top_pr+118,6),0x00699C); //ñèíåå
+		//
-		WriteText(25,top_pr+30,0x80,0,"Number of files:",0); WriteText(135,top_pr+30,0x80,0,IntToStr(kolichestvo),0);
+		WriteText(25,top_pr+30,0x80,0,"Number of files:",0); WriteText(135,top_pr+30,0x80,0,IntToStr(count),0);
-		/*WriteText(30,top_pr+40,0x80,0,"but_num:",0);	 WriteText(105,top_pr+40,0x80,0,IntToStr(but_num),0);
+		WriteText(30,top_pr+40,0x80,0,"but_num:",0);	 WriteText(105,top_pr+40,0x80,0,IntToStr(but_num),0);
 		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);
-		WriteText(30,top_pr+80,0x80,0,#file_name,0);*/
+		WriteText(30,top_pr+80,0x80,0,#file_name,0);
-		//WriteText(30,top_pr+60,0x80,0,"Not realized... I think",0);
-		//WriteText(30,top_pr+70,0x80,0,"it will be realired soon.",0);
-		DrawBar(17,top_pr+118,160,onTop(top_pr+118,6),0x00699C); //ñèíåå
+	}
 	ELSE
+	{
 		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); //ïðîâåðÿåì åñëè ôàéëû â ïàïêå, òàê ìû óçíà¸ì ñóùåñòâóåò ëè îíà
-	IF (kolichestvo==-1) KEdit(); ELSE //ïðîñòî î÷èùàåì ïîëîñó àäðåñà
+	IF (count<1) KEdit(); ELSE //ïðîñòî î÷èùàåì ïîëîñó àäðåñà
 		{za_kadrom=curbtn=0; copystr(#edit_path,#path);}//íàâåðõ ñïèñêà
 	Open_Dir(#path,1);
+}
+void SelectFile(dword that_file)
+{
+	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
+   	Open_Dir(#path,2);
+	ChangeCase(that_file);
+	FOR (i=count-1; i>=0; i--;) IF(strcmp(file_mas[i]*304+buf+72,that_file)==0) BREAK;
+	IF (i>but_num-1) && (i>count-but_num)
+	{
+		za_kadrom=count-but_num;
+		curbtn=i-count+but_num;
+	}
+	ELSE FileList_ReDraw(i);
+	List_ReDraw();
+}
+void Dir_Up()
+{
+	char 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()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
-{
-	//char old_dir[256]='';
-	i=strlen(#PathHistory)-2;
-	//
-	//WHILE (PathHistory[i]<>'/') { copystr(#PathHistory[i],#old_dir); i--; };
-	//old_dir[strlen(#old_dir)-1]=0x00;
-	//DrawTitle(#old_dir);
+inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
-	//
+{
-	WHILE (PathHistory[i]<>'|') { i--; };
+	i=strlen(#PathHistory)-1;
-	IF (i>0) PathHistory[i]=0x00;
+	PathHistory[i]=0x00;
-	WHILE (PathHistory[i]<>'|')	{ copystr(#PathHistory[i],#path); i--;	}
-	IF (i>0) PathHistory[i]=0x00;
+	copystr(#PathHistory+find_symbol(#PathHistory,'/'),#temp); //ïàïêà â êîòîðîé áûëè
-	za_kadrom=curbtn=0; Open_Dir(#path,1);
+	HistoryPath(go_back);

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 975 → 976