diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs index 118f3d2..2dff225 100644 --- a/Bloxstrap/Enums/BootstrapperStyle.cs +++ b/Bloxstrap/Enums/BootstrapperStyle.cs @@ -6,9 +6,9 @@ LegacyDialog2008, LegacyDialog2011, ProgressDialog, - FluentDialog, + ClassicFluentDialog, ByfronDialog, - ProgressFluentDialog, - ProgressFluentAeroDialog + FluentDialog, + FluentAeroDialog } } diff --git a/Bloxstrap/Extensions/BootstrapperStyleEx.cs b/Bloxstrap/Extensions/BootstrapperStyleEx.cs index 0681e54..3802264 100644 --- a/Bloxstrap/Extensions/BootstrapperStyleEx.cs +++ b/Bloxstrap/Extensions/BootstrapperStyleEx.cs @@ -7,9 +7,10 @@ public static IReadOnlyCollection Selections => new BootstrapperStyle[] { BootstrapperStyle.FluentDialog, - BootstrapperStyle.ProgressFluentDialog, - BootstrapperStyle.ProgressFluentAeroDialog, + BootstrapperStyle.FluentAeroDialog, + BootstrapperStyle.ClassicFluentDialog, BootstrapperStyle.ByfronDialog, + BootstrapperStyle.ProgressDialog, BootstrapperStyle.LegacyDialog2011, BootstrapperStyle.LegacyDialog2008, BootstrapperStyle.VistaDialog diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index 9e7df7f..fe388b8 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -803,6 +803,33 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Fluent (Classic). + /// + public static string Enums_BootstrapperStyle_ClassicFluentDialog { + get { + return ResourceManager.GetString("Enums.BootstrapperStyle.ClassicFluentDialog", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fluent (Aero). + /// + public static string Enums_BootstrapperStyle_FluentAeroDialog { + get { + return ResourceManager.GetString("Enums.BootstrapperStyle.FluentAeroDialog", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fluent (Classic). + /// + public static string Enums_BootstrapperStyle_FluentClassicDialog { + get { + return ResourceManager.GetString("Enums.BootstrapperStyle.FluentClassicDialog", resourceCulture); + } + } + /// /// Looks up a localized string similar to Fluent. /// @@ -839,24 +866,6 @@ namespace Bloxstrap.Resources { } } - /// - /// Looks up a localized string similar to Fluent Progress (Aero). - /// - public static string Enums_BootstrapperStyle_ProgressFluentAeroDialog { - get { - return ResourceManager.GetString("Enums.BootstrapperStyle.ProgressFluentAeroDialog", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Fluent Progress. - /// - public static string Enums_BootstrapperStyle_ProgressFluentDialog { - get { - return ResourceManager.GetString("Enums.BootstrapperStyle.ProgressFluentDialog", resourceCulture); - } - } - /// /// Looks up a localized string similar to Vista (2008 - 2011). /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 6604f62..15ea441 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -370,6 +370,15 @@ Your ReShade configuration files will still be saved, and you can locate them by Fake Byfron (2023) + + Fluent (Classic) + + + Fluent (Aero) + + + Fluent (Classic) + Fluent @@ -382,12 +391,6 @@ Your ReShade configuration files will still be saved, and you can locate them by Progress (~2014) - - Fluent Progress (Aero) - - - Fluent Progress - Vista (2008 - 2011) diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml new file mode 100644 index 0000000..bf41ec3 --- /dev/null +++ b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +