1 files changed, 10 insertions, 12 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 377b15610..b2f476eab 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1,5 +1,4 @@
-using GalaSoft.MvvmLight.Ioc;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -35,9 +34,10 @@ using System.Speech.Synthesis;
 using System.Media;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.Speech;
-using Microsoft.Practices.ServiceLocation;
 using System.Threading;
 using Tango.SharedUI.Helpers;
+using Tango.Core.DI;
+using Tango.MachineStudio.Common;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -45,7 +45,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
     /// Represents the developer module main view, view model.
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
-    public class MainViewVM : ViewModel, IShutdownRequestBlocker, IShutdownListener
+    public class MainViewVM : StudioViewModel<DeveloperModule>
     {
         private static object _syncLock = new object();
         private const string EMB_FORMATS_EXPORT = "Baby Lock (PES)|*.pes|Tajima (DST)|*.dst|EXP|*.exp|PCS|*.pcs|HUS|*.hus|KSM|*.ksm";
@@ -652,7 +652,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             LogManager.Log("Initializing relay commands...");
 
-            _dataCaptureVM = ServiceLocator.Current.GetInstance<DataCapture.ViewModels.MainViewVM>();
+            _dataCaptureVM = TangoIOC.Default.GetInstance<DataCapture.ViewModels.MainViewVM>();
             _dataCaptureVM.RelayCommandsInvalidated += (_, __) => StartJobAndRecordCommand.RaiseCanExecuteChanged();
 
             //Initialize Commands...
@@ -1885,9 +1885,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #endregion
 
-        #region IShutdownRequestBlocker
+        #region IStudioViewModel
 
-        public Task<bool> OnShutdownRequest()
+        public override Task<bool> OnShutdownRequest()
         {
             if (IsJobRunning)
             {
@@ -1902,16 +1902,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
             return Task.FromResult(true);
         }
 
-        #endregion
-
-        #region IShutdownListener
-
-        public void OnShuttingDown()
+        public override void OnShuttingDown()
         {
             SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedMachineGuid = SelectedMachine != null ? SelectedMachine.Guid : null;
             SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedJobGuid = SelectedMachineJob != null ? SelectedMachineJob.Guid : null;
         }
 
         #endregion
+
+
     }
 }