jeddunk/GoldbergGUI
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 5 Wiki Activity

Removed unused code. Minor code changes.

Browse Source
This commit is contained in:
Jeddunk 2021-01-19 20:37:13 +01:00
parent 1602937be3
commit 950844a14b
6 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GoldbergGUI.Core/Models/SteamAppModel.cs
View File

@ -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();
}
}

2
GoldbergGUI.Core/Services/SteamService.cs
View File

@ -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;

55
GoldbergGUI.Core/Utils/Misc.cs
View File

@ -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<string> DefaultLanguages = new ObservableCollection<string>(new[]
public const string AlphaNumOnlyRegex = "[^0-9a-zA-Z]+";
}
public class GlobalHelp
{
"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 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!)";
}
}

23
GoldbergGUI.Core/ViewModels/MainViewModel.cs
View File

@ -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();

2
GoldbergGUI.WPF/Views/MainView.xaml
View File

@ -143,7 +143,7 @@
</TabItem>
<TabItem Header="About" HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Width="54">
<StackPanel Margin="10,20,10,10">
<Label VerticalAlignment="Stretch" Content="{Binding AboutVersionText}">
<Label VerticalAlignment="Stretch" Content="{Binding AboutVersionText, Mode=OneTime}">
<Label.ContentTemplate>
<DataTemplate>
<StackPanel>

2
GoldbergGUI.WPF/Views/SearchResultView.xaml.cs
View File

@ -1,6 +1,6 @@
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
// ReSharper disable UnusedType.Global
namespace GoldbergGUI.WPF.Views
{
[MvxWindowPresentation(Identifier = nameof(SearchResultView), Modal = false)]