MERGE.

1 files changed, 137 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 c5f3f452e..48175ed17 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -24,6 +24,23 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<UsersViewVM>();
             SimpleIoc.Default.Register<RolesViewVM>();
             SimpleIoc.Default.Register<PermissionsViewVM>();
+            SimpleIoc.Default.Register<MachineVersionsViewVM>();
+            SimpleIoc.Default.Register<ConfigurationsViewVM>();
+
+            SimpleIoc.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
+            SimpleIoc.Default.Register<ApplicationFirmwareVersionsViewVM>();
+            SimpleIoc.Default.Register<ApplicationOsVersionsViewVM>();
+            SimpleIoc.Default.Register<ApplicationVersionsViewVM>();
+            SimpleIoc.Default.Register<EmbeddedFirmwareVersionsViewVM>();
+            SimpleIoc.Default.Register<EmbeddedSoftwareVersionsViewVM>();
+            SimpleIoc.Default.Register<HardwareVersionsViewVM>();
+
+            SimpleIoc.Default.Register<IdsPacksViewVM>();
+            SimpleIoc.Default.Register<DispensersViewVM>();
+            SimpleIoc.Default.Register<DispenserTypesViewVM>();
+            SimpleIoc.Default.Register<LiquidsViewVM>();
+            SimpleIoc.Default.Register<CartridgesViewVM>();
+            SimpleIoc.Default.Register<CartridgeTypesViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -81,5 +98,125 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<PermissionsViewVM>();
             }
         }
+
+        public static MachineVersionsViewVM MachineVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MachineVersionsViewVM>();
+            }
+        }
+
+        public static ConfigurationsViewVM ConfigurationsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ConfigurationsViewVM>();
+            }
+        }
+
+        public static ApplicationDisplayPanelVersionsViewVM ApplicationDisplayPanelVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ApplicationDisplayPanelVersionsViewVM>();
+            }
+        }
+
+        public static ApplicationFirmwareVersionsViewVM ApplicationFirmwareVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ApplicationFirmwareVersionsViewVM>();
+            }
+        }
+
+        public static ApplicationOsVersionsViewVM ApplicationOsVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ApplicationOsVersionsViewVM>();
+            }
+        }
+
+        public static ApplicationVersionsViewVM ApplicationVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ApplicationVersionsViewVM>();
+            }
+        }
+
+        public static EmbeddedFirmwareVersionsViewVM EmbeddedFirmwareVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<EmbeddedFirmwareVersionsViewVM>();
+            }
+        }
+
+        public static EmbeddedSoftwareVersionsViewVM EmbeddedSoftwareVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<EmbeddedSoftwareVersionsViewVM>();
+            }
+        }
+
+        public static HardwareVersionsViewVM HardwareVersionsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<HardwareVersionsViewVM>();
+            }
+        }
+
+        public static IdsPacksViewVM IdsPacksViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<IdsPacksViewVM>();
+            }
+        }
+
+        public static DispensersViewVM DispensersViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<DispensersViewVM>();
+            }
+        }
+
+        public static DispenserTypesViewVM DispenserTypesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<DispenserTypesViewVM>();
+            }
+        }
+
+        public static LiquidsViewVM LiquidsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LiquidsViewVM>();
+            }
+        }
+
+        public static CartridgesViewVM CartridgesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CartridgesViewVM>();
+            }
+        }
+
+        public static CartridgeTypesViewVM CartridgeTypesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file