Merge branch 'main' of https://git.kolibrios.org/KolibriOS/kolibrios

kiv fix label with green bg in fullscreen mode

data/Tupfile.lua

@@ -38,7 +38,7 @@ img_files = {
  {"UNIMG", SRC_PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
- {"GAMES/FLPYBIRD", SRC_PROGS .. "/games/flappybird/Release/flappybird"},
+ {"GAMES/FLPYBIRD", SRC_PROGS .. "/games/floppybird/Release/floppybird"},
  {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
  -- {"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
  {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"},

data/ca_ES/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

data/common/File Managers/icons.ini

@@ -237,8 +237,6 @@ pcx=70
 png=70
 pdf=73
 mid=74
-mid=74
-midi=74
 midi=74
 3ds=78
 stl=78

data/en_US/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

data/es_ES/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

data/et_EE/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

data/it_IT/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

data/ru_RU/settings/icon.ini

@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49

programs/games/floppybird/README.md

@@ -1,7 +1,7 @@
-## Flappy Bird for KolibriOS
+## Floppy Bird for KolibriOS
 
 * [Forum topic](http://board.kolibrios.org/viewtopic.php?f=41&t=4471) <br>
-* [Directory in official KolibriOS SVN repository](http://websvn.kolibrios.org/listing.php?repname=Kolibri+OS&path=%2Fprograms%2Fgames%2Fflappybird%2F&#a1f3183a01c0fffa57fec6704cbfc0b3d)
+* [Directory in official KolibriOS GIT repository] kolibrios\programs\games\floppybird
 
 <img src="https://i.ibb.co/kMsv8pB/menu.jpg" alt="Screenshot" width="400"> <img src="https://i.ibb.co/7NP1yHZ/screen1.jpg" alt="Screenshot" width="400">
 <img src="https://i.ibb.co/Y2FwxDG/screen2.jpg" alt="Screenshot" width="400"> <img src="https://i.ibb.co/3W8yCYn/gameover.jpg" alt="Screenshot" width="400">

programs/games/floppybird/flappybird.vcxproj

@@ -8,7 +8,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0556BA3E-9447-4000-8613-91AD1CD750D7}</ProjectGuid>
-    <RootNamespace>flappybird</RootNamespace>
+    <RootNamespace>floppybird</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -57,7 +57,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="flappybird.cpp" />
+    <ClCompile Include="floppybird.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="smalllibc\smalllibc.vcxproj">

programs/games/floppybird/flappybird.vcxproj.filters

@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="flappybird.cpp">
+    <ClCompile Include="floppybird.cpp">
       <Filter>Файлы исходного кода</Filter>
     </ClCompile>
   </ItemGroup>

programs/games/floppybird/floppybird.cpp

@@ -3,7 +3,7 @@
 #include "images.hpp"
 
 //Global const strings
-const char HEADER_STRING[] = "Flappy bird";
+const char HEADER_STRING[] = "Floppy bird";
 const char CONTROL_STRING[] = "SPACEBAR TO JUMP";
 const char GAMEOVER_STRING[] = "GAMEOVER";
 const char ANY_KEY_STRING[] = "Press any key for restart";

programs/games/floppybird/floppybird.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flappybird", "flappybird.vcxproj", "{0556BA3E-9447-4000-8613-91AD1CD750D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "floppybird", "floppybird.vcxproj", "{0556BA3E-9447-4000-8613-91AD1CD750D7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0D291390-1953-4E1F-BBE2-57F12AFF3214} = {0D291390-1953-4E1F-BBE2-57F12AFF3214}
 	EndProjectSection

programs/media/kiv/trunk/kiv.asm

@@ -1631,7 +1631,7 @@ proc generate_window_header
         push    eax ebx esi edi
         mov     esi, [last_name_component]
         mov     edi, window_header
-        mov     [window_header_len], 4    ; [,/,],
+        mov     [window_header_len], 8    ; [,/,],
 
         mov     byte[edi], '['
         inc     edi