WinGui: Fix a few bugs:

- Advanced query getting nulled out for QSV due to some dead code.
- Updated the regex for the decomb value to accept unquoted value as well as quoted.
- Remapped Ctrl-F to Ctrl-O to be more standard.

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

2 files changed, 14 insertions, 2 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index ec805ab9d..f20589f7d 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -33,6 +33,8 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>

         private bool showAdvancedTab;

 

+        private string advancedEncoderOptions;

+

         #endregion

 

         /// <summary>

@@ -405,7 +407,17 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets AdvancedEncoderOptions.

         /// </summary>

-        public string AdvancedEncoderOptions { get; set; }

+        public string AdvancedEncoderOptions

+        {

+            get

+            {

+                return this.advancedEncoderOptions;

+            }

+            set

+            {

+                this.advancedEncoderOptions = value;

+            }

+        }

 

         /// <summary>

         /// Gets or sets x264Preset.

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index db92b3504..4872d6e7d 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -75,7 +75,7 @@ namespace HandBrake.ApplicationServices.Utilities
 

             // Picture Settings - Filters

             Match decomb = Regex.Match(input, @" --decomb");

-            Match decombValue = Regex.Match(input, @" --decomb=\""([a-zA-Z0-9.:]*)\""");

+            Match decombValue = Regex.Match(input, @" --decomb=([a-zA-Z0-9.:""\\]*)");

             Match deinterlace = Regex.Match(input, @"--deinterlace=\""([a-zA-Z0-9.:]*)\""");

             Match denoise = Regex.Match(input, @"--denoise=\""([a-zA-Z0-9.:]*)\""");

             Match deblock = Regex.Match(input, @"--deblock=([0-9:]*)");