From 3fe4fce6621e939157b03ce70a52b12c8f1dae85 Mon Sep 17 00:00:00 2001 From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com> Date: Fri, 8 Dec 2023 22:25:56 +0000 Subject: [PATCH 1/2] move byfron status code inside of byfron dialog also made it only delete the '...' if its at the end of the string --- Bloxstrap/Bootstrapper.cs | 4 ---- Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs | 6 +++++- .../ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index bd93f9e..47bc267 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -99,10 +99,6 @@ namespace Bloxstrap message = message.Replace("{product}", productName); - // yea idk - if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ByfronDialog) - message = message.Replace("...", ""); - if (Dialog is not null) Dialog.Message = message; } diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs b/Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs index 4d709ec..54e57ca 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs @@ -26,7 +26,11 @@ namespace Bloxstrap.UI.Elements.Bootstrapper get => _viewModel.Message; set { - _viewModel.Message = value; + string message = value; + if (message.EndsWith("...")) + message = message[..^3]; + + _viewModel.Message = message; _viewModel.OnPropertyChanged(nameof(_viewModel.Message)); } } diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs index 2a5c523..2e91e64 100644 --- a/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs @@ -14,7 +14,7 @@ namespace Bloxstrap.UI.ViewModels.Bootstrapper public string Title => App.Settings.Prop.BootstrapperTitle; public ImageSource Icon { get; set; } = App.Settings.Prop.BootstrapperIcon.GetIcon().GetImageSource(); - public string Message { get; set; } = "Please wait..."; + public string Message { get; set; } = "Please wait"; public bool ProgressIndeterminate { get; set; } = true; public int ProgressMaximum { get; set; } = 0; public int ProgressValue { get; set; } = 0; From 12efad35c68f8144f25ae160985abfb6b3890932 Mon Sep 17 00:00:00 2001 From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com> Date: Fri, 8 Dec 2023 22:27:00 +0000 Subject: [PATCH 2/2] whoops --- .../UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs index 2e91e64..2a5c523 100644 --- a/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Bootstrapper/BootstrapperDialogViewModel.cs @@ -14,7 +14,7 @@ namespace Bloxstrap.UI.ViewModels.Bootstrapper public string Title => App.Settings.Prop.BootstrapperTitle; public ImageSource Icon { get; set; } = App.Settings.Prop.BootstrapperIcon.GetIcon().GetImageSource(); - public string Message { get; set; } = "Please wait"; + public string Message { get; set; } = "Please wait..."; public bool ProgressIndeterminate { get; set; } = true; public int ProgressMaximum { get; set; } = 0; public int ProgressValue { get; set; } = 0;