From 665d1d4f6f0e5d2e66fcd686873d3e3fe319a9e5 Mon Sep 17 00:00:00 2001 From: Jimmy Reichley Date: Sun, 18 Aug 2024 20:49:32 -0400 Subject: [PATCH] Remove autoload content checkbox --- .../Configuration/ConfigurationFileFormat.cs | 7 +------ .../Configuration/ConfigurationState.cs | 18 ------------------ src/Ryujinx/Assets/Locales/en_US.json | 1 - src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 3 --- .../UI/Views/Settings/SettingsUIView.axaml | 3 --- 5 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs index 2ccb67c70..c0c451134 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs @@ -15,7 +15,7 @@ namespace Ryujinx.UI.Common.Configuration /// /// The current version of the file format /// - public const int CurrentVersion = 53; + public const int CurrentVersion = 52; /// /// Version of the configuration file format @@ -167,11 +167,6 @@ namespace Ryujinx.UI.Common.Configuration /// public bool RememberWindowState { get; set; } - /// - /// Enables or disables automatically loading DLC/title updates on library refresh. - /// - public bool AutoloadContent { get; set; } - /// /// Enables hardware-accelerated rendering for Avalonia /// diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index f9179d0c0..7a05498bd 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -638,11 +638,6 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject RememberWindowState { get; private set; } - /// - /// Enables or disables automatically loading DLC/title updates on library refresh. - /// - public ReactiveObject AutoloadContent { get; private set; } - /// /// Enables hardware-accelerated rendering for Avalonia /// @@ -665,7 +660,6 @@ namespace Ryujinx.UI.Common.Configuration CheckUpdatesOnStart = new ReactiveObject(); ShowConfirmExit = new ReactiveObject(); RememberWindowState = new ReactiveObject(); - AutoloadContent = new ReactiveObject(); EnableHardwareAcceleration = new ReactiveObject(); HideCursor = new ReactiveObject(); } @@ -704,7 +698,6 @@ namespace Ryujinx.UI.Common.Configuration CheckUpdatesOnStart = CheckUpdatesOnStart, ShowConfirmExit = ShowConfirmExit, RememberWindowState = RememberWindowState, - AutoloadContent = AutoloadContent, EnableHardwareAcceleration = EnableHardwareAcceleration, HideCursor = HideCursor, EnableVsync = Graphics.EnableVsync, @@ -815,7 +808,6 @@ namespace Ryujinx.UI.Common.Configuration CheckUpdatesOnStart.Value = true; ShowConfirmExit.Value = true; RememberWindowState.Value = true; - AutoloadContent.Value = false; EnableHardwareAcceleration.Value = true; HideCursor.Value = HideCursorMode.OnIdle; Graphics.EnableVsync.Value = true; @@ -1497,15 +1489,6 @@ namespace Ryujinx.UI.Common.Configuration { Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 52."); - configurationFileFormat.AutoloadContent = false; - - configurationFileUpdated = true; - } - - if (configurationFileFormat.Version < 53) - { - Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 53."); - configurationFileFormat.AutoloadDirs = new(); configurationFileUpdated = true; @@ -1542,7 +1525,6 @@ namespace Ryujinx.UI.Common.Configuration CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart; ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit; RememberWindowState.Value = configurationFileFormat.RememberWindowState; - AutoloadContent.Value = configurationFileFormat.AutoloadContent; EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration; HideCursor.Value = configurationFileFormat.HideCursor; Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync; diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json index 339842616..b9ba51d5d 100644 --- a/src/Ryujinx/Assets/Locales/en_US.json +++ b/src/Ryujinx/Assets/Locales/en_US.json @@ -100,7 +100,6 @@ "SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch", "SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", - "SettingsTabGeneralAutoloadContent": "Automatically load DLC/updates", "SettingsTabGeneralHideCursor": "Hide Cursor:", "SettingsTabGeneralHideCursorNever": "Never", "SettingsTabGeneralHideCursorOnIdle": "On Idle", diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 57c576e1f..bfcf5bdfc 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -144,7 +144,6 @@ namespace Ryujinx.Ava.UI.ViewModels public bool CheckUpdatesOnStart { get; set; } public bool ShowConfirmExit { get; set; } public bool RememberWindowState { get; set; } - public bool AutoloadContent { get; set; } public int HideCursor { get; set; } public bool EnableDockedMode { get; set; } public bool EnableKeyboard { get; set; } @@ -407,7 +406,6 @@ namespace Ryujinx.Ava.UI.ViewModels CheckUpdatesOnStart = config.CheckUpdatesOnStart; ShowConfirmExit = config.ShowConfirmExit; RememberWindowState = config.RememberWindowState; - AutoloadContent = config.AutoloadContent; HideCursor = (int)config.HideCursor.Value; GameDirectories.Clear(); @@ -503,7 +501,6 @@ namespace Ryujinx.Ava.UI.ViewModels config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart; config.ShowConfirmExit.Value = ShowConfirmExit; config.RememberWindowState.Value = RememberWindowState; - config.AutoloadContent.Value = AutoloadContent; config.HideCursor.Value = (HideCursorMode)HideCursor; if (_gameDirectoryChanged) diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml index 4f25cbebf..86b77e566 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml @@ -39,9 +39,6 @@ - - -