Просмотр исходного кода

misc: chore: rename IgnoreApplet to IgnoreControllerApplet

Evan Husted 1 год назад
Родитель
Сommit
7d59ada798

+ 1 - 1
src/Ryujinx/Headless/Options.cs

@@ -148,7 +148,7 @@ namespace Ryujinx.Headless
                 IgnoreMissingServices = configurationState.System.IgnoreMissingServices;
                 IgnoreMissingServices = configurationState.System.IgnoreMissingServices;
             
             
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
-                IgnoreControllerApplet = configurationState.System.IgnoreApplet;
+                IgnoreControllerApplet = configurationState.System.IgnoreControllerApplet;
             
             
             return;
             return;
             
             

+ 1 - 1
src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Ava.UI.Applet
 
 
             bool okPressed = false;
             bool okPressed = false;
 
 
-            if (ConfigurationState.Instance.System.IgnoreApplet)
+            if (ConfigurationState.Instance.System.IgnoreControllerApplet)
                 return false;
                 return false;
 
 
             Dispatcher.UIThread.InvokeAsync(async () =>
             Dispatcher.UIThread.InvokeAsync(async () =>

+ 2 - 2
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -526,7 +526,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
             DramSize = config.System.DramSize;
             DramSize = config.System.DramSize;
             IgnoreMissingServices = config.System.IgnoreMissingServices;
             IgnoreMissingServices = config.System.IgnoreMissingServices;
-            IgnoreApplet = config.System.IgnoreApplet;
+            IgnoreApplet = config.System.IgnoreControllerApplet;
 
 
             // CPU
             // CPU
             EnablePptc = config.System.EnablePtc;
             EnablePptc = config.System.EnablePtc;
@@ -629,7 +629,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
-            config.System.IgnoreApplet.Value = IgnoreApplet;
+            config.System.IgnoreControllerApplet.Value = IgnoreApplet;
 
 
             // CPU
             // CPU
             config.System.EnablePtc.Value = EnablePptc;
             config.System.EnablePtc.Value = EnablePptc;

+ 1 - 1
src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -183,7 +183,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public bool ShowConfirmExit { get; set; }
         public bool ShowConfirmExit { get; set; }
 
 
         /// <summary>
         /// <summary>
-        /// ignore "Applet" dialog
+        /// Ignore Controller Applet dialog
         /// </summary>
         /// </summary>
         public bool IgnoreApplet { get; set; }
         public bool IgnoreApplet { get; set; }
 
 

+ 1 - 1
src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -100,7 +100,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = cff.MemoryManagerMode;
             System.MemoryManagerMode.Value = cff.MemoryManagerMode;
             System.DramSize.Value = cff.DramSize;
             System.DramSize.Value = cff.DramSize;
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
-            System.IgnoreApplet.Value = cff.IgnoreApplet;
+            System.IgnoreControllerApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
             System.UseHypervisor.Value = cff.UseHypervisor;
             
             
             UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
             UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;

+ 3 - 3
src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -383,7 +383,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// <summary>
             /// <summary>
             ///  Ignore Controller Applet
             ///  Ignore Controller Applet
             /// </summary>
             /// </summary>
-            public ReactiveObject<bool> IgnoreApplet { get; private set; }
+            public ReactiveObject<bool> IgnoreControllerApplet { get; private set; }
 
 
             /// <summary>
             /// <summary>
             /// Uses Hypervisor over JIT if available
             /// Uses Hypervisor over JIT if available
@@ -424,8 +424,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 DramSize.LogChangesToValue(nameof(DramSize));
                 DramSize.LogChangesToValue(nameof(DramSize));
                 IgnoreMissingServices = new ReactiveObject<bool>();
                 IgnoreMissingServices = new ReactiveObject<bool>();
                 IgnoreMissingServices.LogChangesToValue(nameof(IgnoreMissingServices));
                 IgnoreMissingServices.LogChangesToValue(nameof(IgnoreMissingServices));
-                IgnoreApplet = new ReactiveObject<bool>();
-                IgnoreApplet.LogChangesToValue(nameof(IgnoreApplet));
+                IgnoreControllerApplet = new ReactiveObject<bool>();
+                IgnoreControllerApplet.LogChangesToValue(nameof(IgnoreControllerApplet));
                 AudioVolume = new ReactiveObject<float>();
                 AudioVolume = new ReactiveObject<float>();
                 AudioVolume.LogChangesToValue(nameof(AudioVolume));
                 AudioVolume.LogChangesToValue(nameof(AudioVolume));
                 UseHypervisor = new ReactiveObject<bool>();
                 UseHypervisor = new ReactiveObject<bool>();

+ 2 - 2
src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -81,7 +81,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 MemoryManagerMode = System.MemoryManagerMode,
                 MemoryManagerMode = System.MemoryManagerMode,
                 DramSize = System.DramSize,
                 DramSize = System.DramSize,
                 IgnoreMissingServices = System.IgnoreMissingServices,
                 IgnoreMissingServices = System.IgnoreMissingServices,
-                IgnoreApplet = System.IgnoreApplet,
+                IgnoreApplet = System.IgnoreControllerApplet,
                 UseHypervisor = System.UseHypervisor,
                 UseHypervisor = System.UseHypervisor,
                 GuiColumns = new GuiColumns
                 GuiColumns = new GuiColumns
                 {
                 {
@@ -205,7 +205,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = MemoryManagerMode.HostMappedUnsafe;
             System.MemoryManagerMode.Value = MemoryManagerMode.HostMappedUnsafe;
             System.DramSize.Value = MemoryConfiguration.MemoryConfiguration4GiB;
             System.DramSize.Value = MemoryConfiguration.MemoryConfiguration4GiB;
             System.IgnoreMissingServices.Value = false;
             System.IgnoreMissingServices.Value = false;
-            System.IgnoreApplet.Value = false;
+            System.IgnoreControllerApplet.Value = false;
             System.UseHypervisor.Value = true;
             System.UseHypervisor.Value = true;
             Multiplayer.LanInterfaceId.Value = "0";
             Multiplayer.LanInterfaceId.Value = "0";
             Multiplayer.Mode.Value = MultiplayerMode.Disabled;
             Multiplayer.Mode.Value = MultiplayerMode.Disabled;