diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index f8ec524..1212a3b 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -2056,7 +2056,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Configure what Bloxstrap should do when launching.. + /// Looks up a localized string similar to Configure what Bloxstrap should do when launching Roblox.. /// public static string Menu_Behaviour_Description { get { @@ -2101,7 +2101,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Behaviour. + /// Looks up a localized string similar to Bootstrapper. /// public static string Menu_Behaviour_Title { get { @@ -2109,6 +2109,15 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Configure options related to Bloxstrap's behaviour itself.. + /// + public static string Menu_Bloxstrap_Description { + get { + return ResourceManager.GetString("Menu.Bloxstrap.Description", resourceCulture); + } + } + /// /// Looks up a localized string similar to Add new. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 3a1baf1..d44275b 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -537,7 +537,7 @@ Would you like to upgrade your currently installed version? Prompt to confirm when launching another Roblox instance - Configure what Bloxstrap should do when launching. + Configure what Bloxstrap should do when launching Roblox. Roblox will be installed fresh on next launch. @@ -546,7 +546,7 @@ Would you like to upgrade your currently installed version? Force Roblox reinstallation - Behaviour + Bootstrapper Add new @@ -1219,4 +1219,7 @@ Please manually delete Bloxstrap.exe from the install location or try restarting One-off + + Configure options related to Bloxstrap's behaviour itself. + \ No newline at end of file diff --git a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml index b63b1a7..e0922d9 100644 --- a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml +++ b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml @@ -51,16 +51,17 @@ + - + diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml new file mode 100644 index 0000000..688c54e --- /dev/null +++ b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml.cs b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml.cs new file mode 100644 index 0000000..af95adf --- /dev/null +++ b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Bloxstrap.UI.ViewModels.Settings; + +namespace Bloxstrap.UI.Elements.Settings.Pages +{ + /// + /// Interaction logic for BloxstrapPage.xaml + /// + public partial class BloxstrapPage + { + public BloxstrapPage() + { + DataContext = new BloxstrapViewModel(); + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml similarity index 89% rename from Bloxstrap/UI/Elements/Settings/Pages/BehaviourPage.xaml rename to Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml index 4a92c3b..8a4f40a 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/BehaviourPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml @@ -17,12 +17,6 @@ - - - - diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BehaviourPage.xaml.cs b/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml.cs similarity index 100% rename from Bloxstrap/UI/Elements/Settings/Pages/BehaviourPage.xaml.cs rename to Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml.cs diff --git a/Bloxstrap/UI/ViewModels/Settings/BehaviourViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/BehaviourViewModel.cs index 475bfbd..fdbc6db 100644 --- a/Bloxstrap/UI/ViewModels/Settings/BehaviourViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/BehaviourViewModel.cs @@ -5,12 +5,6 @@ private string _oldPlayerVersionGuid = ""; private string _oldStudioVersionGuid = ""; - public bool UpdateCheckingEnabled - { - get => App.Settings.Prop.CheckForUpdates; - set => App.Settings.Prop.CheckForUpdates = value; - } - public bool ConfirmLaunches { get => App.Settings.Prop.ConfirmLaunches; diff --git a/Bloxstrap/UI/ViewModels/Settings/BloxstrapViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/BloxstrapViewModel.cs new file mode 100644 index 0000000..e1b8278 --- /dev/null +++ b/Bloxstrap/UI/ViewModels/Settings/BloxstrapViewModel.cs @@ -0,0 +1,11 @@ +namespace Bloxstrap.UI.ViewModels.Settings +{ + public class BloxstrapViewModel : NotifyPropertyChangedViewModel + { + public bool UpdateCheckingEnabled + { + get => App.Settings.Prop.CheckForUpdates; + set => App.Settings.Prop.CheckForUpdates = value; + } + } +}