diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 504990a..48099a7 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -343,6 +343,9 @@ namespace Bloxstrap foreach (Process process in autocloseProcesses) { + if (process.HasExited) + continue; + App.Logger.WriteLine($"[Bootstrapper::StartRoblox] Autoclosing process '{process.ProcessName}' (PID {process.Id})"); process.Kill(); } diff --git a/Bloxstrap/ViewModels/AboutViewModel.cs b/Bloxstrap/ViewModels/AboutViewModel.cs index 229d056..a8751b3 100644 --- a/Bloxstrap/ViewModels/AboutViewModel.cs +++ b/Bloxstrap/ViewModels/AboutViewModel.cs @@ -6,16 +6,6 @@ namespace Bloxstrap.ViewModels { public class AboutViewModel { - public ICommand OpenWebpageCommand => new RelayCommand(OpenWebpage); - - private void OpenWebpage(string? location) - { - if (location is null) - return; - - Utilities.OpenWebsite(location); - } - public string Version => $"Version {App.Version}"; } } diff --git a/Bloxstrap/ViewModels/Commands.cs b/Bloxstrap/ViewModels/Commands.cs new file mode 100644 index 0000000..9d3ceba --- /dev/null +++ b/Bloxstrap/ViewModels/Commands.cs @@ -0,0 +1,24 @@ +using Bloxstrap.Helpers; +using CommunityToolkit.Mvvm.Input; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Input; + +namespace Bloxstrap.ViewModels +{ + public static class Commands + { + public static ICommand OpenWebpageCommand => new RelayCommand(OpenWebpage); + + private static void OpenWebpage(string? location) + { + if (location is null) + return; + + Utilities.OpenWebsite(location); + } + } +} diff --git a/Bloxstrap/ViewModels/IntegrationsViewModel.cs b/Bloxstrap/ViewModels/IntegrationsViewModel.cs index 225c24b..ac58aed 100644 --- a/Bloxstrap/ViewModels/IntegrationsViewModel.cs +++ b/Bloxstrap/ViewModels/IntegrationsViewModel.cs @@ -22,7 +22,6 @@ namespace Bloxstrap.ViewModels private readonly Page _page; public ICommand OpenReShadeFolderCommand => new RelayCommand(OpenReShadeFolder); - public ICommand ShowReShadeHelpCommand => new RelayCommand(ShowReShadeHelp); public bool CanOpenReShadeFolder => App.Settings.Prop.UseReShade; @@ -42,11 +41,6 @@ namespace Bloxstrap.ViewModels Process.Start("explorer.exe", Path.Combine(Directories.Integrations, "ReShade")); } - private void ShowReShadeHelp() - { - ((INavigationWindow)Window.GetWindow(_page)!).Navigate(typeof(ReShadeHelpPage)); - } - public bool DiscordActivityEnabled { get => App.Settings.Prop.UseDiscordRichPresence; diff --git a/Bloxstrap/Views/MainWindow.xaml b/Bloxstrap/Views/MainWindow.xaml index ef4c2a7..4e9fed2 100644 --- a/Bloxstrap/Views/MainWindow.xaml +++ b/Bloxstrap/Views/MainWindow.xaml @@ -9,7 +9,7 @@ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" mc:Ignorable="d" Title="Bloxstrap Menu" - MinWidth="880" + MinWidth="960" Width="960" Height="580" Background="{ui:ThemeResource ApplicationBackgroundBrush}" @@ -63,7 +63,6 @@ - diff --git a/Bloxstrap/Views/Pages/AboutPage.xaml b/Bloxstrap/Views/Pages/AboutPage.xaml index 5e48c64..fa6d7d7 100644 --- a/Bloxstrap/Views/Pages/AboutPage.xaml +++ b/Bloxstrap/Views/Pages/AboutPage.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:models="clr-namespace:Bloxstrap.ViewModels" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" mc:Ignorable="d" d:DesignHeight="700" d:DesignWidth="800" @@ -35,9 +36,9 @@ - + - + @@ -55,19 +56,19 @@ - Multako + Multako - bluepilledgreat + bluepilledgreat - 1011025m + 1011025m - sitiom + sitiom - taskmanager + taskmanager @@ -88,31 +89,31 @@ - + - + - + - + - + @@ -120,19 +121,19 @@ - + - + - + diff --git a/Bloxstrap/Views/Pages/IntegrationsPage.xaml b/Bloxstrap/Views/Pages/IntegrationsPage.xaml index 8ebb3ec..01dba22 100644 --- a/Bloxstrap/Views/Pages/IntegrationsPage.xaml +++ b/Bloxstrap/Views/Pages/IntegrationsPage.xaml @@ -85,7 +85,7 @@ - + diff --git a/Bloxstrap/Views/Pages/ModsPage.xaml b/Bloxstrap/Views/Pages/ModsPage.xaml index f9eb393..d21c73b 100644 --- a/Bloxstrap/Views/Pages/ModsPage.xaml +++ b/Bloxstrap/Views/Pages/ModsPage.xaml @@ -12,34 +12,46 @@ - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -81,11 +93,5 @@ - - - - - - diff --git a/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml b/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml deleted file mode 100644 index 022ed44..0000000 --- a/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - If you're using a laptop keyboard, you may have to hold down the Fn key when pressing F6. - - - Any screenshots you take are saved to your pictures folder. - - - - - - - - - - - - diff --git a/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml.cs b/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml.cs deleted file mode 100644 index 1b9b822..0000000 --- a/Bloxstrap/Views/Pages/ReShadeHelpPage.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -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.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Bloxstrap.Views.Pages -{ - /// - /// Interaction logic for ReShadeHelpPage.xaml - /// - public partial class ReShadeHelpPage - { - public ReShadeHelpPage() - { - InitializeComponent(); - } - } -}