From a121e14f94ac1ce8b6da331a995a6642585f0c34 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Fri, 25 Oct 2024 21:06:16 +0100 Subject: [PATCH] Make player launch error dialog less annoying additionally added clarification about the "don't exit to desktop app" option breaking the ability to accept player invites --- Bloxstrap/App.xaml.cs | 1 - Bloxstrap/Resources/Strings.Designer.cs | 8 +++++--- Bloxstrap/Resources/Strings.resx | 8 +++++--- Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml | 3 ++- Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs | 1 + .../UI/Elements/Settings/Pages/IntegrationsPage.xaml | 3 ++- Bloxstrap/UI/Frontend.cs | 8 ++++++-- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index f5bcefb..7542ed4 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -218,7 +218,6 @@ namespace Bloxstrap else { // check if user profile folder has been renamed - // honestly, i'll be expecting bugs from this var match = Regex.Match(value, @"^[a-zA-Z]:\\Users\\([^\\]+)", RegexOptions.IgnoreCase); if (match.Success) diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index ad28195..115ee7e 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -1031,7 +1031,9 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Please read the following help information, which will open in your web browser when you close this dialog.. + /// Looks up a localized string similar to For information about why this could be happening and how this can be resolved, please read [this help article]({0}). + /// + ///Check if Roblox works with [the original launcher]({1}). If it doesn't, then this isn't a Bloxstrap issue. If it does, then refer to the help article.. /// public static string Dialog_PlayerError_HelpInformation { get { @@ -2745,7 +2747,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Roblox will fully close when you leave a game instead of dropping you back into the app.. + /// Looks up a localized string similar to Roblox will fully close when you leave a game instead of going back to the app. [Will break some things!]({0}). /// public static string Menu_Integrations_DesktopApp_Description { get { @@ -2898,7 +2900,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to Font size can be adjusted in the Fast Flags tab.. + /// Looks up a localized string similar to Font size can be adjusted in the Engine Settings tab.. /// public static string Menu_Mods_Misc_CustomFont_Description { get { diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 3c777f9..1771f15 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -717,7 +717,7 @@ Selecting 'No' will ignore this warning and continue installation. Configure additional functionality to go alongside Roblox. - Roblox will fully close when you leave a game instead of dropping you back into the app. + Roblox will fully close when you leave a game instead of going back to the app. [Will break some things!]({0}) Don't exit to desktop app @@ -1104,7 +1104,9 @@ Are you sure you want to continue? Roblox has crashed. - Please read the following help information, which will open in your web browser when you close this dialog. + For information about why this could be happening and how this can be resolved, please read [this help article]({0}). + +Check if Roblox works with [the original launcher]({1}). If it doesn't, then this isn't a Bloxstrap issue. If it does, then refer to the help article. Could not load data because of a network error. @@ -1239,4 +1241,4 @@ Would you like to enable test mode? Version {0} - + \ No newline at end of file diff --git a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml index cf6ec08..3d3ec62 100644 --- a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml +++ b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml @@ -6,6 +6,7 @@ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs" xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base" + xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls" mc:Ignorable="d" Title="Bloxstrap" d:DesignWidth="480" @@ -33,7 +34,7 @@ - + diff --git a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs index 81defd2..60b7d46 100644 --- a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs +++ b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs @@ -60,6 +60,7 @@ namespace Bloxstrap.UI.Elements.Dialogs Title = App.ProjectName; MessageTextBlock.Text = message; + MessageTextBlock.MarkdownText = message; ButtonOne.Visibility = Visibility.Collapsed; ButtonTwo.Visibility = Visibility.Collapsed; ButtonThree.Visibility = Visibility.Collapsed; diff --git a/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml index 84fafee..0e391bb 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml @@ -35,7 +35,8 @@ diff --git a/Bloxstrap/UI/Frontend.cs b/Bloxstrap/UI/Frontend.cs index dc40990..cb069fc 100644 --- a/Bloxstrap/UI/Frontend.cs +++ b/Bloxstrap/UI/Frontend.cs @@ -27,9 +27,13 @@ namespace Bloxstrap.UI if (crash) topLine = Strings.Dialog_PlayerError_Crash; - ShowMessageBox($"{topLine}\n\n{Strings.Dialog_PlayerError_HelpInformation}", MessageBoxImage.Error); + string info = String.Format( + Strings.Dialog_PlayerError_HelpInformation, + $"https://github.com/{App.ProjectRepository}/wiki/Roblox-crashes-or-does-not-launch", + $"https://github.com/{App.ProjectRepository}/wiki/Switching-between-Roblox-and-Bloxstrap" + ); - Utilities.ShellExecute($"https://github.com/{App.ProjectRepository}/wiki/Roblox-crashes-or-does-not-launch"); + ShowMessageBox($"{topLine}\n\n{info}", MessageBoxImage.Error); } public static void ShowExceptionDialog(Exception exception)