From 8a0b8f6abe3d143b43131a330e0ee39c2547ce8f Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 4 Jul 2021 15:25:08 +0300
Subject: After Virus

---
 .../Modules/Tango.MachineStudio.RML/Views/RmlView.xaml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 099637601..f89da482c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -72,14 +72,16 @@
                                     <TextBlock Text="Head Type:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.RmlHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
 
-                                    <TextBlock Text="Qualification Level:" ></TextBlock>
-                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:RmlQualifications},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.RmlQualificationLevel}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+                                    <!--<TextBlock Text="Qualification Level:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:RmlQualifications},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.RmlQualificationLevel}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>-->
 
-                                    <TextBlock Text="Manufacturer:" ></TextBlock>
-                                    <TextBox Text="{Binding ActiveRML.Manufacturer}"></TextBox>
+                                    <TextBlock Text="Manufacturer:" HorizontalAlignment="Left" ></TextBlock>
+                                    <!--<TextBox Text="{Binding ActiveRML.Manufacturer}"></TextBox>-->
+                                    <ComboBox VerticalAlignment="Center" ItemsSource="{Binding Manufacturers}" SelectedItem="{Binding ActiveRML.Manufacturer,Mode=TwoWay}"  IsEditable="False" Margin="20 0 0 0"/>
 
-                                    <TextBlock Text="Material:" ></TextBlock>
-                                    <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+
+                                    <!--<TextBlock Text="Material:" ></TextBlock>
+                                    <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>-->
 
                                     <TextBlock Text="White Point:" ></TextBlock>
                                     <UniformGrid Columns="3">
@@ -88,7 +90,7 @@
                                         <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </UniformGrid>
 
-                                    <TextBlock Text="Purpose:" ></TextBlock>
+                                    <!--<TextBlock Text="Purpose:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Purposes}" SelectedItem="{Binding ActiveRML.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
                                     <TextBlock Text="Condition:" ></TextBlock>
@@ -131,7 +133,7 @@
                                     <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding ActiveRML.AirEntanglement}" Style="{StaticResource MaterialDesignSwitchToggleButton}" />
 
                                     <TextBlock Text="Lubricant:" ></TextBlock>
-                                    <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding ActiveRML.Lubricant}" Style="{StaticResource MaterialDesignSwitchToggleButton}" />
+                                    <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding ActiveRML.Lubricant}" Style="{StaticResource MaterialDesignSwitchToggleButton}" />-->
                                 </controls:TableGrid>
                             </DockPanel>
                         </Grid>
-- 
cgit v1.3.1