diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index 3e4025c..524b783 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -2476,7 +2476,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to A Windows feature that intends to improve fullscreen performance. [See here for more information]({0}).. + /// Looks up a localized string similar to A Windows feature that may conflict with performance in full-screen.. /// public static string Menu_Mods_Misc_DisableFullscreenOptimisations_Description { get { @@ -2637,6 +2637,15 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Click for more information on this option.. + /// + public static string Menu_MoreInfo { + get { + return ResourceManager.GetString("Menu.MoreInfo", resourceCulture); + } + } + /// /// Looks up a localized string similar to There's just a few things you first should know about.. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index a7cd2a6..87592c8 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -936,7 +936,7 @@ Selecting 'No' will ignore this warning and continue installation. Apply custom font - A Windows feature that intends to improve fullscreen performance. [See here for more information]({0}). + A Windows feature that may conflict with performance in full-screen. Disable fullscreen optimisations @@ -989,6 +989,9 @@ Selecting 'No' will ignore this warning and continue installation. Mods + + Click for more information on this option. + There's just a few things you first should know about. diff --git a/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs b/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs index 28c2f09..5dcda3a 100644 --- a/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs +++ b/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs @@ -20,7 +20,7 @@ namespace Bloxstrap.UI.Elements.Controls /// /// Interaction logic for Expander.xaml /// - [ContentProperty("InnerContent")] + [ContentProperty(nameof(InnerContent))] public partial class Expander : UserControl { public static readonly DependencyProperty HeaderIconProperty = diff --git a/Bloxstrap/UI/Elements/Controls/OptionControl.xaml b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml new file mode 100644 index 0000000..db7086e --- /dev/null +++ b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/UI/Elements/Controls/OptionControl.xaml.cs b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml.cs new file mode 100644 index 0000000..53f0366 --- /dev/null +++ b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Bloxstrap.UI.Elements.Controls +{ + /// + /// Interaction logic for OptionControl.xaml + /// - - - - - - - + @@ -26,14 +23,11 @@ - - - - - - - - + + + @@ -41,14 +35,11 @@ - - - - - - - - + + + @@ -67,7 +58,8 @@ - + + diff --git a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml index 2a61f19..a55259e 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Menu.Pages" + xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls" xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels.Menu" xmlns:resources="clr-namespace:Bloxstrap.Resources" d:DataContext="{d:DesignInstance Type=models:BehaviourViewModel}" @@ -16,25 +17,17 @@ - - - - - - - + - + - - - - - - - + - + @@ -149,13 +142,9 @@ - - - - - - - + @@ -163,25 +152,21 @@ - + - - - - - - - - - - + - + diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml index 846c6eb..964c209 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml @@ -38,64 +38,39 @@ - - - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + @@ -103,25 +78,12 @@ - - - - - - - - - - - - - - - - - - - + + + @@ -129,45 +91,19 @@ - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + @@ -175,14 +111,11 @@ - - - - - - - - + + + @@ -190,35 +123,19 @@ - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + - + diff --git a/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml index 2cd8101..a19bcd4 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml @@ -6,6 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels" + xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls" xmlns:resources="clr-namespace:Bloxstrap.Resources" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="800" @@ -15,67 +16,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - + + - + diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml index fae7814..24df243 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml @@ -63,23 +63,15 @@ - - - - - - - + - - - - - - - - - + + + @@ -87,45 +79,29 @@ - - - - - - - - - + + + - - - - - - - - - + + + - - - - - - - - - + + + - - - - - - - - - + + + @@ -133,29 +109,25 @@ - + - - - - - - - + + - - - - - - - - + + + - + diff --git a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs index eb143a3..a6c6175 100644 --- a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs @@ -100,12 +100,5 @@ namespace Bloxstrap.UI.ViewModels.Menu get => App.Settings.Prop.DisableFullscreenOptimizations; set => App.Settings.Prop.DisableFullscreenOptimizations = value; } - - public string DisableFullscreenOptimisationsDescriptionText - { - get => string.Format( - Resources.Strings.Menu_Mods_Misc_DisableFullscreenOptimisations_Description, - "https://devblogs.microsoft.com/directx/demystifying-full-screen-optimizations/"); - } } }