WinGui: Fix tune options on the video tab for x265. Hide the Level option since it's not relevant.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6805 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 29 insertions, 3 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/VideoProfileFactory.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/VideoProfileFactory.cs
index f4a48f5a1..e9c1a23f5 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/VideoProfileFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/VideoProfileFactory.cs
@@ -36,6 +36,10 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories
                     return "High";

                 case "baseline":

                     return "Baseline";

+                case "main10":

+                    return "Main 10";

+                case "mainstillpicture":

+                    return "Main Still Picture";

             }

 

             return shortName;

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 9bcb229fd..3378bbfa3 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -63,6 +63,7 @@ namespace HandBrakeWPF.ViewModels
         private VideoTune videoTune;

         private bool fastDecode;

         private bool displayTuneControls;

+        private bool displayLevelControl;

 

         #endregion

 

@@ -581,6 +582,26 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

+        /// Gets or sets a value indicating whether display level control.

+        /// </summary>

+        public bool DisplayLevelControl

+        {

+            get

+            {

+                return this.displayLevelControl;

+            }

+            set

+            {

+                if (value.Equals(this.displayLevelControl))

+                {

+                    return;

+                }

+                this.displayLevelControl = value;

+                this.NotifyOfPropertyChange(() => this.DisplayLevelControl);

+            }

+        }

+

+        /// <summary>

         /// Gets or sets a value indicating whether fast decode.

         /// </summary>

         public bool FastDecode

@@ -1232,7 +1253,8 @@ namespace HandBrakeWPF.ViewModels
             this.DisplayOptimiseOptions = this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 || this.SelectedVideoEncoder == VideoEncoder.QuickSync;

             this.DisplayNonQSVControls = this.SelectedVideoEncoder != VideoEncoder.QuickSync;

             this.DisplayTurboFirstPass = selectedEncoder == VideoEncoder.X264;

-            this.DisplayTuneControls = SelectedVideoEncoder == VideoEncoder.X264;

+            this.DisplayTuneControls = SelectedVideoEncoder == VideoEncoder.X264 || SelectedVideoEncoder == VideoEncoder.X265;

+            this.DisplayLevelControl = SelectedVideoEncoder == VideoEncoder.X264;

 

             // Refresh Display

             this.NotifyOfPropertyChange(() => this.Rfqp);

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 6aca9a1d4..9fa047575 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -175,8 +175,8 @@
                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />

 

-                    <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />

-                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"

+                    <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />

+                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"

                           ItemsSource="{Binding VideoLevels}"  DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderLevel}"/>