diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-27 13:16:00 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-27 13:16:00 +0200 |
| commit | af8530c50d90c12ebe60383e67101920760c314f (patch) | |
| tree | 53e8f091a3cd8dc2235b38db527ef7798b9c347c /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml | |
| parent | 9d12fd0ba222619dd5b42816ed004c7b762809dd (diff) | |
| download | Tango-af8530c50d90c12ebe60383e67101920760c314f.tar.gz Tango-af8530c50d90c12ebe60383e67101920760c314f.zip | |
Fixed issue with local sync SQL Logic error.
Added some missing columns to SQLite db.
Direct Remote Sync is fully working !!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml index 4c5a719b5..ba0530ca6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/DirectSynchronizationView.xaml @@ -17,6 +17,7 @@ <UserControl.Resources> <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter"></converters:BooleanToVisibilityInverseConverter> + <converters:BooleanInverseConverter x:Key="BooleanInverseConverter"></converters:BooleanInverseConverter> <providers:MachinesProvider x:Key="MachinesProvider"></providers:MachinesProvider> @@ -80,7 +81,7 @@ <TextBlock Background="{StaticResource badgeBackground}" Padding="5" Width="200" FontSize="14" HorizontalAlignment="Left">Remote Database</TextBlock> <StackPanel Orientation="Horizontal" Margin="0 5 0 0"> <fa:ImageAwesome Icon="Key" Width="16" Height="16"></fa:ImageAwesome> - <autoComplete:AutoCompleteTextBox Margin="5 0 0 0" Width="170" materialDesign:HintAssist.Hint="Enter machine serial number" DisplayMember="SerialNumber" Provider="{StaticResource ResourceKey=MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> + <autoComplete:AutoCompleteTextBox Margin="5 0 0 0" IsEnabled="{Binding IsWorking,Converter={StaticResource BooleanInverseConverter}}" Width="170" materialDesign:HintAssist.Hint="Enter machine serial number" DisplayMember="SerialNumber" Provider="{StaticResource ResourceKey=MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> <autoComplete:AutoCompleteTextBox.ItemTemplate> <DataTemplate> <TextBlock Text="{Binding SerialNumber}"></TextBlock> @@ -174,7 +175,7 @@ </GroupBox> </Grid> - <Grid Grid.Row="1" Visibility="Hidden"> + <Grid Grid.Row="1" Visibility="{Binding ApplicationManager.IsMachineConnected,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <Grid.Background> <SolidColorBrush Color="White" Opacity="0.8"></SolidColorBrush> </Grid.Background> |
