diff --git a/Bloxstrap/App.xaml b/Bloxstrap/App.xaml index de6837b..afdfb30 100644 --- a/Bloxstrap/App.xaml +++ b/Bloxstrap/App.xaml @@ -1,12 +1,13 @@  + xmlns:local="clr-namespace:Bloxstrap" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"> - - + + diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 6e6eb7b..77cc318 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -6,7 +6,6 @@ using System.Net.Http; using System.Net; using System.Reflection; using System.Windows; - using Microsoft.Win32; using Bloxstrap.Models; @@ -96,7 +95,8 @@ namespace Bloxstrap if (IsQuiet) BaseDirectory = Path.Combine(Directories.LocalAppData, ProjectName); else - new Preferences().ShowDialog(); + //new Preferences().ShowDialog(); + new Configuration.MainWindow().ShowDialog(); } else { @@ -129,7 +129,8 @@ namespace Bloxstrap string commandLine = ""; #if DEBUG - new Preferences().ShowDialog(); + //new Preferences().ShowDialog(); + new Configuration.MainWindow().ShowDialog(); #else if (LaunchArgs.Length > 0) { @@ -141,7 +142,8 @@ namespace Bloxstrap return; } - new Preferences().ShowDialog(); + //new Preferences().ShowDialog(); + new Configuration.MainWindow().ShowDialog(); } else if (LaunchArgs[0].StartsWith("roblox-player:")) { diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 7ea46c8..b6cbd71 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -11,6 +11,10 @@ 2.0.0.0 + + + + @@ -22,9 +26,15 @@ + + + + + + diff --git a/Bloxstrap/Configuration/MainWindow.xaml b/Bloxstrap/Configuration/MainWindow.xaml new file mode 100644 index 0000000..7d88560 --- /dev/null +++ b/Bloxstrap/Configuration/MainWindow.xaml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/MainWindow.xaml.cs b/Bloxstrap/Configuration/MainWindow.xaml.cs new file mode 100644 index 0000000..5fb1df1 --- /dev/null +++ b/Bloxstrap/Configuration/MainWindow.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Configuration/Pages/AboutPage.xaml b/Bloxstrap/Configuration/Pages/AboutPage.xaml new file mode 100644 index 0000000..5029ad5 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/AboutPage.xaml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/Pages/AboutPage.xaml.cs b/Bloxstrap/Configuration/Pages/AboutPage.xaml.cs new file mode 100644 index 0000000..a937cb0 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/AboutPage.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration.Pages +{ + /// + /// Interaction logic for AboutPage.xaml + /// + public partial class AboutPage + { + public AboutPage() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml b/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml new file mode 100644 index 0000000..7369157 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml.cs b/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml.cs new file mode 100644 index 0000000..2576b63 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/BootstrapperPage.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration.Pages +{ + /// + /// Interaction logic for BootstrapperPage.xaml + /// + public partial class BootstrapperPage + { + public BootstrapperPage() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Configuration/Pages/InstallationPage.xaml b/Bloxstrap/Configuration/Pages/InstallationPage.xaml new file mode 100644 index 0000000..ca0ffc7 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/InstallationPage.xaml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/Pages/InstallationPage.xaml.cs b/Bloxstrap/Configuration/Pages/InstallationPage.xaml.cs new file mode 100644 index 0000000..8e77793 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/InstallationPage.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration.Pages +{ + /// + /// Interaction logic for InstallationPage.xaml + /// + public partial class InstallationPage + { + public InstallationPage() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml b/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml new file mode 100644 index 0000000..80bb266 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml.cs b/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml.cs new file mode 100644 index 0000000..1c053be --- /dev/null +++ b/Bloxstrap/Configuration/Pages/IntegrationsPage.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration.Pages +{ + /// + /// Interaction logic for IntegrationsPage.xaml + /// + public partial class IntegrationsPage + { + public IntegrationsPage() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Configuration/Pages/ModsPage.xaml b/Bloxstrap/Configuration/Pages/ModsPage.xaml new file mode 100644 index 0000000..709a75a --- /dev/null +++ b/Bloxstrap/Configuration/Pages/ModsPage.xaml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bloxstrap/Configuration/Pages/ModsPage.xaml.cs b/Bloxstrap/Configuration/Pages/ModsPage.xaml.cs new file mode 100644 index 0000000..45b2007 --- /dev/null +++ b/Bloxstrap/Configuration/Pages/ModsPage.xaml.cs @@ -0,0 +1,13 @@ +namespace Bloxstrap.Configuration.Pages +{ + /// + /// Interaction logic for ModsPage.xaml + /// + public partial class ModsPage + { + public ModsPage() + { + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs index 1eee9d9..6876093 100644 --- a/Bloxstrap/Helpers/Updater.cs +++ b/Bloxstrap/Helpers/Updater.cs @@ -58,7 +58,8 @@ namespace Bloxstrap.Helpers MessageBoxButton.OK ); - new Preferences().ShowDialog(); + //new Preferences().ShowDialog(); + new Configuration.MainWindow().ShowDialog(); App.Terminate(); } }