WinGui: Always show the framerate controls when using QSV. When full QSV path is...

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index b7b5332d01696c8b8cf9c585de74c5b19ac64971..2c62e229bf21a6940d9385e851f116e0f9220a01 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -2330,15 +2330,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Same as source.\r
-        /// </summary>\r
-        public static string VideoView_SameAsSource {\r
-            get {\r
-                return ResourceManager.GetString("VideoView_SameAsSource", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Turbo first pass.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index d332c0ca4a449cf24b1854948c006ee28380f050..97dfabdc026467375318e2c58945afefa930d279 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -630,9 +630,6 @@
   <data name="VideoView_Quality" xml:space="preserve">\r
     <value>Quality</value>\r
   </data>\r
-  <data name="VideoView_SameAsSource" xml:space="preserve">\r
-    <value>Same as source</value>\r
-  </data>\r
   <data name="VideoView_TurboFirstPass" xml:space="preserve">\r
     <value>Turbo first pass</value>\r
   </data>\r

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 2c592005b1a9b193eabd1ff6b0b24f41dd33828d..e8319b785a9080ee43f574f9fbb9ece9bf3a4414 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -61,12 +61,9 @@
                 <StackPanel Orientation="Horizontal">\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>\r
                     <StackPanel Orientation="Vertical">\r
-                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  \r
-                                  Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
-                        <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_SameAsSource}"  VerticalAlignment="Center" Margin="0,5,0,0"\r
-                                   Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
+                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  />\r
 \r
-                        <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
+                        <StackPanel Orientation="Vertical" >\r
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"\r
                                          ToolTip="{x:Static Properties:ResourcesTooltips.Video_ConstantFramerate}" />\r
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" \r