summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views/QueueView.xaml
diff options
context:
space:
mode:
authorScott <[email protected]>2020-04-26 12:14:42 +0100
committerGitHub <[email protected]>2020-04-26 12:14:42 +0100
commit1f09b740f80dac1ab1e0b17519b2a7e4f3440fa4 (patch)
treec6d3102080111ee699ef6f91c3571ff611a1a882 /win/CS/HandBrakeWPF/Views/QueueView.xaml
parentf8b3478d8b7a1c9284c4339b32ce8f7bdc5d54b3 (diff)
Multi instance (#2791)
WinGui: Refactoring and laying the groundwork in many parts of the UI code in preparation for supporting multiple concurrent jobs running. - Add support for multiple log files to the Activity log screen and refactor usages of ILog. Each Encode instance will now get a separate instance instead of there being one global instance. - Retire the Mini Display Window. It's very rarely used, not very easy to even find and of limited value. - Add the preferences code for the Simultaneous encode setting. Locked to one instance for now. This will allow us to test with users that existing functionality still works fine.
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/QueueView.xaml')
-rw-r--r--win/CS/HandBrakeWPF/Views/QueueView.xaml10
1 files changed, 6 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index e7f057592..c8b290118 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -225,6 +225,9 @@
<DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
<Setter Property="Source" Value="Images/WarningSmall.png" />
</DataTrigger>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Paused">
+ <Setter Property="Source" Value="Images/pause_small.png" />
+ </DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
@@ -246,10 +249,9 @@
TextWrapping="Wrap" VerticalAlignment="Center" Margin="0,0,5,0" />
<ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" HorizontalAlignment="Stretch" Margin="0,8,10,0"
- Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"
+ Value="{Binding JobProgress.ProgressValue}" IsIndeterminate="{Binding JobProgress.IntermediateProgress}"
Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />
</StackPanel>
-
<Button Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"
AutomationProperties.Name="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" >
@@ -395,8 +397,8 @@
</StackPanel>
- <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Margin="0,15,10,5" Visibility="{Binding IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}" />
- <TextBlock Text="{Binding JobStatus}" Visibility="{Binding IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}"
+ <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Margin="0,15,10,5" Visibility="{Binding SelectedTask.IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}" />
+ <TextBlock Text="{Binding SelectedTask.JobProgress.JobStatus}" Visibility="{Binding SelectedTask.IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}"
TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" Margin="0,0,0,5" />
<Grid Style="{StaticResource LongToolTipHolder}" Margin="0,10,0,0" >