Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 6 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 7c56115e3..52a861930 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -430,7 +430,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowError(string message)
         {
-            ShowMessageBox(PackIconKind.AlertOctagon, Brushes.Red, message, false);
+            ShowMessageBox(PackIconKind.AlertOctagon, (SolidColorBrush)Application.Current.Resources["RedBrush100"], message, false);
         }
 
         /// <summary>
@@ -439,7 +439,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowInfo(string message)
         {
-            ShowMessageBox(PackIconKind.CommentAlertOutline, Brushes.Black, message, false);
+            ShowMessageBox(PackIconKind.CommentAlertOutline, (SolidColorBrush)Application.Current.Resources["Dialog.Foreground"], message, false);
         }
 
         /// <summary>
@@ -449,7 +449,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <returns></returns>
         public bool ShowQuestion(string message)
         {
-            return ShowMessageBox(PackIconKind.CommentQuestionOutline, Brushes.Black, message, true).Value;
+            return ShowMessageBox(PackIconKind.CommentQuestionOutline, (SolidColorBrush)Application.Current.Resources["Dialog.Foreground"], message, true).Value;
         }
 
         /// <summary>
@@ -458,7 +458,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowWarning(string message)
         {
-            ShowMessageBox(PackIconKind.AlertOutline, Brushes.DarkOrange, message, false);
+            ShowMessageBox(PackIconKind.AlertOutline, (SolidColorBrush)Application.Current.Resources["OrangeUploadBrush"], message, false);
         }
 
         /// <summary>
@@ -468,7 +468,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <returns></returns>
         public bool ShowErrorQuestion(string message)
         {
-            return ShowMessageBox(PackIconKind.CommentAlertOutline, Brushes.DarkOrange, message, true).Value;
+            return ShowMessageBox(PackIconKind.CommentAlertOutline, (SolidColorBrush)Application.Current.Resources["OrangeUploadBrush"], message, true).Value;
         }
 
         /// <summary>
@@ -568,7 +568,7 @@ namespace Tango.MachineStudio.UI.Notifications
                 Owner = Application.Current.MainWindow,
                 Message = message,
                 IconKind = PackIconKind.Pencil,
-                IconColor = Brushes.DimGray,
+                IconColor = (SolidColorBrush)Application.Current.Resources["DimGrayBrush"],
                 Hint = hint,
                 Response = defaultResponse
             };