aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
diff options
context:
space:
mode:
authorRoy <roy.mail.net@gmail.com>2018-02-23 23:14:27 +0200
committerRoy <roy.mail.net@gmail.com>2018-02-23 23:14:27 +0200
commit2b781099f7cb08d6a5b9363b9079fab5be108541 (patch)
tree41cd2acfa8047cea0399bfc6f46ab851b484aaac /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
parentfadf83a50071ffba21db05eceff10c51c18f5fb3 (diff)
downloadTango-2b781099f7cb08d6a5b9363b9079fab5be108541.tar.gz
Tango-2b781099f7cb08d6a5b9363b9079fab5be108541.zip
Implemented machine studio periodical update checking.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml10
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml40
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml12
3 files changed, 48 insertions, 14 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 aaf4accd4..5f65100df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -13,15 +13,17 @@
<Image Source="/Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant" Width="100"></Image>
<StackPanel Orientation="Horizontal">
<TextBlock FontSize="70" Foreground="{StaticResource AccentColorBrush}">Machine Studio</TextBlock>
- <TextBlock Foreground="Gray" VerticalAlignment="Bottom" Margin="10 0 0 5" FontSize="16" FontWeight="SemiBold" FontStyle="Italic">
- <Run>v</Run>
- <Run Text="{Binding ApplicationManager.Version,Mode=OneWay}"></Run>
- </TextBlock>
</StackPanel>
<TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="{StaticResource AccentColorBrush}">Twine Solutions</TextBlock>
<mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80"></mahapps:ProgressRing>
<TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock>
</StackPanel>
</Grid>
+
+
+ <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>
+ </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 355bdc1fd..19c0c47df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -19,6 +19,7 @@
<converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
<converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
<converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</UserControl.Resources>
<Grid>
@@ -153,14 +154,8 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
-
+
<Button VerticalAlignment="Center" Margin="10 0 0 0" Style="{StaticResource MaterialDesignFlatButton}" FontSize="12" ToolTip="Connect to machine on the local network" BorderThickness="0" Command="{Binding ConnectCommand}">
- <!--<Button.Background>
- <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
- <GradientStop Color="White" Offset="0.4" />
- <GradientStop Color="#75E0FA" Offset="1"/>
- </LinearGradientBrush>
- </Button.Background>-->
<StackPanel Orientation="Horizontal">
<Grid>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
@@ -183,6 +178,37 @@
</Grid>
</StackPanel>
</Button>
+
+ <Button Style="{StaticResource emptyButton}" Cursor="Hand" Command="{Binding UpdateCenterCommand}" Visibility="{Binding IsUpdateAvailable,Converter={StaticResource BooleanToVisibilityConverter}}">
+ <Button.ToolTip>
+ <TextBlock>
+ <Run>Version</Run>
+ <Run Text="{Binding LatestVersion}"></Run>
+ <Run>is available !</Run>
+ </TextBlock>
+ </Button.ToolTip>
+ <Image Source="/Images/update.png" Width="32" RenderTransformOrigin="0.5,0.5" RenderOptions.BitmapScalingMode="Fant">
+ <Image.RenderTransform>
+ <ScaleTransform ScaleX="1" ScaleY="1" />
+ </Image.RenderTransform>
+ <Image.Style>
+ <Style TargetType="Image">
+ <Style.Triggers>
+ <EventTrigger RoutedEvent="Loaded">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="0.9" To="1.1" Duration="00:00:0.5" RepeatBehavior="Forever" AutoReverse="True"></DoubleAnimation>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="0.9" To="1.1" Duration="00:00:0.5" RepeatBehavior="Forever" AutoReverse="True"></DoubleAnimation>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+ </Image.Style>
+ </Image>
+ </Button>
</StackPanel>
</Grid>
</Grid>
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 a08bcbddb..dabbaab94 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -17,7 +17,7 @@
<DockPanel>
<Grid DockPanel.Dock="Top" HorizontalAlignment="Center">
<Grid.Effect>
- <DropShadowEffect BlurRadius="100" ShadowDepth="0" Opacity="0.7" />
+ <DropShadowEffect BlurRadius="200" ShadowDepth="0" Opacity="0.5" />
</Grid.Effect>
<StackPanel Orientation="Horizontal">
<Image Source="/Images/update.png" Width="100" />
@@ -68,10 +68,14 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="/Images/new-version.png" Width="64"></Image>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
- <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">New version is available!</TextBlock>
+ <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">
+ <Run>Version</Run>
+ <Run Text="{Binding LatestVersion}" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></Run>
+ <Run>is available!</Run>
+ </TextBlock>
</StackPanel>
<TextBlock FontSize="12" TextAlignment="Center" Padding="20" Margin="0 0 0 40">
- <Run>A new version of Machine Studio is available to download</Run>
+ <Run>A new version of Machine Studio is available for download</Run>
<LineBreak/>
<Run>Click 'Update' to start the update process.</Run>
</TextBlock>
@@ -111,6 +115,8 @@
<Run>Updating Machine Studio, please wait...</Run>
</TextBlock>
<ProgressBar Height="10" Foreground="DimGray" Margin="0 20 0 0" Maximum="100" Value="{Binding UpdateProgress}"></ProgressBar>
+
+ <TextBlock TextTrimming="CharacterEllipsis" Text="{Binding CurrentUpdateFile}" FontSize="10" Margin="0 10 0 0" TextAlignment="Center" Foreground="DimGray"></TextBlock>
</StackPanel>
</Grid>
</Setter.Value>