misc: chore: Collapse HLE swkbd character validation utils into a single class

src/Ryujinx.Common/Helpers/Patterns.cs

@@ -0,0 +1,118 @@
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.Common.Helper
+{
+    public static partial class Patterns
+    {
+        #region Accessors
+
+        public static readonly Regex Numeric = NumericRegex();
+
+        public static readonly Regex AmdGcn = AmdGcnRegex();
+        public static readonly Regex NvidiaConsumerClass = NvidiaConsumerClassRegex();
+
+        public static readonly Regex DomainLp1Ns = DomainLp1NsRegex();
+        public static readonly Regex DomainLp1Lp1Npln = DomainLp1Lp1NplnRegex();
+        public static readonly Regex DomainLp1Znc = DomainLp1ZncRegex();
+        public static readonly Regex DomainSbApi = DomainSbApiRegex();
+        public static readonly Regex DomainSbAccounts = DomainSbAccountsRegex();
+        public static readonly Regex DomainAccounts = DomainAccountsRegex();
+
+        public static readonly Regex Module = ModuleRegex();
+        public static readonly Regex FsSdk = FsSdkRegex();
+        public static readonly Regex SdkMw = SdkMwRegex();
+
+        // ReSharper disable once InconsistentNaming
+        public static readonly Regex CJK = CJKRegex();
+
+        public static readonly Regex LdnPassphrase = LdnPassphraseRegex();
+
+        public static readonly Regex CleanText = CleanTextRegex();
+
+        #endregion
+
+        #region Generated pattern stubs
+
+        #region Numeric validation
+
+        [GeneratedRegex("[0-9]|.")]
+        internal static partial Regex NumericRegex();
+
+        #endregion
+
+        #region GPU names
+
+        [GeneratedRegex(
+            "Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
+        internal static partial Regex AmdGcnRegex();
+
+        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
+        internal static partial Regex NvidiaConsumerClassRegex();
+
+        #endregion
+
+        #region DNS blocking
+
+        public static readonly Regex[] BlockedHosts =
+        [
+            DomainLp1Ns,
+            DomainLp1Lp1Npln,
+            DomainLp1Znc,
+            DomainSbApi,
+            DomainSbAccounts,
+            DomainAccounts
+        ];
+
+        const RegexOptions DnsRegexOpts =
+            RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
+
+        [GeneratedRegex(@"^(.*)\-lp1\.(n|s)\.n\.srv\.nintendo\.net$", DnsRegexOpts)]
+        internal static partial Regex DomainLp1NsRegex();
+
+        [GeneratedRegex(@"^(.*)\-lp1\.lp1\.t\.npln\.srv\.nintendo\.net$", DnsRegexOpts)]
+        internal static partial Regex DomainLp1Lp1NplnRegex();
+
+        [GeneratedRegex(@"^(.*)\-lp1\.(znc|p)\.srv\.nintendo\.net$", DnsRegexOpts)]
+        internal static partial Regex DomainLp1ZncRegex();
+
+        [GeneratedRegex(@"^(.*)\-sb\-api\.accounts\.nintendo\.com$", DnsRegexOpts)]
+        internal static partial Regex DomainSbApiRegex();
+
+        [GeneratedRegex(@"^(.*)\-sb\.accounts\.nintendo\.com$", DnsRegexOpts)]
+        internal static partial Regex DomainSbAccountsRegex();
+
+        [GeneratedRegex(@"^accounts\.nintendo\.com$", DnsRegexOpts)]
+        internal static partial Regex DomainAccountsRegex();
+
+        #endregion
+
+        #region Executable information
+
+        [GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+        internal static partial Regex ModuleRegex();
+
+        [GeneratedRegex(@"sdk_version: ([0-9.]*)")]
+        internal static partial Regex FsSdkRegex();
+
+        [GeneratedRegex(@"SDK MW[ -~]*")]
+        internal static partial Regex SdkMwRegex();
+
+        #endregion
+
+        #region CJK
+
+        [GeneratedRegex(
+            "\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
+        private static partial Regex CJKRegex();
+
+        #endregion
+
+        [GeneratedRegex("Ryujinx-[0-9a-f]{8}")]
+        private static partial Regex LdnPassphraseRegex();
+
+        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
+        private static partial Regex CleanTextRegex();
+
+        #endregion
+    }
+}

src/Ryujinx.Common/ReleaseInformation.cs

@@ -13,14 +13,12 @@ namespace Ryujinx.Common
         public const string BuildGitHash = "%%RYUJINX_BUILD_GIT_HASH%%";
         private const string ReleaseChannelName = "%%RYUJINX_TARGET_RELEASE_CHANNEL_NAME%%";
         private const string ConfigFileName = "%%RYUJINX_CONFIG_FILE_NAME%%";
-        private const string ConfigFileNameOverride = "%%RYUJINX_CONFIG_FILE_NAME_OVERRIDE%%";
 
         public const string ReleaseChannelOwner = "%%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER%%";
         public const string ReleaseChannelSourceRepo = "%%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO%%";
         public const string ReleaseChannelRepo = "%%RYUJINX_TARGET_RELEASE_CHANNEL_REPO%%";
 
         public static string ConfigName => !ConfigFileName.StartsWith("%%") ? ConfigFileName : "Config.json";
-        public static string CustomConfigNameOverride => !ConfigFileNameOverride.StartsWith("%%") ? ConfigFileNameOverride : "CustomConfigOverride.json";
 
         public static bool IsValid =>
             !BuildGitHash.StartsWith("%%") &&
@@ -28,8 +26,7 @@ namespace Ryujinx.Common
             !ReleaseChannelOwner.StartsWith("%%") &&
             !ReleaseChannelSourceRepo.StartsWith("%%") &&
             !ReleaseChannelRepo.StartsWith("%%") &&
-            !ConfigFileName.StartsWith("%%") &&
-            !ConfigFileNameOverride.StartsWith("%%");
+            !ConfigFileName.StartsWith("%%");
 
         public static bool IsCanaryBuild => IsValid && ReleaseChannelName.Equals(CanaryChannel);
         

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -16,14 +16,8 @@ namespace Ryujinx.Graphics.Vulkan
         Unknown,
     }
 
-    static partial class VendorUtils
+    static class VendorUtils
     {
-        [GeneratedRegex("Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
-        public static partial Regex AmdGcnRegex();
-
-        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
-        public static partial Regex NvidiaConsumerClassRegex();
-
         public static Vendor FromId(uint id)
         {
             return id switch

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -1,5 +1,6 @@
 using Gommon;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
@@ -375,11 +376,11 @@ namespace Ryujinx.Graphics.Vulkan
 
             GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}, Driver v{ParseDriverVersion(ref properties)}";
 
-            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && VendorUtils.AmdGcnRegex().IsMatch(GpuRenderer);
+            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && Patterns.AmdGcn.IsMatch(GpuRenderer);
 
             if (Vendor == Vendor.Nvidia)
             {
-                Match match = VendorUtils.NvidiaConsumerClassRegex().Match(GpuRenderer);
+                Match match = Patterns.NvidiaConsumerClass.Match(GpuRenderer);
 
                 if (match != null && int.TryParse(match.Groups[2].Value, out int gpuNumber))
                 {

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -5,6 +5,7 @@ using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using Ryujinx.HLE.HOS.SystemState;
@@ -30,9 +31,6 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         public event EventHandler AppletStateChanged;
 
-        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
-        private static partial Regex CleanTextRegex();
-
         public ErrorApplet(Horizon horizon)
         {
             _horizon = horizon;
@@ -107,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         private static string CleanText(string value)
         {
-            return CleanTextRegex().Replace(value, string.Empty).Replace("\0", string.Empty);
+            return Patterns.CleanText.Replace(value, string.Empty).Replace("\0", string.Empty);
         }
 
         private string GetMessageText(uint module, uint description, string key)

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs

@@ -1,17 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
-{
-    public static partial class CJKCharacterValidation
-    {
-        public static bool IsCJK(char value)
-        {
-            Regex regex = CJKRegex();
-
-            return regex.IsMatch(value.ToString());
-        }
-
-        [GeneratedRegex("\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
-        private static partial Regex CJKRegex();
-    }
-}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CharacterValidation.cs

@@ -0,0 +1,10 @@
+using Ryujinx.Common.Helper;
+
+namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
+{
+    public static class CharacterValidation
+    {
+        public static bool IsNumeric(char value) => Patterns.Numeric.IsMatch(value.ToString());
+        public static bool IsCJK(char value) => Patterns.CJK.IsMatch(value.ToString());
+    }
+}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/NumericCharacterValidation.cs

@@ -1,17 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
-{
-    public static partial class NumericCharacterValidation
-    {
-        public static bool IsNumeric(char value)
-        {
-            Regex regex = NumericRegex();
-
-            return regex.IsMatch(value.ToString());
-        }
-
-        [GeneratedRegex("[0-9]|.")]
-        private static partial Regex NumericRegex();
-    }
-}

src/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/Proxy/DnsBlacklist.cs

@@ -1,37 +1,13 @@
+using Ryujinx.Common.Helper;
 using System.Text.RegularExpressions;
 
 namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres.Proxy
 {
-    static partial class DnsBlacklist
+    static class DnsBlacklist
     {
-        const RegexOptions RegexOpts = RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
-
-        [GeneratedRegex(@"^(.*)\-lp1\.(n|s)\.n\.srv\.nintendo\.net$", RegexOpts)]
-        private static partial Regex BlockedHost1();
-        [GeneratedRegex(@"^(.*)\-lp1\.lp1\.t\.npln\.srv\.nintendo\.net$", RegexOpts)]
-        private static partial Regex BlockedHost2();
-        [GeneratedRegex(@"^(.*)\-lp1\.(znc|p)\.srv\.nintendo\.net$", RegexOpts)]
-        private static partial Regex BlockedHost3();
-        [GeneratedRegex(@"^(.*)\-sb\-api\.accounts\.nintendo\.com$", RegexOpts)]
-        private static partial Regex BlockedHost4();
-        [GeneratedRegex(@"^(.*)\-sb\.accounts\.nintendo\.com$", RegexOpts)]
-        private static partial Regex BlockedHost5();
-        [GeneratedRegex(@"^accounts\.nintendo\.com$", RegexOpts)]
-        private static partial Regex BlockedHost6();
-
-        private static readonly Regex[] _blockedHosts =
-        [
-            BlockedHost1(),
-            BlockedHost2(),
-            BlockedHost3(),
-            BlockedHost4(),
-            BlockedHost5(),
-            BlockedHost6()
-        ];
-
         public static bool IsHostBlocked(string host)
         {
-            foreach (Regex regex in _blockedHosts)
+            foreach (Regex regex in Patterns.BlockedHosts)
             {
                 if (regex.IsMatch(host))
                 {

src/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs

@@ -2,6 +2,7 @@ using LibHac.Common.FixedArrays;
 using LibHac.Fs;
 using LibHac.Loader;
 using LibHac.Tools.FsSystem;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;
@@ -29,13 +30,6 @@ namespace Ryujinx.HLE.Loaders.Executables
         public string Name;
         public Array32<byte> BuildId;
 
-        [GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
-        private static partial Regex ModuleRegex();
-        [GeneratedRegex(@"sdk_version: ([0-9.]*)")]
-        private static partial Regex FsSdkRegex();
-        [GeneratedRegex(@"SDK MW[ -~]*")]
-        private static partial Regex SdkMwRegex();
-
         public NsoExecutable(IStorage inStorage, string name = null)
         {
             NsoReader reader = new();
@@ -90,7 +84,7 @@ namespace Ryujinx.HLE.Loaders.Executables
 
             if (string.IsNullOrEmpty(modulePath))
             {
-                Match moduleMatch = ModuleRegex().Match(rawTextBuffer);
+                Match moduleMatch = Patterns.Module.Match(rawTextBuffer);
                 if (moduleMatch.Success)
                 {
                     modulePath = moduleMatch.Value;
@@ -99,13 +93,13 @@ namespace Ryujinx.HLE.Loaders.Executables
 
             stringBuilder.AppendLine($"    Module: {modulePath}");
 
-            Match fsSdkMatch = FsSdkRegex().Match(rawTextBuffer);
+            Match fsSdkMatch = Patterns.FsSdk.Match(rawTextBuffer);
             if (fsSdkMatch.Success)
             {
                 stringBuilder.AppendLine($"    FS SDK Version: {fsSdkMatch.Value.Replace("sdk_version: ", string.Empty)}");
             }
 
-            MatchCollection sdkMwMatches = SdkMwRegex().Matches(rawTextBuffer);
+            MatchCollection sdkMwMatches = Patterns.SdkMw.Matches(rawTextBuffer);
             if (sdkMwMatches.Count != 0)
             {
                 string libHeader = "    SDK Libraries: ";

src/Ryujinx/Program.cs

@@ -160,28 +160,6 @@ namespace Ryujinx.Ava
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
 
-            string overrideLocalConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.CustomConfigNameOverride);
-            string overrideAppDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.CustomConfigNameOverride);
-
-            // Copies and reloads the configuration file if the game was loaded with arguments
-            // based on global configuration
-            if (CommandLineState.CountArguments > 0) 
-            {
-                if (File.Exists(localConfigurationPath))
-                {
-                    File.Copy(localConfigurationPath, overrideLocalConfigurationPath, overwrite: true);
-                }
-
-                localConfigurationPath = overrideLocalConfigurationPath;
-
-                if (File.Exists(appDataConfigurationPath))
-                {
-                    File.Copy(appDataConfigurationPath, overrideAppDataConfigurationPath, overwrite: true);
-                }
-
-                appDataConfigurationPath = overrideAppDataConfigurationPath;
-            }
-
             // Now load the configuration as the other subsystems are now registered
             if (File.Exists(localConfigurationPath))
             {
@@ -254,35 +232,8 @@ namespace Ryujinx.Ava
                     _ => ConfigurationState.Instance.HideCursor,
                 };
 
-            // Check if memoryManagerMode was overridden. 
-            if (CommandLineState.OverrideMemoryManagerMode is not null)
-                if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
-                {
-                    ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
-                }
 
-            // Check if PPTC was overridden. 
-            if (CommandLineState.OverridePPTC is not null)
-                if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
-                {
-                    ConfigurationState.Instance.System.EnablePtc.Value = result;
-                }
-
-            // Check if region was overridden. 
-            if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
-                {
-                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
-                }
-
-            //Check if language was overridden. 
-            if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
-                {
-                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
-                }
-
-            // Check if hardware-acceleration was overridden. MemoryManagerMode ( outdated! )
+            // Check if hardware-acceleration was overridden.
             if (CommandLineState.OverrideHardwareAcceleration != null)
                 UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
         }

src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -144,12 +144,12 @@ namespace Ryujinx.Ava.UI.Controls
                 case KeyboardMode.Numeric:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumeric);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(NumericCharacterValidation.IsNumeric);
+                    _checkInput = text => text.All(CharacterValidation.IsNumeric);
                     break;
                 case KeyboardMode.Alphabet:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeAlphabet);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(value => !CJKCharacterValidation.IsCJK(value));
+                    _checkInput = text => text.All(value => !CharacterValidation.IsCJK(value));
                     break;
                 case KeyboardMode.ASCII:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeASCII);

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -375,11 +375,15 @@ namespace Ryujinx.Ava.UI.Controls
             png.SaveTo(fileStream);
         }
 
-        public async void CreateApplicationShortcut_Click(object sender, RoutedEventArgs args)
+        public void CreateApplicationShortcut_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await new ArgumentsConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
-
+                ShortcutHelper.CreateAppShortcut(
+                    viewModel.SelectedApplication.Path,
+                    viewModel.SelectedApplication.Name,
+                    viewModel.SelectedApplication.IdString,
+                    viewModel.SelectedApplication.Icon
+                );
         }
 
         public async void RunApplication_Click(object sender, RoutedEventArgs args)

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -1,10 +1,8 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -18,6 +16,7 @@ using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Vulkan;
@@ -27,7 +26,6 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
@@ -65,56 +63,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public event Action CloseWindow;
         public event Action SaveSettingsEvent;
-        public event Action CompareSettingsEvent; 
         private int _networkInterfaceIndex;
         private int _multiplayerModeIndex;
         private string _ldnPassphrase;
         [ObservableProperty] private string _ldnServer;
 
         public SettingsHacksViewModel DirtyHacks { get; }
-        public string GamePath { get; }
-        public string GameName { get; }
-
-        private Bitmap _gameIcon;
-
-        private string _gameTitle;
-        private string _gameId;
-        public Bitmap GameIcon
-        {
-            get => _gameIcon;
-            set
-            {
-                if (_gameIcon != value)
-                {
-                    _gameIcon = value;
-                }
-            }
-        }
-
-        public string GameTitle
-        {
-            get => _gameTitle;
-            set
-            {
-                if (_gameTitle != value)
-                {
-                    _gameTitle = value;
-                }
-            }
-        }
-
-        public string GameId
-        {
-            get => _gameId;
-            set
-            {
-                if (_gameId != value)
-                {
-                    _gameId = value;
-                }
-            }
-        }
-
 
         public int ResolutionScale
         {
@@ -377,9 +331,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        [GeneratedRegex("Ryujinx-[0-9a-f]{8}")]
-        private static partial Regex LdnPassphraseRegex();
-
         public bool IsInvalidLdnPassphraseVisible { get; set; }
 
         public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
@@ -395,30 +346,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData) : this()
-        {
-            _virtualFileSystem = virtualFileSystem;
-            _contentManager = contentManager;
-  
-            if (gameIconData != null && gameIconData.Length > 0)
-            {
-                using (var ms = new MemoryStream(gameIconData))
-                {
-                    GameIcon = new Bitmap(ms);
-                }
-            }
-
-            GameTitle = gameName;
-            GameId = gameId;
-
-            if (Program.PreviewerDetached)
-            {
-                Task.Run(LoadTimeZones);
-
-                DirtyHacks = new SettingsHacksViewModel(this);
-            }
-        }
-
         public SettingsViewModel()
         {
             GameDirectories = [];
@@ -541,7 +468,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private bool ValidateLdnPassphrase(string passphrase)
         {
-            return string.IsNullOrEmpty(passphrase) || (passphrase.Length == 16 && LdnPassphraseRegex().IsMatch(passphrase));
+            return string.IsNullOrEmpty(passphrase) || (passphrase.Length == 16 && Patterns.LdnPassphrase.IsMatch(passphrase));
         }
 
         public void ValidateAndSetTimeZone(string location)
@@ -799,11 +726,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             SaveSettings();
         }
 
-        public void CreateShortcut()
-        {
-            CompareSettingsEvent?.Invoke(); //raises an event to create a shortcut with arguments
-        }
-
         public void OkButton()
         {
             SaveSettings();

src/Ryujinx/UI/Views/Settings/SettingsApplyOverride.axaml

@@ -1,236 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsApplyOverride"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-
-    <ScrollViewer      
-        Name="AllSettings"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabSystemCore}" />
-                <StackPanel
-                        Margin="10,0,0,0"
-                        Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale SettingsTabSystemSystemRegion}" Width="250" />
-                    <ComboBox
-                        SelectedIndex="{Binding Region}"
-                        ToolTip.Tip="{ext:Locale RegionTooltip}"
-                        HorizontalContentAlignment="Left"
-                        Width="350">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
-                        </ComboBoxItem>
-                    </ComboBox>
-                </StackPanel>
-                <StackPanel
-                        Margin="10,0,0,0"
-                        Orientation="Horizontal">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Text="{ext:Locale SettingsTabSystemSystemLanguage}"
-                        ToolTip.Tip="{ext:Locale LanguageTooltip}"
-                        Width="250" />
-                    <ComboBox
-                        SelectedIndex="{Binding Language}"
-                        ToolTip.Tip="{ext:Locale LanguageTooltip}"
-                        HorizontalContentAlignment="Left"
-                        Width="350">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
-                        </ComboBoxItem>
-                    </ComboBox>
-                </StackPanel>
-                <Separator Height="1" />
-                
-                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabCpu}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <CheckBox IsChecked="{Binding EnablePptc}">
-                        <TextBlock Text="{ext:Locale SettingsTabSystemEnablePptc}"
-                                   ToolTip.Tip="{ext:Locale PptcToggleTooltip}" />
-                    </CheckBox>
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabSystemMemoryManagerMode}"
-                                   ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding MemoryMode}"
-                                  ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
-                                  HorizontalContentAlignment="Left"
-                                  Width="350">
-                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <CheckBox IsChecked="{Binding UseHypervisor}"
-                              IsVisible="{Binding IsAppleSiliconMac}"
-                              ToolTip.Tip="{ext:Locale UseHypervisorTooltip}">
-                        <TextBlock Text="{ext:Locale SettingsTabSystemUseHypervisor}"
-                                   ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
-                    </CheckBox>
-                </StackPanel>
-                <Separator Height="1" />
-                
-                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphics}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
-                                Text="{ext:Locale SettingsTabGraphicsBackend}"
-                                Width="250" />
-                        <ComboBox
-                            Name="GraphicsBackendSelector"
-                            Width="350"
-                            HorizontalContentAlignment="Left"
-                            ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
-                            SelectedIndex="{Binding GraphicsBackendIndex}">
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}" ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendAutoTooltip}" >
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsBackendAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
-                                <TextBlock Text="Vulkan" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
-                                <TextBlock Text="OpenGL" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsAppleSiliconMac}">
-                                <TextBlock Text="Metal (ARM Mac only, Experimental)" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{ext:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{ext:Locale SettingsTabGraphicsBackendMultithreading}"
-                                   Width="250" />
-                        <ComboBox Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
-                                  SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonOn}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>

src/Ryujinx/UI/Views/Settings/SettingsApplyOverride.axaml.cs

@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsApplyOverride : UserControl
-    {
-        public SettingsApplyOverride()
-        {
-            InitializeComponent();
-        }
-    }
-}

src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml

@@ -1,104 +0,0 @@
-<window:StyleableAppWindow
-    x:Class="Ryujinx.Ava.UI.Windows.ArgumentsConfigWindows"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    Width="1100"
-    Height="768"
-    MinWidth="800"
-    MinHeight="480"
-    WindowStartupLocation="CenterOwner"
-    x:DataType="viewModels:SettingsViewModel"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
-        <ContentPresenter
-            x:Name="ContentPresenter"
-            Grid.Row="1"
-            IsVisible="False"
-            KeyboardNavigation.IsTabStop="False"/>
-        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
-            <settings:SettingsApplyOverride Name="AllSettings" />
-        </Grid>
-        <ui:NavigationView
-            Grid.Row="1"
-            IsSettingsVisible="False"
-            Name="NavPanel"
-            IsBackEnabled="False"
-            PaneDisplayMode="Left"
-            Margin="2,10,10,0"
-            VerticalAlignment="Stretch"
-            HorizontalAlignment="Stretch"
-            OpenPaneLength="200"
-            IsPaneToggleButtonVisible="False">
-
-            <!-- For image -->
-            <ui:NavigationView.PaneHeader>
-                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="5"/>
-                    </Grid.RowDefinitions>
-                    <TextBlock Text="{Binding GameId}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Margin="0,0,0,10"
-                        TextAlignment="Center" Grid.Row="0" />
-                    <Image Source="{Binding GameIcon}" 
-                        Width="160" 
-                        Height="160" 
-                        Grid.Row="1" 
-                        Margin="0,0,0,10"
-                        HorizontalAlignment="Center" />
-                    <TextBlock Text="{Binding GameTitle}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Margin="0,0,0,10"
-                        TextAlignment="Center" Grid.Row="2" />
-                    <Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
-                </Grid>
-            </ui:NavigationView.PaneHeader>
-                      
-            <ui:NavigationView.MenuItems>               
-                <ui:NavigationViewItem
-                    Margin="2,10,10,0"
-                    Content="{ext:Locale Settings}"
-                    Tag="AllSettings">
-                    <ui:NavigationViewItem.IconSource>
-                        <ui:FontIconSource
-                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
-                            Glyph="{helpers:GlyphValueConverter Chip}" />
-                    </ui:NavigationViewItem.IconSource>
-                </ui:NavigationViewItem>
-            </ui:NavigationView.MenuItems>
-        </ui:NavigationView>
-       
-        <ReversibleStackPanel
-            Grid.Row="2"
-            Margin="10"
-            Spacing="10"
-            Orientation="Horizontal"
-            HorizontalAlignment="Right"
-            ReverseOrder="{Binding IsMacOS}">
-            <Button
-                Content="{ext:Locale GameListContextMenuCreateShortcut}"
-                Command="{Binding CreateShortcut}" />
-            <Button
-                HotKey="Escape"
-                Content="{ext:Locale ControllerSettingsClose}"
-                Command="{Binding CancelButton}" />
-        </ReversibleStackPanel>
-    </Grid>
-</window:StyleableAppWindow>

src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml.cs

@@ -1,162 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using Projektanker.Icons.Avalonia;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Common.Configuration;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.SystemState;
-using Ryujinx.Input;
-using System;
-using System.IO;
-using System.Linq;
-using Key = Avalonia.Input.Key;
-
-
-namespace Ryujinx.Ava.UI.Windows
-{
-    public partial class ArgumentsConfigWindows : StyleableAppWindow
-    {
-        internal readonly SettingsViewModel ViewModel;
-        public string GamePath { get; }
-        public string GameName { get; }
-        public string GameId { get; }
-        public byte[] GameIconData { get; }
-
-        public static int OverrideBackendThreading { get; private set; }
-        public static int OverrideGraphicsBackend { get; private set; }
-        public static int OverrideSystemLanguage { get; private set; }
-        public static int OverrideSystemRegion { get; private set; }
-        public static bool OverridePPTC { get; private set; }
-        public static int OverrideMemoryManagerMode { get; private set; }
-
-
-        public ArgumentsConfigWindows(MainWindowViewModel viewModel)
-        {
-            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
-
-            DataContext = ViewModel = new SettingsViewModel(
-                viewModel.VirtualFileSystem, 
-                viewModel.ContentManager,
-                viewModel.SelectedApplication.Path,
-                viewModel.SelectedApplication.Name,
-                viewModel.SelectedApplication.IdString,
-                viewModel.SelectedApplication.Icon);
-
-            GamePath = viewModel.SelectedApplication.Path;
-            GameName = viewModel.SelectedApplication.Name;
-            GameId = viewModel.SelectedApplication.IdString;
-            GameIconData = viewModel.SelectedApplication.Icon;
-
-            OverrideBackendThreading = ViewModel.GraphicsBackendMultithreadingIndex;
-            OverrideGraphicsBackend = ViewModel.GraphicsBackendIndex;
-            OverrideSystemLanguage = ViewModel.Language;
-            OverrideSystemRegion = ViewModel.Region;
-            OverridePPTC = ViewModel.EnablePptc;
-            OverrideMemoryManagerMode = ViewModel.MemoryMode;
-
-            ViewModel.CloseWindow += Close;
-            ViewModel.CompareSettingsEvent += CompareConfiguration;
-
-            InitializeComponent();
-            Load();
-
-#if DEBUG
-            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
-#endif
-        }
-
-        public void CompareConfiguration()
-        {
-            ShortcutHelper.CreateAppShortcut(
-                GamePath,
-                GameName,
-                GameId,
-                GameIconData,
-                GetArguments()
-                );
-        }
-
-        private string GetArguments() 
-        {
-
-            string line = "";
-
-            if (OverrideBackendThreading != ViewModel.GraphicsBackendMultithreadingIndex)
-            {
-                string _result = Enum.GetName(typeof(BackendThreading), ViewModel.GraphicsBackendMultithreadingIndex);
-                line += " --backend-threading " + _result;
-            }
-
-            if (OverrideGraphicsBackend != ViewModel.GraphicsBackendIndex)
-            {
-                string _result = Enum.GetName(typeof(GraphicsBackend), ViewModel.GraphicsBackendIndex);
-                line += " -g " + _result;
-            }
-
-            if (OverridePPTC != ViewModel.EnablePptc)
-            {
-                string _result =  ViewModel.EnablePptc.ToString();
-                line += " --pptc " + _result;
-            }
-
-            if (OverrideMemoryManagerMode != ViewModel.MemoryMode)
-            {
-                string _result = Enum.GetName(typeof(MemoryManagerMode), ViewModel.MemoryMode);
-                line += " -m " + _result;
-            }
-
-            if (OverrideSystemRegion != ViewModel.Region)
-            {
-                string _result = Enum.GetName(typeof(RegionCode), ViewModel.Region);
-                line += " --system-region " + _result;
-            }
-
-            if (OverrideSystemLanguage != ViewModel.Language) 
-            {
-                string _result = Enum.GetName(typeof(SystemLanguage), ViewModel.Language);
-                line += " --system-language " + _result;
-            }
-
-            return line;
-        }
-
-        private void Load()
-        {
-            Pages.Children.Clear();
-            NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
-            NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
-            
-        }
-
-        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
-        {
-            
-            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
-            {
-                switch (navItem.Tag.ToString())
-                {
-                    case nameof(AllSettings):
-                        NavPanel.Content = AllSettings;
-                        break;
-                    default:
-                        throw new NotImplementedException();
-                }
-            }        
-        }
-
-        protected override void OnClosing(WindowClosingEventArgs e)
-        {
-            base.OnClosing(e);
-        }
-    }
-}

src/Ryujinx/Utilities/CommandLineState.cs

@@ -6,15 +6,11 @@ namespace Ryujinx.Ava.Utilities
     public static class CommandLineState
     {
         public static string[] Arguments { get; private set; }
-        public static int CountArguments { get; private set; }
+
         public static bool? OverrideDockedMode { get; private set; }
         public static bool? OverrideHardwareAcceleration { get; private set; }
         public static string OverrideGraphicsBackend { get; private set; }
         public static string OverrideBackendThreading { get; private set; }
-        public static string OverridePPTC { get; private set; }
-        public static string OverrideMemoryManagerMode { get; private set; } 
-        public static string OverrideSystemRegion { get; private set; } 
-        public static string OverrideSystemLanguage { get; private set; } 
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
         public static string Profile { get; private set; }
@@ -32,11 +28,6 @@ namespace Ryujinx.Ava.Utilities
             {
                 string arg = args[i];
 
-                if (arg.Contains("-") || arg.Contains("--"))
-                {
-                    CountArguments++; 
-                }
-
                 switch (arg)
                 {
                     case "-r":
@@ -94,47 +85,6 @@ namespace Ryujinx.Ava.Utilities
 
                         OverrideBackendThreading = args[++i];
                         break;
-                    case "--pptc":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverridePPTC = args[++i];
-                        break;
-                    case "-m":
-                    case "--memory-manager-mode":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideMemoryManagerMode = args[++i];
-                        break;
-                    case "--system-region":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemRegion = args[++i];
-                        break;
-                    case "--system-language":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemLanguage = args[++i];
-                        break;
                     case "-i":
                     case "--application-id":
                         LaunchApplicationId = args[++i];

src/Ryujinx/Utilities/ShortcutHelper.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Ava.Utilities
     public static class ShortcutHelper
     {
         [SupportedOSPlatform("windows")]
-        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath)
         {
             string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName + ".exe");
             iconPath += ".ico";
@@ -22,13 +22,13 @@ namespace Ryujinx.Ava.Utilities
             image.Resize(new SKImageInfo(128, 128), SKFilterQuality.High);
             SaveBitmapAsIcon(image, iconPath);
 
-            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId), iconPath, 0);
             shortcut.StringData.NameString = cleanedAppName;
             shortcut.WriteToFile(Path.Combine(desktopPath, cleanedAppName + ".lnk"));
         }
 
         [SupportedOSPlatform("linux")]
-        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName)
         {
             string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx.sh");
             string desktopFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.desktop");
@@ -40,11 +40,11 @@ namespace Ryujinx.Ava.Utilities
             data.SaveTo(file);
 
             using StreamWriter outputFile = new(Path.Combine(desktopPath, cleanedAppName + ".desktop"));
-            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId)}");
         }
 
         [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
         {
             string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx");
             string plistFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.plist");
@@ -63,7 +63,7 @@ namespace Ryujinx.Ava.Utilities
             string scriptPath = Path.Combine(scriptFolderPath, ScriptName);
             using StreamWriter scriptFile = new(scriptPath);
 
-            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId));
 
             // Set execute permission
             FileInfo fileInfo = new(scriptPath);
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.Utilities
             outputFile.Write(plistFile, ScriptName, cleanedAppName, IconName);
         }
 
-        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData)
         {
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             string cleanedAppName = string.Join("_", applicationName.Split(Path.GetInvalidFileNameChars()));
@@ -96,7 +96,7 @@ namespace Ryujinx.Ava.Utilities
             {
                 string iconPath = Path.Combine(AppDataManager.BaseDirPath, "games", applicationId, "app");
 
-                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath);
 
                 return;
             }
@@ -106,14 +106,14 @@ namespace Ryujinx.Ava.Utilities
                 string iconPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "icons", "Ryujinx");
 
                 Directory.CreateDirectory(iconPath);
-                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName);
 
                 return;
             }
 
             if (OperatingSystem.IsMacOS())
             {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
 
                 return;
             }
@@ -121,7 +121,7 @@ namespace Ryujinx.Ava.Utilities
             throw new NotImplementedException("Shortcut support has not been implemented yet for this OS.");
         }
 
-        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
+        private static string GetArgsString(string appFilePath, string applicationId)
         {
             // args are first defined as a list, for easier adjustments in the future
             List<string> argsList = [];
@@ -132,11 +132,6 @@ namespace Ryujinx.Ava.Utilities
                 argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
             }
 
-            if (!string.IsNullOrEmpty(config))
-            {
-                argsList.Add(config);
-            }
-
             if (appFilePath.ToLower().EndsWith(".xci"))
             {
                 argsList.Add("--application-id");