Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 0 insertions, 61 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 e719464f8..b0749e196 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
@@ -80,13 +80,11 @@
     </Compile>
     <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" />
     <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" />
-    <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
     <Compile Include="Messages\OpenEntityEditViewMessage.cs" />
-    <Compile Include="ViewModels\ActionTypesViewVM.cs" />
     <Compile Include="ViewModels\AddressesViewVM.cs" />
     <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
@@ -96,13 +94,11 @@
     <Compile Include="ViewModels\CctsViewVM.cs" />
     <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
     <Compile Include="ViewModels\ContactsViewVM.cs" />
-    <Compile Include="ViewModels\EventTypesGroupsViewVM.cs" />
     <Compile Include="ViewModels\HardwareDancerTypesViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
-    <Compile Include="ViewModels\EventTypesViewVM.cs" />
     <Compile Include="ViewModels\FiberShapesViewVM.cs" />
     <Compile Include="ViewModels\FiberSynthsViewVM.cs" />
     <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
@@ -113,7 +109,6 @@
     <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" />
@@ -132,24 +127,12 @@
     <Compile Include="ViewModels\EntityViewModel.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModelLocator.cs" />
-    <Compile Include="Views\DBViews\ActionTypesView.xaml.cs">
-      <DependentUpon>ActionTypesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
-      <DependentUpon>ActionTypeView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\SpoolTypesView.xaml.cs">
       <DependentUpon>SpoolTypesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\SpoolTypeView.xaml.cs">
       <DependentUpon>SpoolTypeView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypesGroupsView.xaml.cs">
-      <DependentUpon>EventTypesGroupsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\EventTypesGroupView.xaml.cs">
-      <DependentUpon>EventTypesGroupView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\HardwarePidControlTypesView.xaml.cs">
       <DependentUpon>HardwarePidControlTypesView.xaml</DependentUpon>
     </Compile>
@@ -246,18 +229,12 @@
     <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>
@@ -354,18 +331,12 @@
     <Compile Include="Views\DBViews\OrganizationView.xaml.cs">
       <DependentUpon>OrganizationView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypesView.xaml.cs">
-      <DependentUpon>EventTypesView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\LiquidTypesRmlsView.xaml.cs">
       <DependentUpon>LiquidTypesRmlsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\UsersView.xaml.cs">
       <DependentUpon>UsersView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypeView.xaml.cs">
-      <DependentUpon>EventTypeView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\LiquidTypesRmlView.xaml.cs">
       <DependentUpon>LiquidTypesRmlView.xaml</DependentUpon>
     </Compile>
@@ -387,14 +358,6 @@
     <Compile Include="CustomAttributes\DBViewAttribute.cs" />
     <Compile Include="Managers\RegisteredView.cs" />
     <Compile Include="Managers\ViewsManager.cs" />
-    <Page Include="Views\DBViews\ActionTypesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\ActionTypeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\SpoolTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -403,14 +366,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypesGroupsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\EventTypesGroupView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\HardwarePidControlTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -539,10 +494,6 @@
       <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>
@@ -551,10 +502,6 @@
       <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>
@@ -683,10 +630,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\LiquidTypesRmlsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -695,10 +638,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\LiquidTypesRmlView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>