WinGui: Completely hide the 2pass control for all hardware encoders.

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 8fb1018ec9359eebd97fa7cbaae358e6e9706d9a..03863bd1e56dc20e21deabe809e32f0c09dd2a67 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -62,7 +62,6 @@ namespace HandBrakeWPF.ViewModels
         private bool displayTurboFirstPass;\r
         private int videoPresetMaxValue;\r
         private int videoPresetValue;\r
-        private bool displayNonQsvControls;\r
         private VideoTune videoTune;\r
         private bool fastDecode;\r
         private bool displayTuneControls;\r
@@ -234,7 +233,10 @@ namespace HandBrakeWPF.ViewModels
                 if (this.SelectedVideoEncoder == VideoEncoder.NvencH264\r
                     || this.SelectedVideoEncoder == VideoEncoder.NvencH265\r
                     || this.SelectedVideoEncoder == VideoEncoder.VceH264\r
-                    || this.SelectedVideoEncoder == VideoEncoder.VceH265)\r
+                    || this.SelectedVideoEncoder == VideoEncoder.VceH265\r
+                    || this.SelectedVideoEncoder == VideoEncoder.QuickSync\r
+                    || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265\r
+                    || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH26510b)\r
                 {\r
                     return false;\r
                 }\r
@@ -620,21 +622,16 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Gets or sets a value indicating whether display non qsv controls.\r
         /// </summary>\r
-        public bool DisplayNonQSVControls\r
+        public bool DisplayTwoPass\r
         {\r
             get\r
             {\r
-                return this.displayNonQsvControls;\r
-            }\r
+                return this.SelectedVideoEncoder != VideoEncoder.QuickSync\r
+                             && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH265\r
+                             && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH26510b\r
+                             && this.SelectedVideoEncoder != VideoEncoder.NvencH264\r
+                             && this.SelectedVideoEncoder != VideoEncoder.NvencH265;\r
 \r
-            set\r
-            {\r
-                if (value.Equals(this.displayNonQsvControls))\r
-                {\r
-                    return;\r
-                }\r
-                this.displayNonQsvControls = value;\r
-                this.NotifyOfPropertyChange(() => this.DisplayNonQSVControls);\r
             }\r
         }\r
 \r
@@ -1503,8 +1500,6 @@ namespace HandBrakeWPF.ViewModels
                                           this.SelectedVideoEncoder == VideoEncoder.NvencH264 || this.SelectedVideoEncoder == VideoEncoder.NvencH265 ||\r
                                           this.SelectedVideoEncoder == VideoEncoder.VP8 || this.SelectedVideoEncoder == VideoEncoder.VP9;\r
 \r
-            this.DisplayNonQSVControls = this.SelectedVideoEncoder != VideoEncoder.QuickSync && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH265 && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH26510b;\r
-\r
             this.DisplayTurboFirstPass = selectedEncoder == VideoEncoder.X264 || selectedEncoder == VideoEncoder.X264_10 ||\r
                                          selectedEncoder == VideoEncoder.X265 || selectedEncoder == VideoEncoder.X265_10 || selectedEncoder == VideoEncoder.X265_12;\r
 \r
@@ -1534,6 +1529,7 @@ namespace HandBrakeWPF.ViewModels
             this.NotifyOfPropertyChange(() => this.IsAdvancedTabOptionEnabled);\r
             this.NotifyOfPropertyChange(() => this.HighQualityLabel);\r
             this.NotifyOfPropertyChange(() => this.IsTwoPassEnabled);\r
+            this.NotifyOfPropertyChange(() => this.DisplayTwoPass);\r
 \r
             // Handle some quicksync specific options.\r
             if (selectedEncoder == VideoEncoder.QuickSync || selectedEncoder == VideoEncoder.QuickSyncH265 || selectedEncoder == VideoEncoder.QuickSyncH26510b)\r

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 6a41a4a1f94b5387db9655b4c8f1499837ab03ee..368eb0982cff8f8d0a703a8a0a56fbae174f87b5 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -111,7 +111,7 @@
                              ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_AverageBitrate}"  />\r
                 </StackPanel>\r
 \r
-                <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
+                <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayTwoPass, Converter={StaticResource boolToVisConverter}}">\r
                     <CheckBox Content="{x:Static Properties:Resources.VideoView_2Pass}" IsEnabled="{Binding IsTwoPassEnabled, Converter={StaticResource boolConverter}}"\r
                               IsChecked="{Binding TwoPass}" Margin="0,0,10,0" ToolTip="{x:Static Properties:ResourcesTooltips.Video_TwoPass}"  />\r
                     <CheckBox Content="{x:Static Properties:Resources.VideoView_TurboFirstPass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r