WinGui: (WPF) Bug fixes to the advanced panel

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

diff --git a/win/CS/HandBrakeWPF/Helpers/AdvancedChoicesHelper.cs b/win/CS/HandBrakeWPF/Helpers/AdvancedChoicesHelper.cs
index 8c521d9e7add27c0b9e8df908bb8d52ba78bba17..68d64eca317c17f82cc24733d4c1109175e7b9eb 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AdvancedChoicesHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AdvancedChoicesHelper.cs
@@ -145,8 +145,9 @@ namespace HandBrakeWPF.Helpers
 \r
             analysis = new List<AdvancedChoice>\r
                 {\r
+                    new AdvancedChoice { Label = "Most (Default)", IsDefault = true },\r
                     new AdvancedChoice { Label = "None", Value = "none" },\r
-                    new AdvancedChoice { Label = "Some (Default)", IsDefault = true },\r
+                    new AdvancedChoice { Label = "Some", Value = "i4x4,i8x8", },\r
                     new AdvancedChoice { Label = "All", Value = "all" }\r
                 };\r
 \r
@@ -351,6 +352,7 @@ namespace HandBrakeWPF.Helpers
         /// The default number.\r
         /// </param>\r
         /// <returns>\r
+        /// List of Advanced Choices Options.\r
         /// </returns>\r
         private static List<AdvancedChoice> CreateNumberList(int lower, int upper, int defaultNumber)\r
         {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
index 0d65ff5bee20f8164e4849df98b2f35083e922cd..39861bce7c4a42857c115b60b5ff0e80c1a48ab7 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
@@ -523,6 +523,19 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Gets a value indicating whether PsychovisualRateDistortionVisible.\r
+        /// </summary>\r
+        public bool PsychovisualRateDistortionVisible\r
+        {\r
+            get\r
+            {\r
+                int value;\r
+                int.TryParse(this.SubpixelMotionEstimation.Value.Trim(), out value);\r
+                return value >= 6;\r
+            }\r
+        }\r
+\r
         /// <summary>\r
         /// Gets or sets PyramidalBFrames.\r
         /// </summary>\r
@@ -584,6 +597,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 this.subpixelMotionEstimation = value;\r
                 this.NotifyOfPropertyChange(() => this.SubpixelMotionEstimation);\r
+                this.NotifyOfPropertyChange(() => this.PsychovisualRateDistortionVisible);\r
                 this.UpdateOptionsString();\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
index 4221a8e5d74b0d0ac3172e03211e5512c956a498..92923f6c886ed1a3987d1ca70757d1abc780d440 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
@@ -231,10 +231,12 @@
                         </Slider.ToolTip>\r
                     </Slider>\r
 \r
-                    <Label Content="Psychovisual Rate Distortion:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
+                    <Label Content="Psychovisual Rate Distortion:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}"\r
+                           Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}" />\r
                     <Slider Grid.Row="1" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"\r
-                        TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"\r
-                        Value="{Binding PsychovisualRateDistortion}" Style="{StaticResource LongToolTipHolder}">\r
+                            TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"\r
+                            Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}"\r
+                            Value="{Binding PsychovisualRateDistortion}" Style="{StaticResource LongToolTipHolder}">\r
                         <Slider.ToolTip>\r
                             <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" Style="{StaticResource LongToolTip}" />\r
                         </Slider.ToolTip>\r

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 9242bac0b6c7f2ea6d51078a24ba07f79c577adc..930828b7d7761e404eeea683af64204b86bb4765 100644 (file)
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -3,8 +3,6 @@
     Homepage: <http://handbrake.fr/>.\r
     It may be used under the terms of the GNU General Public License. */\r
 \r
-using HandBrake.ApplicationServices.Model.Encoding;\r
-\r
 namespace Handbrake\r
 {\r
     using System;\r