WinGui: Some fixes around the Video and Advanced Tab query generation behaviour.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 1447c1b7e5900481cbbf9a6e8e293e9084f4ec21..e5849bd1cf83533202ecffead5669cd5ad551902 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -902,48 +902,56 @@ namespace HandBrake.ApplicationServices.Utilities
             if (task.VideoEncoder == VideoEncoder.X264)\r
             {\r
                 string query = string.Empty; \r
-\r
-                if (task.X264Preset != x264Preset.Medium)\r
-                {\r
-                    query += string.Format(" --x264-preset={0} ", task.X264Preset.ToString().ToLower().Replace(" ", string.Empty));\r
-                }\r
-\r
-                if (task.H264Profile != x264Profile.None)\r
-                {\r
-                    query += string.Format(" --x264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty));\r
-                }\r
-\r
-                if (task.X264Tune != x264Tune.None)\r
+                \r
+                if (!task.ShowAdvancedTab)\r
                 {\r
-                    string tune = string.Empty;\r
+                    if (task.X264Preset != x264Preset.Medium)\r
+                    {\r
+                        query += string.Format(\r
+                            " --x264-preset={0} ", task.X264Preset.ToString().ToLower().Replace(" ", string.Empty));\r
+                    }\r
 \r
-                    if (task.FastDecode)\r
+                    if (task.H264Profile != x264Profile.None)\r
                     {\r
-                        tune = "fastdecode";\r
+                        query += string.Format(\r
+                            " --x264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty));\r
                     }\r
 \r
-                    string tuneDropdown = task.X264Tune.ToString().ToLower().Replace(" ", string.Empty);\r
-                    if (task.X264Tune != x264Tune.None && !string.IsNullOrEmpty(tuneDropdown))\r
+                    if (task.X264Tune != x264Tune.None)\r
                     {\r
-                        tune = string.IsNullOrEmpty(tune) ? tuneDropdown : string.Format(",{0}", tuneDropdown);  \r
+                        string tune = string.Empty;\r
+\r
+                        if (task.FastDecode)\r
+                        {\r
+                            tune = "fastdecode";\r
+                        }\r
+\r
+                        string tuneDropdown = task.X264Tune.ToString().ToLower().Replace(" ", string.Empty);\r
+                        if (task.X264Tune != x264Tune.None && !string.IsNullOrEmpty(tuneDropdown))\r
+                        {\r
+                            tune = string.IsNullOrEmpty(tune) ? tuneDropdown : string.Format(",{0}", tuneDropdown);\r
+                        }\r
+\r
+                        query += string.Format(" --x264-tune=\"{0}\" ", tune);\r
                     }\r
 \r
-                    query += string.Format(" --x264-tune=\"{0}\" ", tune);\r
-                }\r
+                    if (task.H264Level != "Auto")\r
+                    {\r
+                        query += string.Format(" --h264-level=\"{0}\" ", task.H264Level);\r
+                    }\r
 \r
-                if (task.H264Level != "Auto")\r
-                {\r
-                    query += string.Format(" --h264-level=\"{0}\" ", task.H264Level);\r
-                }\r
+                    if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))\r
+                    {\r
+                        query += string.Format(" -x {0}", task.ExtraAdvancedArguments);\r
+                    }\r
 \r
-                if (!string.IsNullOrEmpty(task.AdvancedEncoderOptions))\r
-                {\r
-                    query += string.Format(" -x {0}", task.AdvancedEncoderOptions);\r
                 }\r
-\r
-                if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))\r
+                else\r
                 {\r
-                    query += string.Format(" -x {0}", task.ExtraAdvancedArguments);\r
+                    if (!string.IsNullOrEmpty(task.AdvancedEncoderOptions))\r
+                    {\r
+                        query += string.Format(" -x {0}", task.AdvancedEncoderOptions);\r
+                    }\r
                 }\r
 \r
                 return query;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index f273f320990ec997820870caa9e83cea710c3ce9..f37f9c7eaeac509acda9051e4cc22b535d712316 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -179,6 +179,11 @@ namespace HandBrakeWPF.ViewModels
                         this.Task.AdvancedEncoderOptions = this.GetActualx264Query();\r
                     }\r
 \r
+                    if (!value)\r
+                    {\r
+                        this.Task.AdvancedEncoderOptions = string.Empty;\r
+                    }\r
+\r
                     this.useAdvancedTab = value;\r
                     this.Task.ShowAdvancedTab = value;\r
                     this.NotifyOfPropertyChange(() => this.UseAdvancedTab);\r
@@ -513,7 +518,7 @@ namespace HandBrakeWPF.ViewModels
             }\r
             set\r
             {\r
-                if (!object.Equals(this.Task.AdvancedEncoderOptions, value))\r
+                if (!object.Equals(this.Task.ExtraAdvancedArguments, value))\r
                 {\r
                     this.Task.ExtraAdvancedArguments = value;\r
                     this.NotifyOfPropertyChange(() => this.ExtraArguments);\r