diff options
| -rw-r--r-- | Software/Test_Studio/Machine Studio/Pages.g.cs | bin | 81486 -> 81486 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk | bin | 1532 -> 1516 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.SharedUI/Converters/VersionToShortVersionConverter.cs | 11 |
6 files changed, 12 insertions, 5 deletions
diff --git a/Software/Test_Studio/Machine Studio/Pages.g.cs b/Software/Test_Studio/Machine Studio/Pages.g.cs Binary files differindex 1297a9e67..d69095831 100644 --- a/Software/Test_Studio/Machine Studio/Pages.g.cs +++ b/Software/Test_Studio/Machine Studio/Pages.g.cs diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk Binary files differindex 349957749..26c45681b 100644 --- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk +++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml index c6b9cf881..6e804c61d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -29,7 +29,7 @@ <TextBlock Foreground="Gray" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="40" FontSize="20" FontWeight="SemiBold" FontStyle="Italic"> <Run>v</Run> - <Run Text="{Binding ApplicationManager.Version,Converter={StaticResource VersionToShortVersionConverter},Mode=OneWay}"></Run> + <Run Text="{Binding ApplicationManager.Version,Converter={StaticResource VersionToShortVersionConverter},Mode=OneWay,ConverterParameter='3'}"></Run> </TextBlock> </Grid> </UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index 67bdf81ed..977cdb9f5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -309,7 +309,7 @@ <Button.ToolTip> <TextBlock> <Run>Version</Run> - <Run Text="{Binding LatestVersion,Converter={StaticResource VersionToShortVersionConverter}}"></Run> + <Run Text="{Binding LatestVersion,Converter={StaticResource VersionToShortVersionConverter},ConverterParameter='3'}"></Run> <Run>is available !</Run> </TextBlock> </Button.ToolTip> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml index 6818d13cc..f5d1065b8 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml @@ -93,7 +93,7 @@ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <TextBlock VerticalAlignment="Center" Margin="0 20 0 0"> <Run>Version</Run> - <Run Text="{Binding LatestVersion,Converter={StaticResource VersionToShortVersionConverter}}" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></Run> + <Run Text="{Binding LatestVersion,Converter={StaticResource VersionToShortVersionConverter},ConverterParameter='3'}" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></Run> <Run>is available!</Run> </TextBlock> </StackPanel> diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/VersionToShortVersionConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/VersionToShortVersionConverter.cs index d56460c2d..18c23b941 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Converters/VersionToShortVersionConverter.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Converters/VersionToShortVersionConverter.cs @@ -12,15 +12,22 @@ namespace Tango.SharedUI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + int components = 2; + + if (parameter != null) + { + int.TryParse(parameter.ToString(), out components); + } + if (value != null) { if (value is Version) { - return (value as Version).ToString(2); + return (value as Version).ToString(components); } else if (value is String) { - return Version.Parse(value.ToString()).ToString(2); + return Version.Parse(value.ToString()).ToString(components); } } |