From f7d320bcc6651d0c85bad73b52b14ba050a40c18 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 9 Dec 2018 16:59:07 +0200
Subject: Refactored PPC firmware upgrade.

---
 .../PPC/Tango.PPC.UI/Views/MachineSetupView.xaml   | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml
index 4ac6dab92..829f284de 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml
@@ -32,7 +32,7 @@
                 <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide" KeepElementsAttached="True" Margin="0 20 0 0" SelectedIndex="0">
 
                     <Grid controls:NavigationControl.NavigationName="WelcomeView">
-                        <StackPanel HorizontalAlignment="Center" Margin="0 100 0 0">
+                        <StackPanel HorizontalAlignment="Center" Margin="0 20 0 0">
                             <TextBlock TextAlignment="Center" LineHeight="40" Margin="20 0" TextWrapping="Wrap" FontSize="{StaticResource TangoTitleFontSize}">
                                 <Run>Welcome to the machine setup wizard!</Run>
                                 <Run>In the next steps the software will gather required information, perform tests and apply an initial configuration to this machine.</Run>
@@ -93,24 +93,10 @@
                     <Run>Please wait while we're setting up this machine.</Run>
                     <Run>Do not turn off this PC.</Run>
                             </TextBlock>
-
-                            <touch:TouchBusyIndicator Width="100" Height="100" Margin="0 80 0 0">
-                                <touch:TouchBusyIndicator.Style>
-                                    <Style TargetType="touch:TouchBusyIndicator">
-                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding State}" Value="Working">
-                                                <Setter Property="IsIndeterminate" Value="True"></Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </touch:TouchBusyIndicator.Style>
-                            </touch:TouchBusyIndicator>
-                            <touch:TouchStepProgressBar FontSize="12" Width="720" Height="50" Margin="0 100 0 0" ItemsSource="{Binding Source={x:Type setup:MachineSetupSteps},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineSetupManager.CurrentStep}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"  />
-
-                            <StackPanel Margin="100 100 100 0" Visibility="{Binding MachineSetupManager.CurrentStep,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter='DownloadingPackage'}">
-                                <TextBlock Text="{Binding MachineSetupManager.DownloadingPackagesStatus,Mode=OneWay}"></TextBlock>
-                                <touch:TouchProgressBar Margin="0 10 0 0" Height="10" Maximum="100" Value="{Binding MachineSetupManager.DownloadingPackagesProgress,Mode=OneWay}" />
+                            <StackPanel Margin="0 200 0 0">
+                                <TextBlock Text="{Binding MachineSetupManager.Status.Name,FallbackValue='Download Software Package'}" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
+                                <TextBlock HorizontalAlignment="Center" Text="{Binding MachineSetupManager.Status.Message,FallbackValue='Connecting to machine service...'}" Margin="0 40 0 0"></TextBlock>
+                                <touch:TouchProgressBar Margin="50 10" Height="10" IsIndeterminate="{Binding MachineSetupManager.Status.IsIntermediate}" Maximum="{Binding MachineSetupManager.Status.Total}" Value="{Binding MachineSetupManager.Status.Progress,Mode=OneWay}" />
                             </StackPanel>
                         </StackPanel>
                     </Grid>
-- 
cgit v1.3.1