diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 12e90d4b..e5f0888b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -5,6 +5,9 @@ body: - type: markdown attributes: value: | + > [!IMPORTANT] + > Do not open an issue if you're getting a "Deserialised application settings is null!" error. This issue is caused by a server error on Roblox's end. + > Wait for the problem to be resolved, and do not report an issue for it. ### **Preliminary instructions** - Before opening an issue, please [check the Wiki first](https://github.com/pizzaboxer/bloxstrap/wiki/) to see if your problem has been addressed there. - If it isn't, please confirm which pages that you read that were relevant to your issue. diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 77f20f35..5c0ee3a0 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -14,12 +14,16 @@ namespace Bloxstrap /// public partial class App : Application { +#if QA_BUILD + public const string ProjectName = "Bloxstrap-QA"; +#else public const string ProjectName = "Bloxstrap"; - public const string ProjectOwner = "pizzaboxer"; - public const string ProjectRepository = "pizzaboxer/bloxstrap"; +#endif + public const string ProjectOwner = "Bloxstrap"; + public const string ProjectRepository = "bloxstraplabs/bloxstrap"; public const string ProjectDownloadLink = "https://bloxstraplabs.com"; - public const string ProjectHelpLink = "https://github.com/pizzaboxer/bloxstrap/wiki"; - public const string ProjectSupportLink = "https://github.com/pizzaboxer/bloxstrap/issues/new"; + public const string ProjectHelpLink = "https://github.com/bloxstraplabs/bloxstrap/wiki"; + public const string ProjectSupportLink = "https://github.com/bloxstraplabs/bloxstrap/issues/new"; public const string RobloxPlayerAppName = "RobloxPlayerBeta"; public const string RobloxStudioAppName = "RobloxStudioBeta"; diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index bc697fa4..aa1b61af 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -51,7 +51,7 @@ - + all diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 195d8832..7137721c 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -158,7 +158,7 @@ public async Task Run() if (connectionResult is not null) HandleConnectionError(connectionResult); -#if !DEBUG || DEBUG_UPDATER +#if (!DEBUG || DEBUG_UPDATER) && !QA_BUILD if (App.Settings.Prop.CheckForUpdates && !App.LaunchSettings.UpgradeFlag.Active) { bool updatePresent = await CheckForUpdates(); @@ -604,9 +604,6 @@ private async Task UpgradeRoblox() { App.Logger.WriteLine(LOG_IDENT, "Could not delete executable/folder, Roblox may still be running. Aborting update."); App.Logger.WriteException(LOG_IDENT, ex); - - Directory.Delete(AppData.Directory); - return; } @@ -1076,7 +1073,7 @@ private async Task DownloadPackage(Package package) Frontend.ShowConnectivityDialog( Strings.Dialog_Connectivity_UnableToDownload, - String.Format(Strings.Dialog_Connectivity_UnableToDownloadReason, "[https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox](https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox)"), + String.Format(Strings.Dialog_Connectivity_UnableToDownloadReason, "[https://github.com/bloxstraplabs/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox](https://github.com/bloxstraplabs/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox)"), MessageBoxImage.Error, ex ); diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs index 326a8cd1..331bb233 100644 --- a/Bloxstrap/Installer.cs +++ b/Bloxstrap/Installer.cs @@ -5,11 +5,11 @@ namespace Bloxstrap { internal class Installer { - private static string DesktopShortcut => Path.Combine(Paths.Desktop, "Bloxstrap.lnk"); + private static string DesktopShortcut => Path.Combine(Paths.Desktop, $"{App.ProjectName}.lnk"); - private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, "Bloxstrap.lnk"); + private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, $"{App.ProjectName}.lnk"); - public string InstallLocation = Path.Combine(Paths.LocalAppData, "Bloxstrap"); + public string InstallLocation = Path.Combine(Paths.LocalAppData, App.ProjectName); public bool ExistingDataPresent => File.Exists(Path.Combine(InstallLocation, "Settings.json")); @@ -52,7 +52,6 @@ public void DoInstall() } } - // TODO: registry access checks, i'll need to look back on issues to see what the error looks like using (var uninstallKey = Registry.CurrentUser.CreateSubKey(App.UninstallKey)) { uninstallKey.SetValueSafe("DisplayIcon", $"{Paths.Application},0"); @@ -571,7 +570,7 @@ public static void HandleUpgrade() App.FastFlags.SetValue("FFlagFixGraphicsQuality", null); - Directory.Delete(Path.Combine(Paths.Base, "Versions")); + Directory.Delete(Path.Combine(Paths.Base, "Versions"), true); } App.Settings.Save(); diff --git a/Bloxstrap/LaunchHandler.cs b/Bloxstrap/LaunchHandler.cs index 090bd035..82957adf 100644 --- a/Bloxstrap/LaunchHandler.cs +++ b/Bloxstrap/LaunchHandler.cs @@ -78,6 +78,10 @@ public static void LaunchInstaller() } else { +#if QA_BUILD + Frontend.ShowMessageBox("You are running a QA build of Bloxstrap. The red window border indicates that this is a QA build.", MessageBoxImage.Information); +#endif + new LanguageSelectorDialog().ShowDialog(); var installer = new UI.Elements.Installer.MainWindow(); diff --git a/Bloxstrap/Locale.cs b/Bloxstrap/Locale.cs index a8184127..7a87edd8 100644 --- a/Bloxstrap/Locale.cs +++ b/Bloxstrap/Locale.cs @@ -1,7 +1,5 @@ using System.Windows; -using Bloxstrap.Resources; - namespace Bloxstrap { internal static class Locale @@ -104,6 +102,11 @@ public static void Initialize() { window.FontFamily = new System.Windows.Media.FontFamily(new Uri("pack://application:,,,/Resources/Fonts/"), "./#Noto Sans Thai"); } + +#if QA_BUILD + window.BorderBrush = System.Windows.Media.Brushes.Red; + window.BorderThickness = new Thickness(4); +#endif })); } } diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index 888ca6e0..2f0fa6df 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -483,6 +483,15 @@ public static string Common_Navigation_Back { } } + /// + /// Looks up a localized string similar to Install. + /// + public static string Common_Navigation_Install { + get { + return ResourceManager.GetString("Common.Navigation.Install", resourceCulture); + } + } + /// /// Looks up a localized string similar to Next. /// @@ -1184,7 +1193,7 @@ public static string Enums_FlagPresets_InGameMenuVersion_V1 { } /// - /// Looks up a localized string similar to 2022 (V2). + /// Looks up a localized string similar to 2020 (V2). /// public static string Enums_FlagPresets_InGameMenuVersion_V2 { get { @@ -1585,6 +1594,15 @@ public static string LaunchMenu_ConfigureSettings { } } + /// + /// Looks up a localized string similar to Support us on Ko-fi!. + /// + public static string LaunchMenu_Donate { + get { + return ResourceManager.GetString("LaunchMenu.Donate", resourceCulture); + } + } + /// /// Looks up a localized string similar to Launch Roblox. /// @@ -2541,7 +2559,7 @@ public static string Menu_FastFlags_Reset_Title { } /// - /// Looks up a localized string similar to Engine settings. + /// Looks up a localized string similar to Engine Settings. /// public static string Menu_FastFlags_Title { get { diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index fca85aee..5a3db233 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -354,7 +354,7 @@ If not, then please report this exception through a [GitHub issue]({1}) along wi 2015 (V1) - 2022 (V2) + 2020 (V2) 2023 (V4) @@ -646,7 +646,7 @@ Do NOT use this to import large "flag lists" made by other people that promise t Rendering mode - Engine settings + Engine Settings Font files @@ -1221,4 +1221,12 @@ Would you like to enable test mode? All of Bloxstrap's translations are crowdsourced through [Crowdin]({0}). Everyone listed here are people who generously volunteered their time and effort to help localise Bloxstrap. A massive thank you to everyone here! + + Install + The word "Install" is being used as a verb in this instance, like the other navigation button texts of "Next" and "Back" + + + Support us on Ko-fi! + Call-to-action button + \ No newline at end of file diff --git a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml index f894da4a..a414499c 100644 --- a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml +++ b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml @@ -40,15 +40,14 @@ - - - + + + - diff --git a/Bloxstrap/UI/Elements/About/Pages/LicensesPage.xaml b/Bloxstrap/UI/Elements/About/Pages/LicensesPage.xaml index 8a4f984f..dbcad7bd 100644 --- a/Bloxstrap/UI/Elements/About/Pages/LicensesPage.xaml +++ b/Bloxstrap/UI/Elements/About/Pages/LicensesPage.xaml @@ -25,7 +25,7 @@ - + diff --git a/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs b/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs index ad2135f3..db06e7f5 100644 --- a/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs +++ b/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs @@ -20,6 +20,11 @@ public void ApplyTheme() { _themeService.SetTheme(App.Settings.Prop.Theme.GetFinal() == Enums.Theme.Dark ? ThemeType.Dark : ThemeType.Light); _themeService.SetSystemAccent(); + +#if QA_BUILD + this.BorderBrush = System.Windows.Media.Brushes.Red; + this.BorderThickness = new Thickness(4); +#endif } protected override void OnSourceInitialized(EventArgs e) diff --git a/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs b/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs index ee33bd9d..59a6e05a 100644 --- a/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs +++ b/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs @@ -114,7 +114,7 @@ private static void OnTextMarkdownChanged(DependencyObject dependencyObject, Dep var lastBlock = document.Last(); // matt was evidently very tired on the night he was first writing this - // https://github.com/pizzaboxer/bloxstrap/blob/289b9dec77cf35b2cc6504019bc9c7701626be1f/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs#L111 + // https://github.com/bloxstraplabs/bloxstrap/blob/289b9dec77cf35b2cc6504019bc9c7701626be1f/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs#L111 foreach (var block in document) { if (block is not ParagraphBlock paragraphBlock || paragraphBlock.Inline is null) diff --git a/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml b/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml index 9ed5a5eb..31783c29 100644 --- a/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml +++ b/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml @@ -28,7 +28,7 @@ - + @@ -52,8 +52,8 @@ - - + + @@ -72,7 +72,7 @@ - + diff --git a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml index 2ceab03c..58171f22 100644 --- a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml +++ b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml @@ -7,8 +7,10 @@ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base" xmlns:resources="clr-namespace:Bloxstrap.Resources" + xmlns:dmodels="clr-namespace:Bloxstrap.UI.ViewModels.Installer" xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Installer" mc:Ignorable="d" + d:DataContext="{d:DesignInstance dmodels:MainWindowViewModel, IsDesignTimeCreatable=True}" Title="{x:Static resources:Strings.Installer_Title}" Height="540" Width="840" MinWidth="840" Background="{ui:ThemeResource ApplicationBackgroundBrush}" diff --git a/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs index 96cbde7e..031d111b 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs +++ b/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs @@ -28,7 +28,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e) { if (Window.GetWindow(this) is MainWindow window) { - window.SetNextButtonText("Next"); + window.SetNextButtonText(Strings.Common_Navigation_Next); window.SetButtonEnabled("back", false); } } diff --git a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml index 7281424f..6c66b7c9 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml +++ b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml @@ -68,7 +68,7 @@ - + diff --git a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs index 43ec5b6c..fbdab7ff 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs +++ b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs @@ -29,7 +29,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e) { if (Window.GetWindow(this) is MainWindow window) { - window.SetNextButtonText("Install"); + window.SetNextButtonText(Strings.Common_Navigation_Install); window.NextPageCallback += NextPageCallback; } } diff --git a/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml b/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml index 2978e77f..e6a86cc9 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml +++ b/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml @@ -37,7 +37,7 @@ - + diff --git a/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs index 1ccc0c83..ca2abfdf 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs +++ b/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs @@ -25,7 +25,7 @@ public WelcomePage() private void UiPage_Loaded(object sender, RoutedEventArgs e) { if (Window.GetWindow(this) is MainWindow window) - window.SetNextButtonText("Next"); + window.SetNextButtonText(Strings.Common_Navigation_Next); _viewModel.DoChecks(); } diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml index 9f2f3da7..d96f0817 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml @@ -25,7 +25,7 @@ + Description="{Binding Source={x:Static resources:Strings.Menu_Bloxstrap_Analytics_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/Privacy-Policy#analytical-functionality'}"> diff --git a/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml index 8a4f40af..370b84f6 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/BootstrapperPage.xaml @@ -26,7 +26,7 @@ + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/Information-on-Roblox-app-localisation"> diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml index e11a8b13..dda7e8f5 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml @@ -15,7 +15,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -57,14 +57,14 @@ + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#framerate-limit"> + Description="{Binding Source={x:Static resources:Strings.Menu_FastFlags_Presets_LightingTechnology_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#preferred-lighting-technology'}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#preferred-lighting-technology"> @@ -77,7 +77,7 @@ + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#dpi-scaling-fixes"> @@ -113,21 +113,21 @@ + Description="{Binding Source={x:Static resources:Strings.Menu_FastFlags_Presets_HideGuis_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#gui-hiding|https://www.roblox.com/groups/32380007/Bloxstrap'}" + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#gui-hiding"> + Description="{Binding Source={x:Static resources:Strings.Menu_FastFlags_Presets_FontPadding_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#gui-hiding|https://www.roblox.com/groups/32380007/Bloxstrap'}"> + HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#escape-menu-version"> diff --git a/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml index 8be8d717..84fafeea 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml @@ -20,7 +20,7 @@ @@ -28,7 +28,7 @@ @@ -41,11 +41,11 @@ - + diff --git a/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml index 79e66274..a6761c8f 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml @@ -33,7 +33,7 @@ - + diff --git a/Bloxstrap/UI/ViewModels/Dialogs/UninstallerViewModel.cs b/Bloxstrap/UI/ViewModels/Dialogs/UninstallerViewModel.cs index 39a957c2..5918893e 100644 --- a/Bloxstrap/UI/ViewModels/Dialogs/UninstallerViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Dialogs/UninstallerViewModel.cs @@ -9,7 +9,7 @@ public class UninstallerViewModel { public string Text => String.Format( Strings.Uninstaller_Text, - "https://github.com/pizzaboxer/bloxstrap/wiki/Roblox-crashes-or-does-not-launch", + "https://github.com/bloxstraplabs/bloxstrap/wiki/Roblox-crashes-or-does-not-launch", Paths.Base ); diff --git a/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs b/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs index 025b84a3..4adaff18 100644 --- a/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs @@ -5,7 +5,7 @@ public class WelcomeViewModel : NotifyPropertyChangedViewModel // formatting is done here instead of in xaml, it's just a bit easier public string MainText => String.Format( Strings.Installer_Welcome_MainText, - "[github.com/pizzaboxer/bloxstrap](https://github.com/pizzaboxer/bloxstrap)", + "[github.com/bloxstraplabs/bloxstrap](https://github.com/bloxstraplabs/bloxstrap)", "[bloxstraplabs.com](https://bloxstraplabs.com)" ); diff --git a/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs index cb4cc548..413bb13e 100644 --- a/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs @@ -5,9 +5,9 @@ namespace Bloxstrap.UI.ViewModels.Settings { public class ShortcutsViewModel : NotifyPropertyChangedViewModel { - public ShortcutTask DesktopIconTask { get; } = new("Desktop", Paths.Desktop, "Bloxstrap.lnk"); + public ShortcutTask DesktopIconTask { get; } = new("Desktop", Paths.Desktop, $"{App.ProjectName}.lnk"); - public ShortcutTask StartMenuIconTask { get; } = new("StartMenu", Paths.WindowsStartMenu, "Bloxstrap.lnk"); + public ShortcutTask StartMenuIconTask { get; } = new("StartMenu", Paths.WindowsStartMenu, $"{App.ProjectName}.lnk"); public ShortcutTask PlayerIconTask { get; } = new("RobloxPlayer", Paths.Desktop, $"{Strings.LaunchMenu_LaunchRoblox}.lnk", "-player"); diff --git a/Bloxstrap/Utility/Filesystem.cs b/Bloxstrap/Utility/Filesystem.cs index fe581df9..77bd2845 100644 --- a/Bloxstrap/Utility/Filesystem.cs +++ b/Bloxstrap/Utility/Filesystem.cs @@ -13,7 +13,7 @@ internal static long GetFreeDiskSpace(string path) { foreach (var drive in DriveInfo.GetDrives()) { - // https://github.com/pizzaboxer/bloxstrap/issues/1648#issuecomment-2192571030 + // https://github.com/bloxstraplabs/bloxstrap/issues/1648#issuecomment-2192571030 if (path.ToUpperInvariant().StartsWith(drive.Name)) return drive.AvailableFreeSpace; } diff --git a/README.md b/README.md index 665f2b3c..38f0cc2b 100644 --- a/README.md +++ b/README.md @@ -57,10 +57,6 @@ It's not unlikely that Windows Smartscreen will show a popup when you run Bloxst Once installed, Bloxstrap is added to your Start Menu, where you can access the menu and reconfigure your preferences if needed. -## Screenshots +## Code -

- - - -

+Bloxstrap uses the [WPF UI](https://github.com/lepoco/wpfui) library for the user interface design. We currently use and maintain our own fork of WPF UI at [bloxstraplabs/wpfui](https://github.com/bloxstraplabs/wpfui). diff --git a/wpfui b/wpfui index 8860d95d..c4c58c58 160000 --- a/wpfui +++ b/wpfui @@ -1 +1 @@ -Subproject commit 8860d95d46fa573e76dfe9b8a0412b90faba08d7 +Subproject commit c4c58c589970a66b27a9de41ab1b6b6539918b52