MERGE.

1 files changed, 245 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index 712a99953..bb52ecb86 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -61,6 +61,9 @@
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
+    <Reference Include="SimpleValidator, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SimpleValidator.0.6.1.0\lib\net40\SimpleValidator.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -79,15 +82,35 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="WriteableBitmapEx.Wpf, Version=1.5.0.0, Culture=neutral, PublicKeyToken=50375ca6144f1c69, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\WriteableBitmapEx.1.5.0.0\lib\net40\WriteableBitmapEx.Wpf.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="ExtensionMethods\INotificationProviderExtensions.cs" />
+    <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
+    <Compile Include="Messages\OpenEntityEditViewMessage.cs" />
     <Compile Include="ViewModels\AddressesViewVM.cs" />
+    <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" />
+    <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
+    <Compile Include="ViewModels\ApplicationOsVersionsViewVM.cs" />
+    <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" />
+    <Compile Include="ViewModels\CartridgesViewVM.cs" />
+    <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
+    <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
+    <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
+    <Compile Include="ViewModels\DispensersViewVM.cs" />
+    <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
+    <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" />
+    <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
+    <Compile Include="ViewModels\IdsPacksViewVM.cs" />
+    <Compile Include="ViewModels\LiquidsViewVM.cs" />
     <Compile Include="ViewModels\MachinesViewVM.cs" />
+    <Compile Include="ViewModels\MachineVersionsViewVM.cs" />
     <Compile Include="ViewModels\MultiComboVM.cs" />
     <Compile Include="ViewModels\OrganizationsViewVM.cs" />
     <Compile Include="ViewModels\PermissionsViewVM.cs" />
@@ -96,6 +119,96 @@
     <Compile Include="ViewModels\EntityViewModel.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="Views\DBViews\IdsPacksView.xaml.cs">
+      <DependentUpon>IdsPacksView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CartridgeTypesView.xaml.cs">
+      <DependentUpon>CartridgeTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CartridgesView.xaml.cs">
+      <DependentUpon>CartridgesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\DispensersView.xaml.cs">
+      <DependentUpon>DispensersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\DispenserTypesView.xaml.cs">
+      <DependentUpon>DispenserTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CartridgeTypeView.xaml.cs">
+      <DependentUpon>CartridgeTypeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CartridgeView.xaml.cs">
+      <DependentUpon>CartridgeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\DispenserView.xaml.cs">
+      <DependentUpon>DispenserView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\DispenserTypeView.xaml.cs">
+      <DependentUpon>DispenserTypeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\IdsPackView.xaml.cs">
+      <DependentUpon>IdsPackView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LiquidView.xaml.cs">
+      <DependentUpon>LiquidView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LiquidsView.xaml.cs">
+      <DependentUpon>LiquidsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\HardwareVersionView.xaml.cs">
+      <DependentUpon>HardwareVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\EmbeddedSoftwareVersionView.xaml.cs">
+      <DependentUpon>EmbeddedSoftwareVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\EmbeddedFirmwareVersionView.xaml.cs">
+      <DependentUpon>EmbeddedFirmwareVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationVersionView.xaml.cs">
+      <DependentUpon>ApplicationVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationOsVersionView.xaml.cs">
+      <DependentUpon>ApplicationOsVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationFirmwareVersionView.xaml.cs">
+      <DependentUpon>ApplicationFirmwareVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\HardwareVersionsView.xaml.cs">
+      <DependentUpon>HardwareVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\EmbeddedSoftwareVersionsView.xaml.cs">
+      <DependentUpon>EmbeddedSoftwareVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\EmbeddedFirmwareVersionsView.xaml.cs">
+      <DependentUpon>EmbeddedFirmwareVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationVersionsView.xaml.cs">
+      <DependentUpon>ApplicationVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationOsVersionsView.xaml.cs">
+      <DependentUpon>ApplicationOsVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationFirmwareVersionsView.xaml.cs">
+      <DependentUpon>ApplicationFirmwareVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ConfigurationsView.xaml.cs">
+      <DependentUpon>ConfigurationsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationDisplayPanelVersionsView.xaml.cs">
+      <DependentUpon>ApplicationDisplayPanelVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MachineVersionsView.xaml.cs">
+      <DependentUpon>MachineVersionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ApplicationDisplayPanelVersionView.xaml.cs">
+      <DependentUpon>ApplicationDisplayPanelVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MachineVersionView.xaml.cs">
+      <DependentUpon>MachineVersionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ConfigurationView.xaml.cs">
+      <DependentUpon>ConfigurationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\PermissionView.xaml.cs">
       <DependentUpon>PermissionView.xaml</DependentUpon>
     </Compile>
@@ -135,6 +248,9 @@
     <Compile Include="Views\MainDBView.xaml.cs">
       <DependentUpon>MainDBView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Windows\DBDialogWindow.xaml.cs">
+      <DependentUpon>DBDialogWindow.xaml</DependentUpon>
+    </Compile>
     <Page Include="Controls\DbTableView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -150,6 +266,126 @@
     <Compile Include="CustomAttributes\DBViewAttribute.cs" />
     <Compile Include="Managers\RegisteredView.cs" />
     <Compile Include="Managers\ViewsManager.cs" />
+    <Page Include="Views\DBViews\IdsPacksView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CartridgeTypesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CartridgesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\DispensersView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\DispenserTypesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CartridgeTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CartridgeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\DispenserView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\DispenserTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\IdsPackView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LiquidView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LiquidsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\HardwareVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\EmbeddedSoftwareVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\EmbeddedFirmwareVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationOsVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationFirmwareVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\HardwareVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\EmbeddedSoftwareVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\EmbeddedFirmwareVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationOsVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationFirmwareVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ConfigurationsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationDisplayPanelVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MachineVersionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ApplicationDisplayPanelVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MachineVersionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ConfigurationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\PermissionView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -202,6 +438,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Windows\DBDialogWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -229,6 +469,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Tango.ColorPicker\Tango.ColorPicker.csproj">
+      <Project>{a2f5af44-29ff-45d6-9d25-ecda5cce88b5}</Project>
+      <Name>Tango.ColorPicker</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
@@ -259,5 +503,6 @@
   <ItemGroup>
     <Resource Include="Images\seamless-grid.jpg" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file