From 5c331a8ee41258196478231b74fef8b3dca8e394 Mon Sep 17 00:00:00 2001
From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com>
Date: Fri, 3 Feb 2023 17:45:46 +0000
Subject: [PATCH] Remove old configuration menu
---
Bloxstrap/App.xaml.cs | 1 -
Bloxstrap/Bootstrapper.cs | 17 +-
.../BootstrapperDialogForm.cs | 2 +-
.../IBootstrapperDialog.cs | 2 +-
.../LegacyDialog2009.Designer.cs | 2 +-
.../LegacyDialog2009.cs | 2 +-
.../LegacyDialog2009.resx | 0
.../LegacyDialog2011.Designer.cs | 2 +-
.../LegacyDialog2011.cs | 2 +-
.../LegacyDialog2011.resx | 0
Bloxstrap/Dialogs/Menu/ModHelp.xaml | 31 -
Bloxstrap/Dialogs/Menu/ModHelp.xaml.cs | 21 -
Bloxstrap/Dialogs/Menu/Preferences.xaml | 169 -
Bloxstrap/Dialogs/Menu/Preferences.xaml.cs | 424 --
Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml | 46 -
Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml.cs | 21 -
.../Menu/Themes/ColourfulDarkTheme.xaml | 4505 ----------------
.../Menu/Themes/ColourfulDarkTheme.xaml.cs | 43 -
.../Menu/Themes/ColourfulLightTheme.xaml | 4555 ----------------
.../Menu/Themes/ColourfulLightTheme.xaml.cs | 43 -
Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml | 4644 -----------------
.../Dialogs/Menu/Themes/DarkTheme.xaml.cs | 43 -
Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml | 4461 ----------------
.../Dialogs/Menu/Themes/LightTheme.xaml.cs | 43 -
.../ProgressDialog.Designer.cs | 2 +-
.../ProgressDialog.cs | 2 +-
.../ProgressDialog.resx | 0
.../VistaDialog.Designer.cs | 2 +-
.../{BootstrapperDialogs => }/VistaDialog.cs | 2 +-
.../VistaDialog.resx | 0
Bloxstrap/Enums/BootstrapperStyle.cs | 2 +-
Bloxstrap/Helpers/Updater.cs | 1 -
Bloxstrap/Properties/launchSettings.json | 3 +-
33 files changed, 28 insertions(+), 19065 deletions(-)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/BootstrapperDialogForm.cs (98%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/IBootstrapperDialog.cs (90%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2009.Designer.cs (98%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2009.cs (96%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2009.resx (100%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2011.Designer.cs (98%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2011.cs (96%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/LegacyDialog2011.resx (100%)
delete mode 100644 Bloxstrap/Dialogs/Menu/ModHelp.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/ModHelp.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/Preferences.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/Preferences.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml.cs
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml
delete mode 100644 Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml.cs
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/ProgressDialog.Designer.cs (99%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/ProgressDialog.cs (98%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/ProgressDialog.resx (100%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/VistaDialog.Designer.cs (96%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/VistaDialog.cs (99%)
rename Bloxstrap/Dialogs/{BootstrapperDialogs => }/VistaDialog.resx (100%)
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
index 1988186..1c6426a 100644
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@@ -9,7 +9,6 @@ using System.Windows;
using Microsoft.Win32;
using Bloxstrap.Models;
-using Bloxstrap.Dialogs.Menu;
using Bloxstrap.Enums;
using Bloxstrap.Helpers;
using Bloxstrap.Views;
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index f52f4e3..10dbe28 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -11,7 +11,7 @@ using System.Windows;
using Microsoft.Win32;
-using Bloxstrap.Dialogs.BootstrapperDialogs;
+using Bloxstrap.Dialogs;
using Bloxstrap.Helpers;
using Bloxstrap.Helpers.Integrations;
using Bloxstrap.Helpers.RSMM;
@@ -381,7 +381,20 @@ namespace Bloxstrap
.WriteToFile(Path.Combine(Directories.StartMenu, "Play Roblox.lnk"));
ShellLink.Shortcut.CreateShortcut(Directories.Application, "-preferences", Directories.Application, 0)
- .WriteToFile(Path.Combine(Directories.StartMenu, $"Configure {App.ProjectName}.lnk"));
+ .WriteToFile(Path.Combine(Directories.StartMenu, $"{App.ProjectName} Menu.lnk"));
+ }
+ else
+ {
+ // v2.0.0 - rebadge configuration menu as just "Bloxstrap Menu"
+ string oldMenuShortcut = Path.Combine(Directories.StartMenu, $"Configure {App.ProjectName}.lnk");
+ string newMenuShortcut = Path.Combine(Directories.StartMenu, $"{App.ProjectName} Menu.lnk");
+
+ if (File.Exists(oldMenuShortcut))
+ File.Delete(oldMenuShortcut);
+
+ if (!File.Exists(newMenuShortcut))
+ ShellLink.Shortcut.CreateShortcut(Directories.Application, "-preferences", Directories.Application, 0)
+ .WriteToFile(newMenuShortcut);
}
if (App.Settings.CreateDesktopIcon && !File.Exists(Path.Combine(Directories.Desktop, "Play Roblox.lnk")))
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs
similarity index 98%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs
rename to Bloxstrap/Dialogs/BootstrapperDialogForm.cs
index 98e958d..7874267 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs
+++ b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
using Bloxstrap.Enums;
using Bloxstrap.Helpers;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
public class BootstrapperDialogForm : Form, IBootstrapperDialog
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/IBootstrapperDialog.cs b/Bloxstrap/Dialogs/IBootstrapperDialog.cs
similarity index 90%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/IBootstrapperDialog.cs
rename to Bloxstrap/Dialogs/IBootstrapperDialog.cs
index 772ecee..6b85d07 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/IBootstrapperDialog.cs
+++ b/Bloxstrap/Dialogs/IBootstrapperDialog.cs
@@ -1,6 +1,6 @@
using System.Windows.Forms;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
public interface IBootstrapperDialog
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.Designer.cs b/Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs
similarity index 98%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.Designer.cs
rename to Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs
index af757c5..e6cf932 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.Designer.cs
+++ b/Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs
@@ -1,6 +1,6 @@
using System.Windows.Forms;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
partial class LegacyDialog2009
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.cs b/Bloxstrap/Dialogs/LegacyDialog2009.cs
similarity index 96%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.cs
rename to Bloxstrap/Dialogs/LegacyDialog2009.cs
index 0592603..2d6b4b3 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.cs
+++ b/Bloxstrap/Dialogs/LegacyDialog2009.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
// windows: https://youtu.be/VpduiruysuM?t=18
// mac: https://youtu.be/ncHhbcVDRgQ?t=63
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.resx b/Bloxstrap/Dialogs/LegacyDialog2009.resx
similarity index 100%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2009.resx
rename to Bloxstrap/Dialogs/LegacyDialog2009.resx
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.Designer.cs b/Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs
similarity index 98%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.Designer.cs
rename to Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs
index 2c490ce..3c00096 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.Designer.cs
+++ b/Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs
@@ -1,6 +1,6 @@
using System.Windows.Forms;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
partial class LegacyDialog2011
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs b/Bloxstrap/Dialogs/LegacyDialog2011.cs
similarity index 96%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs
rename to Bloxstrap/Dialogs/LegacyDialog2011.cs
index 124127d..e9094dd 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs
+++ b/Bloxstrap/Dialogs/LegacyDialog2011.cs
@@ -3,7 +3,7 @@ using System.Windows.Forms;
using Bloxstrap.Enums;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
// https://youtu.be/3K9oCEMHj2s?t=35
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.resx b/Bloxstrap/Dialogs/LegacyDialog2011.resx
similarity index 100%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.resx
rename to Bloxstrap/Dialogs/LegacyDialog2011.resx
diff --git a/Bloxstrap/Dialogs/Menu/ModHelp.xaml b/Bloxstrap/Dialogs/Menu/ModHelp.xaml
deleted file mode 100644
index e346bf4..0000000
--- a/Bloxstrap/Dialogs/Menu/ModHelp.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Bloxstrap/Dialogs/Menu/ModHelp.xaml.cs b/Bloxstrap/Dialogs/Menu/ModHelp.xaml.cs
deleted file mode 100644
index 433d001..0000000
--- a/Bloxstrap/Dialogs/Menu/ModHelp.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Bloxstrap.Dialogs.Menu
-{
- ///
- /// Interaction logic for ModHelp.xaml
- ///
- public partial class ModHelp : Window
- {
- public ModHelp()
- {
- InitializeComponent();
- }
-
- private void ButtonClose_Click(object sender, EventArgs e)
- {
- this.Close();
- }
- }
-}
diff --git a/Bloxstrap/Dialogs/Menu/Preferences.xaml b/Bloxstrap/Dialogs/Menu/Preferences.xaml
deleted file mode 100644
index 734ce82..0000000
--- a/Bloxstrap/Dialogs/Menu/Preferences.xaml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Leave a star on GitHub!
-
-
-
-
-
-
-
-
diff --git a/Bloxstrap/Dialogs/Menu/Preferences.xaml.cs b/Bloxstrap/Dialogs/Menu/Preferences.xaml.cs
deleted file mode 100644
index 6c64246..0000000
--- a/Bloxstrap/Dialogs/Menu/Preferences.xaml.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media.Imaging;
-
-using Microsoft.Win32;
-
-using Bloxstrap.Enums;
-using Bloxstrap.Helpers;
-using Bloxstrap.Models;
-
-namespace Bloxstrap.Dialogs.Menu
-{
- ///
- /// Interaction logic for PreferencesWPF.xaml
- ///
- public partial class Preferences : Window
- {
- public readonly PreferencesViewModel ViewModel;
-
- public Preferences()
- {
- InitializeComponent();
- SetTheme();
-
- ViewModel = new(this);
- this.DataContext = ViewModel;
-
- App.SettingsManager.ShouldSave = false;
-
- this.Icon = Imaging.CreateBitmapSourceFromHIcon(
- Properties.Resources.IconBloxstrap_ico.Handle,
- Int32Rect.Empty,
- BitmapSizeOptions.FromEmptyOptions()
- );
-
- this.Title = App.ProjectName;
-
- // just in case i guess?
- if (!Environment.Is64BitOperatingSystem)
- this.CheckBoxRFUEnabled.IsEnabled = false;
- }
-
- public void SetTheme()
- {
- string theme = "Light";
-
- if (App.Settings.Theme.GetFinal() == Theme.Dark)
- theme = "ColourfulDark";
-
- Application.Current.Resources.MergedDictionaries[0] = new ResourceDictionary() { Source = new Uri($"Dialogs/Menu/Themes/{theme}Theme.xaml", UriKind.Relative) };
- }
-
- private void ButtonOpenReShadeFolder_Click(object sender, EventArgs e)
- {
- Process.Start("explorer.exe", Directories.ReShade);
- }
-
- private void ButtonOpenReShadeHelp_Click(object sender, EventArgs e)
- {
- new ReShadeHelp().Show();
- }
-
- private void ButtonOpenModFolder_Click(object sender, EventArgs e)
- {
- Process.Start("explorer.exe", Directories.Modifications);
- }
-
- private void ButtonOpenModHelp_Click(object sender, EventArgs e)
- {
- new ModHelp().Show();
- }
-
- private void ButtonLocationBrowse_Click(object sender, EventArgs e)
- {
- using (var dialog = new System.Windows.Forms.FolderBrowserDialog())
- {
- if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
- ViewModel.InstallLocation = dialog.SelectedPath;
- }
- }
-
- private void ButtonPreview_Click(object sender, EventArgs e)
- {
- //this.Visible = false;
- App.Settings.BootstrapperStyle.Show();
- //this.Visible = true;
- }
-
- private void ButtonCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
-
- private void ButtonConfirm_Click(object sender, EventArgs e)
- {
- string installLocation = this.TextBoxInstallLocation.Text;
-
- if (String.IsNullOrEmpty(installLocation))
- {
- App.ShowMessageBox("You must set an install location", MessageBoxImage.Error);
- return;
- }
-
- try
- {
- // check if we can write to the directory (a bit hacky but eh)
-
- string testPath = installLocation;
- string testFile = Path.Combine(installLocation, "BloxstrapWriteTest.txt");
- bool testPathExists = Directory.Exists(testPath);
-
- if (!testPathExists)
- Directory.CreateDirectory(testPath);
-
- File.WriteAllText(testFile, "hi");
- File.Delete(testFile);
-
- if (!testPathExists)
- Directory.Delete(testPath);
- }
- catch (UnauthorizedAccessException)
- {
- App.ShowMessageBox($"{App.ProjectName} does not have write access to the install location you selected. Please choose another install location.", MessageBoxImage.Error);
- return;
- }
- catch (Exception ex)
- {
- App.ShowMessageBox(ex.Message, MessageBoxImage.Error);
- return;
- }
-
- if (App.IsFirstRun)
- {
- // this will be set in the registry after first install
- App.BaseDirectory = installLocation;
- }
- else
- {
- App.SettingsManager.ShouldSave = true;
-
- if (App.BaseDirectory is not null && App.BaseDirectory != installLocation)
- {
- App.ShowMessageBox($"{App.ProjectName} will install to the new location you've set the next time it runs.", MessageBoxImage.Information);
-
- App.Settings.VersionGuid = "";
-
- using (RegistryKey registryKey = Registry.CurrentUser.CreateSubKey($@"Software\{App.ProjectName}"))
- {
- registryKey.SetValue("InstallLocation", installLocation);
- registryKey.SetValue("OldInstallLocation", App.BaseDirectory);
- }
-
- // preserve settings
- // we don't need to copy the bootstrapper over since the install process will do that automatically
-
- App.SettingsManager.Save();
-
- File.Copy(Path.Combine(App.BaseDirectory, "Settings.json"), Path.Combine(installLocation, "Settings.json"));
- }
- }
-
- this.Close();
- }
-
- private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
- {
- Utilities.OpenWebsite(e.Uri.AbsoluteUri);
- e.Handled = true;
- }
- }
-
- public class PreferencesViewModel : INotifyPropertyChanged
- {
- private readonly Preferences _window;
- public event PropertyChangedEventHandler? PropertyChanged;
-
- public string BloxstrapVersion { get; } = $"Version {App.Version}";
-
- #region Integrations
- public bool DRPEnabled
- {
- get => App.Settings.UseDiscordRichPresence;
- set
- {
- // if user wants discord rpc, auto-enable buttons by default
- _window.CheckBoxDRPButtons.IsChecked = value;
- App.Settings.UseDiscordRichPresence = value;
- }
- }
-
- public bool DRPButtons
- {
- get => !App.Settings.HideRPCButtons;
- set => App.Settings.HideRPCButtons = !value;
- }
-
- public bool RFUEnabled
- {
- get => App.Settings.RFUEnabled;
- set
- {
- // if user wants to use rbxfpsunlocker, auto-enable autoclosing by default
- _window.CheckBoxRFUAutoclose.IsChecked = value;
- App.Settings.RFUEnabled = value;
- }
- }
-
- public bool RFUAutoclose
- {
- get => App.Settings.RFUAutoclose;
- set => App.Settings.RFUAutoclose = value;
- }
-
- public bool UseReShade
- {
- get => App.Settings.UseReShade;
- set
- {
- // if user wants to use reshade, auto-enable use of extravi's presets by default
- _window.CheckBoxUseReShadeExtraviPresets.IsChecked = value;
- App.Settings.UseReShade = value;
- }
- }
-
- public bool UseReShadeExtraviPresets
- {
- get => App.Settings.UseReShadeExtraviPresets;
- set => App.Settings.UseReShadeExtraviPresets = value;
- }
-
- public bool ReShadeFolderButtonEnabled { get; } = !App.IsFirstRun;
- public string ReShadeFolderButtonTooltip { get; } = App.IsFirstRun ? "Bloxstrap must first be installed before managing ReShade" : "This is the folder that contains all your ReShade resources for presets, shaders and textures.";
- #endregion
-
- #region Modifications
- public bool ModOldDeathSound
- {
- get => App.Settings.UseOldDeathSound;
- set => App.Settings.UseOldDeathSound = value;
- }
-
- public bool ModOldMouseCursor
- {
- get => App.Settings.UseOldMouseCursor;
- set => App.Settings.UseOldMouseCursor = value;
- }
-
- public bool ModDisableAppPatch
- {
- get => App.Settings.UseDisableAppPatch;
- set => App.Settings.UseDisableAppPatch = value;
- }
-
- public bool ModFolderButtonEnabled { get; } = !App.IsFirstRun;
- public string ModFolderButtonTooltip { get; } = App.IsFirstRun ? "Bloxstrap must first be installed before managing mods" : "This is the folder that contains all your file modifications, including presets and any ReShade files needed.";
- #endregion
-
- #region Installation
- private string installLocation = App.IsFirstRun ? Path.Combine(Directories.LocalAppData, App.ProjectName) : App.BaseDirectory;
- public string InstallLocation
- {
- get => installLocation;
- set
- {
- installLocation = value;
- OnPropertyChanged();
- }
- }
-
- private bool showAllChannels = !DeployManager.ChannelsAbstracted.Contains(App.Settings.Channel);
- public bool ShowAllChannels
- {
- get => showAllChannels;
- set
- {
- if (value)
- {
- Channels = DeployManager.ChannelsAll;
- }
- else
- {
- Channels = DeployManager.ChannelsAbstracted;
- Channel = DeployManager.DefaultChannel;
- OnPropertyChanged("Channel");
- }
-
- showAllChannels = value;
- }
- }
-
- private IEnumerable channels = DeployManager.ChannelsAbstracted.Contains(App.Settings.Channel) ? DeployManager.ChannelsAbstracted : DeployManager.ChannelsAll;
- public IEnumerable Channels
- {
- get => channels;
- set
- {
- channels = value;
- OnPropertyChanged();
- }
- }
-
- public string Channel
- {
- get => App.Settings.Channel;
- set
- {
- Task.Run(() => GetChannelInfo(value));
- App.Settings.Channel = value;
- }
- }
-
- private string channelInfo = "Getting latest version info, please wait...\n";
- public string ChannelInfo
- {
- get => channelInfo;
- set
- {
- channelInfo = value;
- OnPropertyChanged();
- }
- }
-
- public bool PromptChannelChange
- {
- get => App.Settings.PromptChannelChange;
- set => App.Settings.PromptChannelChange = value;
- }
- #endregion
-
- #region Bloxstrap
- public IReadOnlyDictionary Themes { get; set; } = new Dictionary()
- {
- { "System Default", Enums.Theme.Default },
- { "Light", Enums.Theme.Light },
- { "Dark", Enums.Theme.Dark },
- };
-
- public string Theme
- {
- get => Themes.FirstOrDefault(x => x.Value == App.Settings.Theme).Key;
- set
- {
- App.Settings.Theme = Themes[value];
- _window.SetTheme();
- }
- }
-
- public IReadOnlyDictionary Dialogs { get; set; } = new Dictionary()
- {
- { "Vista (2009 - 2011)", BootstrapperStyle.VistaDialog },
- { "Legacy (2009 - 2011)", BootstrapperStyle.LegacyDialog2009 },
- { "Legacy (2011 - 2014)", BootstrapperStyle.LegacyDialog2011 },
- { "Progress (~2014)", BootstrapperStyle.ProgressDialog },
- };
-
- public string Dialog
- {
- get => Dialogs.FirstOrDefault(x => x.Value == App.Settings.BootstrapperStyle).Key;
- set => App.Settings.BootstrapperStyle = Dialogs[value];
- }
-
- public IReadOnlyDictionary Icons { get; set; } = new Dictionary()
- {
- { "Bloxstrap", BootstrapperIcon.IconBloxstrap },
- { "2009", BootstrapperIcon.Icon2009 },
- { "2011", BootstrapperIcon.Icon2011 },
- { "2015", BootstrapperIcon.IconEarly2015 },
- { "2016", BootstrapperIcon.IconLate2015 },
- { "2017", BootstrapperIcon.Icon2017 },
- { "2019", BootstrapperIcon.Icon2019 },
- { "2022", BootstrapperIcon.Icon2022 }
- };
-
- public string Icon
- {
- get => Icons.FirstOrDefault(x => x.Value == App.Settings.BootstrapperIcon).Key;
- set => App.Settings.BootstrapperIcon = Icons[value];
- }
-
- public bool CreateDesktopIcon
- {
- get => App.Settings.CreateDesktopIcon;
- set => App.Settings.CreateDesktopIcon = value;
- }
-
- public bool CheckForUpdates
- {
- get => App.Settings.CheckForUpdates;
- set => App.Settings.CheckForUpdates = value;
- }
- #endregion
-
- public string ConfirmButtonText { get; } = App.IsFirstRun ? "Install" : "Save";
-
- public PreferencesViewModel(Preferences window)
- {
- _window = window;
- Task.Run(() => GetChannelInfo(App.Settings.Channel));
- }
-
- protected void OnPropertyChanged([CallerMemberName] string? name = null)
- {
- PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
- }
-
- private async Task GetChannelInfo(string channel)
- {
- ChannelInfo = "Getting latest version info, please wait...\n";
-
- ClientVersion info = await DeployManager.GetLastDeploy(channel, true);
- string? strTimestamp = info.Timestamp?.ToString("MM/dd/yyyy h:mm:ss tt", App.CultureFormat);
-
- ChannelInfo = $"Version: v{info.Version} ({info.VersionGuid})\nDeployed: {strTimestamp}";
- }
- }
-}
diff --git a/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml b/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml
deleted file mode 100644
index 69de0f4..0000000
--- a/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml.cs b/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml.cs
deleted file mode 100644
index 60bd9f2..0000000
--- a/Bloxstrap/Dialogs/Menu/ReShadeHelp.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Bloxstrap.Dialogs.Menu
-{
- ///
- /// Interaction logic for ReShadeHelp.xaml
- ///
- public partial class ReShadeHelp : Window
- {
- public ReShadeHelp()
- {
- InitializeComponent();
- }
-
- private void ButtonClose_Click(object sender, EventArgs e)
- {
- this.Close();
- }
- }
-}
diff --git a/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml b/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml
deleted file mode 100644
index 47e7726..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml
+++ /dev/null
@@ -1,4505 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml.cs b/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml.cs
deleted file mode 100644
index 3ef43c9..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/ColourfulDarkTheme.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Windows;
-
-namespace REghZyFramework.Themes {
- public partial class ColourfulDarkTheme {
- private void CloseWindow_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- CloseWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void AutoMinimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MaximizeRestore(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void Minimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MinimizeWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- public void CloseWind(Window window) => window.Close();
-
- public void MaximizeRestore(Window window) {
- if (window.WindowState == WindowState.Maximized)
- window.WindowState = WindowState.Normal;
- else if (window.WindowState == WindowState.Normal)
- window.WindowState = WindowState.Maximized;
- }
-
- public void MinimizeWind(Window window) => window.WindowState = WindowState.Minimized;
- }
-}
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml b/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml
deleted file mode 100644
index 62a99b5..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml
+++ /dev/null
@@ -1,4555 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml.cs b/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml.cs
deleted file mode 100644
index aec4554..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/ColourfulLightTheme.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Windows;
-
-namespace REghZyFramework.Themes {
- public partial class ColourfulLightTheme {
- private void CloseWindow_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- CloseWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void AutoMinimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MaximizeRestore(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void Minimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MinimizeWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- public void CloseWind(Window window) => window.Close();
-
- public void MaximizeRestore(Window window) {
- if (window.WindowState == WindowState.Maximized)
- window.WindowState = WindowState.Normal;
- else if (window.WindowState == WindowState.Normal)
- window.WindowState = WindowState.Maximized;
- }
-
- public void MinimizeWind(Window window) => window.WindowState = WindowState.Minimized;
- }
-}
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml b/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml
deleted file mode 100644
index 0261c0c..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml
+++ /dev/null
@@ -1,4644 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml.cs b/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml.cs
deleted file mode 100644
index 8177624..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/DarkTheme.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Windows;
-
-namespace REghZyFramework.Themes {
- public partial class DarkTheme {
- private void CloseWindow_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- CloseWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void AutoMinimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MaximizeRestore(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void Minimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MinimizeWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- public void CloseWind(Window window) => window.Close();
-
- public void MaximizeRestore(Window window) {
- if (window.WindowState == WindowState.Maximized)
- window.WindowState = WindowState.Normal;
- else if (window.WindowState == WindowState.Normal)
- window.WindowState = WindowState.Maximized;
- }
-
- public void MinimizeWind(Window window) => window.WindowState = WindowState.Minimized;
- }
-}
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml b/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml
deleted file mode 100644
index d514240..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml
+++ /dev/null
@@ -1,4461 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml.cs b/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml.cs
deleted file mode 100644
index 4ca2f6d..0000000
--- a/Bloxstrap/Dialogs/Menu/Themes/LightTheme.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Windows;
-
-namespace REghZyFramework.Themes {
- public partial class LightTheme {
- private void CloseWindow_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- CloseWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void AutoMinimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MaximizeRestore(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- private void Minimize_Event(object sender, RoutedEventArgs e) {
- if (e.Source != null)
- try {
- MinimizeWind(Window.GetWindow((FrameworkElement) e.Source));
- }
- catch {
- }
- }
-
- public void CloseWind(Window window) => window.Close();
-
- public void MaximizeRestore(Window window) {
- if (window.WindowState == WindowState.Maximized)
- window.WindowState = WindowState.Normal;
- else if (window.WindowState == WindowState.Normal)
- window.WindowState = WindowState.Maximized;
- }
-
- public void MinimizeWind(Window window) => window.WindowState = WindowState.Minimized;
- }
-}
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.Designer.cs b/Bloxstrap/Dialogs/ProgressDialog.Designer.cs
similarity index 99%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.Designer.cs
rename to Bloxstrap/Dialogs/ProgressDialog.Designer.cs
index 3beb221..21b36a7 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.Designer.cs
+++ b/Bloxstrap/Dialogs/ProgressDialog.Designer.cs
@@ -1,6 +1,6 @@
using System.Windows.Forms;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
partial class ProgressDialog
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs b/Bloxstrap/Dialogs/ProgressDialog.cs
similarity index 98%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs
rename to Bloxstrap/Dialogs/ProgressDialog.cs
index 487ed49..d64c283 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs
+++ b/Bloxstrap/Dialogs/ProgressDialog.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
using Bloxstrap.Enums;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
// basically just the modern dialog
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.resx b/Bloxstrap/Dialogs/ProgressDialog.resx
similarity index 100%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.resx
rename to Bloxstrap/Dialogs/ProgressDialog.resx
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.Designer.cs b/Bloxstrap/Dialogs/VistaDialog.Designer.cs
similarity index 96%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.Designer.cs
rename to Bloxstrap/Dialogs/VistaDialog.Designer.cs
index e2d27d5..ce7b3b7 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.Designer.cs
+++ b/Bloxstrap/Dialogs/VistaDialog.Designer.cs
@@ -1,4 +1,4 @@
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
partial class VistaDialog
{
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs b/Bloxstrap/Dialogs/VistaDialog.cs
similarity index 99%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs
rename to Bloxstrap/Dialogs/VistaDialog.cs
index 25e1186..099d5a0 100644
--- a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs
+++ b/Bloxstrap/Dialogs/VistaDialog.cs
@@ -3,7 +3,7 @@ using System.Windows.Forms;
using Bloxstrap.Enums;
-namespace Bloxstrap.Dialogs.BootstrapperDialogs
+namespace Bloxstrap.Dialogs
{
// https://youtu.be/h0_AL95Sc3o?t=48
diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.resx b/Bloxstrap/Dialogs/VistaDialog.resx
similarity index 100%
rename from Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.resx
rename to Bloxstrap/Dialogs/VistaDialog.resx
diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs
index 3816bbd..cd0d800 100644
--- a/Bloxstrap/Enums/BootstrapperStyle.cs
+++ b/Bloxstrap/Enums/BootstrapperStyle.cs
@@ -1,6 +1,6 @@
using System.Windows.Forms;
-using Bloxstrap.Dialogs.BootstrapperDialogs;
+using Bloxstrap.Dialogs;
namespace Bloxstrap.Enums
{
diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs
index 42a9c56..89b6940 100644
--- a/Bloxstrap/Helpers/Updater.cs
+++ b/Bloxstrap/Helpers/Updater.cs
@@ -3,7 +3,6 @@ using System.Diagnostics;
using System.IO;
using System.Windows;
-using Bloxstrap.Dialogs.Menu;
using Bloxstrap.Views;
namespace Bloxstrap.Helpers
diff --git a/Bloxstrap/Properties/launchSettings.json b/Bloxstrap/Properties/launchSettings.json
index 4ac77ad..662b7b5 100644
--- a/Bloxstrap/Properties/launchSettings.json
+++ b/Bloxstrap/Properties/launchSettings.json
@@ -1,7 +1,8 @@
{
"profiles": {
"Bloxstrap": {
- "commandName": "Project"
+ "commandName": "Project",
+ "commandLineArgs": "-preferences"
}
}
}
\ No newline at end of file