diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-22 16:38:48 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-22 16:38:48 +0200 |
| commit | 287af6d4bed5333087cb9d702d20035b1ad9a326 (patch) | |
| tree | 58d229d36680c9ee768516834cde6d8301055e02 /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml | |
| parent | b06466e5b4fd861207452fa4cebb2ee68195a8e6 (diff) | |
| download | Tango-287af6d4bed5333087cb9d702d20035b1ad9a326.tar.gz Tango-287af6d4bed5333087cb9d702d20035b1ad9a326.zip | |
Implemented team viewer join group.
Prevent multiple power up dialogs from showing.
Implement auto available dispenser assignment for machine creation.
Sorting for machines and dispensers in Machine designer.
Implemented new PPC factory reset with team viewer and device name change.
Fixed "Exit To Shell" to open real explorer.
Redesigned restarting system view.
Updated power off animation.
Updated loading animation.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml index 9762ef621..22952a827 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml @@ -11,7 +11,7 @@ d:DesignHeight="1280" d:DesignWidth="800" Background="{StaticResource TangoPrimaryBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:PowerOffViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.PowerOffViewVM}"> <Grid> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> - <touch:TouchGifAnimation Source="/Images/power_off.gif" EnableAnimation="{Binding IsVisible}" HorizontalAlignment="Center" /> + <touch:TouchGifAnimation Source="/Images/power_off_2.gif" EnableAnimation="{Binding IsVisible}" HorizontalAlignment="Center" /> <TextBlock HorizontalAlignment="Center" Margin="0 60 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Machine is turning Off</TextBlock> <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">Do not unplug machine while turning off</TextBlock> <touch:TouchButton Command="{Binding AbortCommand}" Style="{StaticResource TangoHollowButton}" Margin="0 100 0 0" HorizontalAlignment="Center" Width="200" Height="50">ABORT</touch:TouchButton> |