From 8a249931cbff190c1c86a0b7bddc0b80b74370c2 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 18 Apr 2019 16:49:02 +0300
Subject: Fixed FPGA version length on machine studio.

---
 .../Views/ConnectedMachineView.xaml                    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index c323ce0b0..338cb2d22 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -115,7 +115,14 @@
                                     <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
                                     <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="FPGA Version:" />
-                                    <TextBlock>
+                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                        <TextBlock.ToolTip>
+                                            <TextBlock>
+                                        <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
+                                            </TextBlock>
+                                        </TextBlock.ToolTip>
                                         <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
@@ -162,7 +169,14 @@
                                     <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
                                     <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="FPGA Version:" />
-                                    <TextBlock>
+                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                        <TextBlock.ToolTip>
+                                            <TextBlock>
+                                        <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
+                                            </TextBlock>
+                                        </TextBlock.ToolTip>
                                         <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
-- 
cgit v1.3.1


From 9413f43423364fca4ba9cc21af55091c33fbed73 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 23 Apr 2019 18:28:19 +0300
Subject: Added edit option for job upload strategy on Machine Studio about
 dialog.

---
 .../MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml       | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 54a8349e6..bf9a52b98 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -6,6 +6,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:pmrPrinting="clr-namespace:Tango.PMR.Printing;assembly=Tango.PMR"
              xmlns:bl="clr-namespace:Tango.BL;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
@@ -67,6 +68,11 @@
                                 <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type bl:ObservablesContextInMemoryCachingMode},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.CachingMode}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
                                 <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
                             </DockPanel>
+                            <TextBlock FontWeight="SemiBold">Job Upload Strategy:</TextBlock>
+                            <DockPanel>
+                                <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type pmrPrinting:JobUploadStrategy},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.JobUploadStrategy}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+                                <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
+                            </DockPanel>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
-- 
cgit v1.3.1