diff --git a/GoldbergGUI.Core/Models/SteamAppModel.cs b/GoldbergGUI.Core/Models/SteamAppModel.cs index 0b5f79e..66bd139 100644 --- a/GoldbergGUI.Core/Models/SteamAppModel.cs +++ b/GoldbergGUI.Core/Models/SteamAppModel.cs @@ -24,7 +24,7 @@ namespace GoldbergGUI.Core.Models set { _name = value; - _comparableName = Regex.Replace(value, Misc.SpecialCharsRegex, "").ToLower(); + _comparableName = Regex.Replace(value, Misc.AlphaNumOnlyRegex, "").ToLower(); } } diff --git a/GoldbergGUI.Core/Services/SteamService.cs b/GoldbergGUI.Core/Services/SteamService.cs index 53d00fe..300961e 100644 --- a/GoldbergGUI.Core/Services/SteamService.cs +++ b/GoldbergGUI.Core/Services/SteamService.cs @@ -177,7 +177,7 @@ namespace GoldbergGUI.Core.Services public SteamApp GetAppByName(string name) { _log.Info($"Trying to get app {name}"); - var comparableName = Regex.Replace(name, Misc.SpecialCharsRegex, "").ToLower(); + var comparableName = Regex.Replace(name, Misc.AlphaNumOnlyRegex, "").ToLower(); var app = _caches[AppType.Game].Cache.FirstOrDefault(x => x.CompareName(comparableName)); if (app != null) _log.Info($"Successfully got app {app}"); return app; diff --git a/GoldbergGUI.Core/Utils/Misc.cs b/GoldbergGUI.Core/Utils/Misc.cs index 2a76437..6bf7df2 100644 --- a/GoldbergGUI.Core/Utils/Misc.cs +++ b/GoldbergGUI.Core/Utils/Misc.cs @@ -1,42 +1,25 @@ -using System.Collections.ObjectModel; - namespace GoldbergGUI.Core.Utils { - public class Misc + public static class Misc { - public const string SpecialCharsRegex = "[^0-9a-zA-Z]+"; - public const string DefaultLanguageSelection = "english"; - public static readonly ObservableCollection DefaultLanguages = new ObservableCollection(new[] - { - "arabic", - "bulgarian", - "schinese", - "tchinese", - "czech", - "danish", - "dutch", - "english", - "finnish", - "french", - "german", - "greek", - "hungarian", - "italian", - "japanese", - "koreana", - "norwegian", - "polish", - "portuguese", - "brazilian", - "romanian", - "russian", - "spanish", - "latam", - "swedish", - "thai", - "turkish", - "ukrainian", - "vietnamese" - }); + public const string AlphaNumOnlyRegex = "[^0-9a-zA-Z]+"; + } + + public class GlobalHelp + { + public static string Header => + "Information\n"; + + public static string TextPreLink => + "Usually these settings are saved under"; + + public static string Link => "%APPDATA%\\Goldberg SteamEmu Saves\\settings"; + + public static string TextPostLink => + ", which makes these " + + "available for every game that uses the Goldberg Emulator. However, if you want to set specific settings " + + "for certain games (e.g. different language), you can remove the \"Global\" checkmark next to the option " + + "and then change it. If you want to remove that setting, just empty the field while \"Global\" is " + + "unchecked. (Not implemented yet!)"; } } \ No newline at end of file diff --git a/GoldbergGUI.Core/ViewModels/MainViewModel.cs b/GoldbergGUI.Core/ViewModels/MainViewModel.cs index 587711b..a864d3c 100644 --- a/GoldbergGUI.Core/ViewModels/MainViewModel.cs +++ b/GoldbergGUI.Core/ViewModels/MainViewModel.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using System.Windows; using GoldbergGUI.Core.Models; using GoldbergGUI.Core.Services; +using GoldbergGUI.Core.Utils; using Microsoft.Win32; using MvvmCross.Commands; using MvvmCross.Logging; @@ -251,9 +252,6 @@ namespace GoldbergGUI.Core.ViewModels } } - public string AboutVersionText => - FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion; - public string StatusText { get => _statusText; @@ -264,23 +262,8 @@ namespace GoldbergGUI.Core.ViewModels } } - public class GlobalHelp - { - public static string Header => - "Information\n"; - - public static string TextPreLink => - "Usually these settings are saved under"; - - public static string Link => "%APPDATA%\\Goldberg SteamEmu Saves\\settings"; - - public static string TextPostLink => - ", which makes these " + - "available for every game that uses the Goldberg Emulator. However, if you want to set specific settings " + - "for certain games (e.g. different language), you can remove the \"Global\" checkmark next to the option " + - "and then change it. If you want to remove that setting, just empty the field while \"Global\" is " + - "unchecked. (Not implemented yet!)"; - } + public static string AboutVersionText => + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion; public static GlobalHelp G => new GlobalHelp(); diff --git a/GoldbergGUI.WPF/Views/MainView.xaml b/GoldbergGUI.WPF/Views/MainView.xaml index eff2105..62094dc 100644 --- a/GoldbergGUI.WPF/Views/MainView.xaml +++ b/GoldbergGUI.WPF/Views/MainView.xaml @@ -143,7 +143,7 @@ -