diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-07 17:19:25 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-07 17:19:25 +0200 |
| commit | 2a21fe4c9ac87cceed96a03d5ff5ff1aa0d64016 (patch) | |
| tree | 5e4332a86e760aae0e50bfe643f64a0c74046b6a /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml | |
| parent | bd3cb640be12621ac37253e8a8c627ae40692e4d (diff) | |
| download | Tango-2a21fe4c9ac87cceed96a03d5ff5ff1aa0d64016.tar.gz Tango-2a21fe4c9ac87cceed96a03d5ff5ff1aa0d64016.zip | |
Fixed and improved bug reporting in machine studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml index 7387c4ae5..5f5e1042b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml @@ -35,7 +35,7 @@ </StackPanel> </Grid> - <Grid Grid.Row="1"> + <Grid Grid.Row="1" Focusable="True"> <DockPanel> <StackPanel DockPanel.Dock="Top"> <DockPanel> @@ -50,7 +50,28 @@ <DockPanel Margin="0 10 0 0"> <materialDesign:PackIcon Kind="Star" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" /> - <ComboBox materialDesign:HintAssist.Hint="Area" materialDesign:HintAssist.IsFloating="True" ItemsSource="{Binding Project.Areas}" SelectedItem="{Binding WorkItem.Area}" DisplayMemberPath="Name"></ComboBox> + <Grid> + <TextBox IsReadOnly="True" materialDesign:HintAssist.Hint="Area" materialDesign:HintAssist.IsFloating="True" Text="{Binding WorkItem.Area.Name}" VerticalAlignment="Bottom" Margin="0 0 0 3"></TextBox> + <ToggleButton x:Name="toggleArea"> + <ToggleButton.Template> + <ControlTemplate TargetType="ToggleButton"> + <Grid Background="Transparent"> + <Popup Height="200" AllowsTransparency="True" Width="{TemplateBinding ActualWidth}" PopupAnimation="Slide" IsOpen="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"> + <Border Background="White" Margin="0 2 0 0" BorderBrush="Silver" BorderThickness="1" CornerRadius="3"> + <TreeView Loaded="TreeView_Loaded" ItemsSource="{Binding Project.Areas}" SelectedItemChanged="TreeView_SelectedItemChanged"> + <TreeView.ItemTemplate> + <HierarchicalDataTemplate ItemsSource="{Binding SubAreas}"> + <TextBlock Text="{Binding Name}" /> + </HierarchicalDataTemplate> + </TreeView.ItemTemplate> + </TreeView> + </Border> + </Popup> + </Grid> + </ControlTemplate> + </ToggleButton.Template> + </ToggleButton> + </Grid> </DockPanel> <DockPanel Margin="0 10 0 0"> @@ -101,7 +122,7 @@ <TextBox IsReadOnly="True" Text="{Binding ImageFile}"></TextBox> </DockPanel> </StackPanel> - + <Grid> <DockPanel> |