From 910558ed003fc45309bfd6e29264683373ad4dd2 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 28 Feb 2013 13:52:59 +0000 Subject: [PATCH] Eolite 1.56: two bugs fixed git-svn-id: svn://kolibrios.org@3295 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 2 +- programs/fs/Eolite/trunk/include/about_dialog.h | 12 ++++++------ programs/fs/Eolite/trunk/include/ini.h | 8 ++++---- programs/fs/Eolite/trunk/include/left_panel.h | 4 ++-- programs/fs/Eolite/trunk/lib/strings.h | 7 +++++++ programs/fs/Eolite/trunk/txt/History.txt | 4 ++++ 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 40e10f5dd0..7db918affd 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -20,7 +20,7 @@ int BUTTON_HEIGHT=18; #define ONLY_OPEN 2 //переменные -#define title "Eolite File Manager v1.55" +#define title "Eolite File Manager v1.56" dword col_work = 0xE4DFE1; dword col_border = 0x819FC5; dword col_padding = 0xC8C9C9; diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h index 78d78895da..e241e49940 100644 --- a/programs/fs/Eolite/trunk/include/about_dialog.h +++ b/programs/fs/Eolite/trunk/include/about_dialog.h @@ -1,8 +1,8 @@ -//Leency - 2012 +//Leency - 2013 #define EDITOR_PATH "/sys/tinypad" #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() @@ -36,15 +36,15 @@ void about_dialog() DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"About Eolite"); DrawBar(0,0,172,50,0x8494C4); //голубое сзади 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 $int 0x40 WriteText(55,120,0x80,0,"Developers:",0); WriteText(39,130,0x80,0,"Leency & Veliant",0); WriteText(45,140,0x80,0,"KolibriOS Team",0); - WriteText(61,150,0x80,0,"2008-2012",0); - WriteText(12,170,0x80,0,"Visit",0); - DrawLink(48,170,23, "kolibri-os.narod.ru"); //ссылкa + WriteText(61,150,0x80,0,"2008-2013",0); + WriteText(29,170,0x80,0,"Visit"); + DrawLink(66,170,23, "kolibri-n.org"); //ссылкa DrawFlatButton(85,190,70,22,0,0xE4DFE1, "Close"); DefineButton(20-1,195-1, 16+1,15+1, 33+BT_HIDE, 0); diff --git a/programs/fs/Eolite/trunk/include/ini.h b/programs/fs/Eolite/trunk/include/ini.h index df5498714d..83d5445299 100644 --- a/programs/fs/Eolite/trunk/include/ini.h +++ b/programs/fs/Eolite/trunk/include/ini.h @@ -90,12 +90,12 @@ void GetIni(byte onload) } return; } - parametr=option=''; + parametr=option=NULL; break; default: - IF (InfType==SECTION) copystr(#bukva,#section+strlen(#section)); - IF (InfType==PARAM) copystr(#bukva,#parametr+strlen(#parametr)); - IF (InfType==OPTION) copystr(#bukva,#option+strlen(#option)); + IF (InfType==SECTION) chrcat(#section, bukva); + IF (InfType==PARAM) chrcat(#parametr, bukva); + IF (InfType==OPTION) chrcat(#option, bukva); } } RUN_AS_PROGRAM: diff --git a/programs/fs/Eolite/trunk/include/left_panel.h b/programs/fs/Eolite/trunk/include/left_panel.h index 775853bfbb..c530899e73 100644 --- a/programs/fs/Eolite/trunk/include/left_panel.h +++ b/programs/fs/Eolite/trunk/include/left_panel.h @@ -16,13 +16,13 @@ dword devbuf; 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; disc_num=0; if (devbuf) free(devbuf); devbuf= malloc(3112); //буфер где-то на 10 девайсов в левой панели - ReadDir(19, devbuf, "/"); + ReadDir(20, devbuf, "/"); dev_num = EBX; for (i1=0; i1