diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-03-10 20:05:42 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-03-10 20:05:42 +0200 |
| commit | 1270aaf9eac23a03ee8e8ec6ceb9fc6cae6d6c65 (patch) | |
| tree | 7f060beda680cf8d9c5b7320aa31afbc477ce72f /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views | |
| parent | ba06627369df7c7eebc38fbefc22f2f78124f33a (diff) | |
| download | Tango-1270aaf9eac23a03ee8e8ec6ceb9fc6cae6d6c65.tar.gz Tango-1270aaf9eac23a03ee8e8ec6ceb9fc6cae6d6c65.zip | |
Profiling and performance optimizations..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
4 files changed, 11 insertions, 5 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 5f65100df..91fc11a22 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -15,7 +15,7 @@ <TextBlock FontSize="70" Foreground="{StaticResource AccentColorBrush}">Machine Studio</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> + <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing> <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock> </StackPanel> </Grid> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml index dd86238ce..cc1060b2a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml @@ -15,7 +15,7 @@ <TextBlock FontSize="70" Foreground="Gray">Machine Studio</TextBlock> </StackPanel> <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="Gray">Twine Solutions</TextBlock> - <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" Foreground="Gray"></mahapps:ProgressRing> + <mahapps:ProgressRing x:Name="progressRing" IsActive="False" Margin="20 60 20 40" Width="80" Height="80" Foreground="Gray"></mahapps:ProgressRing> <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic" Foreground="Gray">Shutting Down, please wait...</TextBlock> </StackPanel> </Grid> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs index e1d49aec0..afe6d3800 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs @@ -12,17 +12,23 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using static Tango.SharedUI.Controls.MultiTransitionControl; namespace Tango.MachineStudio.UI.Views { /// <summary> /// Interaction logic for ShutdownView.xaml /// </summary> - public partial class ShutdownView : UserControl + public partial class ShutdownView : UserControl, ITransitionView { public ShutdownView() { InitializeComponent(); } + + public void OnTransitionCompleted() + { + progressRing.IsActive = true; + } } } 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 dabbaab94..e34cdb83b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml @@ -16,9 +16,9 @@ <Grid MaxWidth="1200" MaxHeight="700"> <DockPanel> <Grid DockPanel.Dock="Top" HorizontalAlignment="Center"> - <Grid.Effect> + <!--<Grid.Effect> <DropShadowEffect BlurRadius="200" ShadowDepth="0" Opacity="0.5" /> - </Grid.Effect> + </Grid.Effect>--> <StackPanel Orientation="Horizontal"> <Image Source="/Images/update.png" Width="100" /> <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="70">Update Center</TextBlock> |