SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-13 00:31:30 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename "Fast Flags" tab to "Engine settings"

Browse Source 
also remove debug flags
This commit is contained in:
pizzaboxer 2024-10-06 18:12:16 +01:00
parent 65a7bb1c04
commit 8748b3c1cb
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
5 changed files with 2 additions and 71 deletions
Bloxstrap
FastFlagManager.cs
Resources
Strings.Designer.csStrings.resx
UI
Elements/Settings/Pages
FastFlagsPage.xaml
ViewModels/Settings
FastFlagsViewModel.cs

12
Bloxstrap/FastFlagManager.cs
View File

@ -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" },

2
Bloxstrap/Resources/Strings.Designer.cs generated
View File

@ -2541,7 +2541,7 @@ namespace Bloxstrap.Resources {
}
/// <summary>
/// Looks up a localized string similar to Fast Flags.
/// Looks up a localized string similar to Engine settings.
/// </summary>
public static string Menu_FastFlags_Title {
get {

2
Bloxstrap/Resources/Strings.resx
View File

@ -646,7 +646,7 @@ Do NOT use this to import large "flag lists" made by other people that promise t
<value>Rendering mode</value>
</data>
<data name="Menu.FastFlags.Title" xml:space="preserve">
<value>Fast Flags</value>
<value>Engine settings</value>
</data>
<data name="Menu.FontFiles" xml:space="preserve">
<value>Font files</value>

28
Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml
View File

@ -21,34 +21,6 @@
<TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_FastFlags_Help_Description}" Padding="0,0,16,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel>
</ui:CardAction>
<controls:OptionControl
Header="{x:Static resources:Strings.Menu_FastFlags_ManagerEnabled_Title}"
Description="{x:Static resources:Strings.Menu_FastFlags_ManagerEnabled_Description}">
<ui:ToggleSwitch IsChecked="{Binding UseFastFlagManager, Mode=TwoWay}" />
</controls:OptionControl>
<StackPanel Visibility="{Binding ShowDebugFlags, Mode=OneTime}">
<TextBlock Text="Debug" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
<controls:OptionControl
Header="HTTP request logging"
Description="Enables logging of HTTP requests (DFLogHttpTraceLight=12).">
<ui:ToggleSwitch IsChecked="{Binding HttpRequestLogging, Mode=TwoWay}" />
</controls:OptionControl>
<controls:OptionControl
Header="HTTP proxy address"
Description="Set blank if not using a proxy. Don't forget to add cacert.pem as a mod.">
<ui:TextBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" Text="{Binding HttpRequestProxy, Mode=TwoWay}" />
</controls:OptionControl>
<controls:OptionControl
Header="Flag state overlay"
Description="Show values of specified flags during runtime. Each flag is comma separated.">
<ui:TextBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" Text="{Binding StateOverlayFlags, Mode=TwoWay}" />
</controls:OptionControl>
</StackPanel>
<TextBlock Text="{x:Static resources:Strings.Common_Presets}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />

29
Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs
View File

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