diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-23 12:58:19 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-23 12:58:19 +0300 |
| commit | 90d225db29a76051c4e2a0c83f7967bb846b66a9 (patch) | |
| tree | eb04ef805ccb6469c31ade3eafc4d3f6f2708c14 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views | |
| parent | 7d88aaa7f2b7f6a08245f1ce680e6955f18dd800 (diff) | |
| parent | d6974df76b1401f101ca3c7fc3182f73e493ca51 (diff) | |
| download | Tango-90d225db29a76051c4e2a0c83f7967bb846b66a9.tar.gz Tango-90d225db29a76051c4e2a0c83f7967bb846b66a9.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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> |