From 4a357f9146502561807da27510c47624021846df Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Wed, 25 Mar 2020 18:37:18 +0200
Subject: MS Set height 680 pic to report dialog.

Related Work Items: #2606
---
 .../MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
index ef9667b6d..aac712f59 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -12,7 +12,7 @@
              xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"
              xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
-             mc:Ignorable="d" Width="530" Height="720" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
+             mc:Ignorable="d" Width="530" Height="660" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
-- 
cgit v1.3.1


From 4aac6fa20f6c9b415cdadf8bd962c28f6d6c82c8 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 26 Mar 2020 08:45:41 +0200
Subject: Added external bridge signalR address support for MS.

---
 .../Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml            | 4 ++--
 .../Tango.MachineStudio.UI/Views/MachineConnectionView.xaml           | 2 +-
 2 files changed, 3 insertions(+), 3 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 e58885efc..295d6b2dc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -84,8 +84,8 @@
                                     <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.TotalMachineMeters}" />
                                     <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
                                     <TextBlock Text="{Binding DeviceInformation.Version}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Session ID:" />
-                                    <TextBlock Text="{Binding Adapter.SessionID}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Address:" />
+                                    <TextBlock Text="{Binding Adapter.Address}" />
                                     <TextBlock FontWeight="SemiBold" Text="Total Bytes Sent:" />
                                     <TextBlock Text="{Binding Adapter.TotalBytesSent,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" />
                                     <TextBlock FontWeight="SemiBold" Text="Total Bytes Received:" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 4486467a2..78557a42e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -64,7 +64,7 @@
                                             <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
                                                 </TextBlock>
                                                 <TextBlock FontSize="11">
-                                            <Run FontWeight="Bold">Hub:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
+                                            <Run FontWeight="Bold">Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
                                                 </TextBlock>
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">Organization:</Run> <Run Text="{Binding Machine.Organization.Name,Mode=OneWay}"></Run>
-- 
cgit v1.3.1