summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-01-27 21:23:57 +0000
committersr55 <[email protected]>2015-01-27 21:23:57 +0000
commit12def0ed27098092a7a998eaa29886770071a2b4 (patch)
tree3f4f47992d4f5eca884c3cb90e7ee779d4c089ba /win/CS/HandBrakeWPF/Views
parent11eabcf6e929b316ccc3509d73ab176beca2522f (diff)
WinGui:
- Fixes to Disk logging. - Improvements to Queue Item tooltip. - Queue will no longer pause if an encode fails. It will move onto the next item and try that. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6822 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
-rw-r--r--win/CS/HandBrakeWPF/Views/QueueView.xaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 00f77f985..8b86bd34f 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -29,6 +29,8 @@
<Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
<Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
<video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />
+ <video:VideoOptionsTooltipConverter x:Key="videoOptionsTooltipConverter" />
+
<Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
@@ -248,8 +250,7 @@
<TextBlock Text="{Binding Task.PictureSettingsDesc}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
<TextBlock FontWeight="Bold" Text="Video:" Grid.Row="3" Grid.Column="0" />
- <TextBlock Text="{Binding Task.VideoEncoder, Converter={StaticResource enumComboConverter}}"
- Grid.Row="3" Grid.Column="1" />
+ <TextBlock Text="{Binding Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap" />
<TextBlock FontWeight="Bold" Text="Audio: " Grid.Row="4" Grid.Column="0"/>
<TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"