diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 8da3f0f56d..338e7d7841 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -20,9 +20,9 @@ int BUTTON_HEIGHT=18; #define ONLY_OPEN 2 //переменные -#define title "Eolite File Manager v1.28" -dword selection_col=0x94AECE; //цвет выделенного элемента из списка файлов -// +#define title "Eolite File Manager v1.31" +dword selection_col=0x94AECE; + /* int f_visible, @@ -187,9 +187,11 @@ int pressed_y; GoBack(); break; case 22: //Forward - HistoryPath(GO_FORWARD); - za_kadrom=curbtn=0; //вверх списка - Open_Dir(#path,WITH_REDRAW); + if (HistoryPath(GO_FORWARD)) + { + za_kadrom=curbtn=0; //вверх списка + Open_Dir(#path,WITH_REDRAW); + } break; case 23: //up! Dir_Up(); @@ -398,8 +400,10 @@ int pressed_y; inline fastcall void draw_window() { - if (GetScreenHeight()<480) DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0x10E4DFE1,0,0,title); else - DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title); + 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); @@ -439,6 +443,7 @@ inline fastcall void draw_window() void KEdit() { edit1.size=edit1.pos=strlen(#edit_path); + edit1.offset=0; edit_box_draw stdcall (#edit1); } @@ -565,7 +570,7 @@ void Line_ReDraw(dword color, filenum){ if (!TestBit(ESDWORD[off-40], 4)) { copystr(off,#temp); - Put_icon(#temp+find_symbol(#temp,'.'), BUTTON_HEIGHT/2-7+y, color); + Put_icon(#temp+strchr(#temp,'.'), BUTTON_HEIGHT/2-7+y, color); WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),BUTTON_HEIGHT-6/2+y,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size } else @@ -653,7 +658,7 @@ inline Sorting() } FOR (j=count-1, off=count-1*304+buf+32; j>=0; j--, off-=304;) //папки вверх, файлы вниз { - ChangeCase(off+40); + TitleCase(off+40); if (TestBit(ESDWORD[off],4)) //папка? { file_mas[k]=j; @@ -724,12 +729,12 @@ void Paste() IF (!copy_file) return; //отмена, еши ещё ничё не скопировали copystr(#path,#new_copy_path); - copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path)); + copystr(#copy_file+strchr(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path)); if (!strcmp(#copy_file,#new_copy_path)) //если мы копируем и вставляем в одной и той же папке { copystr(#path,#new_copy_path); copystr("new_",#new_copy_path+strlen(#new_copy_path)); - copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path)); + copystr(#copy_file+strchr(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path)); } copy_rezult=CopyFile(#copy_file,#new_copy_path); IF (copy_rezult<>0) //ошибка @@ -745,7 +750,7 @@ void Paste() copy_file=''; cut_active=0; } - SelectFile(#new_copy_path+find_symbol(#new_copy_path,'/')); + SelectFile(#new_copy_path+strchr(#new_copy_path,'/')); } @@ -799,29 +804,33 @@ void ReName(byte rename) void Actions() { int actions_y=disc_num*16; + DrawBar(17,actions_y+75,160,15,0x00699C); //синий прямоугольник - под девайсами DrawBar(17,show_actions*51+actions_y+108,160,onTop(show_actions*51+actions_y+108,6),0x00699C); //синее в конце - if (show_actions==1) + + DeleteButton(80); + DeleteButton(81); + DeleteButton(82); + + if (!show_actions) + Tip(actions_y+90, "Actions", 77, "\x18"); + else { Tip(actions_y+90, "Actions", 77, "\x19"); //заголовок DrawBar(17,actions_y+108,160,51,0xFFFFFF); //белое PutImage(#factions,16,44,21,actions_y+113); //иконки //rename file DefineButton(17,actions_y+108,159,16,80+BT_HIDE,0xE4DFE1); - WriteText(42,actions_y+113,0x80,0,"Rename file ",0); + WriteText(42,actions_y+113,0x80,0,"Rename file",0); + WriteText(150,actions_y+113,0x80,0x999999,"[F2]",0); //delete file DefineButton(17,actions_y+125,159,16,81+BT_HIDE,0xE4DFE1); - WriteText(42,actions_y+130,0x80,0,"Delete file ",0); + WriteText(42,actions_y+130,0x80,0,"Delete file",0); + WriteText(144,actions_y+130,0x80,0x999999,"[Del]",0); //create folder DefineButton(17,actions_y+142,159,16,82+BT_HIDE,0xE4DFE1); - WriteText(42,actions_y+147,0x80,0,"Create folder ",0); - } - else - { - DeleteButton(80); - DeleteButton(81); - DeleteButton(82); - Tip(actions_y+90, "Actions", 77, "\x18"); + WriteText(42,actions_y+147,0x80,0,"Create folder",0); + WriteText(150,actions_y+147,0x80,0x999999,"[F6]",0); } } @@ -846,7 +855,7 @@ void SelectFile(dword that_file) { za_kadrom=curbtn=0; //вверх списка Open_Dir(#path,ONLY_OPEN); - ChangeCase(that_file); + TitleCase(that_file); for (i=count-1; i>=0; i--;) if (!strcmp(file_mas[i]*304+buf+72,that_file)) break; FileList_ReDraw(i); @@ -870,8 +879,8 @@ inline fastcall void GoBack() // { char cur_folder[4096]; copystr(GetCurrentFolder(), #cur_folder); - HistoryPath(GO_BACK); - SelectFile(#cur_folder); + if (HistoryPath(GO_BACK)) + SelectFile(#cur_folder); } diff --git a/programs/fs/Eolite/trunk/History.txt b/programs/fs/Eolite/trunk/History.txt index 499fe27bd2..0b7b1fd7d9 100644 --- a/programs/fs/Eolite/trunk/History.txt +++ b/programs/fs/Eolite/trunk/History.txt @@ -1,3 +1,12 @@ +- фикс для строки адреса. + +10.07.12 -- v1.30 +- небольшие улучшения в работе кнопок "назад/вперёд"; +- иконка для *.grf; +- в окне About кнопка для редактирования Eolite.ini; +- небольшие улучшения кода. + + 23.06.12 -- v1.28 - более правильная реализация вывода ошибок (+задел на мультиязычность) и вывода иконки (+задел на перемещение в ini файл); diff --git a/programs/fs/Eolite/trunk/imgs/Eolite-Sun.png b/programs/fs/Eolite/trunk/imgs/Eolite-Sun.png index 9e2e13423a..a34514aee2 100644 Binary files a/programs/fs/Eolite/trunk/imgs/Eolite-Sun.png and b/programs/fs/Eolite/trunk/imgs/Eolite-Sun.png differ diff --git a/programs/fs/Eolite/trunk/imgs/dev.png b/programs/fs/Eolite/trunk/imgs/dev.png index 9e0256bf1c..2ee4915e05 100644 Binary files a/programs/fs/Eolite/trunk/imgs/dev.png and b/programs/fs/Eolite/trunk/imgs/dev.png differ diff --git a/programs/fs/Eolite/trunk/imgs/file_actions.png b/programs/fs/Eolite/trunk/imgs/file_actions.png index b67f0733b8..d3c20f2421 100644 Binary files a/programs/fs/Eolite/trunk/imgs/file_actions.png and b/programs/fs/Eolite/trunk/imgs/file_actions.png differ diff --git a/programs/fs/Eolite/trunk/imgs/icons.png b/programs/fs/Eolite/trunk/imgs/icons.png index bf94349bda..fe900db6e2 100644 Binary files a/programs/fs/Eolite/trunk/imgs/icons.png and b/programs/fs/Eolite/trunk/imgs/icons.png differ diff --git a/programs/fs/Eolite/trunk/imgs/icons.txt b/programs/fs/Eolite/trunk/imgs/icons.txt index 1565536e8d..b3c0740e65 100644 --- a/programs/fs/Eolite/trunk/imgs/icons.txt +++ b/programs/fs/Eolite/trunk/imgs/icons.txt @@ -2,23 +2,23 @@ //Иконки папок и файлов// ///////////////////////// -dword ficons_pal[] = {0x00FCFDFD,0x005A6079,0x00D0D1D7,0x00878AA5,0x009396AE,0x00DCE0E0,0x00F8F5EE,0x009DA1B6,0x00E9F1F3,0x00A8ABBD,0x007C809C,0x00E9EAF0,0x00C8C9D4,0x00C1C1C6,0x00E2E2E3,0x00D9DAE3,0x00FCB494,0x00BCBCC8,0x00FC9C74,0x005B789F,0x005B7AA3,0x00677EA1,0x00CDDAE4,0x008CA1BE,0x00CED3D9,0x007795B9,0x00BAC7D7,0x00D7E1F6,0x00DBF0FF,0x006B84A7,0x00949CB1,0x00A0ADC0,0x00758DAE,0x00C0DEFE,0x00C0C8E0,0x007DA9D9,0x00E3E0DC,0x00A4B0BD,0x005D90C5,0x005786BA,0x00A9B0C0,0x009EACC5,0x00A47667,0x00644B44,0x007C613B,0x006E5131,0x00FBFBA7,0x007B5E3B,0x00B69A48,0x00FEE270,0x00FBDE6D,0x00C3A651,0x00EFD364,0x00A49982,0x00A1957F,0x00FBC251,0x00EFB648,0x009F947E,0x00E0A850,0x00DCA34E,0x00C0A44F,0x009B6856,0x0055453F,0x00707797,0x0068C0D8,0x00B1E0F8,0x0071B8E0,0x00000000,0x00A0C8F0,0x00F73C4D,0x0046CF3D,0x00017BBB,0x00F8C048,0x00543830,0x006E4D25,0x00FFFF9F,0x00BF9F3F,0x00FCD95B,0x009A8D73,0x00F9B93C,0x00C2B4A4,0x00DF9F3F,0x0078828A,0x00EBF0EE,0x00C28A30,0x00A85701,0x00FBEAA5,0x00A86A16,0x00F2EDD4,0x00FAC830,0x00EEB524,0x0034120D,0x00D6A124,0x00ABC5DF,0x00789DCD,0x00B3DFF6,0x0094BAE3,0x0096B9DF,0x008FA9CD,0x002C72B7,0x00A2C5E8,0x00508CC6,0x004A88C3,0x0085ABD2,0x00407DBC,0x002F77C0,0x00B5CEE5,0x002566AA,0x0088B2DE,0x008DB6E2,0x00236AB1,0x00BAD3ED,0x001F63A8,0x006B9AC9,0x003E78B5,0x00676E84,0x0066708A,0x008797B8,0x00E89090,0x00D19595,0x00909088,0x00C88080,0x00B77720,0x00B86818,0x00E6C165,0x00885810,0x00B07818,0x00D09850,0x00A87028,0x00F0D8B0,0x00B15A00,0x00885028,0x00C89048,0x00C89038,0x00975000,0x00E8D9B1,0x00C99812,0x00FDF6DA,0x00FDF4B8,0x00FDFCC8,0x00F9DD95,0x00FCE9C2,0x00F9D886,0x00F2D47B,0x00EBD271,0x00D6A11E,0x007EBE7E,0x001D8E1B,0x00A88C05,0x00188100,0x0095D786,0x00157F00,0x00F9E09D,0x00E9CA7B,0x002F9019,0x008ACF7E,0x00BFFBA8,0x003EC335,0x002A8C16,0x00C69104,0x00468201,0x0054AE4D,0x00CDFBB7,0x0084F36C,0x0059E54D,0x0021AC1D,0x00FFE6B4,0x00B6D5A5,0x0046A640,0x00E4FFD0,0x00AFF79A,0x00A3F68E,0x004FD944,0x0047E63F,0x00119D0F,0x00818302,0x0095B44E,0x00549829,0x00C8F7A0,0x006FCA4A,0x008AE165,0x00719320,0x00DBBE73,0x00309E2B,0x0053AA35,0x0082B74E,0x00CBEF97,0x0084C744,0x009DDB67,0x0075B443,0x0095BA53,0x00ACE967,0x00C1BA4E,0x00D8B13C,0x00C6E4F5,0x0095CDCE,0x0095C9B2,0x0038A474,0x0055A78D,0x0070B8A9,0x00489F81,0x002E8C6D,0x0067BDD8,0x003D8E90,0x001E6F5E,0x0082ACA3,0x002287B8,0x00196B83,0x00135B6C,0x006B8376,0x00AFBDA4,0x000F4D58,0x004BA4CB,0x0083BBB7,0x00B2CFA4,0x006CBAE0,0x00A3CCAD,0x000894D9,0x002695CA,0x0054CBFE,0x002FA5D8,0x00CD8894,0x00C32E32,0x00926584,0x005A5788,0x00427484,0x00469560,0x006BB032,0x00A3CB94,0x00B42B2E,0x00E86078,0x0088672C,0x009E2727,0x00E12838,0x00DC182A,0x0082C53E,0x00B4B4B4,0x008D4444,0x00A9A9A9,0x003F7827,0x00547844,0x00E65777,0x005E8514,0x00C44246,0x00DD4E6B,0x0083B81C,0x0004A5F5,0x00E97F97,0x00EA889F,0x00A77800,0x00888888,0x00F0E8F0,0x00FFA078}; +dword ficons_pal[] = {0x00FDFDFD,0x005A6079,0x00D0D1D7,0x00878AA5,0x009396AE,0x00DDE1E0,0x00F8F5EE,0x009DA1B6,0x00E9F1F3,0x00A8ABBD,0x007C809C,0x00E9EAF0,0x00C8C9D4,0x00C1C1C6,0x00E4E4E5,0x00D9DAE3,0x00FCB494,0x00BCBCC8,0x00FC9C74,0x005B789F,0x005B7AA3,0x00677EA1,0x00CDDAE4,0x008CA1BE,0x00CED3D9,0x007795B9,0x00B6C4D6,0x00D7E1F6,0x00DBF0FF,0x006B84A7,0x00949CB1,0x00A0ADC0,0x00758DAE,0x00C0DEFE,0x00C0C8E0,0x007DA9D9,0x00E3E0DC,0x00A4B0BD,0x005D90C5,0x005786BA,0x00A9B0C0,0x009EACC5,0x00A47667,0x00644B44,0x007C613B,0x006E5131,0x00FBFBA7,0x007B5E3B,0x00B69A48,0x00FEE270,0x00FBDE6D,0x00C3A651,0x00EFD364,0x00A49982,0x00A1957F,0x00FBC251,0x00EFB648,0x009F947E,0x00E0A850,0x00DCA34E,0x00C0A44F,0x009B6856,0x0055453F,0x00707797,0x0068C0D8,0x00B1E0F8,0x0071B8E0,0x00000000,0x00A0C8F0,0x00F73C4D,0x0046CF3D,0x00017BBB,0x00F8C048,0x00543830,0x006E4D25,0x00FFFF9F,0x00BF9F3F,0x00FCD95B,0x009A8D73,0x00F9B93C,0x00C2B4A4,0x00DF9F3F,0x0078828A,0x00EBF0EE,0x00C28A30,0x00A85701,0x00FBEAA5,0x00A86A16,0x00F2EDD4,0x00FAC830,0x00EEB524,0x0034120D,0x00D6A124,0x00ABC5DF,0x00789DCD,0x00B3DFF6,0x0094BAE3,0x0096B9DF,0x008FA9CD,0x002C72B7,0x00A2C5E8,0x00508CC6,0x004A88C3,0x0085ABD2,0x00407DBC,0x002F77C0,0x00B5CEE5,0x002566AA,0x0088B2DE,0x008DB6E2,0x00236AB1,0x00BAD3ED,0x001F63A8,0x006B9AC9,0x003E78B5,0x00676E84,0x0066708A,0x008797B8,0x00E89090,0x00D19595,0x00909088,0x00C88080,0x00B77720,0x00B86818,0x00E6C165,0x00885810,0x00B07818,0x00D09850,0x00A87028,0x00F0D8B0,0x00B15A00,0x00885028,0x00C89048,0x00C89038,0x00975000,0x00E8D9B1,0x00C99812,0x00FDF6DA,0x00FDF4B8,0x00FDFCC8,0x00F9DD95,0x00FCE9C2,0x00F9D886,0x00F2D47B,0x00EBD271,0x00D6A11E,0x007EBE7E,0x001D8E1B,0x00A88C05,0x00188100,0x0095D786,0x00157F00,0x00F9E19D,0x00E9CA7B,0x002F9019,0x008ACF7E,0x00BFFBA8,0x003EC335,0x002A8C16,0x00C69104,0x00468201,0x0054AE4D,0x00CDFBB7,0x0084F36C,0x0059E54D,0x0021AC1D,0x00FFE6B4,0x00B6D5A5,0x0046A640,0x00E4FFD0,0x00AFF79A,0x00A3F68E,0x004FD944,0x0047E63F,0x00119D0F,0x00818302,0x0090B750,0x00549829,0x00C8F7A0,0x006FCA4A,0x008AE165,0x00719320,0x00DBBE73,0x00309E2B,0x0053AA35,0x00CBEF97,0x0084C744,0x009DDB67,0x0075B443,0x00ACE967,0x00C1BA4E,0x00D8B13C,0x00C6E4F5,0x0095CDCE,0x0095C9B2,0x0038A474,0x0055A78D,0x0070B8A9,0x00489F81,0x002E8C6D,0x0067BDD8,0x003D8E90,0x001E6F5E,0x0082ACA3,0x002287B8,0x00196B83,0x00135B6C,0x006B8376,0x00AFBDA4,0x000F4D58,0x004BA4CB,0x0083BBB7,0x00B2CFA4,0x006CBAE0,0x00A3CCAD,0x000894D9,0x002695CA,0x0054CBFE,0x002FA5D8,0x00CD8894,0x00C32E32,0x00926584,0x005A5788,0x00427484,0x00469560,0x006BB032,0x00A3CB94,0x00B42B2E,0x00E86078,0x0088672C,0x009E2727,0x00E12838,0x00DC182A,0x0082C53E,0x00B4B4B4,0x008D4444,0x00A9A9A9,0x003F7827,0x00547844,0x00E65777,0x005E8514,0x00C44246,0x00DD4E6B,0x0083B81C,0x0004A5F5,0x00E97F97,0x00EA889F,0x00A77800,0x00888888,0x00F0E8F0,0x00FFA078,0x00323443,0x00FF0000,0x00FACACA}; -unsigned char ficons[6000] = { +unsigned char ficons[6240] = { 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x07, 0x05, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x06, 0x00, 0x00, 0x00, 0x09, 0x0A, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0B, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0C, 0x0D, 0x0D, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0B, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x06, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x02, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0C, 0x02, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0C, 0x0C, 0x02, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0E, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0F, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x06, 0x00, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0F, 0x0F, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x06, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x02, 0x0F, 0x0F, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0C, 0x02, 0x0F, 0x0F, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0C, 0x0C, 0x02, 0x0F, 0x0F, 0x0E, 0x0E, 0x0B, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -45,11 +45,11 @@ unsigned char ficons[6000] = { 0x1A, 0x01, 0x1B, 0x1C, 0x1B, 0x0C, 0x16, 0x1D, 0x1E, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x01, 0x0B, 0x08, 0x1C, 0x1C, 0x0C, 0x0F, 0x1F, 0x20, 0x06, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x01, 0x21, 0x21, 0x1C, 0x0C, 0x00, 0x06, 0x0C, 0x14, 0x08, 0x06, 0x00, 0x08, 0x01, 0x00, 0x00, - 0x01, 0x0B, 0x18, 0x22, 0x23, 0x19, 0x24, 0x25, 0x20, 0x0B, 0x08, 0x06, 0x08, 0x01, 0x00, 0x00, - 0x05, 0x01, 0x16, 0x0B, 0x26, 0x27, 0x0C, 0x1D, 0x1E, 0x0B, 0x0B, 0x08, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x1A, 0x01, 0x28, 0x27, 0x27, 0x1D, 0x29, 0x0E, 0x0B, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x14, 0x14, 0x1D, 0x09, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x0B, 0x0B, 0x00, 0x00, 0x00, 0x08, 0x08, 0x01, 0x00, 0x00, + 0x01, 0x0E, 0x18, 0x22, 0x23, 0x19, 0x24, 0x25, 0x20, 0x0B, 0x08, 0x06, 0x08, 0x01, 0x00, 0x00, + 0x1A, 0x01, 0x16, 0x0B, 0x26, 0x27, 0x0C, 0x1D, 0x1E, 0x0B, 0x0B, 0x08, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x1A, 0x01, 0x28, 0x27, 0x27, 0x1D, 0x29, 0x0E, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x14, 0x14, 0x1D, 0x09, 0x0F, 0x0F, 0x0E, 0x0E, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x0E, 0x0B, 0x00, 0x00, 0x00, 0x08, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, @@ -62,8 +62,8 @@ unsigned char ficons[6000] = { 0x00, 0x2C, 0x30, 0x31, 0x32, 0x32, 0x33, 0x2F, 0x0B, 0x08, 0x06, 0x00, 0x08, 0x01, 0x00, 0x00, 0x2A, 0x2B, 0x34, 0x35, 0x2B, 0x36, 0x32, 0x2B, 0x2A, 0x0B, 0x08, 0x06, 0x08, 0x01, 0x00, 0x00, 0x2B, 0x37, 0x38, 0x2B, 0x06, 0x2B, 0x37, 0x37, 0x2B, 0x0B, 0x0B, 0x08, 0x08, 0x01, 0x00, 0x00, - 0x2A, 0x2B, 0x38, 0x35, 0x2B, 0x39, 0x37, 0x2B, 0x2A, 0x0B, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, - 0x00, 0x2C, 0x30, 0x3A, 0x3B, 0x3B, 0x3C, 0x2F, 0x0F, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x2A, 0x2B, 0x38, 0x35, 0x2B, 0x39, 0x37, 0x2B, 0x2A, 0x0E, 0x0B, 0x0B, 0x08, 0x01, 0x00, 0x00, + 0x00, 0x2C, 0x30, 0x3A, 0x3B, 0x3B, 0x3C, 0x2F, 0x0F, 0x0E, 0x0E, 0x0B, 0x08, 0x01, 0x00, 0x00, 0x00, 0x2C, 0x2D, 0x2B, 0x3A, 0x2B, 0x2F, 0x2F, 0x00, 0x00, 0x00, 0x08, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3D, 0x3E, 0x3D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, @@ -166,7 +166,7 @@ unsigned char ficons[6000] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x26, 0x5F, 0x3F, 0x3F, 0x3F, 0x5F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x60, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x26, 0x5F, 0x15, 0x15, 0x15, 0x15, 0x5F, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x3F, 0x5F, 0x23, 0x61, 0x0E, 0x0E, 0x15, 0x5F, 0x3F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x3F, 0x5F, 0x23, 0x61, 0x05, 0x05, 0x15, 0x5F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5E, 0x5F, 0x15, 0x00, 0x00, 0x62, 0x15, 0x5F, 0x3F, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5F, 0x5F, 0x5F, 0x3F, 0x00, 0x00, 0x3F, 0x5F, 0x5F, 0x5F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, @@ -204,9 +204,9 @@ unsigned char ficons[6000] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x73, 0x02, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x29, 0x73, 0x74, 0x74, 0x74, 0x74, 0x75, 0x22, 0x22, 0x75, 0x74, 0x74, 0x74, 0x74, 0x74, 0x75, 0x22, 0x01, - 0x08, 0x08, 0x08, 0x0E, 0x74, 0x22, 0x22, 0x74, 0x76, 0x77, 0x76, 0x77, 0x76, 0x74, 0x22, 0x01, + 0x08, 0x08, 0x08, 0x05, 0x74, 0x22, 0x22, 0x74, 0x76, 0x77, 0x76, 0x77, 0x76, 0x74, 0x22, 0x01, 0x08, 0x08, 0x08, 0x08, 0x74, 0x22, 0x22, 0x74, 0x77, 0x00, 0x77, 0x00, 0x77, 0x74, 0x22, 0x01, - 0x0E, 0x0E, 0x0E, 0x0E, 0x74, 0x22, 0x22, 0x74, 0x76, 0x77, 0x00, 0x77, 0x76, 0x74, 0x22, 0x01, + 0x05, 0x05, 0x05, 0x05, 0x74, 0x22, 0x22, 0x74, 0x76, 0x77, 0x00, 0x77, 0x76, 0x74, 0x22, 0x01, 0x78, 0x78, 0x78, 0x05, 0x74, 0x22, 0x22, 0x74, 0x77, 0x00, 0x77, 0x00, 0x77, 0x74, 0x22, 0x01, 0x0C, 0x0C, 0x0C, 0x0C, 0x74, 0x22, 0x22, 0x74, 0x79, 0x79, 0x79, 0x79, 0x79, 0x74, 0x22, 0x01, 0x74, 0x74, 0x74, 0x74, 0x75, 0x22, 0x22, 0x75, 0x74, 0x74, 0x74, 0x74, 0x74, 0x75, 0x22, 0x01, @@ -270,115 +270,130 @@ unsigned char ficons[6000] = { 0x00, 0x88, 0x8A, 0x88, 0x8A, 0x56, 0x98, 0xB0, 0xB1, 0xB1, 0xB2, 0xB3, 0xB4, 0xB1, 0xB1, 0xB5, 0x00, 0x88, 0x56, 0x88, 0x8A, 0x8E, 0x99, 0xB6, 0xB6, 0xB7, 0xB2, 0xB3, 0xB4, 0xB8, 0xB6, 0x88, 0x00, 0x88, 0x56, 0x88, 0x56, 0x8F, 0x8F, 0x8F, 0x8F, 0xB8, 0xB2, 0xB3, 0xB4, 0xB8, 0x4F, 0x88, - 0x00, 0x88, 0x8C, 0x88, 0x56, 0x8F, 0x8F, 0x8F, 0x8F, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0x4F, 0x88, - 0x00, 0x88, 0x7C, 0x88, 0x8C, 0x90, 0x90, 0x90, 0x90, 0xBE, 0xBA, 0xBC, 0xBF, 0xBE, 0x4F, 0x88, - 0x00, 0x88, 0x88, 0x91, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x4F, 0x88, + 0x00, 0x88, 0x8C, 0x88, 0x56, 0x8F, 0x8F, 0x8F, 0x8F, 0xB0, 0xB9, 0xBA, 0xBB, 0xBC, 0x4F, 0x88, + 0x00, 0x88, 0x7C, 0x88, 0x8C, 0x90, 0x90, 0x90, 0x90, 0xB0, 0xB9, 0xBB, 0xBD, 0xB0, 0x4F, 0x88, + 0x00, 0x88, 0x88, 0x91, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0x4F, 0x88, 0x00, 0x87, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x87, 0x00, 0x00, 0x53, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, - 0x88, 0x7C, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x7C, 0x88, - 0x88, 0x7C, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x7C, 0x88, + 0x88, 0x7C, 0x56, 0x8A, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8A, 0x56, 0x7C, 0x88, + 0x88, 0x7C, 0x98, 0x98, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x98, 0x98, 0x7C, 0x88, 0x88, 0x7C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x7C, 0x88, 0x88, 0x7C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x7C, 0x88, 0x88, 0x7C, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x7C, 0x88, 0x88, 0x7C, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x7C, 0x88, 0x88, 0x7C, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x7C, 0x88, - 0x88, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x88, + 0x88, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0x88, 0x87, 0x88, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x88, 0x87, - 0x00, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x00, + 0x00, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0x00, 0x00, 0x00, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x00, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x00, 0x3F, - 0x3F, 0x00, 0x5F, 0x5F, 0xC2, 0xC2, 0xC2, 0xC2, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x00, 0x3F, - 0x3F, 0x00, 0xC2, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0xC2, 0xC2, 0xC2, 0x16, 0xC3, 0x00, 0x3F, - 0x3F, 0x00, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0xC4, 0xC5, 0xC5, 0x00, 0x3F, - 0x3F, 0x00, 0x5F, 0x5F, 0x5F, 0xC3, 0xC6, 0xC6, 0xC7, 0xC3, 0xC8, 0xC9, 0xC9, 0xC9, 0x00, 0x3F, - 0x3F, 0x00, 0xCA, 0xCA, 0xCB, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCD, 0xCC, 0x00, 0x3F, - 0x3F, 0x00, 0xCE, 0xCF, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD1, 0xD2, 0xD3, 0x00, 0x3F, - 0x3F, 0x00, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD5, 0xD6, 0xD4, 0x00, 0x3F, - 0x3F, 0x00, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD8, 0xD7, 0x00, 0x3F, - 0x3F, 0x00, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0x00, 0x3F, + 0x3F, 0x00, 0x5F, 0x5F, 0xC0, 0xC0, 0xC0, 0xC0, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x5F, 0x00, 0x3F, + 0x3F, 0x00, 0xC0, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0xC0, 0xC0, 0xC0, 0x16, 0xC1, 0x00, 0x3F, + 0x3F, 0x00, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0xC2, 0xC3, 0xC3, 0x00, 0x3F, + 0x3F, 0x00, 0x5F, 0x5F, 0x5F, 0xC1, 0xC4, 0xC4, 0xC5, 0xC1, 0xC6, 0xC7, 0xC7, 0xC7, 0x00, 0x3F, + 0x3F, 0x00, 0xC8, 0xC8, 0xC9, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCB, 0xCA, 0x00, 0x3F, + 0x3F, 0x00, 0xCC, 0xCD, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCF, 0xD0, 0xD1, 0x00, 0x3F, + 0x3F, 0x00, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD3, 0xD4, 0xD2, 0x00, 0x3F, + 0x3F, 0x00, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 0xD6, 0xD5, 0x00, 0x3F, + 0x3F, 0x00, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0x42, 0xDA, 0xDA, 0xDA, 0x42, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0xDA, 0xDB, 0xDB, 0xDB, 0xDA, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0xCE, 0xDC, 0xDC, 0xDC, 0xCE, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0xDD, 0xDE, 0x63, 0xDC, 0xDC, 0xDC, 0x63, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0xDE, 0x45, 0xDF, 0xE0, 0xE1, 0xC9, 0xE2, 0xE3, 0xE4, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x1B, 0x1B, 0xE5, 0xE6, 0xE6, 0xE6, 0xE7, 0xBF, 0xBF, 0xBF, 0xE3, 0x1B, 0x00, 0x3F, - 0x3F, 0x00, 0x0D, 0x0D, 0xE8, 0xE9, 0xEA, 0xEA, 0xE7, 0xEB, 0xEB, 0xEB, 0xB1, 0x0D, 0x00, 0x3F, - 0x3F, 0x00, 0x0D, 0xEC, 0xED, 0xE8, 0xE8, 0xE8, 0x2C, 0xEB, 0xEB, 0xEB, 0xB1, 0x0D, 0x00, 0x3F, - 0x3F, 0x00, 0x0D, 0xEC, 0xEE, 0xEE, 0xEE, 0xEE, 0xD1, 0xEF, 0xEF, 0xEF, 0xF0, 0xEE, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0x42, 0xD8, 0xD8, 0xD8, 0x42, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0xD8, 0xD9, 0xD9, 0xD9, 0xD8, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, 0xCC, 0xDA, 0xDA, 0xDA, 0xCC, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0xDB, 0xDC, 0x63, 0xDA, 0xDA, 0xDA, 0x63, 0x1B, 0x1B, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0xDC, 0x45, 0xDD, 0xDE, 0xDF, 0xC7, 0xE0, 0xE1, 0xE2, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x1B, 0x1B, 0xE3, 0xE4, 0xE4, 0xE4, 0xE5, 0xBD, 0xBD, 0xBD, 0xE1, 0x1B, 0x00, 0x3F, + 0x3F, 0x00, 0x0D, 0x0D, 0xE6, 0xE7, 0xE8, 0xE8, 0xE5, 0xE9, 0xE9, 0xE9, 0xB1, 0x0D, 0x00, 0x3F, + 0x3F, 0x00, 0x0D, 0xEA, 0xEB, 0xE6, 0xE6, 0xE6, 0x2C, 0xE9, 0xE9, 0xE9, 0xB1, 0x0D, 0x00, 0x3F, + 0x3F, 0x00, 0x0D, 0xEA, 0xEC, 0xEC, 0xEC, 0xEC, 0xCF, 0xED, 0xED, 0xED, 0xEE, 0xEC, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x6F, 0x6F, 0x01, 0x6F, 0x6F, 0x01, 0x53, 0x53, 0x53, 0x53, 0x53, 0x01, 0x5D, 0x60, 0x01, 0x01, 0x6F, 0x60, 0x01, 0x60, 0x60, 0x01, 0x02, 0x02, 0x02, 0x01, 0x0D, 0x01, 0x60, 0x60, 0x01, - 0x01, 0x6F, 0x67, 0x01, 0x67, 0x67, 0x01, 0x02, 0x0D, 0x0D, 0x01, 0xEE, 0x01, 0x67, 0x67, 0x01, - 0x01, 0x6F, 0x5E, 0x01, 0x15, 0x5E, 0x01, 0x0D, 0xEE, 0xEE, 0xEE, 0xEE, 0x01, 0x5E, 0x5E, 0x01, + 0x01, 0x6F, 0x67, 0x01, 0x67, 0x67, 0x01, 0x02, 0x0D, 0x0D, 0x01, 0xEC, 0x01, 0x67, 0x67, 0x01, + 0x01, 0x6F, 0x5E, 0x01, 0x15, 0x5E, 0x01, 0x0D, 0xEC, 0xEC, 0xEC, 0xEC, 0x01, 0x5E, 0x5E, 0x01, 0x01, 0x6F, 0x5E, 0x15, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x15, 0x5E, 0x5E, 0x01, 0x01, 0x6A, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x5E, 0x01, 0x01, 0x6A, 0x15, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x15, 0x5E, 0x01, 0x01, 0x5D, 0x01, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x01, 0x5E, 0x01, - 0x01, 0x5D, 0x01, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0x01, 0x5E, 0x01, + 0x01, 0x5D, 0x01, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0x01, 0x5E, 0x01, 0x01, 0x60, 0x01, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x01, 0x5E, 0x01, - 0x01, 0x60, 0x01, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0x01, 0x26, 0x01, + 0x01, 0x60, 0x01, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0x01, 0x26, 0x01, 0x01, 0x60, 0x01, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x01, 0x26, 0x01, 0x01, 0x67, 0x01, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x67, 0x01, 0x65, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xF2, 0xEE, 0x0D, 0x0D, 0x47, 0xEE, 0x0D, 0x0D, 0xF3, 0xEE, 0x0D, 0x0D, 0xF3, - 0x00, 0x00, 0xF2, 0xEE, 0x0D, 0x0D, 0x47, 0xEE, 0x0D, 0x0D, 0xF3, 0xEE, 0x0D, 0x0D, 0xF4, 0xF3, - 0x00, 0xF2, 0xEE, 0x0D, 0x0D, 0x47, 0xEE, 0x0D, 0x0D, 0xF3, 0xEE, 0x0D, 0x0D, 0xF4, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF4, 0xF8, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF8, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF8, 0xF4, 0xF8, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF8, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF4, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF8, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF8, 0xF4, 0xF4, 0xF3, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF4, 0xF3, 0x00, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF4, 0xF3, 0x00, 0x00, - 0xF2, 0xF5, 0xF5, 0xEB, 0x47, 0xD9, 0xD9, 0xF6, 0xF3, 0xF4, 0xE6, 0xF7, 0xF3, 0x00, 0x00, 0x00, - 0xF2, 0xF2, 0xF2, 0xF2, 0x47, 0x47, 0x47, 0x47, 0xF3, 0xF3, 0xF3, 0xF3, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF9, 0x98, 0x98, 0xF9, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xF9, 0x7A, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x7A, 0xF9, 0x00, 0x00, 0x00, - 0x00, 0xF9, 0xF9, 0x8C, 0x8C, 0x7A, 0x7A, 0x8C, 0x8C, 0x7A, 0x7A, 0x8C, 0x8C, 0xF9, 0xF9, 0x00, - 0xF9, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x7A, 0x7A, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0xF9, - 0xF9, 0x7C, 0x7C, 0x8F, 0x8F, 0x7A, 0x7A, 0x8F, 0x8F, 0x7A, 0x7A, 0x8F, 0x8F, 0x88, 0x4F, 0xF9, - 0xF9, 0x38, 0x38, 0x7C, 0x7A, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x7A, 0x4F, 0x88, 0xC1, 0xF9, - 0xF9, 0x38, 0x38, 0x38, 0x7A, 0x7C, 0x7C, 0x90, 0x90, 0x4F, 0x4F, 0x7A, 0xC1, 0x88, 0xC1, 0xF9, - 0xF9, 0x4F, 0x4F, 0x38, 0x7A, 0x38, 0x38, 0x7C, 0x4F, 0xC1, 0xC1, 0x7A, 0xC1, 0x88, 0x5C, 0xF9, - 0xF9, 0x4F, 0x4F, 0x4F, 0x7B, 0x38, 0x38, 0x38, 0xC1, 0xC1, 0xC1, 0x7B, 0x5C, 0x88, 0x5C, 0xF9, - 0xF9, 0x5C, 0x5C, 0x4F, 0x7B, 0x4F, 0x4F, 0x38, 0xC1, 0x5C, 0x5C, 0x7B, 0x5C, 0x88, 0x88, 0xF9, - 0x00, 0xF9, 0xF9, 0x5C, 0x7B, 0x4F, 0x4F, 0x4F, 0x5C, 0x5C, 0x5C, 0x7B, 0x88, 0xF9, 0xF9, 0x00, - 0x00, 0x00, 0x00, 0xF9, 0x55, 0x5C, 0x5C, 0x4F, 0x5C, 0x88, 0x88, 0x55, 0xF9, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF9, 0x5C, 0x88, 0xF9, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0xFA, 0xFA, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0xFA, 0xFA, 0x06, 0x00, 0x00, - 0x00, 0x00, 0x06, 0xFA, 0x00, 0x0D, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0x02, 0x28, 0xFA, 0x06, 0x00, - 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0x28, 0xEE, 0xEE, 0xFA, 0x00, - 0x00, 0x02, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x05, 0x02, 0x28, 0xEE, 0xEE, 0x87, 0xFA, 0x02, - 0x00, 0xFA, 0x0D, 0x0D, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x87, 0x87, 0x4D, 0x4D, 0xFA, - 0x00, 0xFA, 0x0D, 0x0D, 0x0D, 0x0D, 0x00, 0x02, 0xFA, 0x02, 0x00, 0x4D, 0x4D, 0x4D, 0xB2, 0x01, - 0x00, 0xFA, 0x59, 0x59, 0x59, 0x59, 0x00, 0xFA, 0x00, 0xFA, 0x00, 0x0D, 0x0D, 0xB2, 0xB2, 0x01, - 0x00, 0xFA, 0xFB, 0xFB, 0xFB, 0xFB, 0x00, 0x02, 0xFA, 0x02, 0x00, 0x0D, 0x0D, 0x0D, 0x0D, 0x01, - 0x00, 0xFA, 0xFB, 0x1B, 0x1B, 0x44, 0x44, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0x0D, 0x0D, 0x0D, 0x01, - 0x00, 0x02, 0xFA, 0x44, 0x44, 0x44, 0x0D, 0x02, 0x00, 0x28, 0xFC, 0x98, 0xFB, 0xFB, 0x01, 0x02, - 0x00, 0x00, 0x01, 0x44, 0x44, 0x0D, 0x0D, 0x02, 0x00, 0x28, 0xFC, 0xFC, 0x98, 0xFB, 0x01, 0x00, - 0x00, 0x00, 0x06, 0x01, 0x0D, 0x0D, 0x0D, 0x05, 0x00, 0x28, 0x28, 0xFC, 0xFC, 0x01, 0x06, 0x00, + 0x00, 0x00, 0x00, 0xF0, 0xEC, 0x0D, 0x0D, 0x47, 0xEC, 0x0D, 0x0D, 0xF1, 0xEC, 0x0D, 0x0D, 0xF1, + 0x00, 0x00, 0xF0, 0xEC, 0x0D, 0x0D, 0x47, 0xEC, 0x0D, 0x0D, 0xF1, 0xEC, 0x0D, 0x0D, 0xF2, 0xF1, + 0x00, 0xF0, 0xEC, 0x0D, 0x0D, 0x47, 0xEC, 0x0D, 0x0D, 0xF1, 0xEC, 0x0D, 0x0D, 0xF2, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF2, 0xF6, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF6, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF6, 0xF2, 0xF6, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF6, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF2, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF6, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF6, 0xF2, 0xF2, 0xF1, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF2, 0xF1, 0x00, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF2, 0xF1, 0x00, 0x00, + 0xF0, 0xF3, 0xF3, 0xE9, 0x47, 0xD7, 0xD7, 0xF4, 0xF1, 0xF2, 0xE4, 0xF5, 0xF1, 0x00, 0x00, 0x00, + 0xF0, 0xF0, 0xF0, 0xF0, 0x47, 0x47, 0x47, 0x47, 0xF1, 0xF1, 0xF1, 0xF1, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0x98, 0x98, 0xF7, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xF7, 0x7A, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x7A, 0xF7, 0x00, 0x00, 0x00, + 0x00, 0xF7, 0xF7, 0x8C, 0x8C, 0x7A, 0x7A, 0x8C, 0x8C, 0x7A, 0x7A, 0x8C, 0x8C, 0xF7, 0xF7, 0x00, + 0xF7, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x7A, 0x7A, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0xF7, + 0xF7, 0x7C, 0x7C, 0x8F, 0x8F, 0x7A, 0x7A, 0x8F, 0x8F, 0x7A, 0x7A, 0x8F, 0x8F, 0x88, 0x4F, 0xF7, + 0xF7, 0x38, 0x38, 0x7C, 0x7A, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x7A, 0x4F, 0x88, 0xBF, 0xF7, + 0xF7, 0x38, 0x38, 0x38, 0x7A, 0x7C, 0x7C, 0x90, 0x90, 0x4F, 0x4F, 0x7A, 0xBF, 0x88, 0xBF, 0xF7, + 0xF7, 0x4F, 0x4F, 0x38, 0x7A, 0x38, 0x38, 0x7C, 0x4F, 0xBF, 0xBF, 0x7A, 0xBF, 0x88, 0x5C, 0xF7, + 0xF7, 0x4F, 0x4F, 0x4F, 0x7B, 0x38, 0x38, 0x38, 0xBF, 0xBF, 0xBF, 0x7B, 0x5C, 0x88, 0x5C, 0xF7, + 0xF7, 0x5C, 0x5C, 0x4F, 0x7B, 0x4F, 0x4F, 0x38, 0xBF, 0x5C, 0x5C, 0x7B, 0x5C, 0x88, 0x88, 0xF7, + 0x00, 0xF7, 0xF7, 0x5C, 0x7B, 0x4F, 0x4F, 0x4F, 0x5C, 0x5C, 0x5C, 0x7B, 0x88, 0xF7, 0xF7, 0x00, + 0x00, 0x00, 0x00, 0xF7, 0x55, 0x5C, 0x5C, 0x4F, 0x5C, 0x88, 0x88, 0x55, 0xF7, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0x5C, 0x88, 0xF7, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x06, 0xF8, 0xF8, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0xF8, 0xF8, 0x06, 0x00, 0x00, + 0x00, 0x00, 0x06, 0xF8, 0x00, 0x0D, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0x02, 0x28, 0xF8, 0x06, 0x00, + 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x05, 0x02, 0x02, 0x28, 0xEC, 0xEC, 0xF8, 0x00, + 0x00, 0x02, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x05, 0x02, 0x28, 0xEC, 0xEC, 0x87, 0xF8, 0x02, + 0x00, 0xF8, 0x0D, 0x0D, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0x87, 0x87, 0x4D, 0x4D, 0xF8, + 0x00, 0xF8, 0x0D, 0x0D, 0x0D, 0x0D, 0x00, 0x02, 0xF8, 0x02, 0x00, 0x4D, 0x4D, 0x4D, 0xB2, 0x01, + 0x00, 0xF8, 0x59, 0x59, 0x59, 0x59, 0x00, 0xF8, 0x00, 0xF8, 0x00, 0x0D, 0x0D, 0xB2, 0xB2, 0x01, + 0x00, 0xF8, 0xF9, 0xF9, 0xF9, 0xF9, 0x00, 0x02, 0xF8, 0x02, 0x00, 0x0D, 0x0D, 0x0D, 0x0D, 0x01, + 0x00, 0xF8, 0xF9, 0x1B, 0x1B, 0x44, 0x44, 0x00, 0x00, 0x00, 0xF9, 0xF9, 0x0D, 0x0D, 0x0D, 0x01, + 0x00, 0x02, 0xF8, 0x44, 0x44, 0x44, 0x0D, 0x02, 0x00, 0x28, 0xFA, 0x98, 0xF9, 0xF9, 0x01, 0x02, + 0x00, 0x00, 0x01, 0x44, 0x44, 0x0D, 0x0D, 0x02, 0x00, 0x28, 0xFA, 0xFA, 0x98, 0xF9, 0x01, 0x00, + 0x00, 0x00, 0x06, 0x01, 0x0D, 0x0D, 0x0D, 0x05, 0x00, 0x28, 0x28, 0xFA, 0xFA, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x01, 0x01, 0x02, 0x05, 0x00, 0x28, 0x28, 0x01, 0x01, 0x06, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFB, 0xFB, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xFC, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xFC, 0xFD, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFC, 0x06, 0x00, 0x06, 0xFC, 0xFD, 0x53, + 0x00, 0xFB, 0x00, 0x00, 0xFC, 0xFC, 0xFD, 0xFC, 0xFC, 0xFD, 0xFC, 0x06, 0xFC, 0xFD, 0x53, 0x53, + 0x00, 0xFB, 0x00, 0x06, 0xFC, 0xFD, 0xFC, 0xFD, 0x53, 0x53, 0xFD, 0xFC, 0xFD, 0x53, 0x53, 0x53, + 0x00, 0xFB, 0x00, 0xFC, 0xFD, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, + 0x00, 0xFB, 0x06, 0xFC, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, + 0x00, 0xFB, 0xFC, 0xFD, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, + 0x00, 0xFB, 0xFC, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0xFB, 0x53, + 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, + 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0x00 }; \ No newline at end of file diff --git a/programs/fs/Eolite/trunk/imgs/toolbar.png b/programs/fs/Eolite/trunk/imgs/toolbar.png index ad4635cb6e..1daa9500cb 100644 Binary files a/programs/fs/Eolite/trunk/imgs/toolbar.png and b/programs/fs/Eolite/trunk/imgs/toolbar.png differ diff --git a/programs/fs/Eolite/trunk/include/about_dialog.h b/programs/fs/Eolite/trunk/include/about_dialog.h index 3766cdae57..ae16121ba5 100644 --- a/programs/fs/Eolite/trunk/include/about_dialog.h +++ b/programs/fs/Eolite/trunk/include/about_dialog.h @@ -2,8 +2,9 @@ #include "imgs\logo.txt" -#define BROWSER_PATH "/sys/htmlv" -#define BROWSER_LINK "http://kolibri-os.narod.ru" +#define EDITOR_PATH "/sys/tinypad" +#define BROWSER_PATH "/sys/htmlv" +#define BROWSER_LINK "http://kolibri-os.narod.ru" void about_dialog() @@ -27,6 +28,7 @@ void about_dialog() id=GetButtonID(); IF (id==1) ExitProcess(); IF (id==23) RunProgram(BROWSER_PATH, BROWSER_LINK); + IF (id==33) RunProgram(EDITOR_PATH, #program_path); break; case evKey: @@ -34,10 +36,10 @@ void about_dialog() break; case evReDraw: - DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,0,0,"About Eolite"); + DefineAndDrawWindow(600,150,181,256,0x34,0x10EFEBEF,"About Eolite"); DrawBar(0,0,172,50,0x8494C4); //голубое сзади PutPaletteImage(#logo,85,85,43,7,#logo_pal); - WriteText(46,100,0x90,0xBF40BF,"Eolite v1.28",0); + WriteText(46,100,0x90,0xBF40BF,"Eolite v1.31",0); $add ebx, 1<<16 $int 0x40 WriteText(55,120,0x80,0,"Developers:",0); @@ -48,7 +50,8 @@ void about_dialog() DrawLink(48,170,23, "kolibri-os.narod.ru"); //ссылкa DrawFlatButton(85,190,70,22,0,0xE4DFE1, "Close"); - //PutPaletteImage(3*16*15+#ficons,16,15,40,195,#ficons_pal); + DefineButton(20-1,195-1, 16+1,15+1, 33+BT_HIDE, 0); + PutPaletteImage(8*16*15+#ficons,16,15,20,195,#ficons_pal); } } diff --git a/programs/fs/Eolite/trunk/include/history.h b/programs/fs/Eolite/trunk/include/history.h index c0725f6916..3d600a0a73 100644 --- a/programs/fs/Eolite/trunk/include/history.h +++ b/programs/fs/Eolite/trunk/include/history.h @@ -13,11 +13,11 @@ dword GetCurrentFolder() char cur_fol[4096]; copystr(#path,#cur_fol); cur_fol[strlen(#cur_fol)-1]=0x00; //обрезаем последний / - copystr(#cur_fol+find_symbol(#cur_fol,'/'),#cur_fol); + copystr(#cur_fol+strchr(#cur_fol,'/'),#cur_fol); return #cur_fol; } -void HistoryPath(byte action) +int HistoryPath(byte action) { int MAX_HISTORY_NUM; @@ -41,15 +41,17 @@ void HistoryPath(byte action) if (action==GO_BACK) { - if (history_current<=2) return; + if (history_current<=2) return 0; history_current--; copystr(#history_list[history_current].Item,#path); + return 1; } if (action==GO_FORWARD) { - if (history_current==history_num) return; + if (history_current==history_num) return 0; history_current++; copystr(#history_list[history_current].Item,#path); + return 1; } } \ No newline at end of file diff --git a/programs/fs/Eolite/trunk/include/icons_f.h b/programs/fs/Eolite/trunk/include/icons_f.h index bf0bf541f2..7997b80e12 100644 --- a/programs/fs/Eolite/trunk/include/icons_f.h +++ b/programs/fs/Eolite/trunk/include/icons_f.h @@ -85,6 +85,7 @@ char *ext[]={ "mkv", 14, "mp4", 14, "vob", 14, +"grf", 25, 0}; @@ -96,7 +97,11 @@ void Put_icon(dword extension, yy, fairing_color) int icon_n=0, i; for (i=0; ext[i]<>0; i+=2;) - if (!strcmp(extension, ext[i])) icon_n = ext[i+1]; + if (!strcmp(extension, ext[i])) + { + icon_n = ext[i+1]; + break; + } PutPaletteImage(icon_n*16*15+#ficons,16,15,195,yy,#ficons_pal); if (icon_n<>17) && (strlen(extension)<9) WriteText(-strlen(extension)*3+onLeft(168,0)+36,yy+4,0x80,0,extension,0); diff --git a/programs/fs/Eolite/trunk/include/ini.h b/programs/fs/Eolite/trunk/include/ini.h index 3554d9db0b..15ed128a88 100644 --- a/programs/fs/Eolite/trunk/include/ini.h +++ b/programs/fs/Eolite/trunk/include/ini.h @@ -78,7 +78,7 @@ void GetIni(byte onload) disc_num++; }*/ - IF (parametr) && (!strcmp(#file_name+find_symbol(#file_name,'.'),#parametr)) { + IF (parametr) && (!strcmp(#file_name+strchr(#file_name,'.'),#parametr)) { errornum=RunProgram(#option,#file_path); IF (errornum<0) //если ошибочка вышла при запуске { diff --git a/programs/fs/Eolite/trunk/include/some_code.h b/programs/fs/Eolite/trunk/include/some_code.h index 3fd51c6799..3a7d177c46 100644 --- a/programs/fs/Eolite/trunk/include/some_code.h +++ b/programs/fs/Eolite/trunk/include/some_code.h @@ -1,7 +1,7 @@ //Leency - 2012 dword onLeft(dword right,left) {EAX=Form.width-right-left;} -dword onTop(dword down,up) {EAX=Form.height-GetSkinWidth()-down-up;} +dword onTop(dword down,up) {EAX=Form.height-GetSkinHeight()-down-up;} void ShowMessage(dword message) diff --git a/programs/fs/Eolite/trunk/lib/kolibri.h b/programs/fs/Eolite/trunk/lib/kolibri.h index 64b9cbea05..a214a9a861 100644 --- a/programs/fs/Eolite/trunk/lib/kolibri.h +++ b/programs/fs/Eolite/trunk/lib/kolibri.h @@ -153,14 +153,13 @@ inline fastcall void ExitProcess(){ $int 0x40 } -inline fastcall void Pause(dword EBX){ +inline fastcall void Pause( EBX){ $mov eax, 5 $int 0x40 } //------------------------------------------------------------------------------ -void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType, -dword mainAreaColour,byte headerType,dword headerColour,EDI) +void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType, dword mainAreaColour, EDI) { EAX = 12; // function 12:tell os about windowdraw EBX = 1; @@ -169,7 +168,6 @@ dword mainAreaColour,byte headerType,dword headerColour,EDI) EBX = x << 16 + sizeX; ECX = y << 16 + sizeY; EDX = mainAreaType << 24 | mainAreaColour; - ESI = headerType << 24 | headerColour; $xor eax,eax $int 0x40 @@ -191,18 +189,19 @@ inline fastcall void DrawTitle( ECX){ $int 0x40; } -inline fastcall dword GetSkinWidth(){ - EAX = 48; - EBX = 4; +inline fastcall dword GetSkinHeight() +{ + $push ebx + $mov eax,48 + $mov ebx,4 $int 0x40 + $pop ebx } inline fastcall dword GetScreenHeight() { EAX = 14; - EBX = 4; $int 0x40 - //$shr eax, 16 $and eax,0x0000FFFF } @@ -308,7 +307,29 @@ inline fastcall int strcmp(ESI, EDI) } -inline fastcall unsigned int find_symbol(ESI,BL) +inline fastcall signed int strncmp( ESI, EDI, ECX) +{ + asm { + MOV EBX, EDI + XOR EAX, EAX + MOV EDX, ECX + OR ECX, ECX + JE L1 + REPNE SCASB + SUB EDX, ECX + MOV ECX, EDX + MOV EDI, EBX + XOR EBX, EBX + REPE CMPSB + MOV AL, DSBYTE[ ESI-1] + MOV BL, DSBYTE[ EDI-1] + SUB EAX, EBX +L1: + } +} + + +inline fastcall unsigned int strchr(ESI,BL) { int jj=0, last=-1; do{ @@ -320,7 +341,7 @@ inline fastcall unsigned int find_symbol(ESI,BL) } -inline fastcall ChangeCase( EDX) +inline fastcall TitleCase( EDX) { AL=DSBYTE[EDX]; IF(AL>='a')&&(AL<='z')DSBYTE[EDX]=AL&0x5f; @@ -416,6 +437,9 @@ void PutImage(dword EBX,w,h,x,y) //------------------------------------------------------------------------------ inline fastcall void debug( EDX) { + $push eax + $push ebx + $push ecx $mov eax, 63 $mov ebx, 1 next_char: @@ -430,24 +454,7 @@ done: $int 0x40 $mov cl, 10 $int 0x40 -} - -inline fastcall void WriteFullDebug( ESI) -{ - WriteDebug(""); - WriteDebug(ESI); - - WriteDebug("Number of files:"); - WriteDebug(IntToStr(count)); - - WriteDebug("but_num:"); - WriteDebug(IntToStr(but_num)); - - WriteDebug("curbtn"); - WriteDebug(IntToStr(curbtn)); - - WriteDebug("ra_kadrom:"); - WriteDebug(IntToStr(za_kadrom)); - - Pause(200); + $pop eax + $pop ebx + $pop ecx } \ No newline at end of file