diff --git a/Dapplo.CaliburnMicro/Wizard/ViewModels/WizardProgressViewModel.cs b/Dapplo.CaliburnMicro/Wizard/ViewModels/WizardProgressViewModel.cs
index e7fe5df0..955625ab 100644
--- a/Dapplo.CaliburnMicro/Wizard/ViewModels/WizardProgressViewModel.cs
+++ b/Dapplo.CaliburnMicro/Wizard/ViewModels/WizardProgressViewModel.cs
@@ -23,26 +23,77 @@
#endregion
+using System.Windows.Media;
+using Caliburn.Micro;
+using System.Windows;
+
namespace Dapplo.CaliburnMicro.Wizard.ViewModels
{
///
/// A ViewModel to display the progress of a wizard.
/// This is based upon the stackoverflow question here
///
- public class WizardProgressViewModel
+ public class WizardProgressViewModel : PropertyChangedBase
{
+ private const string MapAppsHighlightBrush = "HighlightBrush";
+ private const string MapAppsAccentColorBrush4 = "AccentColorBrush4";
+ private Brush _progressColorBrush = SystemColors.ControlTextBrush;
+
+ private Brush _disabledColorBrush = Brushes.Gray;
+
+ ///
+ /// Brush for the progress line and dots
+ ///
+ public Brush ProgressColorBrush
+ {
+ get
+ {
+ return _progressColorBrush;
+ }
+ set
+ {
+ NotifyOfPropertyChange(nameof(ProgressColorBrush));
+ _progressColorBrush = value;
+ }
+ }
+
+ ///
+ /// Brush for the disabled wizard text
+ ///
+ public Brush DisabledColorBrush
+ {
+ get
+ {
+ return _disabledColorBrush;
+ }
+ set
+ {
+ NotifyOfPropertyChange(nameof(DisabledColorBrush));
+ _disabledColorBrush = value;
+ }
+ }
+
///
/// The IWizard
///
public IWizard Wizard { get; set; }
///
- ///
+ /// Constructor which takes an IWizard, as it's required
///
///
public WizardProgressViewModel(IWizard wizard)
{
Wizard = wizard;
+ // Retrieve the values from MapApps, if they can be found
+ if (Application.Current.Resources.Contains(MapAppsHighlightBrush))
+ {
+ _progressColorBrush = Application.Current.Resources[MapAppsHighlightBrush] as SolidColorBrush;
+ }
+ if (Application.Current.Resources.Contains(MapAppsAccentColorBrush4))
+ {
+ _disabledColorBrush = Application.Current.Resources[MapAppsAccentColorBrush4] as SolidColorBrush;
+ }
}
}
}
\ No newline at end of file
diff --git a/Dapplo.CaliburnMicro/Wizard/Views/WizardProgressView.xaml b/Dapplo.CaliburnMicro/Wizard/Views/WizardProgressView.xaml
index 929720df..f0169ae6 100644
--- a/Dapplo.CaliburnMicro/Wizard/Views/WizardProgressView.xaml
+++ b/Dapplo.CaliburnMicro/Wizard/Views/WizardProgressView.xaml
@@ -37,6 +37,7 @@
+
+
@@ -62,10 +64,14 @@
-
+
+
+
+
-
+
+
@@ -73,6 +79,7 @@
+
@@ -81,6 +88,7 @@
+
@@ -92,10 +100,12 @@
+
+
@@ -120,7 +130,7 @@
-
+