aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-03-18 12:00:50 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-03-18 12:00:50 +0200
commitb73ca494e24ad83f8768946a5bd2e91a60d7d65e (patch)
treee65285f9af71da2dc75b22b85b070d18a138ba69 /Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers
parent1b0cc929b5641c58faf5830ec70d3dec4030b1fd (diff)
downloadTango-b73ca494e24ad83f8768946a5bd2e91a60d7d65e.tar.gz
Tango-b73ca494e24ad83f8768946a5bd2e91a60d7d65e.zip
Implemented open dispensers & machine designer via double click.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
index a1d080380..a8262667e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
@@ -8,6 +8,7 @@
xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
xmlns:vm="clr-namespace:Tango.MachineStudio.Dispensers.ViewModels"
+ xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
xmlns:global="clr-namespace:Tango.MachineStudio.Dispensers"
xmlns:local="clr-namespace:Tango.MachineStudio.Dispensers.Views"
mc:Ignorable="d"
@@ -54,7 +55,7 @@
</StackPanel>
</Grid>
<Grid IsEnabled="{Binding IsFree}">
- <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Dispensers}" SelectedItem="{Binding SelectedDispenser}">
+ <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding ManageDispenserCommand}" Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Dispensers}" SelectedItem="{Binding SelectedDispenser}">
<DataGrid.CellStyle>
<Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
<Setter Property="BorderThickness" Value="0"/>
@@ -73,7 +74,7 @@
<DataGridTextColumn Header="INSTALLED" Binding="{Binding IsInstalled}" Width="Auto" />
<DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
</DataGrid.Columns>
- </DataGrid>
+ </controls:DoubleClickDataGrid>
</Grid>
</DockPanel>
</Grid>