From 20b54cfc2b40bb69d1d6558c7fac6cc412c98da0 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 7 Oct 2019 14:42:44 +0300
Subject: Implemented RML import/export. Fixed issue with MS in 1920x1080.
 Added IP Address & Up Time to PPC. Added ExternalBridge Icon IsInSession
 Indication. Fixed issue with ExternalBridgeService disconnection.

---
 .../PPCApplication/DefaultPPCApplicationManager.cs          |  7 +++++++
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs             |  2 +-
 Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 6a9e42ce5..c7351aa4a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -120,6 +120,11 @@ namespace Tango.PPC.UI.PPCApplication
             }
         }
 
+        /// <summary>
+        /// Gets the application startup date.
+        /// </summary>
+        public DateTime StartUpDate { get; private set; }
+
         private bool _isScreenLocked;
         /// <summary>
         /// Gets or sets a value indicating whether the screen is currently locked.
@@ -171,6 +176,8 @@ namespace Tango.PPC.UI.PPCApplication
             bool initialized = false;
             bool isAfterSetup = false;
 
+            StartUpDate = DateTime.Now;
+
             await Task.Factory.StartNew(() =>
             {
                 try
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index db8540db7..a572fe23e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.47.0")]
+[assembly: AssemblyVersion("1.0.48.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index 5accd8ff3..0ee8058c0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -63,7 +63,18 @@
 
                         <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding HotSpotProvider.IsEnabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
 
-                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <touch:TouchIcon.Style>
+                                <Style TargetType="touch:TouchIcon">
+                                    <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding ExternalBridgeService.IsInSession}" Value="True">
+                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </touch:TouchIcon.Style>
+                        </touch:TouchIcon>
 
                         <ItemsControl ItemsSource="{Binding NotificationProvider.TaskBarItems}">
                             <ItemsControl.ItemsPanel>
-- 
cgit v1.3.1