Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 13 insertions, 12 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
index 26a789d0f..13c3d6779 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
@@ -12,9 +12,6 @@ using Tango.Logging;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Modules;
-using Tango.MachineStudio.DB;
-using Tango.MachineStudio.MachineDesigner;
-using Tango.MachineStudio.Stubs;
 
 namespace Tango.MachineStudio.UI.Modules
 {
@@ -27,7 +24,6 @@ namespace Tango.MachineStudio.UI.Modules
     {
         private IAuthenticationProvider _authenticationProvider;
         private bool _loaded;
-        public event EventHandler ModulesLoaded;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DefaultStudioModuleLoader"/> class.
@@ -78,15 +74,15 @@ namespace Tango.MachineStudio.UI.Modules
         {
             if (!_loaded)
             {
-                //Preloaded
+                ////Preloaded
 
-                LogManager.Log(String.Format("Loading module '{0}'...", nameof(StubsModule)));
-                AllModules.Add(new StubsModule());
-                LogManager.Log(String.Format("Loading module '{0}'...", nameof(DBModule)));
-                AllModules.Add(new DBModule());
-                LogManager.Log(String.Format("Loading module '{0}'...", nameof(MachineDesignerModule)));
-                AllModules.Add(new MachineDesignerModule());
-                //Preloaded
+                //LogManager.Log(String.Format("Loading module '{0}'...", nameof(StubsModule)));
+                //AllModules.Add(new StubsModule());
+                //LogManager.Log(String.Format("Loading module '{0}'...", nameof(DBModule)));
+                //AllModules.Add(new DBModule());
+                //LogManager.Log(String.Format("Loading module '{0}'...", nameof(MachineDesignerModule)));
+                //AllModules.Add(new MachineDesignerModule());
+                ////Preloaded
 
                 AllModules.Clear();
                 string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -146,5 +142,10 @@ namespace Tango.MachineStudio.UI.Modules
         {
             return UserModules.OfType<T>().FirstOrDefault();
         }
+
+        /// <summary>
+        /// Occurs when all modules are initialized.
+        /// </summary>
+        public event EventHandler ModulesLoaded;
     }
 }