WinGui:

- Added checkbox for decomb
- Removed 2 panels for frmMain components. It was screwing up the tab numbering. Maybe re-visit later on.

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

2 files changed, 25 insertions, 3 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 4945d4da6..8f874aaa3 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -128,6 +128,11 @@ namespace Handbrake.Functions
             mainWindow.drp_deInterlace_option.Text = presetQuery.DeInterlace;

             mainWindow.drp_deNoise.Text = presetQuery.DeNoise;

 

+            if (presetQuery.Decomb == true)

+                mainWindow.check_decomb.CheckState = CheckState.Checked;

+            else

+                mainWindow.check_decomb.CheckState = CheckState.Unchecked;

+

             if (presetQuery.DeTelecine == true)

                 mainWindow.check_detelecine.CheckState = CheckState.Checked;

             else

@@ -153,7 +158,6 @@ namespace Handbrake.Functions
                     mainWindow.drp_anamorphic.SelectedIndex = 0;

             }

 

-

             if (presetQuery.Width != 0)

                 mainWindow.text_width.Text = presetQuery.Width.ToString();

             else

@@ -555,6 +559,9 @@ namespace Handbrake.Functions
                     break;

             }

 

+            if (mainWindow.check_decomb.Checked)

+                query += " --decomb ";

+

             if (mainWindow.check_grayscale.Checked)

                 query += " -g ";

 

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index ec07ba3d5..80fe989f8 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -19,6 +19,7 @@ namespace Handbrake.Functions
         #region Varibles

 

         #region Source

+

         private string q_source;

         /// <summary>

         /// Returns a String 

@@ -31,6 +32,7 @@ namespace Handbrake.Functions
                 return this.q_source;

             }

         }

+

         private int q_dvdTitle;

         /// <summary>

         /// Returns an Integer

@@ -265,6 +267,18 @@ namespace Handbrake.Functions
             }

         }

 

+        private Boolean q_decomb;

+        /// <summary>

+        /// Returns a string with the DeNoise option used.

+        /// </summary>

+        public Boolean Decomb

+        {

+            get

+            {

+                return this.q_decomb;

+            }

+        }

+

         private Boolean q_anamorphic;

         /// <summary>

         /// Returns a boolean to indicate wither Anamorphic is on or off.

@@ -806,7 +820,8 @@ namespace Handbrake.Functions
             Match chapterMarkers = Regex.Match(input, @" -m");

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

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

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

+            Match lanamorphic = Regex.Match(input, @" -P");

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

 

             //Video Settings Tab

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

@@ -927,7 +942,6 @@ namespace Handbrake.Functions
                 if (height.Success != false)

                     thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));

 

-

                 if (crop.Success != false)

                 {

                     thisQuery.q_cropValues = crop.ToString().Replace("--crop ", "");

@@ -941,6 +955,7 @@ namespace Handbrake.Functions
 

                 thisQuery.q_detelecine = detelecine.Success;

                 thisQuery.q_deBlock = deblock.Success;

+                thisQuery.q_decomb = decomb.Success;

 

                 thisQuery.q_deinterlace = "None";

                 if (deinterlace.Success != false)