Improvements to machine studio view models and navigation system.

Improvements to tech board selection and edit modes handling.

2 files changed, 13 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index eacc8a4cb..215f7afb5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -28,7 +28,7 @@ namespace Tango.MachineStudio.UI.ViewModels
     /// Represents the Machine Studio loading view, view model.
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
-    public class LoadingViewVM : StudioViewModelInternal
+    public class LoadingViewVM : StudioViewModel
     {
         private INotificationProvider _notificationProvider;
         private TeamFoundationServiceExtendedClient _tfs;
@@ -172,5 +172,10 @@ namespace Tango.MachineStudio.UI.ViewModels
                 }
             });
         }
+
+        public override void OnApplicationReady()
+        {
+            
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 23dd4ecd7..36ce62897 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -629,20 +629,19 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 LogManager.Log(String.Format("Starting module '{0}'...", module.Name));
 
-                if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
+                if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                 {
                     LogManager.Log("Module was not initialized. Initializing...");
 
                     FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
                     NavigationControl.SetNavigationName(view, module.Name);
-                    (MainView.Self as MainView).TransitionControl.Elements.Add(view);
+                    (MainView.Self as MainView).NavigationControl.Elements.Add(view);
                 }
             }
 
             foreach (var m in StudioModuleLoader.AllModules.Where(x => x != module && !x.InNewWindow))
             {
                 m.IsLoaded = false;
-                TangoIOC.Default.GetModuleViewModels(m).ToList().ForEach(x => x.OnNavigatedFrom());
             }
 
             if (module != null)
@@ -652,15 +651,13 @@ namespace Tango.MachineStudio.UI.ViewModels
                 IsModuleLoaded = true;
 
                 LogManager.Log(String.Format("Navigating to module '{0}'...", module.Name));
-                (MainView.Self as MainView).TransitionControl.NavigateTo(module.Name);
-
-                TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo());
+                (MainView.Self as MainView).NavigationControl.NavigateTo(module.Name);
             }
             else
             {
                 IsModuleLoaded = false;
                 LogManager.Log(String.Format("Navigating to Home..."));
-                (MainView.Self as MainView).TransitionControl.NavigateTo("Home");
+                (MainView.Self as MainView).NavigationControl.NavigateTo("Home");
             }
         }
 
@@ -680,16 +677,16 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                 LogManager.Log(String.Format("Starting module '{0}' in new window...", module.Name));
 
-                if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
+                if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                 {
                     LogManager.Log("Module was not initialized. Initializing...");
                     FrameworkElement v = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
                     NavigationControl.SetNavigationName(v, module.Name);
-                    (MainView.Self as MainView).TransitionControl.Elements.Add(v);
+                    (MainView.Self as MainView).NavigationControl.Elements.Add(v);
                 }
 
                 LogManager.Log("Detaching module view...");
-                var view = (MainView.Self as MainView).TransitionControl.GetAndDetach(module.Name);
+                var view = (MainView.Self as MainView).NavigationControl.GetAndDetach(module.Name);
 
                 ModuleWindowVM vm = new ModuleWindowVM(module);
                 ModuleWindow window = new ModuleWindow(this, vm, view);
@@ -700,7 +697,6 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     window.grid.Children.Remove(view);
                     module.InNewWindow = false;
-                    TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(v => v.OnNavigatedFrom());
                 };
 
                 window.Owner = MainWindow.Instance;
@@ -708,8 +704,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                 LogManager.Log("Opening new window...");
                 window.Show();
 
-                TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo());
-
                 (_applicationManager as DefaultStudioApplicationManager).RegisterOpenedWindow(window);
             }
             catch (Exception ex)