From ac3c65651c211646ac4673e92c5c5989904f081e Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 27 Apr 2021 17:47:20 +0300
Subject: Thread loading changes.

---
 .../Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml    | 51 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml')

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 3762ca1c7..55493e286 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
@@ -28,14 +28,20 @@
                                 <StackPanel DockPanel.Dock="Top">
                                     <!--<TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Welcome to the automatic thread loading wizard.</TextBlock>-->
                                     <StackPanel HorizontalAlignment="Center" Margin="0 20 0 0">
-                                        <touch:TouchIcon Icon="Alert" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" />
+                                        <TextBlock TextAlignment="Center">Welcome to the thread loading wizard</TextBlock>
+                                        <touch:TouchIcon Margin="0 20 0 0" Icon="Alert" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" />
                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Margin="0 10 0 0" Width="400">
-                                            <Run>Please ensure there are no thread residue in the system and press</Run>
-                                            <Run FontWeight="SemiBold">continue</Run>
+                                            <Run>Check for residual threads in the system and remove them</Run>
+                                        </TextBlock>
+
+                                        <TextBlock Margin="0 50 0 0" Foreground="{StaticResource TangoErrorBrush}" TextWrapping="Wrap" TextAlignment="Center">
+                                            <Run>CAUTION!</Run>
+                                            <LineBreak/>
+                                            <Run>When pressing continue the system will start preparing</Run>
                                         </TextBlock>
                                     </StackPanel>
                                 </StackPanel>
-                                <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>
+                                <!--<Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>-->
                             </DockPanel>
                         </DockPanel>
                     </Grid>
@@ -57,6 +63,33 @@
                         </DockPanel>
                     </Grid>
 
+                    <!--Insert Thread-->
+                    <Grid controls:NavigationControl.NavigationName="InsertThread" Background="{StaticResource TangoPrimaryBackgroundBrush}">
+                        <DockPanel>
+                            <UniformGrid Margin="50" Columns="1" DockPanel.Dock="Bottom" Height="55">
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Center" Command="{Binding ContinueCommand}">Continue</touch:TouchButton>
+                            </UniformGrid>
+                            <DockPanel Margin="0 50 0 0" >
+                                <StackPanel DockPanel.Dock="Top">
+                                    <!--<TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Welcome to the automatic thread loading wizard.</TextBlock>-->
+                                    <StackPanel HorizontalAlignment="Center" Margin="0 20 0 0">
+                                        <TextBlock TextAlignment="Center" FontWeight="Bold">
+                                            <Run>Insert thread</Run>
+                                            <LineBreak/>
+                                            <Run>(see the User Guide for full details)</Run>
+                                        </TextBlock>
+                                        <TextBlock TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Margin="0 40 0 0" Width="400">
+                                            <Run>Press</Run>
+                                            <Run FontWeight="Bold">continue</Run>
+                                            <Run>after the thread is loaded</Run>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                                <!--<Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>-->
+                            </DockPanel>
+                        </DockPanel>
+                    </Grid>
+
                     <!--Ready For Loading-->
                     <Grid controls:NavigationControl.NavigationName="ReadyForLoading" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <DockPanel>
@@ -85,11 +118,11 @@
                                 </StackPanel>
 
                                 <Grid>
-                                    <Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                    <!--<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <touch:TouchGifAnimation Margin="50" Source="/Images/thread_loading.gif" VerticalAlignment="Center" Stretch="Uniform" EnableAnimation="{Binding IsVisible}" />
-                                    </Grid>
+                                    </Grid>-->
 
-                                    <Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <!--<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <commonControls:ImageGalleryControl Duration="00:00:03">
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/1.jpg"></Image>
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/2.jpg"></Image>
@@ -99,7 +132,7 @@
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/6.jpg"></Image>
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/7.jpg"></Image>
                                         </commonControls:ImageGalleryControl>
-                                    </Grid>
+                                    </Grid>-->
                                 </Grid>
                             </DockPanel>
                         </DockPanel>
@@ -119,7 +152,7 @@
                                     <touch:TouchProgressBar Margin="50 40 50 0" Height="10" IsIndeterminate="{Binding IsVisible}" />
                                 </StackPanel>
 
-                                <Image VerticalAlignment="Center" Margin="50" Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/machine_full.jpg"></Image>
+                                <!--<Image VerticalAlignment="Center" Margin="50" Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/machine_full.jpg"></Image>-->
                             </DockPanel>
                         </DockPanel>
                     </Grid>
-- 
cgit v1.3.1