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

 //Leency & Veliant -=- KolibriOS Team -=- 2012
 //GNU GPL licence.
-#include "lib\kolibri.h--"
+#include "lib\kolibri.h"
-#include "lib\memory.h--"
+#include "lib\memory.h"
-#include "lib\edit_box_lib.h--"
+#include "lib\edit_box_lib.h"
-#include "lib\file_system.h--"
+#include "lib\file_system.h"
 #include "imgs\toolbar.txt"
 #include "imgs\left_p.txt"
 #define ONLY_SHOW	0
 #define WITH_REDRAW	1
 #define ONLY_OPEN	2
 //ïåðåìåííûå
-#define title "Eolite File Manager v1.0"
+#define title "Eolite File Manager v1.1"
-#define videlenie 0x94AECE //0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
-byte toolbar_buttons_x[6]={9,46,85,134,167,203};
+dword videlenie=0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 //
 int  but_num,
      count,
      za_kadrom,
      rename_active,
      del_active;
 byte show_actions=1,
      sort_num=2,
      isdir;
-char path[4096]="/rd/1/",
+char path[4096],
      edit_path[4096],
      file_path[4096],
      file_name[4096],
      copy_file[4096],
      temp[4096];
 byte PathHistory[4096];
+int toolbar_buttons_x[6]={9,46,85,134,167,203};
 dword file_mas[6898];
 int j, i, mouse_dd;
 dword stak[100]; //îêíî About
-edit_box edit1= {250,247,13,0xffffff,videlenie,0xD3DDEB,0xffffff,0,248,#edit_path,#mouse_dd,64,6,6};
+edit_box edit1= {250,247,13,0xffffff,0x94AECE,0xD3DDEB,0xffffff,0,248,#edit_path,#mouse_dd,64,6,6};
-edit_box edit2= {250,213,80,0xFFFFCC,videlenie,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};
-proc_info Form;
-dword buf, off; //äëÿ òåêñòà è áóôåðà
+proc_info Form;
-dword devbuf, dev_num;
+dword buf, off; //äëÿ òåêñòà è áóôåðà
-#include "include\about_dialog.h--"
-#include "include\some_code.h--"
-#include "include\sorting.h--"
+#include "include\about_dialog.h"
-#include "include\icons_f.h--"
-#include "include\ini.h--"
-void Devices()
+#include "include\some_code.h"
-{
-	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, "");
-	for (i=0;i
-	{
-		DrawBar(17,i*16+74,160,17,0xFFFFFF); //áåëîå
-		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);
-		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')  { dev_icon=2; copystr("Floppy disk /",#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_icon<>0) copystr(#dev_name,#drive_name+strlen(#drive_name));
-		copystr("/",#drive_name+strlen(#drive_name));
-		//
+#include "include\sorting.h"
-		WriteText(45,i*16+79,0x80,0,#drive_name,0);
+#include "include\icons_f.h"
-		PutImage(dev_icon*14*13*3+#devices,14,13,21,i*16+76);
+#include "include\ini.h"
 #include "include\devices.h"
 void main()
-word key, id;
+void main()
-mouse m;
-int pressed_y;
+word key, id;
-{
+mouse m;
-	GetIni(1);
+int pressed_y;
-	//
+{
+	//
+	load_editbox_lib();
-	load_editbox_lib();
+	GetSystemDiscs();
-	devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
+	GetIni(1);
 	ReadDir(10, devbuf, "/");
-	dev_num=EBX;
+	edit1.shift_color=videlenie;
-	//
+	edit2.shift_color=videlenie;
 	//curbtn=za_kadrom=0;
+	HistoryPath(add_new_path);
-	HistoryPath(add_new_path);
+	IF (param[0]<>'') //áûë ëè çàïóñê ñ ïàðàìåòðîì
 	IF (param[0]<>'') //áûë ëè çàïóñê ñ ïàðàìåòðîì
 		copystr(#param, #path);
-		copystr(#param, #path);
+		IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
 		IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
 					if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) while (m.lkm)
+					{
 						IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
 						id=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
 						j= scroll_size/2;
-						za_kadrom = m.y -j -57 * count;	za_kadrom /= 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 (id<>za_kadrom) List_ReDraw(); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
 						m.get();
+					}
 					break;
+							}
 							ELSE  ShowMessage("Folder can not be created.");
 							break;
 					case 100...120:
 							DEVICE_MARK:
-							copystr(id-100*304+ devbuf+72, #path);
+							//copystr(#disk_list[id-100].Item, #file_path);
-							IF (path[0]=='r') copystr("/rd/1",#file_path);
-							ELSE {
+							//GOTO OPEN_DEV;
-									copystr("/", #file_path);
+							copystr(#disk_list[id-100].Item, #path);
-									copystr(#path, #file_path+strlen(#file_path));
+							za_kadrom=curbtn=0;
-								 }
+							Open_Dir(#path,1);
-							GOTO OPEN_DEV;
+							break;
 					default:
 							if (id<200) break; //êíîïêè èç ñïèñêà ôàéëîâ
 							IF (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
 							else OPEN_MARK:
-							if (!isdir) GetIni(0); ELSE
+							if (!isdir) GetIni(0); 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));
+									IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
 									za_kadrom=curbtn=0;
 									Open_Dir(#path,1);
+							}
+				}
 				break;
+				}
 				switch (key)
+				{
 						case 209...217:
 								id=key-110;
-								IF (id-100>=dev_num) break;
+								IF (id-100>=disc_num) break;
 								GOTO DEVICE_MARK;
 						case   8: //Íàçàä
 								GoBack();
 								break;
 						case 004: //Ctrl+D ðèñ íà ðàá ñòîë ðàñòÿíóòü
 	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,onTop(46,0),0x94AECE,0x94AECE); //ñèíèé îáîäîê
 	DrawRegion_3D(0,39,Form.width-10,onTop(44,0),0xE4DFE1,0xE4DFE1); //ôîí
-	Devices(); //ïàíåëü ñëåâà íà ñèíåì ôîíå
+	DrawSystemDiscs();
-	Actions();  //ôóíêöèè ôàéëîâ è ïàïîê
+	Actions();
 	//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");
 	//Ïåðåðèñîâûâàåì ñïèñîê
 	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");//ïðîêðóòêà âíèç
+	if (del_active==1) Del_Form();
+}
 			return;
+		}
+	}
 	else  //âíèç
+	{
-		/*if (count-za_kadrom-but_num==1) //ýòî çàãëóøêà
-		{
-			za_kadrom=count-but_num;
-			curbtn=but_num-1;
-			List_ReDraw();
-		}*/
 		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(za_kadrom+but_num+curbtn_>=count) //à òóò êàæèñü áûë áàã
 			IF(za_kadrom+curbtn+curbtn_>=count)
+			{
 				za_kadrom=count-but_num;
 				curbtn=curbtn_-za_kadrom+curbtn;
+				}
 //puticon+icon_fairing!!!
-void Line_ReDraw(dword color, filenum){
+void Line_ReDraw(dword color, filenum){
 	dword text_col=0, temp_int,
-	/*
+	/* //ýòî ÿ ïûòàëñÿ ñäåëàòü âèä êðóïíûìè çíà÷êàìè
 	dword text_col=0, temp_int, x,
 	max_x=onLeft(28,192)/BUTTON_HEIGHT,
 	y=filenum/max_x*BUTTON_HEIGHT+57; //ïîëîæåíèå òåêñòà ïî Y
 	*/
 	y=filenum*BUTTON_HEIGHT+57; //ïîëîæåíèå òåêñòà ïî Y
 	IF (rename_active==1) ReName(false);
 	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
 	DefineButton(192,y,onLeft(28,192),BUTTON_HEIGHT,201+filenum+BT_HIDE+BT_NOFRAME,color); //êíîïà
-	DrawBar(192,y,3,BUTTON_HEIGHT,color); DrawBar(195,y,16,2,color);
+	DrawBar(192,y,3,BUTTON_HEIGHT,color);
 	DrawBar(192+19,y,onLeft(46,192),BUTTON_HEIGHT,color); DrawBar(195,y+17,16,1,color);
 	if (BUTTON_HEIGHT>18) DrawBar(195,y+18,16,BUTTON_HEIGHT-18,color);
+	if (BUTTON_HEIGHT>15) DrawBar(195,y,16,BUTTON_HEIGHT-15,color);
 	//
 	off=file_mas[filenum+za_kadrom]*304 + buf+72;
 	if (TestBit(ESDWORD[off-40],1)) || (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7;
 		if (!TestBit(ESDWORD[off-40],4))
+		{
 			copystr(off,#temp);
-			temp_int = Put_icon(#temp+find_symbol(#temp,'.'), BUTTON_HEIGHT-14/2+y);
+			temp_int = Put_icon(#temp+find_symbol(#temp,'.'), BUTTON_HEIGHT/2-7+y);
 			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)) temp_int=Put_icon("..", y+2);
+			IF (!strcmp("..",off)) temp_int=Put_icon("..", BUTTON_HEIGHT/2-7+y);
 	ELSE
-		temp_int=Put_icon("", y+2);
+		temp_int=Put_icon("", BUTTON_HEIGHT/2-7+y);
 	if (color==videlenie)
+	{
 		isdir=TestBit(ESDWORD[off-40], 4);
-		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
+		IconFairing(temp_int, BUTTON_HEIGHT/2-7+y); //çàêðàøèâàåì èêîíêó
 		copystr(off,#file_name);
 		copystr(#path,#file_path);
 		copystr(#file_name,#file_path+strlen(#file_path)); //ïîëíûé ïóòü ê ôàéëó
 		IF (text_col==0xA6A6B7) text_col=0xFFFFFF;
+	}
 inline Sorting()
 {
+	dword k=0, l=1;
+	if (!strcmp(#path,"/")) //íå ñîðòèðîâàòü ïàïêè è íå ìåíÿòü ðåãèñòð â "/"
+	{
+		FOR(k=1;k
-	dword k=0, l=1;
+		return;
 	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);
+		if (TestBit(ESDWORD[off],4)) //ïàïêà?
+		{
+			file_mas[k]=j;
+			k++;
+		}
-		ChangeCase(off+40);
+		else
+		{
+			file_mas[count-l]=j;
-		IF (TestBit(ESDWORD[off],4)) {file_mas[k]=j; k++;}
+			l++;
 			ELSE {file_mas[count-l]=j; l++;}
+	}
 	//Ñîáñòâåííî ñîðòèðîâêà: âíà÷àëå ïàïêè, ïîòîì ôàéëû
 	Sort_by_Name(0,k-1);
+}
 void Actions()
+{
+	int actions_y=disc_num*16;
-	int actions_y=dev_num*16;
+	DrawBar(17,actions_y+75,160,15,0x00699C); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
-	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); //ñèíåå â êîíöå
 	if (show_actions==1)
+	{
-		Tip(actions_y+90, "Actions", 77, "\x19");
+		Tip(actions_y+90, "Actions", 77, "\x19"); //çàãîëîâîê
 		DrawBar(17,actions_y+108,160,51,0xFFFFFF); //áåëîå
-		PutImage(#factions,16,44,21,actions_y+113); //ïèêòîãðàìêè
+		PutImage(#factions,16,44,21,actions_y+113); //èêîíêè
 		//rename file
-		DefineButton(22,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);
 		//delete file
 		DefineButton(17,actions_y+125,159,16,81+BT_HIDE,0xE4DFE1);
 		WriteText(42,actions_y+130,0x80,0,"Delete file ",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
+	{
-	ELSE
+		DeleteButton(80);
 		DeleteButton(81);
-		DeleteButton(80);	DeleteButton(81);	DeleteButton(82);
+		DeleteButton(82);
-		Tip(actions_y+90, "Actions", 77, "\x18");
 		Tip(actions_y+90, "Actions", 77, "\x18");
 	DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),0x00699C); //ñèíåå â êîíöå
 void SelectFile(dword that_file)
+{
 	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
    	Open_Dir(#path,ONLY_OPEN);
 	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) //âñ¸ ýòî ïî-èäåå ìîæíî ñäåëàòü ÷åðåç FileList_ReDraw(i) èëè ÿ íåïðàâ?
-	{
-		za_kadrom=count-but_num;
-		curbtn=i-count+but_num;
+	for (i=count-1; i>=0; i--;)
-	}
-	ELSE FileList_ReDraw(i);*/
+		if (strcmp(file_mas[i]*304+buf+72,that_file)==0) break;
 	FileList_ReDraw(i);
 	List_ReDraw();
+}

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 2528 → 2568