Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite 1.33: small update

Browse Source 
git-svn-id: svn://kolibrios.org@2903 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2012-08-02 13:31:15 +00:00
parent 7dadbba2bb
commit 8461dc784b
6 changed files with 110 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
programs/fs/Eolite/trunk/Eolite.c--
View File

@ -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);
@ -175,105 +176,106 @@ int pressed_y, scroll_used=0;
break; break;
//Button pressed----------------------------------------------------------------------------- //Button pressed-----------------------------------------------------------------------------
case evButton: case evButton:
id=GetButtonID(); id=GetButtonID();
IF (id==1) ExitProcess(); IF (id==1) ExitProcess();
IF (del_active) IF (del_active)
{ {
IF (id==301) || (id==302) Del_File(302-id); IF (id==301) || (id==302) Del_File(302-id);
break; break;
} }
switch(id) switch(id)
{ {
case 21: //Back case 21: //Back
GoBack(); GoBack();
break; break;
case 22: //Forward case 22: //Forward
if (HistoryPath(GO_FORWARD)) if (HistoryPath(GO_FORWARD))
{ {
za_kadrom=curbtn=0; //ââåðõ ñïèñêà za_kadrom=curbtn=0; //ââåðõ ñïèñêà
Open_Dir(#path,WITH_REDRAW);
}
break;
case 23: //up!
Dir_Up();
break;
case 24: //cut
key=24;
case 25: //copy
goto CTRLC_MARK;
case 26: //paste
Paste();
break;
case 27: //goto edit_path
Goto_edit_path();
break;
case 31...33: //sort
IF(sort_num==1) DrawBar(onLeft(192,168)/2+210,45,6,9,0xE4DFE1);
IF(sort_num==2) DrawBar(onLeft(115,0),45,6,9,0xE4DFE1);
IF(sort_num==3) DrawBar(onLeft(44,0),45,6,9,0xE4DFE1);
sort_num=id-30;
Open_Dir(#path,1);
break;
case 30: //about
CreateThread(#about_dialog,#stak);
break;
case 77:
IF (show_actions==1) show_actions=0; ELSE show_actions=1;
Actions();
break;
case 78:
IF (show_dev_name==1) show_dev_name=0; ELSE show_dev_name=1;
GetSystemDiscs();
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);
} DrawSystemDiscs();
break; Actions();
case 23: //up! break;
Dir_Up(); case 80: //rename
break; goto REN_MARK;
case 24: //cut case 81: //Delete file
key=24; Del_Form();
case 25: //copy break;
goto CTRLC_MARK; case 82: //create folder
case 26: //paste
Paste();
break;
case 27: //goto edit_path
Goto_edit_path();
break;
case 31...33: //sort
IF(sort_num==1) DrawBar(onLeft(192,168)/2+210,45,6,9,0xE4DFE1);
IF(sort_num==2) DrawBar(onLeft(115,0),45,6,9,0xE4DFE1);
IF(sort_num==3) DrawBar(onLeft(44,0),45,6,9,0xE4DFE1);
sort_num=id-30;
Open_Dir(#path,1);
break;
case 30: //about
CreateThread(#about_dialog,#stak);
break;
case 77:
IF (show_actions==1) show_actions=0; ELSE show_actions=1;
Actions();
break;
case 78:
IF (show_dev_name==1) show_dev_name=0; ELSE show_dev_name=1;
GetSystemDiscs();
Open_Dir(#path,WITH_REDRAW);
DrawSystemDiscs();
Actions();
break;
case 80: //rename
goto REN_MARK;
case 81: //Delete file
Del_Form();
break;
case 82: //create folder
NEW_FOLDER_MARK: NEW_FOLDER_MARK:
copystr(#path, #temp); copystr(#path, #temp);
copystr("New folder", #temp+strlen(#temp)); copystr("New folder", #temp+strlen(#temp));
CreateFolder(#temp); CreateFolder(#temp);
IF (EAX==0){ IF (EAX==0){
SelectFile("New folder"); SelectFile("New folder");
goto REN_MARK; goto REN_MARK;
} }
ELSE ELSE
{ {
Write_Error(EAX); Write_Error(EAX);
ShowMessage("Folder can not be created."); ShowMessage("Folder can not be created.");
} }
break; break;
case 100...120: case 100...120:
DEVICE_MARK: DEVICE_MARK:
DrawRegion_3D(17,id-100*16+74,159,16, 0, 0); //âûäåëåíèå DrawRegion_3D(17,id-100*16+74,159,16, 0, 0); //âûäåëåíèå
copystr(#disk_list[id-100].Item, #path); copystr(#disk_list[id-100].Item, #path);
za_kadrom=curbtn=0; za_kadrom=curbtn=0;
Open_Dir(#path,1); Open_Dir(#path,1);
Pause(5); Pause(5);
DrawRegion_3D(17,id-100*16+74,159,16, 0xFFFFFF, 0xFFFFFF); DrawRegion_3D(17,id-100*16+74,159,16, 0xFFFFFF, 0xFFFFFF);
break; break;
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
if (!isdir) GetIni(0); else OPEN_MARK:
if (strcmp(#file_name,"..")==0) Dir_Up(); if (!isdir) GetIni(0); else
else if (!strcmp(#file_name,"..")) Dir_Up();
{ else
{
OPEN_DEV: OPEN_DEV:
copystr(#file_path, #path); copystr(#file_path, #path);
IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/" IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
za_kadrom=curbtn=0; za_kadrom=curbtn=0;
Open_Dir(#path,1); Open_Dir(#path,1);
} }
} }
break; break;
//Key pressed----------------------------------------------------------------------------- //Key pressed-----------------------------------------------------------------------------
case evKey: case evKey:
key = GetKey(); key = GetKey();
@ -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);

3
programs/fs/Eolite/trunk/ReadMe_en.txt
View File

@ -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.

2
programs/fs/Eolite/trunk/ReadMe_ru.txt
View File

@ -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 - разработка, дизайн.

2
programs/fs/Eolite/trunk/include/about_dialog.h
View File

@ -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);

6
programs/fs/Eolite/trunk/include/devices.h
View File

@ -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, "-");

1
programs/fs/Eolite/trunk/include/icons_f.h
View File

@ -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,