diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml | 28 |
1 files changed, 4 insertions, 24 deletions
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 d397cfa35..4ac6dab92 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml @@ -33,7 +33,7 @@ <Grid controls:NavigationControl.NavigationName="WelcomeView"> <StackPanel HorizontalAlignment="Center" Margin="0 100 0 0"> - <TextBlock TextAlignment="Center" LineHeight="20" Margin="20 0" TextWrapping="Wrap" FontSize="{StaticResource TangoTitleFontSize}"> + <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> <LineBreak/> @@ -67,29 +67,9 @@ </StackPanel> </Grid> - <Grid controls:NavigationControl.NavigationName="EmbeddedWelcomeView"> - <StackPanel HorizontalAlignment="Center" Margin="0 100 0 0"> - <TextBlock TextAlignment="Center" LineHeight="20" Margin="20 0" TextWrapping="Wrap" FontSize="{StaticResource TangoTitleFontSize}"> - <Run>It is recommended to perform a quick communication test with the machine before proceeding. Please turn on and connect the machine, then tap 'perform test'.</Run> - </TextBlock> - - <StackPanel Orientation="Horizontal" Margin="0 250 0 0" HorizontalAlignment="Center"> - <touch:TouchButton Margin="10" Background="{StaticResource TangoGrayBrush}" Padding="20" Width="300" CornerRadius="35" Command="{Binding SkipEmbeddedTestCommand}">SKIP</touch:TouchButton> - <touch:TouchButton Margin="10" Padding="20" Width="300" CornerRadius="35" Command="{Binding PerformEmbeddedTestCommand}">PERFORM TEST</touch:TouchButton> - </StackPanel> - </StackPanel> - </Grid> - - <Grid controls:NavigationControl.NavigationName="EmbeddedTestView"> - <StackPanel HorizontalAlignment="Center" Margin="0 200 0 0"> - <TextBlock Text="{Binding MachineConnectionStatus}" DockPanel.Dock="Top" Margin="20 0" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center"></TextBlock> - <touch:TouchProgressBar Height="20" Width="700" Margin="0 40 0 0" IsIndeterminate="True" /> - </StackPanel> - </Grid> - <Grid controls:NavigationControl.NavigationName="SetupWelcomeView"> <StackPanel> - <TextBlock TextAlignment="Center" LineHeight="25" FontSize="{StaticResource TangoTitleFontSize}" Margin="40 0" TextWrapping="Wrap"> + <TextBlock TextAlignment="Center" LineHeight="40" FontSize="{StaticResource TangoTitleFontSize}" Margin="40 0" TextWrapping="Wrap"> The next step is to download the latest software package and synchronize the machine data. Please enter your machine serial number and press 'install'. </TextBlock> @@ -110,7 +90,7 @@ <Grid controls:NavigationControl.NavigationName="SetupProgressView"> <StackPanel> <TextBlock TextAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}"> - <Run>Please wait while we setting up this machine.</Run> + <Run>Please wait while we're setting up this machine.</Run> <Run>Do not turn off this PC.</Run> </TextBlock> @@ -126,7 +106,7 @@ </Style> </touch:TouchBusyIndicator.Style> </touch:TouchBusyIndicator> - <touch:TouchStepProgressBar FontSize="10" 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" /> + <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> |