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://localhost/HandBrake/trunk@1635 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 4945d4d..8f874aa 100644 (file)
--- 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;\r
             mainWindow.drp_deNoise.Text = presetQuery.DeNoise;\r
 \r
+            if (presetQuery.Decomb == true)\r
+                mainWindow.check_decomb.CheckState = CheckState.Checked;\r
+            else\r
+                mainWindow.check_decomb.CheckState = CheckState.Unchecked;\r
+\r
             if (presetQuery.DeTelecine == true)\r
                 mainWindow.check_detelecine.CheckState = CheckState.Checked;\r
             else\r
@@ -153,7 +158,6 @@ namespace Handbrake.Functions
                     mainWindow.drp_anamorphic.SelectedIndex = 0;\r
             }\r
 \r
-\r
             if (presetQuery.Width != 0)\r
                 mainWindow.text_width.Text = presetQuery.Width.ToString();\r
             else\r
@@ -555,6 +559,9 @@ namespace Handbrake.Functions
                     break;\r
             }\r
 \r
+            if (mainWindow.check_decomb.Checked)\r
+                query += " --decomb ";\r
+\r
             if (mainWindow.check_grayscale.Checked)\r
                 query += " -g ";\r
 \r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index ec07ba3..80fe989 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -19,6 +19,7 @@ namespace Handbrake.Functions
         #region Varibles\r
 \r
         #region Source\r
+\r
         private string q_source;\r
         /// <summary>\r
         /// Returns a String \r
@@ -31,6 +32,7 @@ namespace Handbrake.Functions
                 return this.q_source;\r
             }\r
         }\r
+\r
         private int q_dvdTitle;\r
         /// <summary>\r
         /// Returns an Integer\r
@@ -265,6 +267,18 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
+        private Boolean q_decomb;\r
+        /// <summary>\r
+        /// Returns a string with the DeNoise option used.\r
+        /// </summary>\r
+        public Boolean Decomb\r
+        {\r
+            get\r
+            {\r
+                return this.q_decomb;\r
+            }\r
+        }\r
+\r
         private Boolean q_anamorphic;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Anamorphic is on or off.\r
@@ -806,7 +820,8 @@ namespace Handbrake.Functions
             Match chapterMarkers = Regex.Match(input, @" -m");\r
             Match crop = Regex.Match(input, @"--crop ([0-9]):([0-9]):([0-9]):([0-9])");\r
             Match vfr = Regex.Match(input, @" -V");\r
-            Match lanamorphic = Regex.Match(input, @"-P");\r
+            Match lanamorphic = Regex.Match(input, @" -P");\r
+            Match decomb = Regex.Match(input, @" --decomb");\r
 \r
             //Video Settings Tab\r
             Match videoFramerate = Regex.Match(input, @"-r ([0-9]*)");\r
@@ -927,7 +942,6 @@ namespace Handbrake.Functions
                 if (height.Success != false)\r
                     thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));\r
 \r
-\r
                 if (crop.Success != false)\r
                 {\r
                     thisQuery.q_cropValues = crop.ToString().Replace("--crop ", "");\r
@@ -941,6 +955,7 @@ namespace Handbrake.Functions
 \r
                 thisQuery.q_detelecine = detelecine.Success;\r
                 thisQuery.q_deBlock = deblock.Success;\r
+                thisQuery.q_decomb = decomb.Success;\r
 \r
                 thisQuery.q_deinterlace = "None";\r
                 if (deinterlace.Success != false)\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 7d15c73..f290dd6 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -253,16 +253,6 @@
     <None Include="Resources\General Preferences.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <COMReference Include="AxMSComctlLib">\r
-      <Guid>{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}</Guid>\r
-      <VersionMajor>2</VersionMajor>\r
-      <VersionMinor>0</VersionMinor>\r
-      <Lcid>0</Lcid>\r
-      <WrapperTool>aximp</WrapperTool>\r
-      <Isolated>False</Isolated>\r
-    </COMReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
       <Visible>False</Visible>\r
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 0b962a3..7cc7742 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -258,8 +258,7 @@ namespace Handbrake
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
-            this.panel4 = new System.Windows.Forms.Panel();\r
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
+            this.check_decomb = new System.Windows.Forms.CheckBox();\r
             Label38 = new System.Windows.Forms.Label();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
@@ -287,10 +286,6 @@ namespace Handbrake
             this.groupBox2.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
             this.StatusStrip.SuspendLayout();\r
-            this.panel4.SuspendLayout();\r
-            this.splitContainer1.Panel1.SuspendLayout();\r
-            this.splitContainer1.Panel2.SuspendLayout();\r
-            this.splitContainer1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -1255,10 +1250,10 @@ namespace Handbrake
             this.GroupBox1.Controls.Add(this.Label10);\r
             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
-            this.GroupBox1.Location = new System.Drawing.Point(10, 10);\r
+            this.GroupBox1.Location = new System.Drawing.Point(12, 70);\r
             this.GroupBox1.Name = "GroupBox1";\r
             this.GroupBox1.Size = new System.Drawing.Size(705, 87);\r
-            this.GroupBox1.TabIndex = 0;\r
+            this.GroupBox1.TabIndex = 2;\r
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
             // \r
@@ -1314,10 +1309,10 @@ namespace Handbrake
             this.groupBox_output.Controls.Add(this.check_optimiseMP4);\r
             this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_output.Location = new System.Drawing.Point(10, 154);\r
+            this.groupBox_output.Location = new System.Drawing.Point(12, 214);\r
             this.groupBox_output.Name = "groupBox_output";\r
             this.groupBox_output.Size = new System.Drawing.Size(705, 50);\r
-            this.groupBox_output.TabIndex = 3;\r
+            this.groupBox_output.TabIndex = 4;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
             // \r
@@ -1866,6 +1861,7 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage1.Controls.Add(this.check_decomb);\r
             this.TabPage1.Controls.Add(this.lbl_src_res);\r
             this.TabPage1.Controls.Add(this.label7);\r
             this.TabPage1.Controls.Add(this.label6);\r
@@ -1899,7 +1895,7 @@ namespace Handbrake
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(697, 302);\r
+            this.TabPage1.Size = new System.Drawing.Size(697, 307);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
@@ -2068,7 +2064,7 @@ namespace Handbrake
             "Weak",\r
             "Medium",\r
             "Strong"});\r
-            this.drp_deNoise.Location = new System.Drawing.Point(413, 244);\r
+            this.drp_deNoise.Location = new System.Drawing.Point(413, 266);\r
             this.drp_deNoise.Name = "drp_deNoise";\r
             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deNoise.TabIndex = 29;\r
@@ -2078,7 +2074,7 @@ namespace Handbrake
             this.label11.AutoSize = true;\r
             this.label11.BackColor = System.Drawing.Color.Transparent;\r
             this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label11.Location = new System.Drawing.Point(311, 247);\r
+            this.label11.Location = new System.Drawing.Point(311, 269);\r
             this.label11.Name = "label11";\r
             this.label11.Size = new System.Drawing.Size(58, 13);\r
             this.label11.TabIndex = 28;\r
@@ -2113,7 +2109,7 @@ namespace Handbrake
             this.label4.AutoSize = true;\r
             this.label4.BackColor = System.Drawing.Color.Transparent;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(311, 219);\r
+            this.label4.Location = new System.Drawing.Point(311, 241);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(77, 13);\r
             this.label4.TabIndex = 26;\r
@@ -2129,7 +2125,7 @@ namespace Handbrake
             "Fast",\r
             "Slow",\r
             "Slower"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(413, 216);\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(413, 238);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 27;\r
@@ -2237,11 +2233,11 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.h264Tab);\r
             this.advancedOptions.Controls.Add(this.tabPage4);\r
             this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.advancedOptions.Location = new System.Drawing.Point(10, 218);\r
+            this.advancedOptions.Location = new System.Drawing.Point(12, 274);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(705, 328);\r
-            this.advancedOptions.TabIndex = 1;\r
+            this.advancedOptions.Size = new System.Drawing.Size(705, 333);\r
+            this.advancedOptions.TabIndex = 5;\r
             this.advancedOptions.TabStop = false;\r
             // \r
             // tab_chapters\r
@@ -2308,7 +2304,7 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(697, 302);\r
+            this.h264Tab.Size = new System.Drawing.Size(697, 307);\r
             this.h264Tab.TabIndex = 8;\r
             this.h264Tab.Text = "Advanced";\r
             // \r
@@ -2694,7 +2690,7 @@ namespace Handbrake
             this.check_pyrmidalBFrames.AutoSize = true;\r
             this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_pyrmidalBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(47, 198);\r
+            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(46, 198);\r
             this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
             this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_pyrmidalBFrames.Size = new System.Drawing.Size(121, 16);\r
@@ -2709,7 +2705,7 @@ namespace Handbrake
             this.check_BidirectionalRefinement.AutoSize = true;\r
             this.check_BidirectionalRefinement.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_BidirectionalRefinement.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_BidirectionalRefinement.Location = new System.Drawing.Point(21, 180);\r
+            this.check_BidirectionalRefinement.Location = new System.Drawing.Point(20, 180);\r
             this.check_BidirectionalRefinement.Name = "check_BidirectionalRefinement";\r
             this.check_BidirectionalRefinement.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_BidirectionalRefinement.Size = new System.Drawing.Size(147, 16);\r
@@ -2946,10 +2942,10 @@ namespace Handbrake
             this.groupBox_dest.Controls.Add(this.text_destination);\r
             this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_dest.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_dest.Location = new System.Drawing.Point(10, 100);\r
+            this.groupBox_dest.Location = new System.Drawing.Point(12, 160);\r
             this.groupBox_dest.Name = "groupBox_dest";\r
             this.groupBox_dest.Size = new System.Drawing.Size(705, 50);\r
-            this.groupBox_dest.TabIndex = 2;\r
+            this.groupBox_dest.TabIndex = 3;\r
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
             // \r
@@ -2972,10 +2968,10 @@ namespace Handbrake
             this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox2.Location = new System.Drawing.Point(5, 10);\r
+            this.groupBox2.Location = new System.Drawing.Point(728, 70);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(198, 535);\r
-            this.groupBox2.TabIndex = 11;\r
+            this.groupBox2.Size = new System.Drawing.Size(198, 537);\r
+            this.groupBox2.TabIndex = 6;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
@@ -2989,7 +2985,7 @@ namespace Handbrake
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
             this.treeView_presets.Size = new System.Drawing.Size(177, 473);\r
-            this.treeView_presets.TabIndex = 2;\r
+            this.treeView_presets.TabIndex = 0;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             // \r
             // toolStrip1\r
@@ -3144,7 +3140,7 @@ namespace Handbrake
             this.StatusStrip.Location = new System.Drawing.Point(0, 619);\r
             this.StatusStrip.Name = "StatusStrip";\r
             this.StatusStrip.Size = new System.Drawing.Size(938, 22);\r
-            this.StatusStrip.TabIndex = 12;\r
+            this.StatusStrip.TabIndex = 7;\r
             this.StatusStrip.Text = "statusStrip1";\r
             // \r
             // lbl_encode\r
@@ -3154,43 +3150,28 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
-            // panel4\r
+            // check_decomb\r
             // \r
-            this.panel4.Controls.Add(this.splitContainer1);\r
-            this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.panel4.Location = new System.Drawing.Point(0, 63);\r
-            this.panel4.Name = "panel4";\r
-            this.panel4.Size = new System.Drawing.Size(938, 556);\r
-            this.panel4.TabIndex = 13;\r
-            // \r
-            // splitContainer1\r
-            // \r
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);\r
-            this.splitContainer1.Name = "splitContainer1";\r
-            // \r
-            // splitContainer1.Panel1\r
-            // \r
-            this.splitContainer1.Panel1.Controls.Add(this.GroupBox1);\r
-            this.splitContainer1.Panel1.Controls.Add(this.groupBox_dest);\r
-            this.splitContainer1.Panel1.Controls.Add(this.groupBox_output);\r
-            this.splitContainer1.Panel1.Controls.Add(this.advancedOptions);\r
-            this.splitContainer1.Panel1.Margin = new System.Windows.Forms.Padding(2);\r
-            this.splitContainer1.Panel1.Padding = new System.Windows.Forms.Padding(2);\r
-            // \r
-            // splitContainer1.Panel2\r
-            // \r
-            this.splitContainer1.Panel2.Controls.Add(this.groupBox2);\r
-            this.splitContainer1.Size = new System.Drawing.Size(938, 556);\r
-            this.splitContainer1.SplitterDistance = 723;\r
-            this.splitContainer1.TabIndex = 0;\r
+            this.check_decomb.AutoSize = true;\r
+            this.check_decomb.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_decomb.Location = new System.Drawing.Point(314, 215);\r
+            this.check_decomb.Name = "check_decomb";\r
+            this.check_decomb.Size = new System.Drawing.Size(73, 17);\r
+            this.check_decomb.TabIndex = 32;\r
+            this.check_decomb.Text = "Decomb";\r
+            this.check_decomb.UseVisualStyleBackColor = false;\r
             // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.ClientSize = new System.Drawing.Size(938, 641);\r
-            this.Controls.Add(this.panel4);\r
+            this.Controls.Add(this.GroupBox1);\r
+            this.Controls.Add(this.groupBox_dest);\r
+            this.Controls.Add(this.groupBox_output);\r
+            this.Controls.Add(this.groupBox2);\r
+            this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Controls.Add(this.StatusStrip);\r
@@ -3237,10 +3218,6 @@ namespace Handbrake
             this.toolStrip1.PerformLayout();\r
             this.StatusStrip.ResumeLayout(false);\r
             this.StatusStrip.PerformLayout();\r
-            this.panel4.ResumeLayout(false);\r
-            this.splitContainer1.Panel1.ResumeLayout(false);\r
-            this.splitContainer1.Panel2.ResumeLayout(false);\r
-            this.splitContainer1.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -3467,8 +3444,7 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;\r
         private System.Windows.Forms.StatusStrip StatusStrip;\r
         private System.Windows.Forms.ToolStripStatusLabel lbl_encode;\r
-        private System.Windows.Forms.Panel panel4;\r
-        private System.Windows.Forms.SplitContainer splitContainer1;\r
+        internal System.Windows.Forms.CheckBox check_decomb;\r
 \r
     }\r
 }
\ No newline at end of file