diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-19 18:29:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-19 18:29:10 +0300 |
| commit | 8e49a8041391c9aa946060aed2c538b1ce958a68 (patch) | |
| tree | 1c3bc353a0311865ab0e8037bdf5d59d16b5972f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views | |
| parent | 48c5d636927f832497e8939a8423ecd1c16892d7 (diff) | |
| download | Tango-8e49a8041391c9aa946060aed2c538b1ce958a68.tar.gz Tango-8e49a8041391c9aa946060aed2c538b1ce958a68.zip | |
Added support for multiple ColorLib versions !
Added version control and display in RML & Research Module.
Implemented GenerateHive optimizations.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 861a639d3..742798ce4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -753,13 +753,19 @@ <StackPanel> <TextBlock>MEDIA</TextBlock> <StackPanel Orientation="Horizontal" DockPanel.Dock="Left"> - <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}"> + <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch"> <ComboBox.ItemTemplate> <DataTemplate> - <StackPanel> - <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock> - <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock> - </StackPanel> + <DockPanel> + <StackPanel DockPanel.Dock="Left"> + <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock> + <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock> + </StackPanel> + <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right"> + <Run Foreground="Gray">v:</Run> + <Run FontWeight="Bold" Text="{Binding ColorConversionVersion,Mode=OneWay}"></Run> + </TextBlock> + </DockPanel> </DataTemplate> </ComboBox.ItemTemplate> </ComboBox> |