diff options
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 27 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 9 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 13 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/VideoView.xaml | 25 |
4 files changed, 66 insertions, 8 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 337952dfe..05ecfba15 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -384,6 +384,15 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
+ /// Looks up a localized string similar to Higher Quality |.
+ /// </summary>
+ public static string Video_HigherQuality {
+ get {
+ return ResourceManager.GetString("Video_HigherQuality", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Warning: RF 0 is Lossless!.
/// </summary>
public static string Video_LosslessWarning {
@@ -409,6 +418,24 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
+ /// Looks up a localized string similar to | Lower Quality.
+ /// </summary>
+ public static string Video_LowQuality {
+ get {
+ return ResourceManager.GetString("Video_LowQuality", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Placebo Quality |.
+ /// </summary>
+ public static string Video_PlaceboQuality {
+ get {
+ return ResourceManager.GetString("Video_PlaceboQuality", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality.
///The scale used by each video encoder is different.
///
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 48f8ca27e..2b08ae332 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -343,4 +343,13 @@ If you do not use this tab, it can be hidden from: Tools Menu > Options > <data name="Presets_ResetHeader" xml:space="preserve">
<value>Reset Complete</value>
</data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Higher Quality |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Lower Quality</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Placebo Quality |</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index e5a8d6159..0df0c47a9 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -394,6 +394,18 @@ namespace HandBrakeWPF.ViewModels }
/// <summary>
+ /// Gets the high quality label.
+ /// </summary>
+ public string HighQualityLabel
+ {
+ get
+ {
+ return this.SelectedVideoEncoder == VideoEncoder.X264 ? Resources.Video_PlaceboQuality : Resources.Video_HigherQuality;
+ }
+ }
+
+
+ /// <summary>
/// Gets or sets SelectedFramerate.
/// </summary>
public string SelectedFramerate
@@ -459,6 +471,7 @@ namespace HandBrakeWPF.ViewModels this.DisplayX264Options = value == VideoEncoder.X264;
this.NotifyOfPropertyChange(() => this.Rfqp);
+ this.NotifyOfPropertyChange(() => this.HighQualityLabel);
}
}
diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml index 58fedf7bb..7c617c2c1 100644 --- a/win/CS/HandBrakeWPF/Views/VideoView.xaml +++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml @@ -13,7 +13,7 @@ <Converters:EnumComboConverter x:Key="enumComboConverter" />
<Converters:InverseBooleanConverter x:Key="inverseConverter" />
<Video:VideoEncoderConverter x:Key="videoEncoderConverter" />
-
+
<Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
<Setter Property="ToolTipService.ShowDuration" Value="20000" />
</Style>
@@ -28,7 +28,7 @@ </Setter>
</Style>
</UserControl.Resources>
-
+
<Grid Margin="10,5,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -41,7 +41,7 @@ <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
-
+
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -67,7 +67,7 @@ </MultiBinding>
</ComboBox.ItemsSource>
</ComboBox>
-
+
</StackPanel>
<StackPanel Orientation="Horizontal">
@@ -84,7 +84,7 @@ </StackPanel>
- <StackPanel Orientation="Vertical" Grid.Column="1" >
+ <StackPanel Orientation="Vertical" Grid.Column="1" Grid.RowSpan="2">
<TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>
<StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
@@ -97,10 +97,19 @@ </StackPanel>
<Slider Width="280" Value="{Binding RF}" HorizontalAlignment="Left" Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"
- IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,20"
+ IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,10"
ToolTip="{x:Static Properties:Resources.Video_QualitySlider}" Style="{StaticResource LongToolTipHolder}"
IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />
+ <Grid Margin="20,0,0,20" Width="280" HorizontalAlignment="Left">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <TextBlock Text="{x:Static Properties:Resources.Video_LowQuality}" />
+ <TextBlock Text="{Binding HighQualityLabel}" HorizontalAlignment="Right" Grid.Column="1" />
+ </Grid>
+
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
<RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
<TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}"
@@ -192,8 +201,8 @@ </Grid>
</Grid>
-
-
+
+
</Grid>
</Grid>
|