diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-04-22 19:50:30 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-04-22 19:50:30 +0300 |
| commit | ffbda2b8be71d4942e0d4af2f53b5bde357c72e2 (patch) | |
| tree | 6656196be6ecaccaed9b39aaf1a75619aeec194b /Software/Visual_Studio/MachineStudio | |
| parent | c2945492e7c4d168c36b632d1f28dd8ca569b5ac (diff) | |
| parent | 0a63ef17afb9afe60e4ea98cff86dda7fbdad1f6 (diff) | |
| download | Tango-ffbda2b8be71d4942e0d4af2f53b5bde357c72e2.tar.gz Tango-ffbda2b8be71d4942e0d4af2f53b5bde357c72e2.zip | |
MERGE!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml | 18 |
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> |