Merge branch 'Ryubing:master' into master

Update locales.json with Swedish and Norwegian
Adding SettingsTabSystemSystemLanguageSwedish SettingsTabSystemSystemLanguageNorwegian
2025-01-13 15:30:57 +01:00 · 2025-01-11 13:32:56 +01:00 · 2025-01-11 13:29:12 +01:00 · 2025-01-11 13:25:07 +01:00 · 2025-01-11 12:22:20 +01:00
8 changed files with 123 additions and 71 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,13 +3,13 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -18,7 +18,7 @@
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.2" />
+    <PackageVersion Include="Concentus" Version="2.2.0" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +26,7 @@
    <PackageVersion Include="LibHac" Version="0.19.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -48,11 +48,11 @@
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
    <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
--- a/src/Ryujinx.Common/RyujinxException.cs
+++ b/src/Ryujinx.Common/RyujinxException.cs
@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Common
-{
-    public class RyujinxException : Exception
-    {
-        public RyujinxException(string message) : base(message)
-        { }
-    }
-}
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Vendor.cs
@@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                DriverId.MesaDozen => "Dozen",
                DriverId.MesaNvk => "NVK",
                DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaHoneykrisp => "Honeykrisp",
+                DriverId.MesaAgxv => "Honeykrisp",
                _ => id.ToString(),
            };
        }
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -26,17 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes

        private ulong _latestPid;

-        public ProcessResult ActiveApplication
-        {
-            get
-            {
-                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
-                    throw new RyujinxException(
-                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
-                
-                return value;
-            }
-        }
+        public ProcessResult ActiveApplication => _processesByPid[_latestPid];

        public ProcessLoader(Switch device)
        {
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\Controller_JoyConLeft.svg" />
+    <None Remove="Resources\Controller_JoyConPair.svg" />
+    <None Remove="Resources\Controller_JoyConRight.svg" />
+    <None Remove="Resources\Controller_ProCon.svg" />
+    <None Remove="Resources\Icon_NCA.png" />
+    <None Remove="Resources\Icon_NRO.png" />
+    <None Remove="Resources\Icon_NSO.png" />
+    <None Remove="Resources\Icon_NSP.png" />
+    <None Remove="Resources\Icon_XCI.png" />
+    <None Remove="Resources\Logo_Amiibo.png" />
+    <None Remove="Resources\Logo_Discord.png" />
+    <None Remove="Resources\Logo_GitHub.png" />
+    <None Remove="Resources\Logo_Ryujinx.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DiscordRichPresence" />
+    <PackageReference Include="DynamicData" />
+    <PackageReference Include="securifybv.ShellLink" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3946,6 +3946,54 @@
        "zh_CN": "繁体中文（推荐）",
        "zh_TW": "正體中文 (建議)"
      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageSwedish",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Swedish",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Svenska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageNorwegian",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Norwegian",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Norsk",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Norska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
    },
    {
      "ID": "SettingsTabSystemSystemTimeZone",
@@ -22614,7 +22662,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Senast uppdaterad: {0}",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22639,7 +22687,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Denna kompatibilitetslista kan innehålla utdaterade poster.\nTesta gärna spelen som listas med \"Spelproblem\"-status.",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22664,7 +22712,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Sök i kompatibilitetsposter...",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22689,7 +22737,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Öppna kompatibilitetslistan",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22714,7 +22762,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Visa endast ägda spel",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22739,7 +22787,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22764,7 +22812,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelproblem",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22789,7 +22837,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Menyer",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22814,7 +22862,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Startar",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22839,7 +22887,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Ingenting",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22848,4 +22896,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -21,7 +21,6 @@ using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL2.Common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -244,33 +243,16 @@ namespace Ryujinx.Ava
                    : $"Launch Mode: {AppDataManager.Mode}");
        }

-        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
        {
            Logger.Log log = Logger.Error ?? Logger.Notice;
+            string message = $"Unhandled exception caught: {ex}";

-            List<Exception> exceptions = [];
-
-            if (initialException is AggregateException ae)
-            {
-                exceptions.AddRange(ae.InnerExceptions);
-            }
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            if (sender?.GetType()?.AsPrettyString() is { } senderName)
+                log.Print(LogClass.Application, message, senderName);
            else
-            {
-                exceptions.Add(initialException);
-            }
-
-            foreach (var e in exceptions)
-            {
-                string message = $"Unhandled exception caught: {e}";
-                // ReSharper disable once ConstantConditionalAccessQualifier
-                if (sender?.GetType()?.AsPrettyString() is { } senderName)
-                    log.Print(LogClass.Application, message, senderName);
-                else
-                    log.PrintMsg(LogClass.Application, message);
-            }
-            
-
-
+                log.PrintMsg(LogClass.Application, message);

            if (isTerminating)
                Exit();
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -136,6 +136,12 @@
                            <ComboBoxItem>
                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
Author	SHA1	Message	Date
Daniel Nylander	ebeac1f4aa	Merge branch 'Ryubing:master' into master	2025-01-13 15:30:57 +01:00
Daniel Nylander	92b6756d24	Update locales.json with Swedish and Norwegian Adding SettingsTabSystemSystemLanguageSwedish SettingsTabSystemSystemLanguageNorwegian	2025-01-11 13:32:56 +01:00
Daniel Nylander	a93adad50b	Update SettingsSystemView.axaml adding Swedish and Norwegian This list should be in alphabetical order?	2025-01-11 13:29:12 +01:00
Daniel Nylander	8ff24506fb	Merge branch 'Ryubing:master' into master	2025-01-11 13:25:07 +01:00
Daniel Nylander	f05b3cdd53	Updated sv_SE in locales.json	2025-01-11 12:22:20 +01:00