diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-07-27 14:47:37 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-07-27 14:47:37 +0300 |
| commit | e29f87822e09f2986af24023504bb160093b8483 (patch) | |
| tree | 3e90b257e98ae816cdc4f29c845018cfbd8046ab /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml | |
| parent | 64049f8be57df4a391c64c4200e2b3208ae1b460 (diff) | |
| download | Tango-e29f87822e09f2986af24023504bb160093b8483.tar.gz Tango-e29f87822e09f2986af24023504bb160093b8483.zip | |
Added column "Level" to RML Extension. Changes in DB and GUI.
Related Work Items: #4219
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml index cd131d76d..be255f749 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/RMLExtensionView.xaml @@ -25,7 +25,14 @@ <x:Type TypeName="enumerations:RMLExtensionStatus"/> </ObjectDataProvider.MethodParameters> </ObjectDataProvider> - + + + <ObjectDataProvider x:Key="RMLExtensionLevel" ObjectType="{x:Type sys:Enum}" MethodName="GetValues"> + <ObjectDataProvider.MethodParameters> + <x:Type TypeName="enumerations:RMLExtensionLevel"/> + </ObjectDataProvider.MethodParameters> + </ObjectDataProvider> + </UserControl.Resources> <Grid> <DockPanel> @@ -37,6 +44,14 @@ <TextBlock MaxWidth="350" Text="{Binding ActiveRML.Name}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="30" TextWrapping="Wrap"></TextBlock> </StackPanel> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Margin="0 20 50 0"> + <TextBlock Text="Level: " VerticalAlignment="Center" FontSize="20" Margin="0 3 0 0"></TextBlock> + <ComboBox Margin="20 0 40 0" FontSize="20" ItemsSource="{Binding Source={StaticResource RMLExtensionLevel}}" SelectedItem="{Binding ActiveRMLExtension.Level, Mode=TwoWay}" Width="Auto"> + <ComboBox.ItemTemplate> + <DataTemplate> + <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock> + </DataTemplate> + </ComboBox.ItemTemplate> + </ComboBox> <TextBlock Text="Status: " VerticalAlignment="Center" FontSize="20" Margin="0 3 0 0"></TextBlock> <ComboBox Margin="20 0 40 0" FontSize="20" ItemsSource="{Binding Source={StaticResource RMLExtensionStatus}}" SelectedItem="{Binding ActiveRMLExtension.RMLStatus, Mode=TwoWay}" Width="160"> <ComboBox.ItemTemplate> |