Merge pull request #31 from 9xbt/main

Fix keyboard mappings because of a Cosmos update
Owen2k6 · Mar 28, 2023 · ed36f2b · ed36f2b
2 parents a6ed6fd + b0f76c0
commit ed36f2b
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 61 deletions.
diff --git a/GoOS/Settings/ControlPanel.cs b/GoOS/Settings/ControlPanel.cs
@@ -299,11 +299,12 @@ private static void KeyboardLayoutDialogue()
         {
             List<(string, ScanMapBase)> scanMaps = new()
             {
-                ("British English", new GB_Standard()),
-                ("US English", new US_Standard()),
-                ("Deutsch (German)", new DE_Standard()),
-                ("Espanol (Spanish)", new ES_Standard()),
-                ("Turkce (Turkish)", new TR_StandardQ())
+                ("Deutsch (German)", new DEStandardLayout()),
+                ("Espanol (Spanish)", new ESStandardLayout()),
+                ("Francais (French)", new ESStandardLayout()),
+                ("British English", new GBStandardLayout()),
+                ("Turkce (Turkish)", new TRStandardLayout()),
+                ("US English", new USStandardLayout())
             };
 
             Console.BackgroundColor = Black;

diff --git a/GoOS/obj/Debug/net6.0/GoOS.assets.cache b/GoOS/obj/Debug/net6.0/GoOS.assets.cache
diff --git a/GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache b/GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache
diff --git a/GoOS/obj/GoOS.csproj.nuget.g.props b/GoOS/obj/GoOS.csproj.nuget.g.props
@@ -14,9 +14,9 @@
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230203061803\build\Cosmos.Build.props" Condition="Exists('$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230203061803\build\Cosmos.Build.props')" />
+    <Import Project="$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230328062437\build\Cosmos.Build.props" Condition="Exists('$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230328062437\build\Cosmos.Build.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgCosmos_Build Condition=" '$(PkgCosmos_Build)' == '' ">C:\Users\Eric\.nuget\packages\cosmos.build\0.1.0-localbuild20230203061803</PkgCosmos_Build>
+    <PkgCosmos_Build Condition=" '$(PkgCosmos_Build)' == '' ">C:\Users\Eric\.nuget\packages\cosmos.build\0.1.0-localbuild20230328062437</PkgCosmos_Build>
   </PropertyGroup>
 </Project>
diff --git a/GoOS/obj/GoOS.csproj.nuget.g.targets b/GoOS/obj/GoOS.csproj.nuget.g.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230203061803\build\Cosmos.Build.targets" Condition="Exists('$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230203061803\build\Cosmos.Build.targets')" />
+    <Import Project="$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230328062437\build\Cosmos.Build.targets" Condition="Exists('$(NuGetPackageRoot)cosmos.build\0.1.0-localbuild20230328062437\build\Cosmos.Build.targets')" />
   </ImportGroup>
 </Project>
diff --git a/GoOS/obj/project.assets.json b/GoOS/obj/project.assets.json
@@ -2,17 +2,17 @@
   "version": 3,
   "targets": {
     "net6.0": {
-      "Cosmos.Build/0.1.0-localbuild20230203061803": {
+      "Cosmos.Build/0.1.0-localbuild20230328062437": {
         "type": "package",
         "build": {
           "build/Cosmos.Build.props": {},
           "build/Cosmos.Build.targets": {}
         }
       },
-      "Cosmos.Common/0.1.0-localbuild20230203061808": {
+      "Cosmos.Common/0.1.0-localbuild20230328062444": {
         "type": "package",
         "dependencies": {
-          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230203061808"
+          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230328062444"
         },
         "compile": {
           "lib/net6.0/Cosmos.Common.dll": {}
@@ -21,11 +21,11 @@
           "lib/net6.0/Cosmos.Common.dll": {}
         }
       },
-      "Cosmos.Core/0.1.0-localbuild20230203061808": {
+      "Cosmos.Core/0.1.0-localbuild20230328062444": {
         "type": "package",
         "dependencies": {
-          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230203061808",
-          "IL2CPU.API": "0.1.0-localbuild20230203061808"
+          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230328062444",
+          "IL2CPU.API": "0.1.0-localbuild20230328062444"
         },
         "compile": {
           "lib/net6.0/Cosmos.Core.dll": {
@@ -38,7 +38,7 @@
           }
         }
       },
-      "Cosmos.Debug.Kernel/0.1.0-localbuild20230203061808": {
+      "Cosmos.Debug.Kernel/0.1.0-localbuild20230328062444": {
         "type": "package",
         "compile": {
           "lib/netstandard2.0/Cosmos.Debug.Kernel.dll": {
@@ -51,13 +51,13 @@
           }
         }
       },
-      "Cosmos.HAL2/0.1.0-localbuild20230203061808": {
+      "Cosmos.HAL2/0.1.0-localbuild20230328062444": {
         "type": "package",
         "dependencies": {
-          "Cosmos.Common": "0.1.0-localbuild20230203061808",
-          "Cosmos.Core": "0.1.0-localbuild20230203061808",
-          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230203061808",
-          "IL2CPU.API": "0.1.0-localbuild20230203061808"
+          "Cosmos.Common": "0.1.0-localbuild20230328062444",
+          "Cosmos.Core": "0.1.0-localbuild20230328062444",
+          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230328062444",
+          "IL2CPU.API": "0.1.0-localbuild20230328062444"
         },
         "compile": {
           "lib/net6.0/Cosmos.HAL2.dll": {
@@ -70,13 +70,13 @@
           }
         }
       },
-      "Cosmos.System2/0.1.0-localbuild20230203061808": {
+      "Cosmos.System2/0.1.0-localbuild20230328062444": {
         "type": "package",
         "dependencies": {
-          "Cosmos.Common": "0.1.0-localbuild20230203061808",
-          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230203061808",
-          "Cosmos.HAL2": "0.1.0-localbuild20230203061808",
-          "IL2CPU.API": "0.1.0-localbuild20230203061808"
+          "Cosmos.Common": "0.1.0-localbuild20230328062444",
+          "Cosmos.Debug.Kernel": "0.1.0-localbuild20230328062444",
+          "Cosmos.HAL2": "0.1.0-localbuild20230328062444",
+          "IL2CPU.API": "0.1.0-localbuild20230328062444"
         },
         "compile": {
           "lib/net6.0/Cosmos.System2.dll": {
@@ -89,7 +89,7 @@
           }
         }
       },
-      "IL2CPU.API/0.1.0-localbuild20230203061808": {
+      "IL2CPU.API/0.1.0-localbuild20230328062444": {
         "type": "package",
         "compile": {
           "lib/netstandard2.0/IL2CPU.API.dll": {}
@@ -101,17 +101,17 @@
     }
   },
   "libraries": {
-    "Cosmos.Build/0.1.0-localbuild20230203061803": {
-      "sha512": "fFqV2HV772uxbwmo0XvMQFuXtbGqLIY0+NEpjjY11abc8JN4uZ7FpXiC2qrA+NlFAPb4gKu+xxctn7Y2j8245g==",
+    "Cosmos.Build/0.1.0-localbuild20230328062437": {
+      "sha512": "QPRYQoiil/6RqVTNVGEi9iFVjQt8yt8n/t7zkUWyg1rELBZO4UbaR8d91WLBBAhwN3lPharXcLy2Vzk93vsHxg==",
       "type": "package",
-      "path": "cosmos.build/0.1.0-localbuild20230203061803",
+      "path": "cosmos.build/0.1.0-localbuild20230328062437",
       "hasTools": true,
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
         "build/Cosmos.Build.props",
         "build/Cosmos.Build.targets",
-        "cosmos.build.0.1.0-localbuild20230203061803.nupkg.sha512",
+        "cosmos.build.0.1.0-localbuild20230328062437.nupkg.sha512",
         "cosmos.build.nuspec",
         "runtime.json",
         "tools/cygwin/win/GPL Readme.txt",
@@ -460,77 +460,77 @@
         "tools/yasm/win/yasm.exe"
       ]
     },
-    "Cosmos.Common/0.1.0-localbuild20230203061808": {
-      "sha512": "kt/7r51o/PXXBN8s+OAeow+6AkPkwVrXl4EEFsyo2g8zVeDwWpfuTb3V/UrkjkQ015YR61s1JYfyjI91cwFLLg==",
+    "Cosmos.Common/0.1.0-localbuild20230328062444": {
+      "sha512": "cc0ujJq9TNTtLOvhHPe38tML0WyyKtbCCN1pv2K+cHqDDSmWnEp96XtivRcXL4+YoN9F9sTX833WtLayidxOMA==",
       "type": "package",
-      "path": "cosmos.common/0.1.0-localbuild20230203061808",
+      "path": "cosmos.common/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
-        "cosmos.common.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "cosmos.common.0.1.0-localbuild20230328062444.nupkg.sha512",
         "cosmos.common.nuspec",
         "lib/net6.0/Cosmos.Common.dll"
       ]
     },
-    "Cosmos.Core/0.1.0-localbuild20230203061808": {
-      "sha512": "rhxsF1URr1sMCrgYxpK5njG2IWR1gKSVNZEBtR5WRcbJ6C8FXMNazdAbFBhqBs1l7k7lXkrHEs1yOzhRW5UfKg==",
+    "Cosmos.Core/0.1.0-localbuild20230328062444": {
+      "sha512": "T1pFNlDnynEC7VO1imARnYYGQ0SLThy8aV5VQfILpxIePBPsV9DeHFqkYroaYxseG7XLs4swxbxsh54CIQwBVQ==",
       "type": "package",
-      "path": "cosmos.core/0.1.0-localbuild20230203061808",
+      "path": "cosmos.core/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
-        "cosmos.core.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "cosmos.core.0.1.0-localbuild20230328062444.nupkg.sha512",
         "cosmos.core.nuspec",
         "lib/net6.0/Cosmos.Core.dll",
         "lib/net6.0/Cosmos.Core.xml"
       ]
     },
-    "Cosmos.Debug.Kernel/0.1.0-localbuild20230203061808": {
-      "sha512": "gbpVUbuZwrMqHpySPt9T8F1lyaY25LVBpAdpBaoCopRFavxLrUGwKYsfOwglKoLEtnUtvhxk97NOBrjALP7fQg==",
+    "Cosmos.Debug.Kernel/0.1.0-localbuild20230328062444": {
+      "sha512": "S7SR+8ZaTFjpmgJ4XPQtOpm14rRUtfd36aeeVfyJZfvREwTdgMRWeZcFY1y2EOBii8dWZOPxZZGFSgfduI5eLA==",
       "type": "package",
-      "path": "cosmos.debug.kernel/0.1.0-localbuild20230203061808",
+      "path": "cosmos.debug.kernel/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
-        "cosmos.debug.kernel.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "cosmos.debug.kernel.0.1.0-localbuild20230328062444.nupkg.sha512",
         "cosmos.debug.kernel.nuspec",
         "lib/netstandard2.0/Cosmos.Debug.Kernel.dll",
         "lib/netstandard2.0/Cosmos.Debug.Kernel.xml"
       ]
     },
-    "Cosmos.HAL2/0.1.0-localbuild20230203061808": {
-      "sha512": "ah/wHJvr7aWznLVeyCE5C9kdBmA5oi1dULRHeh2cUV+ku+V8sM2nbPHAXiQAoCvHyLvE3KBRyibt1v8AWFt7fA==",
+    "Cosmos.HAL2/0.1.0-localbuild20230328062444": {
+      "sha512": "O3KAj3PVmGQ3EOltkciJolj64jxe9/El9lbKkudWSmXNBGLumaOiwaarHK3fnonnbIxkA4UDZTspooSeMDawIg==",
       "type": "package",
-      "path": "cosmos.hal2/0.1.0-localbuild20230203061808",
+      "path": "cosmos.hal2/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
-        "cosmos.hal2.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "cosmos.hal2.0.1.0-localbuild20230328062444.nupkg.sha512",
         "cosmos.hal2.nuspec",
         "lib/net6.0/Cosmos.HAL2.dll",
         "lib/net6.0/Cosmos.HAL2.xml"
       ]
     },
-    "Cosmos.System2/0.1.0-localbuild20230203061808": {
-      "sha512": "m32Lj93FujKYM2NOGtQPQujT1j0ZiZISsYJ7HD8MuVs4h0S1hL+RwjHrgWoEHPaiAht5XJ1acekJTs9QolZYvQ==",
+    "Cosmos.System2/0.1.0-localbuild20230328062444": {
+      "sha512": "vOKGc5ZUDQPbDhjjpNcmNxIHfimVBgd5d6HEQDIynEoAxy/SI7uS8Vp0BwGqHgCZ/zpxYTTB4w1dtt7LvDU/NA==",
       "type": "package",
-      "path": "cosmos.system2/0.1.0-localbuild20230203061808",
+      "path": "cosmos.system2/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
         "LICENSE.txt",
-        "cosmos.system2.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "cosmos.system2.0.1.0-localbuild20230328062444.nupkg.sha512",
         "cosmos.system2.nuspec",
         "lib/net6.0/Cosmos.System2.dll",
         "lib/net6.0/Cosmos.System2.xml"
       ]
     },
-    "IL2CPU.API/0.1.0-localbuild20230203061808": {
-      "sha512": "B7aw7PiocIbqIPd9hYZZ2f91YKboiCtHNLZfyyQzf6ru4vVbRe0tVZXMyYtGB4nTSnJt0hKnagoHgzu4KaCVZw==",
+    "IL2CPU.API/0.1.0-localbuild20230328062444": {
+      "sha512": "XFZFenH/aABvv2Q458NQ89q3kEblJdM+4ZTO1o3NzIVbum6dBz1Ozy5WJzAGzY7SqWhVw4wGQzqoJHEiljMQDA==",
       "type": "package",
-      "path": "il2cpu.api/0.1.0-localbuild20230203061808",
+      "path": "il2cpu.api/0.1.0-localbuild20230328062444",
       "files": [
         ".nupkg.metadata",
-        "il2cpu.api.0.1.0-localbuild20230203061808.nupkg.sha512",
+        "il2cpu.api.0.1.0-localbuild20230328062444.nupkg.sha512",
         "il2cpu.api.nuspec",
         "lib/netstandard2.0/IL2CPU.API.dll"
       ]

diff --git a/GoOS/obj/project.nuget.cache b/GoOS/obj/project.nuget.cache
@@ -4,13 +4,13 @@
   "success": true,
   "projectFilePath": "C:\\Users\\Eric\\Documents\\GitHub\\GoOS\\GoOS\\GoOS.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.build\\0.1.0-localbuild20230203061803\\cosmos.build.0.1.0-localbuild20230203061803.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.common\\0.1.0-localbuild20230203061808\\cosmos.common.0.1.0-localbuild20230203061808.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.core\\0.1.0-localbuild20230203061808\\cosmos.core.0.1.0-localbuild20230203061808.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.debug.kernel\\0.1.0-localbuild20230203061808\\cosmos.debug.kernel.0.1.0-localbuild20230203061808.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.hal2\\0.1.0-localbuild20230203061808\\cosmos.hal2.0.1.0-localbuild20230203061808.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.system2\\0.1.0-localbuild20230203061808\\cosmos.system2.0.1.0-localbuild20230203061808.nupkg.sha512",
-    "C:\\Users\\Eric\\.nuget\\packages\\il2cpu.api\\0.1.0-localbuild20230203061808\\il2cpu.api.0.1.0-localbuild20230203061808.nupkg.sha512"
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.build\\0.1.0-localbuild20230328062437\\cosmos.build.0.1.0-localbuild20230328062437.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.common\\0.1.0-localbuild20230328062444\\cosmos.common.0.1.0-localbuild20230328062444.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.core\\0.1.0-localbuild20230328062444\\cosmos.core.0.1.0-localbuild20230328062444.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.debug.kernel\\0.1.0-localbuild20230328062444\\cosmos.debug.kernel.0.1.0-localbuild20230328062444.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.hal2\\0.1.0-localbuild20230328062444\\cosmos.hal2.0.1.0-localbuild20230328062444.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\cosmos.system2\\0.1.0-localbuild20230328062444\\cosmos.system2.0.1.0-localbuild20230328062444.nupkg.sha512",
+    "C:\\Users\\Eric\\.nuget\\packages\\il2cpu.api\\0.1.0-localbuild20230328062444\\il2cpu.api.0.1.0-localbuild20230328062444.nupkg.sha512"
   ],
   "logs": []
 }