diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 066d2b3ebb..123af20aef 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -367,7 +367,7 @@ int pressed_y; inline fastcall void draw_window() { WindowRedrawStatus(1); - DefineAndDrawWindow(98,90,580,481,0x73,0x10E4DFE1,0,0,title); + DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title); WindowRedrawStatus(2); Form.GetInfo(#Form, SelfInfo); IF (Form.height==GetSkinWidth()+3) return; //ничего не делать если окно схлопнуто в заголовок diff --git a/programs/fs/Eolite/trunk/include/icons_f.h-- b/programs/fs/Eolite/trunk/include/icons_f.h-- index 20685c6e92..0edfad8c28 100644 --- a/programs/fs/Eolite/trunk/include/icons_f.h-- +++ b/programs/fs/Eolite/trunk/include/icons_f.h-- @@ -4,7 +4,8 @@ dword Put_icon(dword extension, yy) { dword ftype="", fnum=0; //еши неизвесный файл - IF (!strcmp(extension,"htm")) || (!strcmp(extension,"html")) {fnum = 2; ftype="Web-page";} + IF (!strcmp(extension,"htm")) || (!strcmp(extension,"html")) || + (!strcmp(extension,"mht")) {fnum = 2; ftype="Web-page";} IF (!strcmp(extension,"ini")) || (!strcmp(extension,"conf")) {fnum = 3; ftype="Config";} IF (!strcmp(extension,"xlt")) || (!strcmp(extension,"xls")) || (!strcmp(extension,"ods")) || (!strcmp(extension,"xlsx")) {fnum = 4; ftype="Table";} @@ -29,7 +30,7 @@ dword Put_icon(dword extension, yy) //text IF (!strcmp(extension,"txt")) || (!strcmp(extension,"doc")) || (!strcmp(extension,"rtf")) || (!strcmp(extension,"odt")) || - (!strcmp(extension,"docx")) {fnum = 1; ftype="Text";} + (!strcmp(extension,"log")) || (!strcmp(extension,"docx")) {fnum = 1; ftype="Text";} //изображения IF (!strcmp(extension,"gif")) || (!strcmp(extension,"bmp")) || (!strcmp(extension,"tga")) || (!strcmp(extension,"pcx")) || @@ -38,7 +39,8 @@ dword Put_icon(dword extension, yy) (!strcmp(extension,"jpeg")) || (!strcmp(extension,"raw")) || (!strcmp(extension,"psd")) {fnum = 19; ftype="Image";} //пиктограммы - IF (!strcmp(extension,"ico")) || (!strcmp(extension,"cur")) {fnum = 20; ftype="Icon";} + IF (!strcmp(extension,"ico")) {fnum = 20; ftype="Icon";} + IF (!strcmp(extension,"cur")) || (!strcmp(extension,"ani")) {fnum = 20; ftype="Cursor";} //архивы IF (!strcmp(extension,"rar")) || (!strcmp(extension,"zip")) || (!strcmp(extension,"cab")) || (!strcmp(extension,"tar")) || diff --git a/programs/fs/Eolite/trunk/include/ini.h-- b/programs/fs/Eolite/trunk/include/ini.h-- index 9ed17eb2ca..023d6cf513 100644 --- a/programs/fs/Eolite/trunk/include/ini.h-- +++ b/programs/fs/Eolite/trunk/include/ini.h-- @@ -81,9 +81,11 @@ void GetIni(byte onload) /// нужно чтобы просто возвращало текст /// /////////////////////////////////////////// -void Write_Debug_Error(int error_number){ - - IF (error_number<0) error_number=-1*error_number; +void Write_Debug_Error(int error_number) +{ + char unknown_error[8]; + + if (error_number<0) error_number=-1*error_number; switch (error_number) //извесная ошибка - пишем какая и уходим { CASE 2: RunProgram(#NOTIFY_PATH, "Eolite: error 2 - Function is not supported for the given file system"); @@ -99,7 +101,7 @@ void Write_Debug_Error(int error_number){ case 8: RunProgram(#NOTIFY_PATH, "Eolite: error 8 - FAT table is destroyed"); return; case 9: RunProgram(#NOTIFY_PATH, "Eolite: error 9 - FAT table is destroyed"); - RETURN; + return; case 10:RunProgram(#NOTIFY_PATH, "Eolite: error 10 - Access denied"); RETURN; case 11:RunProgram(#NOTIFY_PATH, "Eolite: error 11 - Device error"); @@ -110,6 +112,8 @@ void Write_Debug_Error(int error_number){ RETURN; case 32:RunProgram(#NOTIFY_PATH, "Eolite: error 32 - Too many processes"); RETURN; - default:RunProgram(#NOTIFY_PATH, "Unknown error number O_o"); + default:copystr(IntToStr(error_number), #unknown_error); + copystr(" - Unknown error number O_o", #unknown_error+strlen(#unknown_error)); + RunProgram(#NOTIFY_PATH, #unknown_error); } }