merge

1 files changed, 6 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs
index 4203a1e8b..be0906fc4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs
@@ -3,25 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.Common
 {
     /// <summary>
     /// Represents a Machine Studio view model.
     /// </summary>
-    public interface IStudioViewModel
+    public interface IStudioViewModel : INavigationViewModel
     {
         /// <summary>
-        /// Called when the user has navigated in to the module.
-        /// </summary>
-        void OnNavigatedTo();
-
-        /// <summary>
-        /// Called when the user has navigated out of the module.
-        /// </summary>
-        void OnNavigatedFrom();
-
-        /// <summary>
         /// Called when application is shutting down.
         /// </summary>
         void OnShuttingDown();
@@ -34,14 +25,13 @@ namespace Tango.MachineStudio.Common
         Task<bool> OnShutdownRequest();
 
         /// <summary>
-        /// Called when another module has wants to navigate to this module with some arguments.
+        /// Called when the application has been started
         /// </summary>
-        /// <param name="args">The arguments.</param>
-        void OnModuleRequest(params object[] args);
+        void OnApplicationStarted();
 
         /// <summary>
-        /// Called when the application has been started
+        /// Called when the application is ready and all modules are loaded.
         /// </summary>
-        void OnApplicationStarted();
+        void OnApplicationReady();
     }
 }