diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-15 17:45:04 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-15 17:45:04 +0200 |
| commit | 886a476b862f573be5b38036edfe9582946ebe1d (patch) | |
| tree | b6103fda927a5f8cfede9640fb51f1ce2abb3cb0 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml | |
| parent | 65220384b09029ea1e672c119b6731a666261a21 (diff) | |
| parent | 24292197223caf2ffa1a771c38b2e2f7418ad03e (diff) | |
| download | Tango-886a476b862f573be5b38036edfe9582946ebe1d.tar.gz Tango-886a476b862f573be5b38036edfe9582946ebe1d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml index d9ea2cb44..8d1ff8ec8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml @@ -18,9 +18,9 @@ <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" /> <converters:StringToOneLineConverter x:Key="StringToOneLineConverter" /> </UserControl.Resources> - + <Grid Margin="20" DataContext="{Binding MachineUpdatesViewVM}"> - <DockPanel> + <DockPanel IsEnabled="{Binding IsFree}"> <Grid DockPanel.Dock="Bottom"> </Grid> @@ -34,11 +34,16 @@ <local:MachineView Margin="30 80 0 0" DataContext="{Binding Machine}" IsHitTestVisible="False" VerticalAlignment="Top" Height="241" /> <DockPanel Grid.Column="1" Margin="50 100 50 50"> - <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Height="50"> - <CheckBox IsChecked="{Binding DisplayMachineSetups}">Machine Setups</CheckBox> - <CheckBox IsChecked="{Binding DisplayApplicationUpdates}" Margin="30 0">Software Updates</CheckBox> - <CheckBox IsChecked="{Binding DisplayDatabaseUpdates}">Database Updates</CheckBox> - </StackPanel> + <Grid DockPanel.Dock="Bottom" Height="50"> + <StackPanel Orientation="Horizontal"> + <CheckBox IsChecked="{Binding DisplayMachineSetups}">Machine Setups</CheckBox> + <CheckBox IsChecked="{Binding DisplayApplicationUpdates}" Margin="30 0">Software Updates</CheckBox> + <CheckBox IsChecked="{Binding DisplayDatabaseUpdates}">Database Updates</CheckBox> + <CheckBox IsChecked="{Binding DisplaySynchronizations}" Margin="30 0 0 0">Synchronizations</CheckBox> + </StackPanel> + + <Button Command="{Binding RefreshCommand}" HorizontalAlignment="Right" Width="150" Style="{StaticResource MaterialDesignFlatButton}">REFRESH</Button> + </Grid> <Grid> <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" ItemsSource="{Binding Updates}" SelectedItem="{Binding SelectedUpdate}"> <DataGrid.CellStyle> @@ -66,6 +71,9 @@ <DataTrigger Binding="{Binding IsDataBase}" Value="True"> <Setter Property="Kind" Value="Database"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding IsSynchronization}" Value="True"> + <Setter Property="Kind" Value="Sync"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding IsStarted}" Value="True"> <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter> </DataTrigger> |