forked from KolibriOS/kolibrios
Eolite 1.33: small update
git-svn-id: svn://kolibrios.org@2903 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
7dadbba2bb
commit
8461dc784b
@ -20,8 +20,9 @@ int BUTTON_HEIGHT=18;
|
|||||||
#define ONLY_OPEN 2
|
#define ONLY_OPEN 2
|
||||||
|
|
||||||
//ïåðåìåííûå
|
//ïåðåìåííûå
|
||||||
#define title "Eolite File Manager v1.32"
|
#define title "Eolite File Manager v1.33"
|
||||||
dword selection_col=0x94AECE;
|
dword selection_col = 0x94AECE;
|
||||||
|
dword lpanel_col = 0x00699C;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -83,7 +84,7 @@ dword buf, off; //
|
|||||||
void main()
|
void main()
|
||||||
word key, id;
|
word key, id;
|
||||||
mouse m;
|
mouse m;
|
||||||
int pressed_y, scroll_used=0;
|
int scroll_used=0;
|
||||||
{
|
{
|
||||||
load_editbox_lib();
|
load_editbox_lib();
|
||||||
GetSystemDiscs();
|
GetSystemDiscs();
|
||||||
@ -92,10 +93,10 @@ int pressed_y, scroll_used=0;
|
|||||||
edit1.shift_color=selection_col;
|
edit1.shift_color=selection_col;
|
||||||
edit2.shift_color=selection_col;
|
edit2.shift_color=selection_col;
|
||||||
|
|
||||||
IF (param)
|
if (param)
|
||||||
{
|
{
|
||||||
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)); //åñëè íåò, + "/"
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
copystr("/rd/1/", #path);
|
copystr("/rd/1/", #path);
|
||||||
@ -261,9 +262,10 @@ int pressed_y, scroll_used=0;
|
|||||||
default:
|
default:
|
||||||
if (id<200) break; //êíîïêè èç ñïèñêà ôàéëîâ
|
if (id<200) break; //êíîïêè èç ñïèñêà ôàéëîâ
|
||||||
if (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
|
if (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
|
||||||
else OPEN_MARK:
|
else
|
||||||
|
OPEN_MARK:
|
||||||
if (!isdir) GetIni(0); else
|
if (!isdir) GetIni(0); else
|
||||||
if (strcmp(#file_name,"..")==0) Dir_Up();
|
if (!strcmp(#file_name,"..")) Dir_Up();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
OPEN_DEV:
|
OPEN_DEV:
|
||||||
@ -498,8 +500,6 @@ void FileList_ReDraw(int curbtn_)
|
|||||||
curbtn=but_num-1;
|
curbtn=but_num-1;
|
||||||
}
|
}
|
||||||
List_ReDraw();
|
List_ReDraw();
|
||||||
|
|
||||||
//WriteFullDebug("");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -512,7 +512,7 @@ void List_ReDraw()
|
|||||||
int paint_x=but_num*BUTTON_HEIGHT+57;
|
int paint_x=but_num*BUTTON_HEIGHT+57;
|
||||||
IF (count-za_kadrom<but_num) || (curbtn>but_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
|
IF (count-za_kadrom<but_num) || (curbtn>but_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
|
||||||
{ za_kadrom=count-but_num; curbtn=but_num-1; } //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
|
{ za_kadrom=count-but_num; curbtn=but_num-1; } //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
|
||||||
//
|
|
||||||
FOR (j=0; j<but_num; j++) IF (curbtn<>j) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(selection_col, curbtn);
|
FOR (j=0; j<but_num; j++) IF (curbtn<>j) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(selection_col, curbtn);
|
||||||
DrawBar(192,paint_x,onLeft(27,192),onTop(paint_x,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
|
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),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
|
||||||
@ -553,8 +553,6 @@ void List_ReDraw()
|
|||||||
TVScroll();
|
TVScroll();
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
void Line_ReDraw(dword color, filenum){
|
void Line_ReDraw(dword color, filenum){
|
||||||
dword text_col=0, name_len,
|
dword text_col=0, name_len,
|
||||||
@ -569,7 +567,7 @@ void Line_ReDraw(dword color, filenum){
|
|||||||
|
|
||||||
off=file_mas[filenum+za_kadrom]*304 + buf+72;
|
off=file_mas[filenum+za_kadrom]*304 + buf+72;
|
||||||
|
|
||||||
if (!TestBit(ESDWORD[off-40], 4))
|
if (!TestBit(ESDWORD[off-40], 4)) //ýòî ÔÀÉË èëè ïàïêà?
|
||||||
{
|
{
|
||||||
copystr(off,#temp);
|
copystr(off,#temp);
|
||||||
Put_icon(#temp+strchr(#temp,'.'), BUTTON_HEIGHT/2-7+y, color);
|
Put_icon(#temp+strchr(#temp,'.'), BUTTON_HEIGHT/2-7+y, color);
|
||||||
@ -807,8 +805,8 @@ void Actions()
|
|||||||
{
|
{
|
||||||
int actions_y=disc_num*16;
|
int actions_y=disc_num*16;
|
||||||
|
|
||||||
DrawBar(17,actions_y+75,160,15,0x00699C); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
|
DrawBar(17,actions_y+75,160,15,lpanel_col); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
|
||||||
DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),0x00699C); //ñèíåå â êîíöå
|
DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),lpanel_col); //ñèíåå â êîíöå
|
||||||
|
|
||||||
DeleteButton(80);
|
DeleteButton(80);
|
||||||
DeleteButton(81);
|
DeleteButton(81);
|
||||||
|
@ -12,9 +12,6 @@ Put box_lib.obj into "/sys/lib/" directory.
|
|||||||
Put Eolite.ini into programs directory or in "/sys/File Managers/".
|
Put Eolite.ini into programs directory or in "/sys/File Managers/".
|
||||||
Eolite can be opened from anywhere.
|
Eolite can be opened from anywhere.
|
||||||
|
|
||||||
==Known bugs==
|
|
||||||
1.
|
|
||||||
|
|
||||||
|
|
||||||
==Authors==
|
==Authors==
|
||||||
Leency - programming and design.
|
Leency - programming and design.
|
||||||
|
@ -13,8 +13,6 @@ http://board.kolibrios.org/viewtopic.php?f=9&t=973
|
|||||||
Нужно иметь свежий box_lib.obj. Eolite.ini должен быть в папке
|
Нужно иметь свежий box_lib.obj. Eolite.ini должен быть в папке
|
||||||
с программой или в "/sys/File Managers/".
|
с программой или в "/sys/File Managers/".
|
||||||
|
|
||||||
==Известные баги==
|
|
||||||
1. Загрузка процессора 100%, если зажать ЛКМ на ползунке.
|
|
||||||
|
|
||||||
==Авторы==
|
==Авторы==
|
||||||
Leency - разработка, дизайн.
|
Leency - разработка, дизайн.
|
||||||
|
@ -39,7 +39,7 @@ void about_dialog()
|
|||||||
DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,"About Eolite");
|
DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,"About Eolite");
|
||||||
DrawBar(0,0,172,50,0x8494C4); //ãîëóáîå ñçàäè
|
DrawBar(0,0,172,50,0x8494C4); //ãîëóáîå ñçàäè
|
||||||
PutPaletteImage(#logo,85,85,43,7,#logo_pal);
|
PutPaletteImage(#logo,85,85,43,7,#logo_pal);
|
||||||
WriteText(46,100,0x90,0xBF40BF,"Eolite v1.32",0);
|
WriteText(46,100,0x90,0xBF40BF,"Eolite v1.33",0);
|
||||||
$add ebx, 1<<16
|
$add ebx, 1<<16
|
||||||
$int 0x40
|
$int 0x40
|
||||||
WriteText(55,120,0x80,0,"Developers:",0);
|
WriteText(55,120,0x80,0,"Developers:",0);
|
||||||
|
@ -42,9 +42,9 @@ void DrawSystemDiscs()
|
|||||||
char disc_name[100];
|
char disc_name[100];
|
||||||
int i, dev_icon;
|
int i, dev_icon;
|
||||||
|
|
||||||
DrawBar(2,41,190,15,0x00699C); //синий прямоугольник - сверху
|
DrawBar(2,41,190,15,lpanel_col); //синий прямоугольник - сверху
|
||||||
DrawBar(2,56,15,onTop(21,41),0x00699C); //синий прямоугольник - слева
|
DrawBar(2,56,15,onTop(21,41),lpanel_col); //синий прямоугольник - слева
|
||||||
DrawBar(177,56,15,onTop(21,41),0x00699C); //синий прямоугольник - справа
|
DrawBar(177,56,15,onTop(21,41),lpanel_col); //синий прямоугольник - справа
|
||||||
//ñïèñîê äèñêîâ
|
//ñïèñîê äèñêîâ
|
||||||
if (show_dev_name) Tip(56, "Devices", 78, "=");
|
if (show_dev_name) Tip(56, "Devices", 78, "=");
|
||||||
else Tip(56, "Devices", 78, "-");
|
else Tip(56, "Devices", 78, "-");
|
||||||
|
@ -11,6 +11,7 @@ char *ext[]={
|
|||||||
"html",2,
|
"html",2,
|
||||||
"mht", 2,
|
"mht", 2,
|
||||||
"ini", 3,
|
"ini", 3,
|
||||||
|
"js", 3,
|
||||||
"conf",3,
|
"conf",3,
|
||||||
"xlt", 4,
|
"xlt", 4,
|
||||||
"xls", 4,
|
"xls", 4,
|
||||||
|
Loading…
Reference in New Issue
Block a user