MERGE

1 files changed, 83 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 8bc6ff1c0..fa4139389 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -44,6 +44,17 @@ namespace Tango.MachineStudio.DB
 
             SimpleIoc.Default.Register<EventTypesViewVM>();
             SimpleIoc.Default.Register<ActionTypesViewVM>();
+
+            SimpleIoc.Default.Register<ContactsViewVM>();
+
+            SimpleIoc.Default.Register<MediaMaterialsViewVM>();
+            SimpleIoc.Default.Register<MediaColorsViewVM>();
+            SimpleIoc.Default.Register<MediaPurposesViewVM>();
+            SimpleIoc.Default.Register<MediaConditionsViewVM>();
+            SimpleIoc.Default.Register<LinearMassDensityUnitsViewVM>();
+            SimpleIoc.Default.Register<FiberShapesViewVM>();
+            SimpleIoc.Default.Register<FiberSynthsViewVM>();
+            SimpleIoc.Default.Register<RmlsViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -237,5 +248,77 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<ActionTypesViewVM>();
             }
         }
+
+        public static ContactsViewVM ContactsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ContactsViewVM>();
+            }
+        }
+
+        public static MediaMaterialsViewVM MediaMaterialsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MediaMaterialsViewVM>();
+            }
+        }
+
+        public static MediaColorsViewVM MediaColorsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MediaColorsViewVM>();
+            }
+        }
+
+        public static MediaPurposesViewVM MediaPurposesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MediaPurposesViewVM>();
+            }
+        }
+
+        public static MediaConditionsViewVM MediaConditionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MediaConditionsViewVM>();
+            }
+        }
+
+        public static LinearMassDensityUnitsViewVM LinearMassDensityUnitsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LinearMassDensityUnitsViewVM>();
+            }
+        }
+
+        public static FiberShapesViewVM FiberShapesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<FiberShapesViewVM>();
+            }
+        }
+
+        public static FiberSynthsViewVM FiberSynthsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<FiberSynthsViewVM>();
+            }
+        }
+
+        public static RmlsViewVM RmlsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<RmlsViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file