diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 17acd13c9f..c98b83f267 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -16,7 +16,7 @@ img_files = { {"CONFIG.INC", PROGS .. "/config.inc"}, {"STRUCT.INC", PROGS .. "/struct.inc"}, {"FB2READ", "common/fb2read"}, - {"game_center", "common/game_center"}, + {"ALLGAMES", "common/allgames"}, {"ICONS32.PNG", "common/icons32.png"}, {"ICONS16.PNG", "common/icons16.png"}, {"INDEX.HTM", "common/index_htm"}, @@ -80,7 +80,7 @@ img_files = { if build_type == "rus" then tup.append_table(img_files, { {"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/rus/.shell"}, - {"SETTINGS/GAME_CENTER.INI", "rus/settings/game_center.ini"}, + {"SETTINGS/GAMES.INI", "rus/settings/GAMES.INI"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, {"PIPETKA", build_type .. "/pipetka"}, @@ -90,28 +90,28 @@ if build_type == "rus" then tup.append_table(img_files, { {"GAMES/PADENIE", build_type .. "/games/padenie"}, }) elseif build_type == "eng" then tup.append_table(img_files, { {"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, - {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"}, + {"SETTINGS/GAMES.INI", "common/settings/GAMES.INI"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, }) elseif build_type == "sp" then tup.append_table(img_files, { {"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, - {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"}, + {"SETTINGS/GAMES.INI", "common/settings/GAMES.INI"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, }) elseif build_type == "it" then tup.append_table(img_files, { {"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, - {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"}, + {"SETTINGS/GAMES.INI", "common/settings/GAMES.INI"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, }) else tup.append_table(img_files, { {"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, - {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"}, + {"SETTINGS/GAMES.INI", "common/settings/GAMES.INI"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index 21c7ae8903..03efd5e3b6 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** Principal **** -Centre de jocs /sys/game_center +Centre de jocs /sys/allgames Demos > /@1 Gràfics > /@3 Multimèdia > /@4 diff --git a/data/common/allgames b/data/common/allgames new file mode 100644 index 0000000000..9e4c398fc2 Binary files /dev/null and b/data/common/allgames differ diff --git a/data/common/game_center b/data/common/game_center deleted file mode 100644 index 7cc223e147..0000000000 Binary files a/data/common/game_center and /dev/null differ diff --git a/data/common/icons32.png b/data/common/icons32.png index e042911c6e..b3c7a19afa 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/common/settings/game_center.ini b/data/common/settings/games.ini similarity index 100% rename from data/common/settings/game_center.ini rename to data/common/settings/games.ini diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 8c50cdb6a4..f44a3cf933 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** MAIN **** -Game Center /sys/game_center +Game Center /sys/allgames Demos > /@1 Graphics > /@3 Multimedia > /@4 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 634cc4d1fa..537f092b83 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** MAIN **** -Game center /sys/game_center +Game center /sys/allgames Demod > /@1 Graafika > /@3 Multimeedia > /@4 diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index e6e19f853b..8333616902 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** MAIN **** -Centro gioco /sys/game_center +Centro gioco /sys/allgames Demo > /@1 Grafica > /@3 Multimedia > /@4 diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/games.ini similarity index 100% rename from data/rus/settings/game_center.ini rename to data/rus/settings/games.ini diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 4284e4f0b4..477cff7efe 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** ƒ« ¢­®¥ ¬¥­î **** -ˆ£à®¢®© 業âà /sys/game_center +ˆ£à®¢®© 業âà /sys/allgames „¥¬ª¨ > /@1 ƒà ä¨ª  > /@3 Œã«ì⨬¥¤¨  > /@4 diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 40eaae2e50..c415143b63 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -1,5 +1,5 @@ #0 **** MAIN **** -Centro de juegos /sys/game_center +Centro de juegos /sys/allgames Demos > /@1 Gr ficos > /@3 Multimedia > /@4 diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index c4cf7e2019..aa44e5568f 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -79,9 +79,10 @@ int action_buf; dword TOOLBAR_H = 40; dword STATUSBAR_H = 15; -dword col_bg; -dword panel_color; -dword border_color; + +dword col_bg = 0xE3E2E2; +dword panel_color = 0xE3E2E2; +dword border_color = 0x8C8C8C; bool debug_mode = false; bool old_tag_parser_mode = false; @@ -124,7 +125,7 @@ void main() load_dll(libHTTP, #http_lib_init,1); load_dll(iconv_lib, #iconv_open,0); Libimg_LoadImage(#skin, abspath("wv_skin.png")); - SetSkinColors(); + wv_progress_bar.progress_color = 0x72B7EB; CreateDir("/tmp0/1/downloads"); if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME); WB1.list.SetFont(8, 14, 10011000b); @@ -255,7 +256,7 @@ void Draw_Window() img_draw stdcall(skin.image, address_box.left-53, address_box.top-3, 51, skin.h, 3, 0); DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0); DefineButton(Form.cwidth-27, address_box.top-3, 23, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0); - img_draw stdcall(skin.image, Form.cwidth-24, address_box.top-3, 17, skin.h, 87, 0); + img_draw stdcall(skin.image, Form.cwidth-24, address_box.top-3, 17, skin.h, 105, 0); DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg); DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color); if (!header) @@ -479,20 +480,6 @@ byte UrlExtIs(dword ext) return false; } -int SetSkinColors() -{ - dword image_data; - image_data = DSDWORD[skin.image+24]; - col_bg = DSDWORD[image_data]; - panel_color = DSDWORD[skin.w*4*4 + image_data]; - border_color = DSDWORD[skin.w*4*7 + image_data]; - wv_progress_bar.progress_color = DSDWORD[skin.w*4*10 + image_data]; - $and col_bg, 0x00ffffff - $and panel_color, 0x00ffffff - $and border_color, 0x00ffffff - $and wv_progress_bar.progress_color, 0x00ffffff -} - void DrawProgress() { dword persent; diff --git a/programs/cmm/browser/wv_skin.png b/programs/cmm/browser/wv_skin.png index ec43b12869..cf6f91601e 100644 Binary files a/programs/cmm/browser/wv_skin.png and b/programs/cmm/browser/wv_skin.png differ diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index 407da09c44..561963d23e 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -337,5 +337,5 @@ void PropertiesDrawIcon(dword file_path, extension) { #define ICON_PADDING 11 DrawBar(20-ICON_PADDING, 30-ICON_PADDING-1, ICON_PADDING*2+16, ICON_PADDING*2+16, 0xFFFfff); - DrawIconByExtension(file_path, extension, 20, 30, system.color.work_light); + DrawIconByExtension(file_path, extension, -icon_size/2+28, -icon_size/2+38, 0xFFFfff); } diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 75bacac23c..ef72de24ea 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.96b" -#define ABOUT_TITLE "EOLITE 3.96b" +#define TITLE "Eolite File Manager v3.96c" +#define ABOUT_TITLE "EOLITE 3.96c" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/system/board/trunk/board.asm b/programs/system/board/trunk/board.asm index aa6296bfba..bef499306c 100644 --- a/programs/system/board/trunk/board.asm +++ b/programs/system/board/trunk/board.asm @@ -184,7 +184,13 @@ key: mcall 2 cmp ah, ' ' je button.noclose + cmp ah, 51 ; F2 + je open_boardlog jmp still +open_boardlog: + mcall 70, open_log_in_tinypad + jmp red + ;------------------------------------------------------------------------------ button: mcall 17 ; get id @@ -443,6 +449,14 @@ InfoStructure: db ? dd ? ; pointer to the filename +open_log_in_tinypad: + dd 7 + dd 0 + dd filename + dd 0 + dd 0 + db '/sys/tinypad',0 + buffer_length rb 3 process_count dd ? krnl_cnt dd ?