From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Tango.PPC.Common/Navigation/INavigationManager.cs   | 17 +----------------
 .../PPC/Tango.PPC.Common/Navigation/NavigationView.cs   |  3 +--
 2 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
index 1fcdb4410..8df0a7fb8 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
@@ -12,11 +12,6 @@ namespace Tango.PPC.Common.Navigation
     /// </summary>
     public interface INavigationManager
     {
-        /// <summary>
-        /// Occurs when the current view model has changed.
-        /// </summary>
-        event EventHandler<PPCViewModel> CurrentVMChanged;
-
         /// <summary>
         /// Gets the current module.
         /// </summary>
@@ -32,16 +27,6 @@ namespace Tango.PPC.Common.Navigation
         /// </summary>
         bool CanNavigateBack { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether the back should be enabled.
-        /// </summary>
-        bool IsBackEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the navigation system is currently navigating.
-        /// </summary>
-        bool IsNavigating { get; set; }
-
         /// <summary>
         /// Navigates to the previous view if <see cref="CanNavigateBack"/> is true.
         /// </summary>
@@ -94,7 +79,7 @@ namespace Tango.PPC.Common.Navigation
         /// Navigates to the specified module and view by full path (e.g Jobs.JobsView).
         /// </summary>
         /// <param name="fullPath">The full path.</param>
-        Task<bool> NavigateTo(String fullPath, bool pushToHistory = true, Action<PPCViewModel, PPCViewModel> onNavigating = null, Action<PPCViewModel, PPCViewModel> onNavigated = null);
+        Task<bool> NavigateTo(String fullPath, bool pushToHistory = true);
 
         /// <summary>
         /// Navigates to the specified module and view with the specified object and expecting a return parameter.
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
index 643908e87..b4562054c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
@@ -22,7 +22,6 @@ namespace Tango.PPC.Common.Navigation
         HomeModule,
         ShutdownView,
         RestartingSystemView,
-        EmergencyView,
-        RestartingView,
+        EmergencyView
     }
 }
-- 
cgit v1.3.1