aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
diff options
context:
space:
mode:
authorMirta <mirta@twine-s.com>2019-05-12 13:34:12 +0300
committerMirta <mirta@twine-s.com>2019-05-12 13:34:12 +0300
commit843774b4d84769783cf0100ad5a91ce3871c83b1 (patch)
tree3323ea585fd8475d3720bb4912b62c86c4a7b0f9 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
parent3043e65ad539455ad2510e402e1c8f2d168577d2 (diff)
parent524bc43f07339979eda1c812354a9a2e8e0f7e09 (diff)
downloadTango-843774b4d84769783cf0100ad5a91ce3871c83b1.tar.gz
Tango-843774b4d84769783cf0100ad5a91ce3871c83b1.zip
MERGE
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml18
1 files changed, 16 insertions, 2 deletions
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>