diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 371ca66955..17acd13c9f 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -41,8 +41,6 @@ img_files = { {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"}, {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"}, {"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/KMENU.OBJ", "common/lib/kmenu.obj"}, {"LIB/NETCODE.OBJ", "common/lib/netcode.obj"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 140e03691a..fd2a31f395 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -167,8 +167,8 @@ pas=27 fb2=29 [icons32] -=94 -=94 +=45 +=45 =60 txt=9 png=70 diff --git a/data/common/icons32.png b/data/common/icons32.png index d702351740..e042911c6e 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/common/lib/array.obj b/data/common/lib/array.obj deleted file mode 100644 index d6498c1cdc..0000000000 Binary files a/data/common/lib/array.obj and /dev/null differ diff --git a/data/common/lib/library.obj b/data/common/lib/library.obj deleted file mode 100644 index 339fa15afd..0000000000 Binary files a/data/common/lib/library.obj and /dev/null differ diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index b1faaccb15..2ff05d6d8f 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -68,7 +68,7 @@ icon=10 [KPack] exec=/sys/kpack -icon=10 +icon=99 [View3DS] exec=/sys/3d/view3ds diff --git a/data/common/settings/game_center.ini b/data/common/settings/game_center.ini index 01eda1d0a0..e59714634a 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -4,61 +4,60 @@ window_title=KolibriOS Game Center default_icon=35 [Casual] -2048=/kolibrios/games/2048/2048,53 -Fara=/kolibrios/games/fara/fara,42 -MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 -Tetris=/sys/games/tetris,47 -Pipes=/sys/games/pipes,26 -Snake=/sys/games/snake,32 -Xonix=/sys/games/xonix,21 -RedSquare=/sys/games/rsquare -Freecell=/sys/games/freecell,68 -Pong=/sys/games/pong,101 -Pong3=/sys/games/pong3,12 -Arcanii=/kolibrios/games/arcanii,12 +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=/kolibrios/games/lasertank/lasertank,72 -Heliothryx=/kolibrios/games/heliothryx/heliothryx -Dungeons=/kolibrios/games/dungeons/dungeons -JumpBump=/kolibrios/games/jumpbump/jumpbump.kex,102 -Nsider=/kolibrios/games/Nsider/Nsider -TheBus=/kolibrios/games/the_bus/the_bus,86 -Mun=/kolibrios/games/mun/mun -Kosilka=/sys/games/kosilka,23 -Bomber=/kolibrios/games/bomber/bomber,97 -Invaders=/kolibrios/games/invaders -Tanks=/sys/games/tanks,67 -RocketForces=/sys/games/rforces -; Pig=/kolibrios/games/pig/pig ;doesn't work from CD -; Ataka=/sys/games/ataka ;rus only -Sea War=/sys/games/SW,66 -Donkey=/kolibrios/games/donkey -Almaz=/kolibrios/games/almaz,81 -Loderunner=/kolibrios/games/LRL/LRL,41 -; 21days=/kolibrios/games/21days/21days,104 ;rus only -BabyPainter=/kolibrios/games/BabyPainter,87 -Klavisha=/sys/games/klavisha,69 -Millioneer=/kolibrios/games/WHOWTBAM/whowtbam +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=/kolibrios/games/quake/sdlquake,56 -DOOM1=/kolibrios/games/doom1/doom,43 -; DOOM2=/kolibrios/games/doom2/doom,43 +Quake=/k/games/quake/sdlquake,56 +DOOM1=/k/games/doom1/doom,43 [Logical] -Clicks=/sys/games/clicks,18 -Checkers=/sys/games/checkers,20 -Sudoku=/sys/games/sudoku,25 -Mine=/sys/games/mine,14 -Flood-It=/sys/games/flood-it,59 -Knight=/kolibrios/games/knight,82 -15=/sys/games/15,34 -Gomoku=/sys/games/gomoku,24 -Reversi=/sys/games/reversi,103 -C4=/sys/games/c4,100 -Lights=/sys/games/lights,99 -Square=/sys/games/msquare,25 -Memory=/sys/games/mblocks -Lines=/sys/games/lines,59 +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 diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 8d5efce82b..971c02f5c2 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -6,32 +6,32 @@ window_title=KolibriOS System Panel [Configuration] RamDisks=tmpdisk,36 -VideoMode=vmode,98 -NetConfig=/sys/network/netcfg,33 +VideoMode=vmode,108 +NetConfig=network/netcfg,33 SysSetup=setup,5 Date&Time=calendar,52 -Appearance=/kolibrios/utils/appearance,62 -Background=/sys/media/palitra,61 +Appearance=/k/utils/appearance,62 +Background=media/palitra,61 SkinConfig=skincfg,80 Volume=@VOLUME,64 Panels=panels_cfg,63 Mouse=mousecfg,54 -DriverInstall=/kolibrios/drivers/DRVINST.KEX,71 -Autorun=/sys/tinypad|/sys/settings/autorun.dat,55 -HotAngles=/sys/HACONFIG,105 +DriverInstall=/k/drivers/DRVINST.KEX,71 +Autorun=tinypad|/sys/settings/autorun.dat,55 +HotAngles=HACONFIG,105 [Monitoring] -Debug Board=/sys/develop/board,19 -NetStat=/sys/network/netstat,33 -GhostMonitor=gmon,57 +Debug Board=develop/board,19 +NetStat=network/netstat,33 +GhostMonitor=gmon,107 SysMonitor=sysmon,57 Processes=cpu,60 -Clipboard=/sys/develop/clipview,83 +Clipboard=develop/clipview,83 [Testing] Protection=test,37 CpuID=cpuid,37 -Display=disptest,7 +Display=disptest,113 File Speed=fspeed,45 HDDinfo=hdd_info,50 BusOff=kbd,37 diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini index 3d9690f3d5..d1c747c754 100644 --- a/data/eng/settings/icon.ini +++ b/data/eng/settings/icon.ini @@ -64,7 +64,7 @@ y=68 name=KPACK path=KPACK param= -ico=10 +ico=99 x=-67 y=0 [09] diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini index b2bdb71865..25d7bfcb63 100644 --- a/data/et/settings/icon.ini +++ b/data/et/settings/icon.ini @@ -63,7 +63,7 @@ y=68 name=KPACK path=KPACK param= -ico=10 +ico=99 x=-67 y=0 [09] diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini index 3d9690f3d5..d1c747c754 100644 --- a/data/it/settings/icon.ini +++ b/data/it/settings/icon.ini @@ -64,7 +64,7 @@ y=68 name=KPACK path=KPACK param= -ico=10 +ico=99 x=-67 y=0 [09] diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/game_center.ini index 10fb1ff3fc..1a41b569b4 100644 --- a/data/rus/settings/game_center.ini +++ b/data/rus/settings/game_center.ini @@ -4,61 +4,60 @@ window_title=KolibriOS Game Center default_icon=35 [Casual] -2048=/kolibrios/games/2048/2048,53 -Fara=/kolibrios/games/fara/fara,42 -MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 -Tetris=/sys/games/tetris,47 -Pipes=/sys/games/pipes,26 -Snake=/sys/games/snake,32 -Xonix=/sys/games/xonix,21 -RedSquare=/sys/games/rsquare -Freecell=/sys/games/freecell,68 -Pong=/sys/games/pong,101 -Pong3=/sys/games/pong3,12 -Arcanii=/kolibrios/games/arcanii,12 +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=/kolibrios/games/lasertank/lasertank,72 -Heliothryx=/kolibrios/games/heliothryx/heliothryx -Dungeons=/kolibrios/games/dungeons/dungeons -JumpBump=/kolibrios/games/jumpbump/jumpbump.kex,102 -Nsider=/kolibrios/games/Nsider/Nsider -TheBus=/kolibrios/games/the_bus/the_bus,86 -Mun=/kolibrios/games/mun/mun -Kosilka=/sys/games/kosilka,23 -Bomber=/kolibrios/games/bomber/bomber,97 -Invaders=/kolibrios/games/invaders -Tanks=/sys/games/tanks,67 -RocketForces=/sys/games/rforces -; Pig=/kolibrios/games/pig/pig ;doesn't work from CD -Ataka=/sys/games/ataka -Sea War=/sys/games/SW,66 -Donkey=/kolibrios/games/donkey -Almaz=/kolibrios/games/almaz,81 -Loderunner=/kolibrios/games/LRL/LRL,41 -21days=/kolibrios/games/21days/21days,104 -BabyPainter=/kolibrios/games/BabyPainter,87 -Klavisha=/sys/games/klavisha,69 -Millioneer=/kolibrios/games/WHOWTBAM/whowtbam +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=/kolibrios/games/quake/sdlquake,56 -DOOM1=/kolibrios/games/doom1/doom,43 -; DOOM2=/kolibrios/games/doom2/doom,43 +Quake=/k/games/quake/sdlquake,56 +DOOM1=/k/games/doom1/doom,43 [Logical] -Clicks=/sys/games/clicks,18 -Checkers=/sys/games/checkers,20 -Sudoku=/sys/games/sudoku,25 -Mine=/sys/games/mine,14 -Flood-It=/sys/games/flood-it,59 -Knight=/kolibrios/games/knight,82 -15=/sys/games/15,34 -Gomoku=/sys/games/gomoku,24 -Reversi=/sys/games/reversi,103 -C4=/sys/games/c4,100 -Lights=/sys/games/lights,99 -Square=/sys/games/msquare,25 -Memory=/sys/games/mblocks -Lines=/sys/games/lines,59 +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 diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini index 47fcf6fab8..e0c79b63c8 100644 --- a/data/rus/settings/icon.ini +++ b/data/rus/settings/icon.ini @@ -64,7 +64,7 @@ y=68 name=KPACK path=KPACK param= -ico=10 +ico=99 x=-67 y=0 [09] diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini index 3d9690f3d5..d1c747c754 100644 --- a/data/sp/settings/icon.ini +++ b/data/sp/settings/icon.ini @@ -64,7 +64,7 @@ y=68 name=KPACK path=KPACK param= -ico=10 +ico=99 x=-67 y=0 [09] diff --git a/programs/cmm/software_widget/compile.bat b/programs/cmm/software_widget/compile.bat index 6450f167e8..d567597217 100644 --- a/programs/cmm/software_widget/compile.bat +++ b/programs/cmm/software_widget/compile.bat @@ -1,7 +1,5 @@ @C-- software_widget.c -@del game_center -@copy software_widget.com game_center -@copy software_widget.com syspanel -@del software_widget.com +@del syspanel +@ren software_widget.com syspanel @pause @del warning.txt diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c index b8a624040c..9bb1af314b 100644 --- a/programs/cmm/software_widget/software_widget.c +++ b/programs/cmm/software_widget/software_widget.c @@ -1,5 +1,5 @@ /* -SOFTWARE CENTER v2.8 +SOFTWARE CENTER v2.81 */ #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; //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) { row++; @@ -178,17 +179,32 @@ void draw_top_bar() void EventRunApp(dword appid) { + char run_app_path[4096]=0; dword app_path = app_path_collection.get(appid); - dword param_pos = strchr(app_path, '|'); if (param_pos) { ESBYTE[param_pos] = NULL; 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] = '|'; } else