diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2022-05-02 16:49:31 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2022-05-02 16:49:31 +0300 |
| commit | 643e13480ee25f02e8bf88a8d8e152780545bf3b (patch) | |
| tree | 475e687705349d57df716be054412a074e6e6295 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | c7d7c3cbd8f6a2b03301c69cbd7a9ee6d1edd858 (diff) | |
| parent | 516438dede5ffce6f2685e85d2b793a604eebd72 (diff) | |
| download | Tango-643e13480ee25f02e8bf88a8d8e152780545bf3b.tar.gz Tango-643e13480ee25f02e8bf88a8d8e152780545bf3b.zip | |
merged vica jobs v2 fixes and ms rml extension fixes.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ColorCalibrationView.xaml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ColorCalibrationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ColorCalibrationView.xaml index 0d8acbc53..e853e2075 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ColorCalibrationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ColorCalibrationView.xaml @@ -39,7 +39,20 @@ <commonControls:MachineView Width="500" Margin="0 40 0 0" DataContext="{Binding Machine}" /> <StackPanel Margin="40 40"> <TextBlock FontSize="16">MEDIA</TextBlock> - <ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding Machine,Converter={StaticResource NullObjectToBooleanConverter}}" Background="Transparent" Style="{StaticResource TransparentComboBoxStyle}" > + + <controls:SearchComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding Machine,Converter={StaticResource NullObjectToBooleanConverter}}" HorizontalContentAlignment="Stretch" SearchProperty="Name" > + + <ComboBox.ItemTemplate> + <DataTemplate> + <StackPanel> + <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock> + <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="{StaticResource GrayBrush}"></TextBlock> + </StackPanel> + </DataTemplate> + </ComboBox.ItemTemplate> + </controls:SearchComboBox> + + <!--<ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding Machine,Converter={StaticResource NullObjectToBooleanConverter}}" Background="Transparent" Style="{StaticResource TransparentComboBoxStyle}" > <ComboBox.ItemTemplate> <DataTemplate> @@ -49,7 +62,7 @@ </StackPanel> </DataTemplate> </ComboBox.ItemTemplate> - </ComboBox> + </ComboBox>--> <TextBlock FontSize="16" Margin="0 40 0 0">LIQUID FACTORS</TextBlock> |