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.5"
+dword col_work    = 0xE4DFE1;
+dword col_border  = 0x819FC5;
-#define title "Eolite File Manager v1.45"
+dword col_padding = 0xC8C9C9;
-dword selection_col = 0x94AECE;
+dword col_selec   = 0x94AECE;
-dword lpanel_col = 0x00699C;
+dword col_lpanel  = 0x00699C;
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
 char tmp_disk_del_param[3]="d0\0";
 dword file_mas[6898];
+int j, i, mouse_dd;
-int j, i, mouse_dd;
+int scroll_used;
 struct path_string {
 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; //äëÿ òåêñòà è áóôåðà
 dword buf, off; //äëÿ òåêñòà è áóôåðà
-#include "include\about_dialog.h"
+#include "include\some_code.h"
-#include "include\some_code.h"
+#include "include\about_dialog.h"
 #include "include\sorting.h"
 #include "include\icons_f.h"
 #include "include\ini.h"
 #include "include\left_panel.h"
 #include "include\history.h"
 void main()
-{
 	word key, id;
-	mouse m;
+	word key, id;
-	int scroll_used;
+	mouse m;
 	load_editbox_lib();
 	GetSystemDiscs();
 	GetIni(1);
-	edit1.shift_color=selection_col;
+	edit1.shift_color=col_selec;
-					if (za_kadrom
+				if (za_kadrom
-					if (curbtn>0) curbtn--;
+				if (curbtn>0) curbtn--;
-					List_ReDraw();
+				List_ReDraw();
+			}
-				//ñêðîëë
+			//ñêðîëë
-				if (!m.lkm) scroll_used=NULL;
+			if (!m.lkm) && (scroll_used) { scroll_used=NULL; TVScroll(); }
-				if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && (m.y
+			if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && (m.y
-				if (scroll_used)
+			if (scroll_used)
+			{
-					IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
+				IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
-							break;
+						break;
-					case 27: //goto edit_path
+				case 27: //goto edit_path
-							Goto_edit_path();
+						Goto_edit_path();
-							break;
+						break;
-					case 31...33: //sort
+				case 31...33: //sort
-							IF(sort_num==1) DrawBar(onLeft(192,168)/2+210,45,6,9,0xE4DFE1);
+						IF(sort_num==1) DrawFilledBar(onLeft(192,168)/2+210,42,6,10);
-							IF(sort_num==2) DrawBar(onLeft(115,0),45,6,9,0xE4DFE1);
+						IF(sort_num==2) DrawFilledBar(onLeft(115,0),42,6,10);
-							IF(sort_num==3) DrawBar(onLeft(44,0),45,6,9,0xE4DFE1);
+						IF(sort_num==3) DrawFilledBar(onLeft(44,0),42,6,10);
-							sort_num=id-30;
+						sort_num=id-30;
-							Open_Dir(#path,1);
+						Open_Dir(#path,1);
-							break;
+						break;
-					case 30: //about
+				case 30: //about
-							CreateThread(#about_dialog,#stak);
+						CreateThread(#about_dialog,#stak);
 inline fastcall void draw_window()
+{
 	int min_size_y = disc_num*16+195;
 	if (GetScreenHeight()<480)
-		DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0xE4DFE1,title);
+		DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,col_work,title);
 	else
-		DefineAndDrawWindow(98,90,582,482,0x73,0xE4DFE1,title);
+		DefineAndDrawWindow(98,90,582,482,0x73,col_work,title);
-	Form.GetInfo(#Form, SelfInfo);
+	GetProcessInfo(#Form, SelfInfo);
-	if (Form.status_window>2) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
+	if (Form.status_window>2) return;
 	if (Form.height
 	if (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 	//toolbar buttons
-	PutPaletteImage(#toolbar,246,39,0,0,#toolbar_pal);
+	PutPaletteImage(#toolbar,246,34,0,0,#toolbar_pal);
-	for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,0xE4DFE1);
+	for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,col_work);
-	for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,0xE4DFE1);
+	for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,col_work);
 	//ïîëîñà àäðåñà
 	edit1.width=Form.width-314;
-	DrawBar(246,0,onLeft(246,60),12,0xE4DFE1); //ôîí íàä ïîëîñîé àäðåñà
+	DrawBar(246,0,onLeft(246,60),12, col_work); //ôîí íàä ïîëîñîé àäðåñà
-	DrawBar(246,29,onLeft(246,60),10,0xE4DFE1); //ôîí ïîä ïîëîñîé àäðåñà
+	DrawBar(246,29,onLeft(246,60),5,col_work); //ôîí ïîä ïîëîñîé àäðåñà
-	DrawRegion_3D(246,12,onLeft(66,246),16,0x94AECE,0x94AECE);	//îáîäîê
+	DrawRegion_3D(246,12,onLeft(66,246),16,col_border,col_border);	//îáîäîê
-	DefineButton(onLeft(34,0),6,27,28,30+BT_HIDE+BT_NOFRAME,0xE4DFE1); //about
+	DefineButton(onLeft(34,0),6,27,28,30+BT_HIDE+BT_NOFRAME,col_work); //about
-	DefineButton(onLeft(66,0),12,18,16,27+BT_HIDE,0xE4DFE1); //êíîïêà ïåðåõîäà
+	DefineButton(onLeft(65,0),13,16,14,27+BT_HIDE,col_work); //êíîïêà ïåðåõîäà
-	PutPaletteImage(#goto_about,56,40,Form.width-65,0,#goto_about_pal);
+	PutPaletteImage(#goto_about,56,34,Form.width-65,0,#goto_about_pal);
 	//ïðÿìîóãîëüíèêè âíóòðè
+	DrawRegion_3D(1,40,Form.cwidth-3,onTop(46,0),col_border,col_border); //ñèíèé îáîäîê
-	DrawRegion_3D(1,40,Form.width-12,onTop(46,0),0x94AECE,0x94AECE); //ñèíèé îáîäîê
+	DrawRegion_3D(0,39,Form.cwidth-1,onTop(44,0),col_palette[4],col_palette[4]); //ôîí
-	DrawRegion_3D(0,39,Form.width-10,onTop(44,0),0xE4DFE1,0xE4DFE1); //ôîí
+	for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
 	DrawLeftPanel();
 	//SortButtons
-	DrawFlatButton(192,40,onLeft(192,168),16,31,0xE4DFE1,"File");
+	DrawFlatButton(192,40,onLeft(192,168),16,31,col_work,"File");
-	DrawFlatButton(onLeft(168,0),40,73,16,32,0xE4DFE1,"Type");
+	DrawFlatButton(onLeft(168,0),40,73,16,32,col_work,"Type");
-	DrawFlatButton(onLeft(95,0),40,68,16,33,0xE4DFE1,"Size");
+	DrawFlatButton(onLeft(95,0),40,68,16,33,col_work,"Size");
 	//Ïåðåðèñîâûâàåì ñïèñîê
 	Open_Dir(#path,ONLY_SHOW);
 	//ïðîêðóòêà
-	DrawBar(onLeft(27,0),57,1,onTop(22,57),0x94AECE); //ëèíèÿ ñëåâà îò ïðîêðóòêè
+	DrawBar(onLeft(27,0),57,1,onTop(22,57),col_border); //ëèíèÿ ñëåâà îò ïðîêðóòêè
-	DrawFlatButton(onLeft(27,0),40,16,16,0,0xE4DFE1,"\x18");		//ïðîêðóòêà ââåðõ
+	DrawFlatButton(onLeft(27,0),40,16,16,0,col_work,"\x18");		//ïðîêðóòêà ââåðõ
-	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,0xE4DFE1,"\x19");//ïðîêðóòêà âíèç
+	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,col_work,"\x19");//ïðîêðóòêà âíèç
 	if (del_active) Del_Form();
 		IF (za_kadrom==0) && (curbtn<=0) return;
 		IF (-curbtn_-1
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
-			Line_ReDraw(selection_col, curbtn); //âûäåëåíèå
+			Line_ReDraw(col_selec, curbtn); //âûäåëåíèå
 			return;
+		}
 		ELSE
+		{
 			IF (-curbtn_
 		IF (za_kadrom==count-f_visible) && (curbtn==f_visible-1) return;
 		IF (f_visible-curbtn>curbtn_)
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
-			Line_ReDraw(selection_col, curbtn); //âûäåëåíèå
+			Line_ReDraw(col_selec, curbtn); //âûäåëåíèå
 			return;
+		}
 		else
+		{
 			IF(za_kadrom+curbtn+curbtn_>=count)
+{
 	int paint_x=f_visible*BUTTON_HEIGHT+57;
 	IF (count-za_kadromf_visible-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
 	{ za_kadrom=count-f_visible; curbtn=f_visible-1; } //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
-	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(selection_col, curbtn);
+	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(col_selec, curbtn);
 		DrawBar(192,paint_x,onLeft(27,192),onTop(paint_x,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
-		DrawBar(onLeft(168,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
+		DrawBar(onLeft(168,0),paint_x,1,onTop(paint_x,6),col_work); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
-		DrawBar(onLeft(95,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+		DrawBar(onLeft(95,0),paint_x,1,onTop(paint_x,6),col_work); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
 	TVScroll();
+}
 		IF (text_col==0xA6A6B7) text_col=0xFFFFFF;
+	}
 	name_len = onLeft(215,165)/6;
 	IF (strlen(off)
 	WriteText(215,BUTTON_HEIGHT-6/2+y,0,text_col,off,name_len);  //èìÿ ôàéëà
-	DrawBar(onLeft(168,0),y,1,BUTTON_HEIGHT,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
+	DrawBar(onLeft(168,0),y,1,BUTTON_HEIGHT,col_work); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
-	DrawBar(onLeft(95,0),y,1,BUTTON_HEIGHT,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+	DrawBar(onLeft(95,0),y,1,BUTTON_HEIGHT,col_work); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+}
 void Del_Form()
+{
 	int dform_x=Form.width/2-13;
 	//òèïà îêíî
 	FOR (i=5;i<11;i++) DeleteButton(201+i); //óäàëÿåì êíîïêè ïîä ôîðìîé
-	DrawFlatButton(dform_x,160,200,80,0,0xE4DFE1, ""); //ôîðìà
+	DrawFlatButton(dform_x,160,200,80,0,col_work, ""); //ôîðìà
 	WriteText(dform_x+19,175,0x80,0,"Do you really want to delete",0);
 	IF (strlen(#file_name)<28)
+		{
 			WriteText(strlen(#file_name)*6+dform_x+20,190,0x80,0,"?",0);
 			WriteText(dform_x+20,190,0x80,0,#file_name,0); //ïèøåì èìÿ
 			CopyFile(#file_path,#temp);
 			Del_File(true);
+		}
 		SelectFile(#edit_name);
+	}
-	Line_ReDraw(selection_col,curbtn);
+	Line_ReDraw(col_selec,curbtn);
+}
 inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
+{
 	char cur_folder[4096];
 	copystr(GetCurrentFolder(), #cur_folder);
-	if (HistoryPath(GO_BACK))
-		SelectFile(#cur_folder);
+	if (HistoryPath(GO_BACK)) SelectFile(#cur_folder);
+}

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- @ 3125 – Rev 3113 → 3123