From de514b47f502ace13335e2a432b896f16af55039 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 20 Dec 2017 10:17:08 +0200
Subject: MERGE.

---
 .../Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml
index 53bcfdb1e..bac530777 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Views/MainView.xaml
@@ -5,7 +5,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.Synchronization.Views"
-              xmlns:global="clr-namespace:Tango.MachineStudio.Synchronization"
+             xmlns:global="clr-namespace:Tango.MachineStudio.Synchronization"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
@@ -32,8 +32,8 @@
         </controls:MultiTransitionControl>
 
         <Grid Grid.Row="1">
-            <TextBox Background="#202020" Foreground="Gainsboro" FontSize="11" Padding="5" Style="{x:Null}" BorderThickness="1" IsReadOnly="True" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" TextWrapping="Wrap">
-                11:35:10.34>  Synchronization Engine Started...
+            <TextBox x:Name="txtLog" TextChanged="txtLog_TextChanged" Text="{Binding Log}" Background="{StaticResource AccentColorBrush}" Opacity="0.8" Foreground="White" FontSize="11" Padding="5" Style="{x:Null}" BorderThickness="1" IsReadOnly="True" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" TextWrapping="Wrap">
+
             </TextBox>
         </Grid>
     </Grid>
-- 
cgit v1.3.1