merge alarm handling from remote

1 files changed, 6 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index d7dca484e..5062df1d6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -140,7 +140,7 @@ namespace Tango.PPC.UI.Notifications
             return ShowMessageBox(new MessageBoxVM()
             {
                 Message = message,
-                Icon = TouchIconKind.AlertOctagon,
+                Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
             });
@@ -156,7 +156,7 @@ namespace Tango.PPC.UI.Notifications
             return ShowMessageBox(new MessageBoxVM()
             {
                 Message = message,
-                Icon = TouchIconKind.InfoCircleSolid,
+                Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
             });
@@ -172,7 +172,7 @@ namespace Tango.PPC.UI.Notifications
             return ShowMessageBox(new MessageBoxVM()
             {
                 Message = message,
-                Icon = TouchIconKind.Alert,
+                Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
             });
@@ -188,7 +188,7 @@ namespace Tango.PPC.UI.Notifications
             return ShowMessageBox(new MessageBoxVM()
             {
                 Message = message,
-                Icon = TouchIconKind.QuestionCircleSolid,
+                Icon = TouchIconKind.QuestionCircleRegular,
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
@@ -218,6 +218,8 @@ namespace Tango.PPC.UI.Notifications
         /// <returns></returns>
         private Task<bool> ShowMessageBox(MessageBoxVM vm)
         {
+            ReleaseGlobalBusyMessage();
+
             LogManager.Log($"Displaying MessagBox '{vm.Message}'.");
 
             TaskCompletionSource<bool> source = new TaskCompletionSource<bool>();