diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 6a41546592..1e2053de36 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.36" +#define title "Eolite File Manager v1.38" dword selection_col = 0x94AECE; dword lpanel_col = 0x00699C; @@ -407,13 +407,15 @@ void main() inline fastcall void draw_window() { + int min_size_y = disc_num*16+195; + if (GetScreenHeight()<480) DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0xE4DFE1,title); else DefineAndDrawWindow(98,90,582,482,0x73,0xE4DFE1,title); Form.GetInfo(#Form, SelfInfo); if (Form.status_window>2) return; //ничего не делать если окно схлопнуто в заголовок - if (Form.height<280) MoveSize(OLD,OLD,OLD,280); + if (Form.height6) //если файла с настройками тупо нет печалька { - IF (onload==1) RunProgram(NOTIFY_PATH, "Eolite.ini not found. Defaults will be used."); + IF (onload==1) notify("Eolite.ini not found. Defaults will be used."); IF (onload==0) goto RUN_AS_PROGRAM; } fsize=EBX; @@ -120,7 +118,7 @@ void Write_Error(int error_number) } if (curbtn>=0) Line_ReDraw(0xFF0000, curbtn); Pause(5); - RunProgram(NOTIFY_PATH, #error); + notify(#error); //DrawBar(192,onTop(0, BUTTON_HEIGHT+7),onLeft(27,192),BUTTON_HEIGHT,0xFF0000); //WriteText(205,onTop(-5, BUTTON_HEIGHT+7),0x80,0xFFFFFF,#error,0); } \ No newline at end of file diff --git a/programs/fs/Eolite/trunk/lib/file_system.h b/programs/fs/Eolite/trunk/lib/file_system.h index dbd15462fb..54bb9409a2 100644 --- a/programs/fs/Eolite/trunk/lib/file_system.h +++ b/programs/fs/Eolite/trunk/lib/file_system.h @@ -175,4 +175,7 @@ inline fastcall int CopyFile(dword EBX,ECX) } - +void notify(dword notify_param) +{ + RunProgram("@notify", notify_param); +} \ No newline at end of file diff --git a/programs/fs/Eolite/trunk/lib/kolibri.h b/programs/fs/Eolite/trunk/lib/kolibri.h index a505243208..afc5a99ed7 100644 --- a/programs/fs/Eolite/trunk/lib/kolibri.h +++ b/programs/fs/Eolite/trunk/lib/kolibri.h @@ -7,8 +7,8 @@ byte os_name[8] = {'M','E','N','U','E','T','0','1'}; dword os_version = 0x00000001; dword start_addr = #main; dword final_addr = #stop+32; -dword alloc_mem = 0x00070000; -dword x86esp_reg = 0x00070000; +dword alloc_mem = 0x00080000; +dword x86esp_reg = 0x00080000; dword I_Param = #param; dword I_Path = #program_path; diff --git a/programs/fs/Eolite/trunk/lib/strings.h b/programs/fs/Eolite/trunk/lib/strings.h index 10ce42ac48..76f864f45f 100644 --- a/programs/fs/Eolite/trunk/lib/strings.h +++ b/programs/fs/Eolite/trunk/lib/strings.h @@ -83,7 +83,7 @@ dword StrToCol(char* htmlcolor) return color; } -inline fastcall int strcmp(ESI, EDI) +inline fastcall signed char strcmp(ESI, EDI) { loop() { @@ -97,7 +97,6 @@ inline fastcall int strcmp(ESI, EDI) - inline fastcall unsigned int strchr(ESI,BL) { int jj=0, last=-1; diff --git a/programs/fs/Eolite/trunk/History.txt b/programs/fs/Eolite/trunk/txt/History.txt similarity index 96% rename from programs/fs/Eolite/trunk/History.txt rename to programs/fs/Eolite/trunk/txt/History.txt index 3c02d168bd..4cfe2bed86 100644 --- a/programs/fs/Eolite/trunk/History.txt +++ b/programs/fs/Eolite/trunk/txt/History.txt @@ -1,3 +1,8 @@ +16.11.12 -- v1.38 +- при минимальном размере окна учитывается количество дисков в системе; +- добавлен фон на левую панель; +- изменения в организации файлов. + 15.11.12 -- v1.36 - устранена утечка памяти при сканировании устройств; - частично устранён вылет программы на больших папках (спасибо SoUrcerer за diff --git a/programs/fs/Eolite/trunk/ReadMe_en.txt b/programs/fs/Eolite/trunk/txt/ReadMe_en.txt similarity index 100% rename from programs/fs/Eolite/trunk/ReadMe_en.txt rename to programs/fs/Eolite/trunk/txt/ReadMe_en.txt diff --git a/programs/fs/Eolite/trunk/ReadMe_ru.txt b/programs/fs/Eolite/trunk/txt/ReadMe_ru.txt similarity index 100% rename from programs/fs/Eolite/trunk/ReadMe_ru.txt rename to programs/fs/Eolite/trunk/txt/ReadMe_ru.txt