diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-01-20 21:30:53 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-01-20 21:30:53 +0200 |
| commit | bc2d3eb5ec8c7176627dcb8f5c02cc085b2db584 (patch) | |
| tree | e2d690486b4546fc73e81cfbe15526a36b86e232 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml | |
| parent | 215127ecf2b971a7164ab303f09de74e56c970f4 (diff) | |
| download | Tango-bc2d3eb5ec8c7176627dcb8f5c02cc085b2db584.tar.gz Tango-bc2d3eb5ec8c7176627dcb8f5c02cc085b2db584.zip | |
Implemented new CATS.
Implemented Process Parameters View on DB Module.
Implemented RML Process Parameters View on DB Module.
Modified DB Module table initials letter casing.
Moved observables generator to CLI.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml index 60aebef7f..f6c39a6cd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml @@ -36,18 +36,9 @@ </Grid.RowDefinitions> <Grid> - <StackPanel HorizontalAlignment="Left" Margin="10"> + <StackPanel Margin="10"> <TextBlock>Version</TextBlock> - <autoComplete:AutoCompleteTextBox Margin="0 5 0 0" Width="200" materialDesign:HintAssist.Hint="Selected version" DisplayMember="Version" Provider="{Binding VersionsProvider}" SelectedItem="{Binding SelectedVersion,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> - <autoComplete:AutoCompleteTextBox.ItemTemplate> - <DataTemplate> - <TextBlock><Run Text="{Binding Name}"></Run><Run>,</Run><Run Text="{Binding Version}"></Run></TextBlock> - </DataTemplate> - </autoComplete:AutoCompleteTextBox.ItemTemplate> - <autoComplete:AutoCompleteTextBox.LoadingContent> - <TextBlock Text="Loading..." Margin="5" FontSize="14" /> - </autoComplete:AutoCompleteTextBox.LoadingContent> - </autoComplete:AutoCompleteTextBox> + <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" Text="{Binding Version}" DisplayMemberPath="Version" SelectedItem="{Binding SelectedVersion}" IsEditable="True" materialDesign:HintAssist.Hint="Select or enter a new version name"></ComboBox> <TextBlock Margin="0 10 0 0">Name</TextBlock> <TextBox materialDesign:HintAssist.Hint="Version name" Text="{Binding VersionName}"> <TextBox.Style> |