diff --git a/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs b/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs index e1e684993..0000ad1ce 100644 --- a/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs +++ b/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs @@ -69,7 +69,7 @@ private class Config public bool SoundDebug { get; internal set; } = false; public bool EnableCache { get; internal set; } = true; public bool QuickMenu { get; internal set; } = false; - public bool DevView { get; internal set; } = false; + public bool EnablePatching { get; internal set; } = false; public bool AutoUpdateMods { get; internal set; } public string pcVersion { get; internal set; } = "EGS"; public bool steamAPITrick1525 { get; internal set; } = false; @@ -495,12 +495,12 @@ public static bool QuickMenu _config.Save(ConfigPath); } } - public static bool DevView + public static bool EnablePatching { - get => _config.DevView; + get => _config.EnablePatching; set { - _config.DevView = value; + _config.EnablePatching = value; _config.Save(ConfigPath); } } diff --git a/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs index c13bcf60a..4b0d923e3 100644 --- a/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs +++ b/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs @@ -46,7 +46,7 @@ public class MainViewModel : BaseNotifyPropertyChanged, IChangeModEnableState private bool _panaceaSoundDebugEnabled; private bool _panaceaCacheEnabled; private bool _panaceaQuickMenuEnabled; - private bool _devView; + private bool _enablePatching; private bool _autoUpdateMods = false; private string _launchGame = "kh2"; private List _supportedGames = new List() @@ -126,8 +126,7 @@ public ModViewModel SelectedValue public Visibility IsModInfoVisible => IsModSelected ? Visibility.Visible : Visibility.Collapsed; public Visibility IsModUnselectedMessageVisible => !IsModSelected ? Visibility.Visible : Visibility.Collapsed; - public Visibility PatchVisible => PC && !PanaceaInstalled || PC && DevView ? Visibility.Visible : Visibility.Collapsed; - public Visibility ModLoader => !PC || PanaceaInstalled ? Visibility.Visible : Visibility.Collapsed; + public Visibility PatchVisible => PC && EnablePatching ? Visibility.Visible : Visibility.Collapsed; public Visibility notPC => !PC ? Visibility.Visible : Visibility.Collapsed; public Visibility isPC => PC ? Visibility.Visible : Visibility.Collapsed; public bool GameSelectInteractable => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) || (PCSX2 && MultiEmuGames); @@ -229,13 +228,13 @@ public bool PanaceaQuickMenuEnabled UpdatePanaceaSettings(); } } - public bool DevView + public bool EnablePatching { - get => _devView; + get => _enablePatching; set { - _devView = value; - ConfigurationService.DevView = DevView; + _enablePatching = value; + ConfigurationService.EnablePatching = EnablePatching; OnPropertyChanged(nameof(PatchVisible)); } } @@ -255,7 +254,6 @@ public bool PanaceaInstalled { _panaceaInstalled = value; OnPropertyChanged(nameof(PatchVisible)); - OnPropertyChanged(nameof(ModLoader)); OnPropertyChanged(nameof(PanaceaSettings)); } } @@ -267,7 +265,6 @@ public bool PC { _pc = value; OnPropertyChanged(nameof(PC)); - OnPropertyChanged(nameof(ModLoader)); OnPropertyChanged(nameof(PatchVisible)); OnPropertyChanged(nameof(notPC)); OnPropertyChanged(nameof(isPC)); @@ -284,7 +281,6 @@ public bool PCSX2 { _pcsx2 = value; OnPropertyChanged(nameof(PCSX2)); - OnPropertyChanged(nameof(ModLoader)); OnPropertyChanged(nameof(PatchVisible)); OnPropertyChanged(nameof(notPC)); OnPropertyChanged(nameof(isPC)); @@ -390,7 +386,7 @@ public MainViewModel() PC = true; PCSX2 = false; PanaceaInstalled = ConfigurationService.PanaceaInstalled; - DevView = ConfigurationService.DevView; + EnablePatching = ConfigurationService.EnablePatching; _panaceaConsoleEnabled = ConfigurationService.ShowConsole; _panaceaDebugLogEnabled = ConfigurationService.DebugLog; _panaceaSoundDebugEnabled = ConfigurationService.SoundDebug; diff --git a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs index 87437b827..a4dacd229 100644 --- a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs +++ b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs @@ -225,7 +225,6 @@ public string IsoLocationRecom public Visibility KH1RecognizedVisibility => !string.IsNullOrEmpty(_isoLocationKH1) ? Visibility.Visible : Visibility.Collapsed; public Visibility KH2RecognizedVisibility => !string.IsNullOrEmpty(_isoLocationKH2) ? Visibility.Visible : Visibility.Collapsed; public Visibility RecomRecognizedVisibility => !string.IsNullOrEmpty(_isoLocationRecom) ? Visibility.Visible : Visibility.Collapsed; - public Visibility OpenKhGameEngineVisible => ConfigurationService.DevView ? Visibility.Visible : Visibility.Collapsed; public bool IsGameSelected { diff --git a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml b/OpenKh.Tools.ModsManager/Views/MainWindow.xaml index 9ddfc17e7..91e32cca4 100644 --- a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml +++ b/OpenKh.Tools.ModsManager/Views/MainWindow.xaml @@ -74,7 +74,7 @@ - + @@ -151,7 +151,7 @@ - +