1 files changed, 42 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 1f08e31ca..5095dfc93 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -3,7 +3,13 @@ using GalaSoft.MvvmLight.Ioc;
 using Microsoft.Practices.ServiceLocation;
 using System;
 using Tango.Logging;
+using Tango.MachineStudio.Common.Authentication;
+using Tango.MachineStudio.Common.Modules;
+using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.UI.Authentication;
+using Tango.MachineStudio.UI.Modules;
+using Tango.MachineStudio.UI.Navigation;
 using Tango.MachineStudio.UI.Notifications;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.MachineStudio.UI.ViewModels;
@@ -35,9 +41,20 @@ namespace Tango.MachineStudio.UI
             ////    SimpleIoc.Default.Register<IDataService, DataService>();
             ////}
 
-            SimpleIoc.Default.Register<INotificationProvider>(() => new DefaultNotificationProvider());
+            SimpleIoc.Default.Unregister<INotificationProvider>();
+            SimpleIoc.Default.Unregister<IAuthenticationProvider>();
+            SimpleIoc.Default.Unregister<INavigationManager>();
+            SimpleIoc.Default.Unregister<IStudioModuleLoader>();
+
+            SimpleIoc.Default.Register<INotificationProvider, DefaultNotificationProvider>();
+            SimpleIoc.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
+            SimpleIoc.Default.Register<INavigationManager, DefaultNavigationManager>();
+            SimpleIoc.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
 
             SimpleIoc.Default.Register<MainViewVM>();
+            SimpleIoc.Default.Register<LoadingViewVM>();
+            SimpleIoc.Default.Register<ShutdownViewVM>();
+            SimpleIoc.Default.Register<LoginViewVM>();
 
             //Register View (Supervising Controller Pattern).
             if (!ViewModelBase.IsInDesignModeStatic)
@@ -54,5 +71,29 @@ namespace Tango.MachineStudio.UI
                 return ServiceLocator.Current.GetInstance<MainViewVM>();
             }
         }
+
+        public LoadingViewVM LoadingViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LoadingViewVM>();
+            }
+        }
+
+        public ShutdownViewVM ShutdownViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ShutdownViewVM>();
+            }
+        }
+
+        public LoginViewVM LoginViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LoginViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file