diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-12-22 14:51:17 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-12-22 14:51:17 +0200 |
| commit | c6ca09b04ceb4024311b86aab409ca658fbee37e (patch) | |
| tree | 28fbf57ba2f7ed1e480350288d6e3b1edfa18307 /Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs | |
| parent | 1ee3c5e5cdacd6797fbcb87a7784b40fe5d6be7f (diff) | |
| download | Tango-c6ca09b04ceb4024311b86aab409ca658fbee37e.tar.gz Tango-c6ca09b04ceb4024311b86aab409ca658fbee37e.zip | |
Improved CanPrint and IsPrinting detection on PPC.
Added support for PowerUp and StandBy states.
Made sync jobs false by default.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml index 28f922898..081778434 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml @@ -13,7 +13,7 @@ <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Margin="0 30 0 0">Continue getting ready for:</TextBlock> <DockPanel HorizontalAlignment="Center" Margin="0 40 0 0"> <touch:TouchRadioButton IsChecked="{Binding IsSelectedRml}" /> - <touch:TouchComboBox Margin="20 0 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name"></touch:TouchComboBox> + <touch:TouchComboBox Margin="20 0 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name" Title="Select thread type"></touch:TouchComboBox> </DockPanel> <DockPanel HorizontalAlignment="Left" Margin="0 40 0 0"> <touch:TouchRadioButton IsChecked="{Binding IsMinimalTemperature}" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml index 98f2e1381..f6fc7704a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml @@ -16,9 +16,9 @@ <Grid Height="283"> <StackPanel Visibility="{Binding IsFinalizing,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" Margin="40 10 40 0" Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" TextAlignment="Center"> - The machine is ready for loading the thread. Please load the selected thread below and press 'continue'. + The machine is ready for thread loading. Please load the thread as instructed and press 'continue'. </TextBlock> - <touch:TouchComboBox Margin="0 40 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name"></touch:TouchComboBox> + <touch:TouchComboBox Margin="0 40 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name" Title="Select thread type"></touch:TouchComboBox> <touch:TouchButton Command="{Binding ContinueCommand}" Margin="0 50 0 50" Style="{StaticResource TangoHollowButton}" HorizontalAlignment="Center" Padding="60 15" CornerRadius="25">CONTINUE</touch:TouchButton> </StackPanel> <StackPanel Visibility="{Binding IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}"> |