From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Views/MainView.xaml                            | 58 ++++++++++------------
 1 file changed, 27 insertions(+), 31 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index d0caa2447..abea6aec9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -330,36 +330,31 @@
                                                                     <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center" Fill="{Binding SegmentBrush}">
                                                                     </Rectangle>
 
-
-                                                                    <Grid Height="30">
-                                                                        <TextBlock   Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=DataContext.RunningJobStatus.IsFinalizing, Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Center"  Background="Transparent" FontSize="12"  Foreground="{StaticResource RedBrush100}">Finalizing...</TextBlock>
-                                                                        <Canvas   Height="30" HorizontalAlignment="Center" Width="80">
-                                                                            <Label Padding="0" Margin="0">
-                                                                                <Label.Style>
-                                                                                    <Style TargetType="Label">
-                                                                                        <Setter Property="Content" Value="{x:Null}"></Setter>
-                                                                                        <Style.Triggers>
-                                                                                            <DataTrigger Binding="{Binding Started}" Value="True">
-                                                                                                <Setter Property="Content">
-                                                                                                    <Setter.Value>
-                                                                                                        <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="{StaticResource RedBrush300}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
-                                                                                                    </Setter.Value>
-                                                                                                </Setter>
-                                                                                            </DataTrigger>
-                                                                                            <DataTrigger Binding="{Binding Completed}" Value="True">
-                                                                                                <Setter Property="Content">
-                                                                                                    <Setter.Value>
-                                                                                                        <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
-                                                                                                    </Setter.Value>
-                                                                                                </Setter>
-                                                                                            </DataTrigger>
-                                                                                        </Style.Triggers>
-                                                                                    </Style>
-                                                                                </Label.Style>
-                                                                            </Label>
-                                                                        </Canvas>
-                                                                    </Grid>
-
+                                                                    <Canvas Height="30" HorizontalAlignment="Center" Width="80">
+                                                                        <Label Padding="0" Margin="0">
+                                                                            <Label.Style>
+                                                                                <Style TargetType="Label">
+                                                                                    <Setter Property="Content" Value="{x:Null}"></Setter>
+                                                                                    <Style.Triggers>
+                                                                                        <DataTrigger Binding="{Binding Started}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="{StaticResource RedBrush300}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                        <DataTrigger Binding="{Binding Completed}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                    </Style.Triggers>
+                                                                                </Style>
+                                                                            </Label.Style>
+                                                                        </Label>
+                                                                    </Canvas>
                                                                 </StackPanel>
 
                                                                 <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
@@ -413,7 +408,8 @@
                                 </Grid>
                             </DockPanel>
 
-                              </Grid>
+                            <TextBlock Visibility="{Binding RunningJobStatus.IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="-170 0 0 0" Background="{StaticResource DarkGrayBrush}" FontSize="14" Height="30" Foreground="{StaticResource RedBrush100}">Finalizing...</TextBlock>
+                        </Grid>
                     </Border>
 
                     <ProgressBar IsIndeterminate="True" VerticalAlignment="Bottom" Height="3" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}"></ProgressBar>
-- 
cgit v1.3.1