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

 #include "lib\file_system.h--"
 #include "imgs\toolbar.txt"
 #include "imgs\left_p.txt"
 //ëîêàëèçàöèÿ è íàñòðîéêè
-#define header "Eolite File Manager v0.97.1";
+#define header "Eolite File Manager v0.97.2"
-#define videlenie 0xFEA4B7; //0x94AECE,,0x8BCDFF,0x9EACCA,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+#define videlenie 0x94AECE //0x94AECE,0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 byte toolbar_buttons_x[6]={14,51,90,139,172,208};
 //
 dword but_num, kolichestvo, za_kadrom, curbtn, razm_scrl;
 byte cut_active, rename_active, del_active;
 #include "include\icons_f.h--"
 //IPC
-/*#include "lib\Nable_lib.h--"
+#include "lib\Nable_lib.h--"
 #include "lib\ipc.h--"
 int pLoadedImage;
 void GetImage(dword ipath)
 {
 	IF (pLoadedImage) free(pLoadedImage);
 	pLoadedImage=loadimage_viaIPC(ipath, #CurrentImage);
 	SetEventMask(100111b); //restore normal event mask
-		ReadDir(10, devbuf, "/");
+	ReadDir(10, devbuf, "/");
-		dev_num=EBX;
+	dev_num=EBX;
 	load_dll(); //ïîäãðóæàåò ëèáó ñ åäèò_áîêñîì
 	IF (param[0]<>'') {copystr(#param,#edit_path); Goto_edit_path();}
 	Open_Dir(#path,2);
-	//GetImage("/sys/wallpaper.gif");
-	//DrawImage(#CurrentImage, 0*65536+0);
- 	//SetEventMask(100111b);
 	loop()
+	{
 		switch(WaitEvent())
+		{
 			CASE evMouse:
 					IF (del_active==1) break;
 					m.get();
 					//
 					IF (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.pkm==1) && (m.x>197) && (m.x56)
-					//	&& (m.y-skin_width-56/18<>curbtn) FileList_ReDraw(m.y-skin_width-56/18-curbtn);
 					//ñêðîëë
-					IF (m.y>Form.width) || (razm_scrl/2+57>m.y) m.y=razm_scrl/2+57; //åñëè êóðñîð íàä îêíîì
+					IF (razm_scrl/2+57>m.y)  || (m.y<0) || (m.y>4000) m.y=razm_scrl/2+57; //åñëè êóðñîð íàä îêíîì
 					IF (m.lkm==0) pressed=0; ELSE
 					IF (m.x>=Form.width-21) && (m.x<=Form.width-6) pressed=1;
 					IF (pressed==1)
+					{
 						temp_int=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
 					break;
 //Button pressed-----------------------------------------------------------------------------
 			case evButton:
 				IF (edit1.flags<>64) {edit1.flags=64; edit_box_draw stdcall(#edit1);} //ñáðàñûâàåì âûäåëåíèå ïðè íàæàòèè íà áàòîí
 				id=GetButtonID();
-				IF (id==1) {IF(buf)free(buf); ExitProcess();}
+				IF (id==1) ExitProcess();
 				IF (del_active==1) {IF (id==301) || (id==302) Del_File(302-id); break;}
 				switch(id)
+				{
 					CASE 21: GoBack(); break;//Íàçàä
 					CASE 23: IF (strcmp(#path,"/")<>0) Dir_Up(); break;//up!
 				break;
 				case evReDraw:	draw_window();	BREAK;
+		}
 		IF (rename_active==0) edit_box_mouse stdcall(#edit1); ELSE edit_box_mouse stdcall(#edit2);
+	}
-	free(buf); //free memory
-	ExitProcess();
+}
 		but_num=onTop(6,57)/18;
 		IF (but_num>100) but_num=1; ELSE IF (kolichestvo
 		FOR (j=0;j
 		List_ReDraw();
 	IF (del_active==1) Del_Form();
+	//
 	WindowRedrawStatus(2);
+}
 	edit_box_draw  stdcall (#edit1);
+}
+inline fastcall void TVScroll() { //Ïðîêðóòêà
+	dword on_y;
-inline fastcall void TVScroll() { //Ïðîêðóòêà
+	IF (kolichestvo<=0) {DrawFlatButton(onLeft(22,0),57,16,onTop(22,58),0,0xE4DFE1,""); return;}
-	dword on_y = za_kadrom * onTop(22,57) / kolichestvo +57;
+	on_y = za_kadrom * onTop(22,57) / kolichestvo +57;
 	razm_scrl=onTop(22,57) * but_num - but_num / kolichestvo;
 	IF (razm_scrl<20) razm_scrl = 20; //óñòàíàâëèâàåì ìèíèìàëüíûé ðàçìåð ñêðîëëà
 	IF (razm_scrl>onTop(22,57)-on_y+56) || (za_kadrom+but_num>=kolichestvo) on_y=onTop(23+razm_scrl,0); //äëÿ áîëüøîãî ñïèñêà
 	if (!EAX)
+	{
 		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
 	} ELSE IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
-	IF (color==videlenie)
+	if (color==videlenie)
+	{
 		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
 		copystr(#path,#file_path);
 		copystr(off,#file_name);
 		copystr(off,#file_path+strlen(#file_path)); //èòàê, file_path=ôàéëó, ò.ê. ïî-óìîë÷àíèþ ýòî ïðîãà
+		/*IF (show_preview) && (!isdir)
+		{
+			GetImage(#file_path);
+			j=dev_num*16+123;
+			j+=show_actions*51;
+			IF (pLoadedImage<>0) DrawImage(#CurrentImage, 22*65536+j+skin_width+18);
+		}*/
+	}
 	temp_int = onLeft(220,160)/6;
 	IF (strlen(off)
 		WriteText(220,y+6,0,0,off,temp_int);  //èìÿ ôàéëà
 	DrawBar(onLeft(163,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
 	DrawBar(onLeft(90,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
-	//Preview();
+}
 void Open_Dir(dword path_,redraw){
   IF (buf) free(buf);
+	//buf = malloc(2097152);
+	//ReadDir(6898, buf, path_);
+    buf = malloc(32);
+	ReadDir(0, buf, path_);
+    EAX = buf + 8;
+    kolichestvo = ESDWORD[EAX];
+    buf = realloc(kolichestvo * 304 + 32, buf);
-	buf = malloc(2097152);
+	ReadDir(kolichestvo, buf, path_);
-	ReadDir(6898, buf, path_);
+	//
 	kolichestvo=EBX;
 	//
 	if (kolichestvo<>-1) && (redraw>0)
 		$and eax,1
 		IF (EAX) {file_mas[k]=j; k++;}
 			ELSE {file_mas[kolichestvo-l]=j; l++;}
 		off += 304;
+	}
-	//k=0; l=kolichestvo;
 	switch(sort_num)
+	{
 		CASE 1: //óïîðÿäî÷èâàåì ôàéëû ïî èìåíè
 			WriteText(onLeft(197,163)/2+215,45,0x80,0x4E78AC,"\x19",0);
 			IF (strcmp(#path,"/")==0) break;
 	DrawFlatButton(temp_int+20,208,70,20,301,0xFFB6B5,"Yes");
 	DrawFlatButton(temp_int+111,208,70,20,302,0xC6DFC6,"No");
 	del_active=1;
+}
 //f70 del_file_70;
 void Del_File(byte dodel)
+{
 	IF (dodel==true)
+	{
 		DefineButton(22,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]=='f')  { copystr("Floppy disk /",#drive_name); dev_icon=2; }
-		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));
 		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);
 	DeleteButton(78);
 	if (show_preview==1)
+	{
 		Tip(top_pr,"Preview",78,"\x19");
 		DrawBar(22,top_pr+18,160,100,0xFFFFFF); //áåëîå
-		//WriteText(30,top_pr+30,0x80,0,"kolichestvo:",0); WriteText(105,top_pr+30,0x80,0,IntToStr(kolichestvo),0);
+		/*WriteText(30,top_pr+30,0x80,0,"kolichestvo:",0); WriteText(105,top_pr+30,0x80,0,IntToStr(kolichestvo),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+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+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+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+60,0x80,0,"Not realized... I think",0);
-		WriteText(30,top_pr+70,0x80,0,"it will be realired soon.",0);
+		//WriteText(30,top_pr+70,0x80,0,"it will be realired soon.",0);
 		DrawBar(22,top_pr+118,160,onTop(top_pr+118,6),0x00699C); //ñèíåå
+	}
-	ELSE  {
+	ELSE
+	{
 		Tip(top_pr,"Preview",78,"\x18");
 		DrawBar(22,top_pr+18,160,onTop(top_pr+18,6),0x00699C); //ñèíåå
+	}
+}

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 937 → 944