From e66cd269ad02302f2a5a4ec377112cd61789647e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 16 Apr 2018 17:45:25 +0300
Subject: Application Logs & Embedded Logs on Logging Module!

---
 .../Views/ApplicationLogsView.xaml                  | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
index 1274f6523..b8f464e5f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
@@ -56,9 +56,9 @@
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
-                                <materialDesign:PackIcon Kind="KeyboardBackspace" Width="20" Height="20" />
+                                <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
                             </StackPanel>
                         </Button>
@@ -77,6 +77,21 @@
                                 <TextBlock VerticalAlignment="Center" Margin="10 17 0 0">Real-Time</TextBlock>
                             </StackPanel>
                         </Border>
+
+                        <Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="#202020" ToolTip="Pause/Resume Real-Time">
+                            <materialDesign:PackIcon Width="50" Height="50">
+                                <materialDesign:PackIcon.Style>
+                                    <Style TargetType="materialDesign:PackIcon">
+                                        <Setter Property="Kind" Value="Pause"></Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RealTimePaused}" Value="True">
+                                                <Setter Property="Kind" Value="Play"></Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </materialDesign:PackIcon.Style>
+                            </materialDesign:PackIcon>
+                        </Button>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -173,7 +188,7 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTextColumn Header="DATE TIME" Binding="{Binding TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.ff'}" />
+                                        <DataGridTextColumn Header="DATE TIME" Binding="{Binding TimeStamp,StringFormat='MM/dd/yyyy HH:mm:ss.ff'}" />
                                         <DataGridTextColumn Header="FILE" Binding="{Binding CallerFile}" />
                                         <DataGridTextColumn Header="METHOD" Binding="{Binding CallerMethodName}" />
                                         <DataGridTextColumn Header="LINE" Binding="{Binding CallerLineNumber}" />
-- 
cgit v1.3.1