XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Eolite 1.56: two bugs fixed

Browse Source 
git-svn-id: svn://kolibrios.org@3295 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-02-28 13:52:59 +00:00
parent debda5ffe2
commit 910558ed00
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ int BUTTON_HEIGHT=18;
#define ONLY_OPEN 2 #define ONLY_OPEN 2
//ïåðåìåííûå //ïåðåìåííûå
#define title "Eolite File Manager v1.55" #define title "Eolite File Manager v1.56"
dword col_work = 0xE4DFE1; dword col_work = 0xE4DFE1;
dword col_border = 0x819FC5; dword col_border = 0x819FC5;
dword col_padding = 0xC8C9C9; dword col_padding = 0xC8C9C9;

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

@ -1,8 +1,8 @@
//Leency - 2012 //Leency - 2013
#define EDITOR_PATH "/sys/tinypad" #define EDITOR_PATH "/sys/tinypad"
#define BROWSER_PATH "/sys/htmlv" #define BROWSER_PATH "/sys/htmlv"
#define BROWSER_LINK "http://kolibri-os.narod.ru" #define BROWSER_LINK "http://kolibri-n.org/index.php"
void about_dialog() void about_dialog()
@ -36,15 +36,15 @@ void about_dialog()
DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"About Eolite"); DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"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.55",0); WriteText(46,100,0x90,0xBF40BF,"Eolite v1.56",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);
WriteText(39,130,0x80,0,"Leency & Veliant",0); WriteText(39,130,0x80,0,"Leency & Veliant",0);
WriteText(45,140,0x80,0,"KolibriOS Team",0); WriteText(45,140,0x80,0,"KolibriOS Team",0);
WriteText(61,150,0x80,0,"2008-2012",0); WriteText(61,150,0x80,0,"2008-2013",0);
WriteText(12,170,0x80,0,"Visit",0); WriteText(29,170,0x80,0,"Visit");
DrawLink(48,170,23, "kolibri-os.narod.ru"); //ññûëêa DrawLink(66,170,23, "kolibri-n.org"); //ññûëêa
DrawFlatButton(85,190,70,22,0,0xE4DFE1, "Close"); DrawFlatButton(85,190,70,22,0,0xE4DFE1, "Close");
DefineButton(20-1,195-1, 16+1,15+1, 33+BT_HIDE, 0); DefineButton(20-1,195-1, 16+1,15+1, 33+BT_HIDE, 0);

8
programs/fs/Eolite/trunk/include/ini.h
View File

@ -90,12 +90,12 @@ void GetIni(byte onload)
} }
return; return;
} }
parametr=option=''; parametr=option=NULL;
break; break;
default: default:
IF (InfType==SECTION) copystr(#bukva,#section+strlen(#section)); IF (InfType==SECTION) chrcat(#section, bukva);
IF (InfType==PARAM) copystr(#bukva,#parametr+strlen(#parametr)); IF (InfType==PARAM) chrcat(#parametr, bukva);
IF (InfType==OPTION) copystr(#bukva,#option+strlen(#option)); IF (InfType==OPTION) chrcat(#option, bukva);
} }
} }
RUN_AS_PROGRAM: RUN_AS_PROGRAM:

4
programs/fs/Eolite/trunk/include/left_panel.h
View File

@ -16,13 +16,13 @@ dword devbuf;
void GetSystemDiscs() void GetSystemDiscs()
{ {
unsigned char dev_name[10], sys_discs[10]; unsigned char dev_name[20], sys_discs[20];
unsigned int i1, j1, dev_num, dev_disc_num; unsigned int i1, j1, dev_num, dev_disc_num;
disc_num=0; disc_num=0;
if (devbuf) free(devbuf); if (devbuf) free(devbuf);
devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
ReadDir(19, devbuf, "/"); ReadDir(20, devbuf, "/");
dev_num = EBX; dev_num = EBX;
for (i1=0; i1<dev_num; i1++) for (i1=0; i1<dev_num; i1++)
{ {

7
programs/fs/Eolite/trunk/lib/strings.h
View File

@ -161,4 +161,11 @@ inline fastcall strcat( EDI, ESI)
rep movsb rep movsb
mov eax, ebx mov eax, ebx
} }
}
inline fastcall void chrcat(ESI, BL)
{
EDI = strlen(ESI);
ESBYTE[ESI+EDI] = BL;
ESBYTE[ESI+EDI+1] = 0;
} }

4
programs/fs/Eolite/trunk/txt/History.txt
View File

@ -1,3 +1,7 @@
28.02.13 -- v1.56
- исправлено падение после запуска переименованого файла;
- увеличено количество поддерживаемых дисков с 10 до 20.
10.01.13 -- v1.55 10.01.13 -- v1.55
- исправлен эпичный баг с сортировкой; - исправлен эпичный баг с сортировкой;
- испрвлены баги при попытке переименования или удаления файла в папке, - испрвлены баги при попытке переименования или удаления файла в папке,