Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7424 → Rev 7425

/data/Tupfile.lua
16,7 → 16,7
{"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
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,7 → 90,7
{"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"},
97,7 → 97,7
{"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"},
104,7 → 104,7
{"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"},
111,7 → 111,7
{"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"},
/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
/data/common/game_center
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/data/common/allgames
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/data/common/icons32.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/data/common/settings/game_center.ini
File deleted
/data/common/settings/games.ini
0,0 → 1,63
[Config]
window_width=750
window_title=KolibriOS Game Center
default_icon=35
 
[Casual]
2048=/k/games/2048/2048,53
Fara=/k/games/fara/fara,42
MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3
Tetris=games/tetris,47
Pipes=games/pipes,26
Snake=games/snake,32
Xonix=games/xonix,21
RedSquare=games/rsquare,115
Freecell=games/freecell,68
Pong=games/pong,101
Pong3=games/pong3,12
Arcanii=/k/games/arcanii,12
 
[Arcade]
LaserTank=/k/games/lasertank/lasertank,72
Heliothryx=/k/games/heliothryx/heliothryx,112
Dungeons=/k/games/dungeons/dungeons,94
JumpBump=/k/games/jumpbump/jumpbump.kex,102
Nsider=/k/games/Nsider/Nsider,109
TheBus=/k/games/the_bus/the_bus,86
Mun=/k/games/mun/mun
Kosilka=games/kosilka,23
Bomber=/k/games/bomber/bomber,97
Invaders=/k/games/invaders,111
Sea War=games/SW,66
Almaz=/k/games/almaz,81
Tanks=games/tanks,67
RocketForces=games/rforces,110
; Pig=/k/games/pig/pig ;doesn't work from CD
; Ataka=games/ataka ;rus only
Donkey=/k/games/donkey
Loderunner=/k/games/LRL/LRL,41
; 21days=/k/games/21days/21days,104 ;rus only
BabyPainter=/k/games/BabyPainter,87
Klavisha=games/klavisha,69
Millioneer=/k/games/WHOWTBAM/whowtbam,114
 
[3D Shooter]
Quake=/k/games/quake/sdlquake,56
DOOM1=/k/games/doom1/doom,43
 
[Logical]
Clicks=games/clicks,18
Checkers=games/checkers,20
Sudoku=games/sudoku,25
Mine=games/mine,14
Flood-It=games/flood-it,59
Knight=/k/games/knight,82
15=games/15,34
Gomoku=games/gomoku,24
Reversi=games/reversi,103
C4=games/c4,100
Lights=games/lights,106
Square=games/msquare,25
Memory=games/mblocks
Lines=games/lines,116
 
/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
/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
/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
/data/rus/settings/game_center.ini
File deleted
/data/rus/settings/games.ini
0,0 → 1,63
[Config]
window_width=750
window_title=KolibriOS Game Center
default_icon=35
 
[Casual]
2048=/k/games/2048/2048,53
Fara=/k/games/fara/fara,42
MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3
Tetris=games/tetris,47
Pipes=games/pipes,26
Snake=games/snake,32
Xonix=games/xonix,21
RedSquare=games/rsquare,115
Freecell=games/freecell,68
Pong=games/pong,101
Pong3=games/pong3,12
Arcanii=/k/games/arcanii,12
 
[Arcade]
LaserTank=/k/games/lasertank/lasertank,72
Heliothryx=/k/games/heliothryx/heliothryx,112
Dungeons=/k/games/dungeons/dungeons,94
JumpBump=/k/games/jumpbump/jumpbump.kex,102
Nsider=/k/games/Nsider/Nsider,109
TheBus=/k/games/the_bus/the_bus,86
Mun=/k/games/mun/mun
Kosilka=games/kosilka,23
Bomber=/k/games/bomber/bomber,97
Invaders=/k/games/invaders,111
Sea War=games/SW,66
Almaz=/k/games/almaz,81
Tanks=games/tanks,67
RocketForces=games/rforces,110
; Pig=/k/games/pig/pig ;doesn't work from CD
Ataka=games/ataka
Donkey=/k/games/donkey
Loderunner=/k/games/LRL/LRL,41
21days=/k/games/21days/21days,104 ;rus only
BabyPainter=/k/games/BabyPainter,87
Klavisha=games/klavisha,69
Millioneer=/k/games/WHOWTBAM/whowtbam,114
 
[3D Shooter]
Quake=/k/games/quake/sdlquake,56
DOOM1=/k/games/doom1/doom,43
 
[Logical]
Clicks=games/clicks,18
Checkers=games/checkers,20
Sudoku=games/sudoku,25
Mine=games/mine,14
Flood-It=games/flood-it,59
Knight=/k/games/knight,82
15=games/15,34
Gomoku=games/gomoku,24
Reversi=games/reversi,103
C4=games/c4,100
Lights=games/lights,106
Square=games/msquare,25
Memory=games/mblocks
Lines=games/lines,116
 
/data/rus/settings/menu.dat
1,5 → 1,5
#0 **** ƒ« ¢­®¥ ¬¥­î ****
ˆ£à®¢®© 業âà /sys/game_center
ˆ£à®¢®© 業âà /sys/allgames
„¥¬ª¨ > /@1
ƒà ä¨ª  > /@3
Œã«ì⨬¥¤¨  > /@4
/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
/programs/cmm/browser/WebView.c
79,10 → 79,11
 
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
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
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
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;
/programs/cmm/browser/wv_skin.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/programs/cmm/eolite/include/properties.h
337,5 → 337,5
{
#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);
}
/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 "” ©«"
/programs/system/board/trunk/board.asm
184,7 → 184,13
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
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 ?