diff options
| author | sr55 <[email protected]> | 2016-02-13 22:31:41 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2016-02-13 22:31:41 +0000 |
| commit | b63b0bb81471ca6d8aa89fc3800126dfe91d84bc (patch) | |
| tree | 6cf39de1d69fe9a02700c376f4a23a2ec4a3002b /win/CS/HandBrakeWPF/Views | |
| parent | 9667fe056a99b83bdc90cf75f8922ee745f87d52 (diff) | |
WinGui: Fix a few binding errors on the audio Default tab. Allow Turbo first pass for x265
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml | 3 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/VideoView.xaml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml index b8c1263f2..b5d2f70a6 100644 --- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml +++ b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml @@ -31,8 +31,7 @@ </Grid.ColumnDefinitions> <!-- Row 2 --> - <StackPanel Grid.Row="0" Grid.Column="0" Margin="10,0,0,0" - Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, FallbackValue=Visible}"> + <StackPanel Grid.Row="0" Grid.Column="0" Margin="10,0,0,0"> <Grid Margin="0,0,0,0" > <Grid.RowDefinitions> @@ -148,8 +147,8 @@ </ComboBox.SelectedItem> <ComboBox.ItemsSource> <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True"> - <Binding Path="AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" /> - <Binding Path="Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" /> + <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" /> + <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" /> </MultiBinding> </ComboBox.ItemsSource> </ComboBox> diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml index d15c02813..87ce1e7cd 100644 --- a/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml +++ b/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml @@ -38,8 +38,7 @@ <!-- Row 0 --> - <StackPanel Grid.Row="0" Grid.Column="0" Margin="10,0,0,0" - Visibility="{Binding ShowDefaultsPanel, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}"> + <StackPanel Grid.Row="0" Grid.Column="0" Margin="10,0,0,0"> <Grid Margin="5,0,0,0" > <Grid.RowDefinitions> diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml index aaa8064e8..8c30ea5f8 100644 --- a/win/CS/HandBrakeWPF/Views/VideoView.xaml +++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml @@ -124,7 +124,7 @@ </StackPanel>
<!-- H264 settings -->
- <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,10,0,0">
+ <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,5,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
|