diff --git a/data/common/icons32.png b/data/common/icons32.png index 686da88690..2b9a3d9440 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/game_center.ini index fbcab898be..6ad2eb8f28 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -13,7 +13,7 @@ Snake=/sys/games/snake,32 Xonix=/sys/games/xonix,21 RedSquare=/sys/games/rsquare Freecell=/sys/games/freecell,68 -Pong=/sys/games/pong,12 +Pong=/sys/games/pong,101 Pong3=/sys/games/pong3,12 Arcanii=/kolibrios/games/arcanii,12 @@ -21,8 +21,8 @@ Arcanii=/kolibrios/games/arcanii,12 LaserTank=/kolibrios/games/lasertank/lasertank,72 Heliothryx=/kolibrios/games/heliothryx/heliothryx Dungeons=/kolibrios/games/dungeons/dungeons -JumpBump=/kolibrios/games/jumpbump/jumpbump.kex -Loderunner=/kolibrios/games/LRL/LRL,41 +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 @@ -35,7 +35,7 @@ RocketForces=/sys/games/rforces Sea War=/sys/games/SW,66 Donkey=/kolibrios/games/donkey Almaz=/kolibrios/games/almaz,81 -Nsider=/kolibrios/games/Nsider/Nsider +Loderunner=/kolibrios/games/LRL/LRL,41 ; 21days=/kolibrios/games/21days/21days,2 ;rus only BabyPainter=/kolibrios/games/BabyPainter,87 Klavisha=/sys/games/klavisha,69 @@ -55,7 +55,7 @@ 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 +Reversi=/sys/games/reversi,103 C4=/sys/games/c4,100 Lights=/sys/games/lights,99 Square=/sys/games/msquare,25 diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/game_center.ini index 76406a8953..31c86aec1c 100644 --- a/data/rus/settings/game_center.ini +++ b/data/rus/settings/game_center.ini @@ -1,48 +1,9 @@ [Config] window_width=750 -window_title=Игровой центр KolibriOS +window_title=KolibriOS Game Center default_icon=35 -[Аркады] -LaserTank=/kolibrios/games/lasertank/lasertank,72 -Heliothryx=/kolibrios/games/heliothryx/heliothryx -Dungeons=/kolibrios/games/dungeons/dungeons -JumpBump=/kolibrios/games/jumpbump/jumpbump.kex -Loderunner=/kolibrios/games/LRL/LRL,41 -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 -Ataka=/sys/games/ataka -Sea War=/sys/games/SW,66 -Donkey=/kolibrios/games/donkey -Almaz=/kolibrios/games/almaz,81 -Nsider=/kolibrios/games/Nsider/Nsider -21days=/kolibrios/games/21days/21days,2 -BabyPainter=/kolibrios/games/BabyPainter,87 -Klavisha=/sys/games/klavisha,69 -Millioneer=/sys/games/whowtbam - -[Логические] -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 -C4=/sys/games/c4 -Square=/sys/games/msquare,25 -Memory=/sys/games/mblocks -Lines=/sys/games/lines,59 - -[Казуальные] +[Casual] 2048=/kolibrios/games/2048/2048,53 Fara=/kolibrios/games/fara/fara,42 MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 @@ -52,11 +13,52 @@ Snake=/sys/games/snake,32 Xonix=/sys/games/xonix,21 RedSquare=/sys/games/rsquare Freecell=/sys/games/freecell,68 -Pong=/sys/games/pong,12 +Pong=/sys/games/pong,101 Pong3=/sys/games/pong3,12 Arcanii=/kolibrios/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,2 +BabyPainter=/kolibrios/games/BabyPainter,87 +Klavisha=/sys/games/klavisha,69 +Millioneer=/sys/games/whowtbam + +[3D Shooter] Quake=/kolibrios/games/quake/sdlquake,56 DOOM1=/kolibrios/games/doom1/doom,43 ; DOOM2=/kolibrios/games/doom2/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 + diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c index 5e8fc3381f..b8a624040c 100644 --- a/programs/cmm/software_widget/software_widget.c +++ b/programs/cmm/software_widget/software_widget.c @@ -135,7 +135,7 @@ byte draw_icons_from_section(dword key_value, key_name, sec_name, f_name) if (icon_char_pos) ESBYTE[icon_char_pos] = '\0'; //delete icon from string app_path_collection.add(key_value); //kfont.WriteIntoWindowCenter(col*list.item_w+7,row*list.item_h+47 + list_pos, list.item_w,0, LIST_BACKGROUND_COLOR, 0xDCDCDC, 12, key_name); - kfont.WriteIntoWindowCenter(col*list.item_w+6,row*list.item_h+46 + list_pos, list.item_w,0, LIST_BACKGROUND_COLOR, 0x000000, 12, key_name); + kfont.WriteIntoWindowCenter(col*list.item_w+5,row*list.item_h+46 + list_pos, list.item_w,0, LIST_BACKGROUND_COLOR, 0x000000, 12, key_name); if (list.cur_y == list.count) DrawWideRectangle(col*list.item_w+6, row*list.item_h + list_pos,list.item_w,list.item_h-5, 2, 0x0080FF); list.count++; col++;