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;