From 650128cf890df30b846a23bbec702abce0db66c5 Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 19 Dec 2017 22:49:05 +0200 Subject: Done implementing local <-> local synchronization on synchronization module. --- .../Views/LocalSynchronizationView.xaml | 46 +++++++++++++++++----- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/LocalSynchronizationView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/LocalSynchronizationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/LocalSynchronizationView.xaml index ded60fbb7..e52a8bfc1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/LocalSynchronizationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/LocalSynchronizationView.xaml @@ -4,10 +4,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:synchronization="clr-namespace:Tango.Synchronization;assembly=Tango.Synchronization" + xmlns:global="clr-namespace:Tango.MachineStudio.Synchronization" xmlns:local="clr-namespace:Tango.MachineStudio.Synchronization.Views" xmlns:fa="http://schemas.fontawesome.io/icons/" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280"> + d:DesignHeight="720" d:DesignWidth="1280" DataContext="{x:Static global:ViewModelLocator.LocalSynchronizationViewVM}"> @@ -31,11 +34,23 @@ - + + + + + + + + Local Database Synchronization + + + - + @@ -58,10 +73,10 @@ - Master DataBase + Master Database - @@ -69,10 +84,10 @@ - Slave DataBase + Slave Database - @@ -91,14 +106,25 @@ - Differences + Differences - + + + + + @@ -123,7 +149,7 @@ SQL Command - + -- cgit v1.3.1