aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-16 15:13:55 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-16 15:13:55 +0200
commit92c52918e13dbbaf2a658945c349a6d04c29aa81 (patch)
tree82967e8201bcf009c8a51ea2284a759fae3fd69b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
parente87626ffc0298426d8242c2453a6992d94f38e1f (diff)
downloadTango-92c52918e13dbbaf2a658945c349a6d04c29aa81.tar.gz
Tango-92c52918e13dbbaf2a658945c349a6d04c29aa81.zip
Added custom image support for bug reporting.
Fixed issue with dispensers filter search.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml14
1 files changed, 12 insertions, 2 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 aa2a70a5f..7387c4ae5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -12,7 +12,7 @@
xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"
xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS"
xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
- mc:Ignorable="d" Width="530" Height="680" Background="White" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}">
+ mc:Ignorable="d" Width="530" Height="720" Background="White" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}">
<UserControl.Resources>
<converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
@@ -91,11 +91,21 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
+
+ <DockPanel Margin="0 20 0 0">
+ <materialDesign:PackIcon Kind="FileImage" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" />
+ <TextBlock VerticalAlignment="Center"><Run>Attach Image</Run></TextBlock>
+ </DockPanel>
+ <DockPanel Margin="30 0 0 0">
+ <Button DockPanel.Dock="Right" Margin="10 0 0 0" Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding BrowseImageCommand}">BROWSE</Button>
+ <TextBox IsReadOnly="True" Text="{Binding ImageFile}"></TextBox>
+ </DockPanel>
</StackPanel>
+
<Grid>
<DockPanel>
- <DockPanel Margin="0 10 0 0" DockPanel.Dock="Top">
+ <DockPanel Margin="0 20 0 0" DockPanel.Dock="Top">
<materialDesign:PackIcon Kind="ChartTimeline" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" />
<TextBlock VerticalAlignment="Center">Steps To Reproduce</TextBlock>
</DockPanel>