KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Allgames: renamed "game_center" and its ini file to save space on ramdisk

Browse Source 
Eolite: fixed big icon position in properties dialog
Board: press F2 to open boardlog.ini in Tinypad
Wv_skin.png: much better packed 2 secors instead of 5
Icons32.png: improved Almaz icons


git-svn-id: svn://kolibrios.org@7425 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-10-02 14:01:29 +00:00
parent 34d38f1a42
commit b1df9e7cd1
17 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/Tupfile.lua
View File

@ -16,7 +16,7 @@ img_files = {
{"CONFIG.INC", PROGS .. "/config.inc"}, {"CONFIG.INC", PROGS .. "/config.inc"},
{"STRUCT.INC", PROGS .. "/struct.inc"}, {"STRUCT.INC", PROGS .. "/struct.inc"},
{"FB2READ", "common/fb2read"}, {"FB2READ", "common/fb2read"},
{"game_center", "common/game_center"}, {"ALLGAMES", "common/allgames"},
{"ICONS32.PNG", "common/icons32.png"}, {"ICONS32.PNG", "common/icons32.png"},
{"ICONS16.PNG", "common/icons16.png"}, {"ICONS16.PNG", "common/icons16.png"},
{"INDEX.HTM", "common/index_htm"}, {"INDEX.HTM", "common/index_htm"},
@ -80,7 +80,7 @@ img_files = {
if build_type == "rus" then tup.append_table(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"}, {"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/.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"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
{"PIPETKA", build_type .. "/pipetka"}, {"PIPETKA", build_type .. "/pipetka"},
@ -90,28 +90,28 @@ if build_type == "rus" then tup.append_table(img_files, {
{"GAMES/PADENIE", build_type .. "/games/padenie"}, {"GAMES/PADENIE", build_type .. "/games/padenie"},
}) elseif build_type == "eng" then tup.append_table(img_files, { }) elseif build_type == "eng" then tup.append_table(img_files, {
{"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, {"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"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
{"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
{"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
}) elseif build_type == "sp" then tup.append_table(img_files, { }) elseif build_type == "sp" then tup.append_table(img_files, {
{"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, {"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"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
{"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
{"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
}) elseif build_type == "it" then tup.append_table(img_files, { }) elseif build_type == "it" then tup.append_table(img_files, {
{"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, {"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"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
{"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
{"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
}) else tup.append_table(img_files, { }) else tup.append_table(img_files, {
{"File Managers/KFM_KEYS.TXT", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, {"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"}, {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
{"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},

2
data/ca/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** Principal **** #0 **** Principal ****
Centre de jocs /sys/game_center Centre de jocs /sys/allgames
Demos > /@1 Demos > /@1
Gràfics > /@3 Gràfics > /@3
Multimèdia > /@4 Multimèdia > /@4

BIN
data/common/allgames Normal file
View File

Binary file not shown.

BIN
data/common/game_center
View File

Binary file not shown.

BIN
data/common/icons32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

0
data/common/settings/game_center.ini → data/common/settings/games.ini
View File

2
data/eng/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** MAIN **** #0 **** MAIN ****
Game Center /sys/game_center Game Center /sys/allgames
Demos > /@1 Demos > /@1
Graphics > /@3 Graphics > /@3
Multimedia > /@4 Multimedia > /@4

2
data/et/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** MAIN **** #0 **** MAIN ****
Game center /sys/game_center Game center /sys/allgames
Demod > /@1 Demod > /@1
Graafika > /@3 Graafika > /@3
Multimeedia > /@4 Multimeedia > /@4

2
data/it/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** MAIN **** #0 **** MAIN ****
Centro gioco /sys/game_center Centro gioco /sys/allgames
Demo > /@1 Demo > /@1
Grafica > /@3 Grafica > /@3
Multimedia > /@4 Multimedia > /@4

0
data/rus/settings/game_center.ini → data/rus/settings/games.ini
View File

2
data/rus/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** ƒ« ¢­®¥ ¬¥­מ **** #0 **** ƒ« ¢­®¥ ¬¥­מ ****
ˆ£à®¢®© 業âà /sys/game_center ˆ£à®¢®© 業âà /sys/allgames
„¥¬×¨ > /@1 „¥¬×¨ > /@1
ƒא ה¨×  > /@3 ƒא ה¨×  > /@3
<EFBFBD>ד«לג¨¬¥₪¨  > /@4 <EFBFBD>ד«לג¨¬¥₪¨  > /@4

2
data/sp/settings/menu.dat
View File

@ -1,5 +1,5 @@
#0 **** MAIN **** #0 **** MAIN ****
Centro de juegos /sys/game_center Centro de juegos /sys/allgames
Demos > /@1 Demos > /@1
Gr ficos > /@3 Gr ficos > /@3
Multimedia > /@4 Multimedia > /@4

25
programs/cmm/browser/WebView.c
View File

@ -79,9 +79,10 @@ int action_buf;
dword TOOLBAR_H = 40; dword TOOLBAR_H = 40;
dword STATUSBAR_H = 15; dword STATUSBAR_H = 15;
dword col_bg;
dword panel_color; dword col_bg = 0xE3E2E2;
dword border_color; dword panel_color = 0xE3E2E2;
dword border_color = 0x8C8C8C;
bool debug_mode = false; bool debug_mode = false;
bool old_tag_parser_mode = false; bool old_tag_parser_mode = false;
@ -124,7 +125,7 @@ void main()
load_dll(libHTTP, #http_lib_init,1); load_dll(libHTTP, #http_lib_init,1);
load_dll(iconv_lib, #iconv_open,0); load_dll(iconv_lib, #iconv_open,0);
Libimg_LoadImage(#skin, abspath("wv_skin.png")); Libimg_LoadImage(#skin, abspath("wv_skin.png"));
SetSkinColors(); wv_progress_bar.progress_color = 0x72B7EB;
CreateDir("/tmp0/1/downloads"); CreateDir("/tmp0/1/downloads");
if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME); if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME);
WB1.list.SetFont(8, 14, 10011000b); 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); 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(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); 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,STATUSBAR_H, col_bg);
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color); DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
if (!header) if (!header)
@ -479,20 +480,6 @@ byte UrlExtIs(dword ext)
return false; 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() void DrawProgress()
{ {
dword persent; dword persent;

BIN
programs/cmm/browser/wv_skin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 574 B

2
programs/cmm/eolite/include/properties.h
View File

@ -337,5 +337,5 @@ void PropertiesDrawIcon(dword file_path, extension)
{ {
#define ICON_PADDING 11 #define ICON_PADDING 11
DrawBar(20-ICON_PADDING, 30-ICON_PADDING-1, ICON_PADDING*2+16, ICON_PADDING*2+16, 0xFFFfff); 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);
} }

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.96b" #define TITLE "Eolite File Manager v3.96c"
#define ABOUT_TITLE "EOLITE 3.96b" #define ABOUT_TITLE "EOLITE 3.96c"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

14
programs/system/board/trunk/board.asm
View File

@ -184,7 +184,13 @@ key:
mcall 2 mcall 2
cmp ah, ' ' cmp ah, ' '
je button.noclose je button.noclose
cmp ah, 51 ; F2
je open_boardlog
jmp still jmp still
open_boardlog:
mcall 70, open_log_in_tinypad
jmp red
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
button: button:
mcall 17 ; get id mcall 17 ; get id
@ -443,6 +449,14 @@ InfoStructure:
db ? db ?
dd ? ; pointer to the filename 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 buffer_length rb 3
process_count dd ? process_count dd ?
krnl_cnt dd ? krnl_cnt dd ?