diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index a12cf9e4a..7cb0cc181 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -268,7 +268,7 @@ </DataTemplate> </UserControl.Resources> - <Grid Width="960" Height="1080"> + <Grid Width="998" Height="1123"> <Grid > <Grid.ColumnDefinitions> <ColumnDefinition Width="28"></ColumnDefinition> @@ -380,12 +380,12 @@ </StackPanel> </StackPanel> - <UniformGrid x:Name="JobProperties" DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="350" VerticalAlignment="Top" MaxWidth="260"> + <UniformGrid x:Name="JobProperties" DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="390" VerticalAlignment="Top" MaxWidth="260"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/> <StackPanel Orientation="Vertical" Margin="15 0 0 0"> <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Thread Type</TextBlock> - <TextBlock Text="{Binding Job.Rml.DisplayName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43', TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" TextWrapping="Wrap" MaxWidth="200" ></TextBlock> + <TextBlock Text="{Binding Job.Rml.DisplayName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='38', TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" TextWrapping="Wrap" MaxWidth="200" MaxHeight="52" ></TextBlock> </StackPanel> </StackPanel> @@ -579,14 +579,15 @@ </StackPanel> </StackPanel> - <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> + <DockPanel Height="106" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top"> <Image Source="../Images/JobProgressView/drop.png" Stretch="None" /> <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock> </StackPanel> - </StackPanel> + <TextBlock Margin="40 30 40 0" FontSize="{StaticResource TangoSmallFontSize}" FontWeight="Light" Text="{Binding RunningJobStatus.Message, FallbackValue='', TargetNullValue='', Converter={StaticResource StringEllipsisConverter},ConverterParameter='76'}" TextWrapping="Wrap" MaxWidth="310" HorizontalAlignment="Center" TextAlignment="Center" Height="42"></TextBlock> + </DockPanel> - <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" /> + <Rectangle x:Name="Rrect" Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoLightBorderBrush}" StrokeThickness="1" Fill="{StaticResource TangoLightBorderBrush}" Height="2" /> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0"> <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" /> |