diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-04-29 13:54:29 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-04-29 13:54:29 +0300 |
| commit | 2b838164abd4f282a29a7ec9ad3a38d474b241fc (patch) | |
| tree | a55aba39b856a51bcd45968782efe29c165c5bcd /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml | |
| parent | ccbe23b1bb2a63b649d7bd1a3252303e16d2d912 (diff) | |
| parent | 25df9bd5e3f81ab476c452e127a10c8718144a71 (diff) | |
| download | Tango-2b838164abd4f282a29a7ec9ad3a38d474b241fc.tar.gz Tango-2b838164abd4f282a29a7ec9ad3a38d474b241fc.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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.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> |