MERGE.

1 files changed, 124 insertions, 3 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 48175ed17..857f0d3cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -38,9 +38,26 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<IdsPacksViewVM>();
             SimpleIoc.Default.Register<DispensersViewVM>();
             SimpleIoc.Default.Register<DispenserTypesViewVM>();
-            SimpleIoc.Default.Register<LiquidsViewVM>();
+            SimpleIoc.Default.Register<LiquidTypesViewVM>();
             SimpleIoc.Default.Register<CartridgesViewVM>();
             SimpleIoc.Default.Register<CartridgeTypesViewVM>();
+
+            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>();
+
+            SimpleIoc.Default.Register<CctsViewVM>();
+            SimpleIoc.Default.Register<CatsViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -195,11 +212,11 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static LiquidsViewVM LiquidsViewVM
+        public static LiquidTypesViewVM LiquidTypesViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LiquidsViewVM>();
+                return ServiceLocator.Current.GetInstance<LiquidTypesViewVM>();
             }
         }
 
@@ -218,5 +235,109 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>();
             }
         }
+
+        public static EventTypesViewVM EventTypesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<EventTypesViewVM>();
+            }
+        }
+
+        public static ActionTypesViewVM ActionTypesViewVM
+        {
+            get
+            {
+                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>();
+            }
+        }
+
+        public static CctsViewVM CctsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CctsViewVM>();
+            }
+        }
+
+        public static CatsViewVM CatsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CatsViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file