From 2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Tue, 26 Dec 2017 21:16:15 +0200
Subject: MERGE

---
 .../Tango.MachineStudio.DB.csproj                  | 136 +++++++++++++++++++++
 1 file changed, 136 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj')

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 bd6166b4f..12af196bc 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
@@ -88,6 +88,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
+    <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
@@ -101,6 +102,7 @@
     <Compile Include="ViewModels\CartridgesViewVM.cs" />
     <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
     <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
+    <Compile Include="ViewModels\ContactsViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
@@ -108,14 +110,22 @@
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EventTypesViewVM.cs" />
+    <Compile Include="ViewModels\FiberShapesViewVM.cs" />
+    <Compile Include="ViewModels\FiberSynthsViewVM.cs" />
     <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\IdsPacksViewVM.cs" />
+    <Compile Include="ViewModels\LinearMassDensityUnitsViewVM.cs" />
     <Compile Include="ViewModels\LiquidTypesViewVM.cs" />
     <Compile Include="ViewModels\MachinesViewVM.cs" />
     <Compile Include="ViewModels\MachineVersionsViewVM.cs" />
+    <Compile Include="ViewModels\MediaColorsViewVM.cs" />
+    <Compile Include="ViewModels\MediaConditionsViewVM.cs" />
+    <Compile Include="ViewModels\MediaMaterialsViewVM.cs" />
+    <Compile Include="ViewModels\MediaPurposesViewVM.cs" />
     <Compile Include="ViewModels\MultiComboVM.cs" />
     <Compile Include="ViewModels\OrganizationsViewVM.cs" />
     <Compile Include="ViewModels\PermissionsViewVM.cs" />
+    <Compile Include="ViewModels\RmlsViewVM.cs" />
     <Compile Include="ViewModels\RolesViewVM.cs" />
     <Compile Include="ViewModels\UsersViewVM.cs" />
     <Compile Include="ViewModels\EntityViewModel.cs" />
@@ -127,6 +137,60 @@
     <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
       <DependentUpon>ActionTypeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\RmlView.xaml.cs">
+      <DependentUpon>RmlView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\RmlsView.xaml.cs">
+      <DependentUpon>RmlsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ContactView.xaml.cs">
+      <DependentUpon>ContactView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ContactsView.xaml.cs">
+      <DependentUpon>ContactsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaConditionsView.xaml.cs">
+      <DependentUpon>MediaConditionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaConditionView.xaml.cs">
+      <DependentUpon>MediaConditionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LinearMassDensityUnitsView.xaml.cs">
+      <DependentUpon>LinearMassDensityUnitsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LinearMassDensityUnitView.xaml.cs">
+      <DependentUpon>LinearMassDensityUnitView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberShapesView.xaml.cs">
+      <DependentUpon>FiberShapesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberShapeView.xaml.cs">
+      <DependentUpon>FiberShapeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberSynthsView.xaml.cs">
+      <DependentUpon>FiberSynthsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberSynthView.xaml.cs">
+      <DependentUpon>FiberSynthView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaPurposesView.xaml.cs">
+      <DependentUpon>MediaPurposesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaMaterialsView.xaml.cs">
+      <DependentUpon>MediaMaterialsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaColorView.xaml.cs">
+      <DependentUpon>MediaColorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaPurposView.xaml.cs">
+      <DependentUpon>MediaPurposView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaMaterialView.xaml.cs">
+      <DependentUpon>MediaMaterialView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaColorsView.xaml.cs">
+      <DependentUpon>MediaColorsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\IdsPacksView.xaml.cs">
       <DependentUpon>IdsPacksView.xaml</DependentUpon>
     </Compile>
@@ -288,6 +352,78 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\RmlView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\RmlsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ContactView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ContactsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaConditionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaConditionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LinearMassDensityUnitsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LinearMassDensityUnitView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberShapesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberShapeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberSynthsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberSynthView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaPurposesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaMaterialsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaColorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaPurposView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaMaterialView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaColorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\IdsPacksView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-- 
cgit v1.3.1