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

 //Leency & Veliant -=- KolibriOS Team -=- 2012
 //GNU GPL licence.
-//íåìíîãî êðèâàÿ ïðîêðóòêà
 #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"
-#include "imgs\left_p.txt"
+int BUTTON_HEIGHT=18;
 //for OpenDir
 #define ONLY_SHOW	0
 						case 051: //Íàæàòà F2
 								REN_MARK:
 								DeleteButton(curbtn+201); //ýòî ÷òîá ìîæíî áûëî âûäåëÿòü ìûøüþ
 								edit2.flags=66; //äåëàåì êîìïîíåíò àêòèâíûì
 								edit2.width=onLeft(24,217);
-								edit2.top=curbtn*18+59;
+								edit2.top=curbtn*BUTTON_HEIGHT+59;
 								edit2.size=edit2.pos=strlen(#file_name);
 								edit_box_draw  stdcall (#edit2);
-								DrawBar(213,curbtn*18+58,edit2.width+1,1,0xFFFFCC); //ïîëîñà æåëòàÿ ñâåðõó äëÿ îäèíàêîâîñòè
+								DrawBar(213,curbtn*BUTTON_HEIGHT+58,edit2.width+1,1,0xFFFFCC); //ïîëîñà æåëòàÿ ñâåðõó äëÿ îäèíàêîâîñòè
 								rename_active=1;
 								break;
 						case 052: //Íàæàòà F3
 								IF (isdir==false) RunProgram("/sys/tinypad", #file_path);
 								break;
+			{
 				curbtn=but_num-1;
+			}
 			List_ReDraw();
-			/*WriteDebug("");
-			WriteDebug(#path);
-			WriteDebug("Number of files:"); WriteDebug(IntToStr(count));
-			WriteDebug("but_num:");	 		WriteDebug(IntToStr(but_num));
-			WriteDebug("curbtn");		 	WriteDebug(IntToStr(curbtn));
-			WriteDebug("ra_kadrom:");	 	WriteDebug(IntToStr(za_kadrom));*/
+			//WriteFullDebug("");
+		}
+	}
+}
 void List_ReDraw()
+{
-	int paint_x=but_num*18+57;
+	int paint_x=but_num*BUTTON_HEIGHT+57;
 //puticon+icon_fairing!!!
+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
+	temp_int=filenum/max_x;
+	temp_int=temp_int*max_x;
-void Line_ReDraw(dword color, filenum){
+	x=filenum-temp_int*BUTTON_HEIGHT+192;
-	dword text_col=0, temp_int,
+	*/
-	y=filenum*18+57; //ïîëîæåíèå òåêñòà ïî Y
+	y=filenum*BUTTON_HEIGHT+57; //ïîëîæåíèå òåêñòà ïî Y
 	IF (rename_active==1) ReName(false);
 	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
 	DeleteButton(201+filenum);
-	DefineButton(192,y,onLeft(28,192),18,201+filenum+BT_HIDE+BT_NOFRAME,color); //êíîïà
+	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,18,color); DrawBar(195,y,16,2,color);
+	DrawBar(192+19,y,onLeft(46,192),BUTTON_HEIGHT,color); DrawBar(195,y+17,16,1,color);
-	DrawBar(192+19,y,onLeft(46,192),18,color); DrawBar(195,y+17,16,1,color);
+	if (BUTTON_HEIGHT>18) DrawBar(195,y+18,16,BUTTON_HEIGHT-18,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,'.'), y+2);
+			temp_int = Put_icon(#temp+find_symbol(#temp,'.'), BUTTON_HEIGHT-14/2+y);
-			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),BUTTON_HEIGHT-6/2+y,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
+		}
 		ELSE
 			IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2);
 		copystr(#file_name,#file_path+strlen(#file_path)); //ïîëíûé ïóòü ê ôàéëó
 		IF (text_col==0xA6A6B7) text_col=0xFFFFFF;
+	}
 	temp_int = onLeft(215,165)/6;
 	IF (strlen(off)
-		WriteText(215,y+6,0,text_col,off,temp_int);  //èìÿ ôàéëà
+		WriteText(215,BUTTON_HEIGHT-6/2+y,0,text_col,off,temp_int);  //èìÿ ôàéëà
-	DrawBar(onLeft(168,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
+	DrawBar(onLeft(168,0),y,1,BUTTON_HEIGHT,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
-	DrawBar(onLeft(95,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+	DrawBar(onLeft(95,0),y,1,BUTTON_HEIGHT,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+}
 		copystr(temp_,#edit_path);
 		KEdit();
 		HistoryPath(add_new_path);
 		IF (!strcmp(".",buf+72)) {memmov(buf,buf+304,count-1*304); count--;} //ôèëüòðóåì ýëåìåíò "."
 		FOR (j=0;j
-		but_num=onTop(6,57)/18;
+		but_num=onTop(6,57)/BUTTON_HEIGHT;
 		IF (count
 		//ñòðåëî÷êà ñîðòèðîâêè
 		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);
+{
 	int del_file_rez;
 	char edit_name[256]='';
 	rename_active=0;
 	edit2.flags=64;
-	DefineButton(192,curbtn*18+57,onLeft(27,192),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
+	DefineButton(192,curbtn*BUTTON_HEIGHT+57,onLeft(27,192),BUTTON_HEIGHT,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
 	if (rename==true)
+	{
 		copystr(#path,#temp);
 		copystr(#file_name,#edit_name); //ñîõðàíÿåì íîâîå èìÿ ôàéëà, äëÿ òîãî, ÷òîáû åãî ïîòîì âûäåëèòü
 		copystr(#file_name,#temp+strlen(#temp));

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 2506 → 2527