From 8748b3c1cb8500b12f0c80f9b5b56eeec0c43470 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Sun, 6 Oct 2024 18:12:16 +0100 Subject: [PATCH] Rename "Fast Flags" tab to "Engine settings" also remove debug flags --- Bloxstrap/FastFlagManager.cs | 12 -------- Bloxstrap/Resources/Strings.Designer.cs | 2 +- Bloxstrap/Resources/Strings.resx | 2 +- .../Settings/Pages/FastFlagsPage.xaml | 28 ------------------ .../ViewModels/Settings/FastFlagsViewModel.cs | 29 ------------------- 5 files changed, 2 insertions(+), 71 deletions(-) diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs index f8ea19e..284df3d 100644 --- a/Bloxstrap/FastFlagManager.cs +++ b/Bloxstrap/FastFlagManager.cs @@ -16,15 +16,6 @@ namespace Bloxstrap { { "Network.Log", "FLogNetwork" }, -#if DEBUG - { "HTTP.Log", "DFLogHttpTraceLight" }, - - { "HTTP.Proxy.Enable", "DFFlagDebugEnableHttpProxy" }, - { "HTTP.Proxy.Address.1", "DFStringDebugPlayerHttpProxyUrl" }, - { "HTTP.Proxy.Address.2", "DFStringHttpCurlProxyHostAndPort" }, - { "HTTP.Proxy.Address.3", "DFStringHttpCurlProxyHostAndPortForExternalUrl" }, -#endif - { "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" }, { "Rendering.ManualFullscreen", "FFlagHandleAltEnterFullscreenManually" }, { "Rendering.DisableScaling", "DFFlagDisableDPIScale" }, @@ -45,9 +36,6 @@ namespace Bloxstrap { "UI.Hide", "DFIntCanHideGuiGroupId" }, { "UI.FontSize", "FIntFontSizePadding" }, -#if DEBUG - { "UI.FlagState", "FStringDebugShowFlagState" }, -#endif { "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" }, diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index ee9fe4d..888ca6e 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -2541,7 +2541,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Fast Flags. + /// Looks up a localized string similar to Engine settings. /// public static string Menu_FastFlags_Title { get { diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index f6a4824..fca85ae 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -646,7 +646,7 @@ Do NOT use this to import large "flag lists" made by other people that promise t Rendering mode - Fast Flags + Engine settings Font files diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml index 20a1d98..e11a8b1 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml @@ -21,34 +21,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs index 537520b..bb3ea2d 100644 --- a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs @@ -18,12 +18,6 @@ namespace Bloxstrap.UI.ViewModels.Settings private void OpenFastFlagEditor() => OpenFlagEditorEvent?.Invoke(this, EventArgs.Empty); public ICommand OpenFastFlagEditorCommand => new RelayCommand(OpenFastFlagEditor); - -#if DEBUG - public Visibility ShowDebugFlags => Visibility.Visible; -#else - public Visibility ShowDebugFlags => Visibility.Collapsed; -#endif public bool UseFastFlagManager { @@ -31,29 +25,6 @@ namespace Bloxstrap.UI.ViewModels.Settings set => App.Settings.Prop.UseFastFlagManager = value; } - public bool HttpRequestLogging - { - get => App.FastFlags.GetPreset("HTTP.Log") is not null; - set => App.FastFlags.SetPreset("HTTP.Log", value ? 12 : null); - } - - public string HttpRequestProxy - { - get => App.FastFlags.GetPreset("HTTP.Proxy.Address.1") ?? ""; - - set - { - App.FastFlags.SetPreset("HTTP.Proxy.Enable", String.IsNullOrEmpty(value) ? null : true); - App.FastFlags.SetPreset("HTTP.Proxy.Address", String.IsNullOrEmpty(value) ? null : value); - } - } - - public string StateOverlayFlags - { - get => App.FastFlags.GetPreset("UI.FlagState") ?? ""; - set => App.FastFlags.SetPreset("UI.FlagState", String.IsNullOrEmpty(value) ? null : value); - } - public int FramerateLimit { get => int.TryParse(App.FastFlags.GetPreset("Rendering.Framerate"), out int x) ? x : 0;