aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-02 10:44:57 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-02 10:44:57 +0300
commit3499090dce4acc5b5d4bbb02f07f138950790b25 (patch)
tree1f78b36e8805eb9c1429c863dfd8ae043b1ef668 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
parent9e979a9b18727fdc9f128da5a7d2347dff2d0705 (diff)
downloadTango-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/AboutView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 0f8bceac7..55c4edc91 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -5,9 +5,15 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
mc:Ignorable="d"
- d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}">
+ d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}">
+
+ <UserControl.Resources>
+ <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" />
+ </UserControl.Resources>
+
<Grid>
<Grid>
<Grid.RowDefinitions>