From 74d15c9bf38f58fc6e32cb34def670f3475aab29 Mon Sep 17 00:00:00 2001 From: 1011025m <37438176+1011025m@users.noreply.github.com> Date: Sat, 13 May 2023 11:57:16 +0800 Subject: [PATCH] Add Byfron logo --- Bloxstrap/Bloxstrap.csproj | 4 +++- Bloxstrap/Bootstrapper.cs | 2 ++ Bloxstrap/Dialogs/BootstrapperDialogForm.cs | 3 +++ Bloxstrap/Dialogs/ByfronDialog.xaml | 3 ++- Bloxstrap/Dialogs/ByfronDialog.xaml.cs | 13 ++++++++++++- Bloxstrap/Dialogs/FluentDialog.xaml.cs | 3 +++ Bloxstrap/Dialogs/IBootstrapperDialog.cs | 1 + Bloxstrap/Properties/Resources.Designer.cs | 2 +- Bloxstrap/Resources/ByfronLogo.png | Bin 0 -> 15113 bytes Bloxstrap/Resources/ByfronLogoDark.png | Bin 0 -> 19543 bytes Bloxstrap/ViewModels/AppearanceViewModel.cs | 2 ++ Bloxstrap/ViewModels/ByfronDialogViewModel.cs | 10 +++++++++- 12 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 Bloxstrap/Resources/ByfronLogo.png create mode 100644 Bloxstrap/Resources/ByfronLogoDark.png diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 60a5348..84c8b59 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -14,7 +14,9 @@ - + + + diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 5b915eb..5d57f8c 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -709,6 +709,8 @@ namespace Bloxstrap { Dialog.CancelEnabled = true; Dialog.ProgressStyle = ProgressBarStyle.Continuous; + // Byfron dialog specific + Dialog.VersionVisibility = false; } // compute total bytes to download diff --git a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs index 64e5c5f..3bff244 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs @@ -63,6 +63,9 @@ namespace Bloxstrap.Dialogs _cancelEnabled = value; } } + + // Byfron specific - not required here, bypassing + public bool VersionVisibility { get; set; } #endregion public void ScaleWindow() diff --git a/Bloxstrap/Dialogs/ByfronDialog.xaml b/Bloxstrap/Dialogs/ByfronDialog.xaml index 30dd0ab..6bbaa09 100644 --- a/Bloxstrap/Dialogs/ByfronDialog.xaml +++ b/Bloxstrap/Dialogs/ByfronDialog.xaml @@ -15,6 +15,7 @@ + - + diff --git a/Bloxstrap/Dialogs/ByfronDialog.xaml.cs b/Bloxstrap/Dialogs/ByfronDialog.xaml.cs index 92b01d6..6ac5cce 100644 --- a/Bloxstrap/Dialogs/ByfronDialog.xaml.cs +++ b/Bloxstrap/Dialogs/ByfronDialog.xaml.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Forms; using System.Windows.Media; - +using System.Windows.Media.Imaging; using Bloxstrap.Enums; using Bloxstrap.Extensions; using Bloxstrap.ViewModels; @@ -58,6 +58,16 @@ namespace Bloxstrap.Dialogs _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility)); } } + + public bool VersionVisibility + { + get => _viewModel.VersionNumberVisibility == Visibility.Collapsed; + set + { + _viewModel.VersionNumberVisibility = (value ? Visibility.Visible : Visibility.Collapsed); + _viewModel.OnPropertyChanged(nameof(_viewModel.VersionNumberVisibility)); + } + } #endregion public ByfronDialog() @@ -75,6 +85,7 @@ namespace Bloxstrap.Dialogs _viewModel.Foreground = new SolidColorBrush(Color.FromRgb(57, 59, 61)); _viewModel.IconColor = new SolidColorBrush(Color.FromRgb(57, 59, 61)); _viewModel.ProgressBarBackground = new SolidColorBrush(Color.FromRgb(189, 190, 190)); + _viewModel.ByfronLogo = new BitmapImage(new Uri("pack://application:,,,/Bloxstrap;component/Resources/ByfronLogoDark.png")); } InitializeComponent(); diff --git a/Bloxstrap/Dialogs/FluentDialog.xaml.cs b/Bloxstrap/Dialogs/FluentDialog.xaml.cs index ff65b08..dd88b7c 100644 --- a/Bloxstrap/Dialogs/FluentDialog.xaml.cs +++ b/Bloxstrap/Dialogs/FluentDialog.xaml.cs @@ -63,6 +63,9 @@ namespace Bloxstrap.Dialogs _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility)); } } + + // Byfron specific - not required here, bypassing + public bool VersionVisibility { get; set; } #endregion public FluentDialog() diff --git a/Bloxstrap/Dialogs/IBootstrapperDialog.cs b/Bloxstrap/Dialogs/IBootstrapperDialog.cs index e66b687..53b816b 100644 --- a/Bloxstrap/Dialogs/IBootstrapperDialog.cs +++ b/Bloxstrap/Dialogs/IBootstrapperDialog.cs @@ -10,6 +10,7 @@ namespace Bloxstrap.Dialogs ProgressBarStyle ProgressStyle { get; set; } int ProgressValue { get; set; } bool CancelEnabled { get; set; } + bool VersionVisibility { get; set; } void ShowBootstrapper(); void CloseBootstrapper(); diff --git a/Bloxstrap/Properties/Resources.Designer.cs b/Bloxstrap/Properties/Resources.Designer.cs index 202cd2e..2e36579 100644 --- a/Bloxstrap/Properties/Resources.Designer.cs +++ b/Bloxstrap/Properties/Resources.Designer.cs @@ -59,7 +59,7 @@ namespace Bloxstrap.Properties { resourceCulture = value; } } - + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Bloxstrap/Resources/ByfronLogo.png b/Bloxstrap/Resources/ByfronLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..5e0c9e8721212f48d6e15c9a0d4971fd098d83a5 GIT binary patch literal 15113 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

3oAyk-M;{J@OknAR^zdstw?QJSZ_42o1ODEKc{ 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�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 E0ZAhxj{pDw literal 0 HcmV?d00001 diff --git a/Bloxstrap/ViewModels/AppearanceViewModel.cs b/Bloxstrap/ViewModels/AppearanceViewModel.cs index ba85815..228385c 100644 --- a/Bloxstrap/ViewModels/AppearanceViewModel.cs +++ b/Bloxstrap/ViewModels/AppearanceViewModel.cs @@ -36,6 +36,8 @@ namespace Bloxstrap.ViewModels dialog.Message = "Style preview - Click Cancel to close"; dialog.CancelEnabled = true; + // Byfron dialog specific + dialog.VersionVisibility = false; dialog.ShowBootstrapper(); } diff --git a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs b/Bloxstrap/ViewModels/ByfronDialogViewModel.cs index 7609046..4b5405c 100644 --- a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs +++ b/Bloxstrap/ViewModels/ByfronDialogViewModel.cs @@ -1,7 +1,10 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using System.Windows; using System.Windows.Media; +using System.Windows.Media.Imaging; using Bloxstrap.Dialogs; +using Bloxstrap.Extensions; namespace Bloxstrap.ViewModels { @@ -15,6 +18,11 @@ namespace Bloxstrap.ViewModels public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(239, 239, 239)); public Brush IconColor { get; set; } = new SolidColorBrush(Color.FromRgb(255, 255, 255)); public Brush ProgressBarBackground { get; set; } = new SolidColorBrush(Color.FromRgb(86, 86, 86)); + public ImageSource ByfronLogo { get; set; } = new BitmapImage(new Uri("pack://application:,,,/Bloxstrap;component/Resources/ByfronLogo.png")); + + // When cancel button is visible, version number is hidden. + public Visibility VersionNumberVisibility { get; set; } = Visibility.Collapsed; + public ByfronDialogViewModel(IBootstrapperDialog dialog) : base(dialog) { }