diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
| commit | 898213e7a5380bea18e5b45ef48b4d2d990b4832 (patch) | |
| tree | c0067b6a26ad3853681c9151e1fe9fc5ac5503c6 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | |
| parent | 3f78570409abd79e46dcb0bfe8f8e2127cc7f67c (diff) | |
| parent | 9cdd202a86fec153935637fc43eef428fced2fd6 (diff) | |
| download | Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.tar.gz Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.zip | |
merge conflict
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> |