Added PPC power up sequence support !

Refactored AppBarItems implementation.

1 files changed, 21 insertions, 17 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 3b1e1e2f5..e9de2538e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -49,6 +49,11 @@ namespace Tango.PPC.UI.Notifications
         public ObservableCollection<NotificationItem> NotificationItems { get; private set; }
 
         /// <summary>
+        /// Gets the application bar items.
+        /// </summary>
+        public ObservableCollection<AppBarItem> AppBarItems { get; private set; }
+
+        /// <summary>
         /// Gets the notification items view.
         /// </summary>
         public ICollectionView NotificationItemsView { get; private set; }
@@ -65,6 +70,10 @@ namespace Tango.PPC.UI.Notifications
         {
             NotificationsVisible = true;
             NotificationItems = new ObservableCollection<NotificationItem>();
+
+            AppBarItems = new ObservableCollection<AppBarItem>();
+            CollectionViewSource.GetDefaultView(AppBarItems).SortDescriptions.Add(new SortDescription(nameof(AppBarItem.Priority), ListSortDirection.Ascending));
+
             TaskBarItems = new ObservableCollection<TaskBarItem>();
             _pendingMessageBoxes = new ConcurrentQueue<PendingNotification<MessageBoxVM, bool>>();
             _pendingDialogs = new ConcurrentQueue<PendingNotification<DialogAndView, DialogViewVM>>();
@@ -472,22 +481,12 @@ namespace Tango.PPC.UI.Notifications
         /// </summary>
         public bool IsInGlobalBusyState { get; private set; }
 
-        private AppBarItem _currentAppBarItem;
-        /// <summary>
-        /// Gets the current application bar item.
-        /// </summary>
-        public AppBarItem CurrentAppBarItem
-        {
-            get { return _currentAppBarItem; }
-            set { _currentAppBarItem = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(HasAppBarItem)); }
-        }
-
         /// <summary>
         /// Gets a value indicating whether this instance has application bar item.
         /// </summary>
-        public bool HasAppBarItem
+        public bool HasAppBarItems
         {
-            get { return CurrentAppBarItem != null; }
+            get { return AppBarItems.Count > 0; }
         }
 
         /// <summary>
@@ -498,8 +497,9 @@ namespace Tango.PPC.UI.Notifications
         public AppBarItem PushAppBarItem(AppBarItem appBarItem)
         {
             LogManager.Log($"Pushing AppBarItem '{appBarItem.GetType().Name}'.");
-            CurrentAppBarItem = appBarItem;
+            AppBarItems.Add(appBarItem);
             appBarItem.RemoveAction = () => PopAppBarItem(appBarItem);
+            RaisePropertyChanged(nameof(HasAppBarItems));
             return appBarItem;
         }
 
@@ -508,9 +508,9 @@ namespace Tango.PPC.UI.Notifications
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
-        public AppBarItem PushAppBarItem<T>() where T : AppBarItem
+        public T PushAppBarItem<T>() where T : AppBarItem
         {
-            return PushAppBarItem(Activator.CreateInstance<T>());
+            return PushAppBarItem(Activator.CreateInstance<T>()) as T;
         }
 
         /// <summary>
@@ -519,8 +519,12 @@ namespace Tango.PPC.UI.Notifications
         /// <param name="appBarItem">The application bar item.</param>
         public void PopAppBarItem(AppBarItem appBarItem)
         {
-            LogManager.Log($"Popping out AppBarItem '{appBarItem.GetType().Name}'.");
-            CurrentAppBarItem = null;
+            InvokeUI(() =>
+            {
+                LogManager.Log($"Popping out AppBarItem '{appBarItem.GetType().Name}'.");
+                AppBarItems.Remove(appBarItem);
+                RaisePropertyChanged(nameof(HasAppBarItems));
+            });
         }
 
         /// <summary>