diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-02 10:44:57 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-02 10:44:57 +0300 |
| commit | 3499090dce4acc5b5d4bbb02f07f138950790b25 (patch) | |
| tree | 1f78b36e8805eb9c1429c863dfd8ae043b1ef668 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | |
| parent | 9e979a9b18727fdc9f128da5a7d2347dff2d0705 (diff) | |
| download | Tango-3499090dce4acc5b5d4bbb02f07f138950790b25.tar.gz Tango-3499090dce4acc5b5d4bbb02f07f138950790b25.zip | |
Implemented new version display in machine studio.
Added release notes to machine studio update center.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | 8 |
1 files changed, 7 insertions, 1 deletions
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 2a63ae00f..c6b9cf881 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -4,9 +4,15 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" d:DesignHeight="720" d:DesignWidth="1280" Cursor="Wait" DataContext="{Binding LoadingViewVM, Source={StaticResource Locator}}" Background="Transparent"> + + <UserControl.Resources> + <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" /> + </UserControl.Resources> + <Grid> <Grid HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel> @@ -23,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,Mode=OneWay}"></Run> + <Run Text="{Binding ApplicationManager.Version,Converter={StaticResource VersionToShortVersionConverter},Mode=OneWay}"></Run> </TextBlock> </Grid> </UserControl> |
