Remove from SVN and from IMG:

- lib/array.obj 
- lib/library.obj
SoftwareWidget (SysPanel, GameCenter): 
- use relative paths for /sys/ 
- use short additional app directory path /k/ for /kolibrios/
- update syspanel.ini and game_center.ini
Icons32.png:
- a lot of new game icons
- all monitor screens changed from 3:4 to wide ones (16:9)
- several fixes, like KFM floppy icon is now looks like a real floppy
This is a big change so there is a probability to broke a compatability with custom distro builds. Please be pationate in this case.

git-svn-id: svn://kolibrios.org@7424 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-10-01 19:41:32 +00:00
parent fc5e7644b9
commit 34d38f1a42
16 changed files with 143 additions and 133 deletions

View File

@ -41,8 +41,6 @@ img_files = {
{"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"}, {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"},
{"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"}, {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
{"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"}, {"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"},
{"LIB/ARRAY.OBJ", "common/lib/array.obj"},
{"LIB/LIBRARY.OBJ", "common/lib/library.obj"},
{"LIB/ICONV.OBJ", "common/lib/iconv.obj"}, {"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
{"LIB/KMENU.OBJ", "common/lib/kmenu.obj"}, {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"},
{"LIB/NETCODE.OBJ", "common/lib/netcode.obj"}, {"LIB/NETCODE.OBJ", "common/lib/netcode.obj"},

View File

@ -167,8 +167,8 @@ pas=27
fb2=29 fb2=29
[icons32] [icons32]
<dir>=94 <dir>=45
<up>=94 <up>=45
<lot>=60 <lot>=60
txt=9 txt=9
png=70 png=70

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Binary file not shown.

View File

@ -68,7 +68,7 @@ icon=10
[KPack] [KPack]
exec=/sys/kpack exec=/sys/kpack
icon=10 icon=99
[View3DS] [View3DS]
exec=/sys/3d/view3ds exec=/sys/3d/view3ds

View File

@ -4,61 +4,60 @@ window_title=KolibriOS Game Center
default_icon=35 default_icon=35
[Casual] [Casual]
2048=/kolibrios/games/2048/2048,53 2048=/k/games/2048/2048,53
Fara=/kolibrios/games/fara/fara,42 Fara=/k/games/fara/fara,42
MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3
Tetris=/sys/games/tetris,47 Tetris=games/tetris,47
Pipes=/sys/games/pipes,26 Pipes=games/pipes,26
Snake=/sys/games/snake,32 Snake=games/snake,32
Xonix=/sys/games/xonix,21 Xonix=games/xonix,21
RedSquare=/sys/games/rsquare RedSquare=games/rsquare,115
Freecell=/sys/games/freecell,68 Freecell=games/freecell,68
Pong=/sys/games/pong,101 Pong=games/pong,101
Pong3=/sys/games/pong3,12 Pong3=games/pong3,12
Arcanii=/kolibrios/games/arcanii,12 Arcanii=/k/games/arcanii,12
[Arcade] [Arcade]
LaserTank=/kolibrios/games/lasertank/lasertank,72 LaserTank=/k/games/lasertank/lasertank,72
Heliothryx=/kolibrios/games/heliothryx/heliothryx Heliothryx=/k/games/heliothryx/heliothryx,112
Dungeons=/kolibrios/games/dungeons/dungeons Dungeons=/k/games/dungeons/dungeons,94
JumpBump=/kolibrios/games/jumpbump/jumpbump.kex,102 JumpBump=/k/games/jumpbump/jumpbump.kex,102
Nsider=/kolibrios/games/Nsider/Nsider Nsider=/k/games/Nsider/Nsider,109
TheBus=/kolibrios/games/the_bus/the_bus,86 TheBus=/k/games/the_bus/the_bus,86
Mun=/kolibrios/games/mun/mun Mun=/k/games/mun/mun
Kosilka=/sys/games/kosilka,23 Kosilka=games/kosilka,23
Bomber=/kolibrios/games/bomber/bomber,97 Bomber=/k/games/bomber/bomber,97
Invaders=/kolibrios/games/invaders Invaders=/k/games/invaders,111
Tanks=/sys/games/tanks,67 Sea War=games/SW,66
RocketForces=/sys/games/rforces Almaz=/k/games/almaz,81
; Pig=/kolibrios/games/pig/pig ;doesn't work from CD Tanks=games/tanks,67
; Ataka=/sys/games/ataka ;rus only RocketForces=games/rforces,110
Sea War=/sys/games/SW,66 ; Pig=/k/games/pig/pig ;doesn't work from CD
Donkey=/kolibrios/games/donkey ; Ataka=games/ataka ;rus only
Almaz=/kolibrios/games/almaz,81 Donkey=/k/games/donkey
Loderunner=/kolibrios/games/LRL/LRL,41 Loderunner=/k/games/LRL/LRL,41
; 21days=/kolibrios/games/21days/21days,104 ;rus only ; 21days=/k/games/21days/21days,104 ;rus only
BabyPainter=/kolibrios/games/BabyPainter,87 BabyPainter=/k/games/BabyPainter,87
Klavisha=/sys/games/klavisha,69 Klavisha=games/klavisha,69
Millioneer=/kolibrios/games/WHOWTBAM/whowtbam Millioneer=/k/games/WHOWTBAM/whowtbam,114
[3D Shooter] [3D Shooter]
Quake=/kolibrios/games/quake/sdlquake,56 Quake=/k/games/quake/sdlquake,56
DOOM1=/kolibrios/games/doom1/doom,43 DOOM1=/k/games/doom1/doom,43
; DOOM2=/kolibrios/games/doom2/doom,43
[Logical] [Logical]
Clicks=/sys/games/clicks,18 Clicks=games/clicks,18
Checkers=/sys/games/checkers,20 Checkers=games/checkers,20
Sudoku=/sys/games/sudoku,25 Sudoku=games/sudoku,25
Mine=/sys/games/mine,14 Mine=games/mine,14
Flood-It=/sys/games/flood-it,59 Flood-It=games/flood-it,59
Knight=/kolibrios/games/knight,82 Knight=/k/games/knight,82
15=/sys/games/15,34 15=games/15,34
Gomoku=/sys/games/gomoku,24 Gomoku=games/gomoku,24
Reversi=/sys/games/reversi,103 Reversi=games/reversi,103
C4=/sys/games/c4,100 C4=games/c4,100
Lights=/sys/games/lights,99 Lights=games/lights,106
Square=/sys/games/msquare,25 Square=games/msquare,25
Memory=/sys/games/mblocks Memory=games/mblocks
Lines=/sys/games/lines,59 Lines=games/lines,116

View File

@ -6,32 +6,32 @@ window_title=KolibriOS System Panel
[Configuration] [Configuration]
RamDisks=tmpdisk,36 RamDisks=tmpdisk,36
VideoMode=vmode,98 VideoMode=vmode,108
NetConfig=/sys/network/netcfg,33 NetConfig=network/netcfg,33
SysSetup=setup,5 SysSetup=setup,5
Date&Time=calendar,52 Date&Time=calendar,52
Appearance=/kolibrios/utils/appearance,62 Appearance=/k/utils/appearance,62
Background=/sys/media/palitra,61 Background=media/palitra,61
SkinConfig=skincfg,80 SkinConfig=skincfg,80
Volume=@VOLUME,64 Volume=@VOLUME,64
Panels=panels_cfg,63 Panels=panels_cfg,63
Mouse=mousecfg,54 Mouse=mousecfg,54
DriverInstall=/kolibrios/drivers/DRVINST.KEX,71 DriverInstall=/k/drivers/DRVINST.KEX,71
Autorun=/sys/tinypad|/sys/settings/autorun.dat,55 Autorun=tinypad|/sys/settings/autorun.dat,55
HotAngles=/sys/HACONFIG,105 HotAngles=HACONFIG,105
[Monitoring] [Monitoring]
Debug Board=/sys/develop/board,19 Debug Board=develop/board,19
NetStat=/sys/network/netstat,33 NetStat=network/netstat,33
GhostMonitor=gmon,57 GhostMonitor=gmon,107
SysMonitor=sysmon,57 SysMonitor=sysmon,57
Processes=cpu,60 Processes=cpu,60
Clipboard=/sys/develop/clipview,83 Clipboard=develop/clipview,83
[Testing] [Testing]
Protection=test,37 Protection=test,37
CpuID=cpuid,37 CpuID=cpuid,37
Display=disptest,7 Display=disptest,113
File Speed=fspeed,45 File Speed=fspeed,45
HDDinfo=hdd_info,50 HDDinfo=hdd_info,50
BusOff=kbd,37 BusOff=kbd,37

View File

@ -64,7 +64,7 @@ y=68
name=KPACK name=KPACK
path=KPACK path=KPACK
param= param=
ico=10 ico=99
x=-67 x=-67
y=0 y=0
[09] [09]

View File

@ -63,7 +63,7 @@ y=68
name=KPACK name=KPACK
path=KPACK path=KPACK
param= param=
ico=10 ico=99
x=-67 x=-67
y=0 y=0
[09] [09]

View File

@ -64,7 +64,7 @@ y=68
name=KPACK name=KPACK
path=KPACK path=KPACK
param= param=
ico=10 ico=99
x=-67 x=-67
y=0 y=0
[09] [09]

View File

@ -4,61 +4,60 @@ window_title=KolibriOS Game Center
default_icon=35 default_icon=35
[Casual] [Casual]
2048=/kolibrios/games/2048/2048,53 2048=/k/games/2048/2048,53
Fara=/kolibrios/games/fara/fara,42 Fara=/k/games/fara/fara,42
MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3
Tetris=/sys/games/tetris,47 Tetris=games/tetris,47
Pipes=/sys/games/pipes,26 Pipes=games/pipes,26
Snake=/sys/games/snake,32 Snake=games/snake,32
Xonix=/sys/games/xonix,21 Xonix=games/xonix,21
RedSquare=/sys/games/rsquare RedSquare=games/rsquare,115
Freecell=/sys/games/freecell,68 Freecell=games/freecell,68
Pong=/sys/games/pong,101 Pong=games/pong,101
Pong3=/sys/games/pong3,12 Pong3=games/pong3,12
Arcanii=/kolibrios/games/arcanii,12 Arcanii=/k/games/arcanii,12
[Arcade] [Arcade]
LaserTank=/kolibrios/games/lasertank/lasertank,72 LaserTank=/k/games/lasertank/lasertank,72
Heliothryx=/kolibrios/games/heliothryx/heliothryx Heliothryx=/k/games/heliothryx/heliothryx,112
Dungeons=/kolibrios/games/dungeons/dungeons Dungeons=/k/games/dungeons/dungeons,94
JumpBump=/kolibrios/games/jumpbump/jumpbump.kex,102 JumpBump=/k/games/jumpbump/jumpbump.kex,102
Nsider=/kolibrios/games/Nsider/Nsider Nsider=/k/games/Nsider/Nsider,109
TheBus=/kolibrios/games/the_bus/the_bus,86 TheBus=/k/games/the_bus/the_bus,86
Mun=/kolibrios/games/mun/mun Mun=/k/games/mun/mun
Kosilka=/sys/games/kosilka,23 Kosilka=games/kosilka,23
Bomber=/kolibrios/games/bomber/bomber,97 Bomber=/k/games/bomber/bomber,97
Invaders=/kolibrios/games/invaders Invaders=/k/games/invaders,111
Tanks=/sys/games/tanks,67 Sea War=games/SW,66
RocketForces=/sys/games/rforces Almaz=/k/games/almaz,81
; Pig=/kolibrios/games/pig/pig ;doesn't work from CD Tanks=games/tanks,67
Ataka=/sys/games/ataka RocketForces=games/rforces,110
Sea War=/sys/games/SW,66 ; Pig=/k/games/pig/pig ;doesn't work from CD
Donkey=/kolibrios/games/donkey Ataka=games/ataka
Almaz=/kolibrios/games/almaz,81 Donkey=/k/games/donkey
Loderunner=/kolibrios/games/LRL/LRL,41 Loderunner=/k/games/LRL/LRL,41
21days=/kolibrios/games/21days/21days,104 21days=/k/games/21days/21days,104 ;rus only
BabyPainter=/kolibrios/games/BabyPainter,87 BabyPainter=/k/games/BabyPainter,87
Klavisha=/sys/games/klavisha,69 Klavisha=games/klavisha,69
Millioneer=/kolibrios/games/WHOWTBAM/whowtbam Millioneer=/k/games/WHOWTBAM/whowtbam,114
[3D Shooter] [3D Shooter]
Quake=/kolibrios/games/quake/sdlquake,56 Quake=/k/games/quake/sdlquake,56
DOOM1=/kolibrios/games/doom1/doom,43 DOOM1=/k/games/doom1/doom,43
; DOOM2=/kolibrios/games/doom2/doom,43
[Logical] [Logical]
Clicks=/sys/games/clicks,18 Clicks=games/clicks,18
Checkers=/sys/games/checkers,20 Checkers=games/checkers,20
Sudoku=/sys/games/sudoku,25 Sudoku=games/sudoku,25
Mine=/sys/games/mine,14 Mine=games/mine,14
Flood-It=/sys/games/flood-it,59 Flood-It=games/flood-it,59
Knight=/kolibrios/games/knight,82 Knight=/k/games/knight,82
15=/sys/games/15,34 15=games/15,34
Gomoku=/sys/games/gomoku,24 Gomoku=games/gomoku,24
Reversi=/sys/games/reversi,103 Reversi=games/reversi,103
C4=/sys/games/c4,100 C4=games/c4,100
Lights=/sys/games/lights,99 Lights=games/lights,106
Square=/sys/games/msquare,25 Square=games/msquare,25
Memory=/sys/games/mblocks Memory=games/mblocks
Lines=/sys/games/lines,59 Lines=games/lines,116

View File

@ -64,7 +64,7 @@ y=68
name=KPACK name=KPACK
path=KPACK path=KPACK
param= param=
ico=10 ico=99
x=-67 x=-67
y=0 y=0
[09] [09]

View File

@ -64,7 +64,7 @@ y=68
name=KPACK name=KPACK
path=KPACK path=KPACK
param= param=
ico=10 ico=99
x=-67 x=-67
y=0 y=0
[09] [09]

View File

@ -1,7 +1,5 @@
@C-- software_widget.c @C-- software_widget.c
@del game_center @del syspanel
@copy software_widget.com game_center @ren software_widget.com syspanel
@copy software_widget.com syspanel
@del software_widget.com
@pause @pause
@del warning.txt @del warning.txt

View File

@ -1,5 +1,5 @@
/* /*
SOFTWARE CENTER v2.8 SOFTWARE CENTER v2.81
*/ */
#define MEMSIZE 4096 * 15 #define MEMSIZE 4096 * 15
@ -118,7 +118,8 @@ byte draw_icons_from_section(dword key_value, key_name, sec_name, f_name)
icon_char_pos; icon_char_pos;
//do not show items located in /kolibrios/ if this directory not mounted //do not show items located in /kolibrios/ if this directory not mounted
if (!strncmp(key_value, "/kolibrios/", 11)) && (!kolibrios_mounted) return true; if (!strncmp(key_value, "/kolibrios/", 11)) || (!strncmp(key_value, "/k/", 3))
if (!kolibrios_mounted) return true;
if (col==list.column_max) { if (col==list.column_max) {
row++; row++;
@ -178,17 +179,32 @@ void draw_top_bar()
void EventRunApp(dword appid) void EventRunApp(dword appid)
{ {
char run_app_path[4096]=0;
dword app_path = app_path_collection.get(appid); dword app_path = app_path_collection.get(appid);
dword param_pos = strchr(app_path, '|'); dword param_pos = strchr(app_path, '|');
if (param_pos) { if (param_pos) {
ESBYTE[param_pos] = NULL; ESBYTE[param_pos] = NULL;
param_pos++; param_pos++;
} }
if (file_exists(app_path)) // the next block is created to save some space in ramdisk{
//
// convert relative path to absolute "calc" => "/sys/calc"
// convert short kolibrios path to full "/k/calc" => "/kolibrios/calc"
// other copy => as is
if (ESBYTE[app_path]!='/') {
strcpy(#run_app_path, "/sys/");
}
else if (!strncmp(app_path, "/k/",3)) {
strcpy(#run_app_path, "/kolibrios/");
app_path+=3;
}
strcat(#run_app_path, app_path);
// }end
if (file_exists(#run_app_path))
{ {
io.run(app_path, param_pos); //0 or offset io.run(#run_app_path, param_pos); //0 or offset
if (param_pos) ESBYTE[param_pos - 1] = '|'; if (param_pos) ESBYTE[param_pos - 1] = '|';
} }
else else