From 3499090dce4acc5b5d4bbb02f07f138950790b25 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 2 Aug 2018 10:44:57 +0300
Subject: Implemented new version display in machine studio. Added release
 notes to machine studio update center.

---
 .../Tango.MachineStudio.UI/Views/UpdateView.xaml   | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index a5c31af3d..52ba9ee18 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -5,10 +5,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" DataContext="{Binding UpdateViewVM, Source={StaticResource Locator}}" FontSize="20">
+
+    <UserControl.Resources>
+        <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" />
+    </UserControl.Resources>
+
     <Grid>
         <!--<Grid.Background>
             <ImageBrush ImageSource="/Images/White-Abstract.png" />
@@ -21,7 +27,7 @@
                     </Grid.Effect>-->
                     <StackPanel Orientation="Horizontal">
                         <Image Source="/Images/update.png" Width="100" />
-                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="70">Update Center</TextBlock>
+                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" FontSize="60" Foreground="#606060">Update Center</TextBlock>
                     </StackPanel>
                 </Grid>
 
@@ -34,6 +40,23 @@
                             </StackPanel>
                         </Button>
                     </StackPanel>
+
+                    <Canvas HorizontalAlignment="Left">
+                        <StackPanel>
+                            <StackPanel.Style>
+                                <Style TargetType="StackPanel">
+                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Status}" Value="{x:Static vm:UpdateStatus.UpdateAvailable}">
+                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </StackPanel.Style>
+                            <TextBlock Foreground="Gray" FontSize="16">Release Notes</TextBlock>
+                            <TextBlock FontSize="12" TextWrapping="Wrap" Foreground="#404040" Margin="0 5 0 0" Text="{Binding UpdateComments}"></TextBlock>
+                        </StackPanel>
+                    </Canvas>
                 </Grid>
 
                 <Grid>
@@ -70,7 +93,7 @@
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                                 <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">
                                                                     <Run>Version</Run>
-                                                                    <Run Text="{Binding LatestVersion}" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></Run>
+                                                                    <Run Text="{Binding LatestVersion,Converter={StaticResource VersionToShortVersionConverter}}" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></Run>
                                                                     <Run>is available!</Run>
                                                                 </TextBlock>
                                                             </StackPanel>
-- 
cgit v1.3.1