WinGui:

- Combine all the Filters controls and widgets onto 1 panel.  Replaces 12 files by 3.

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

19 files changed, 646 insertions, 1413 deletions

diff --git a/win/C#/Controls/Decomb.Designer.cs b/win/C#/Controls/Decomb.Designer.cs
deleted file mode 100644
index 7826c27e3..000000000
--- a/win/C#/Controls/Decomb.Designer.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Decomb.designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-namespace Handbrake

-{

-    partial class Decomb

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.label18 = new System.Windows.Forms.Label();

-            this.drop_decomb = new System.Windows.Forms.ComboBox();

-            this.text_custom = new System.Windows.Forms.TextBox();

-            this.SuspendLayout();

-            // 

-            // label18

-            // 

-            this.label18.AutoSize = true;

-            this.label18.BackColor = System.Drawing.Color.Transparent;

-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label18.Location = new System.Drawing.Point(3, 7);

-            this.label18.Name = "label18";

-            this.label18.Size = new System.Drawing.Size(59, 13);

-            this.label18.TabIndex = 43;

-            this.label18.Text = "Decomb:";

-            // 

-            // drop_decomb

-            // 

-            this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drop_decomb.FormattingEnabled = true;

-            this.drop_decomb.Items.AddRange(new object[] {

-            "Off",

-            "Default",

-            "Custom"});

-            this.drop_decomb.Location = new System.Drawing.Point(111, 4);

-            this.drop_decomb.Name = "drop_decomb";

-            this.drop_decomb.Size = new System.Drawing.Size(161, 21);

-            this.drop_decomb.TabIndex = 42;

-            this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);

-            // 

-            // text_custom

-            // 

-            this.text_custom.Location = new System.Drawing.Point(278, 4);

-            this.text_custom.Name = "text_custom";

-            this.text_custom.Size = new System.Drawing.Size(115, 20);

-            this.text_custom.TabIndex = 44;

-            this.text_custom.Visible = false;

-            // 

-            // Decomb

-            // 

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

-            this.AutoSize = true;

-            this.Controls.Add(this.text_custom);

-            this.Controls.Add(this.label18);

-            this.Controls.Add(this.drop_decomb);

-            this.Margin = new System.Windows.Forms.Padding(0);

-            this.MaximumSize = new System.Drawing.Size(400, 30);

-            this.Name = "Decomb";

-            this.Size = new System.Drawing.Size(400, 30);

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        internal System.Windows.Forms.Label label18;

-        internal System.Windows.Forms.ComboBox drop_decomb;

-        private System.Windows.Forms.TextBox text_custom;

-    }

-}

diff --git a/win/C#/Controls/Decomb.cs b/win/C#/Controls/Decomb.cs
deleted file mode 100644
index 35c613ae4..000000000
--- a/win/C#/Controls/Decomb.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Decomb.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-

-using System;

-using System.Windows.Forms;

-

-namespace Handbrake

-{

-    public partial class Decomb : UserControl

-    {

-        public Decomb()

-        {

-            InitializeComponent();

-            drop_decomb.SelectedIndex = 0;

-        }

-

-        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            text_custom.Visible = drop_decomb.Text == "Custom";

-

-            valueChanged(null);

-        }

-

-        public string getDropValue

-        {

-            get { return drop_decomb.Text; }

-        }

-

-        public string getCustomValue

-        {

-            get { return text_custom.Text; }

-        }

-

-        public string getCLIQuery

-        {

-            get

-            {

-                string query;

-                switch (drop_decomb.Text)

-                {

-                    case "Off":

-                        query = "";

-                        break;

-                    case "Default":

-                        query = " --decomb";

-                        break;

-                    case "Custom":

-                        query = " --decomb=\"" + text_custom.Text + "\"";

-                        break;

-                    default:

-                        query = "";

-                        break;

-                }

-                return query;

-            }

-        }

-

-        public void setOption(string value)

-        {

-            text_custom.Text = "";

-            text_custom.Visible = false;

-            switch (value)

-            {

-                case "Off":

-                    drop_decomb.SelectedIndex = 0;

-                    break;

-                case "Default":

-                    drop_decomb.SelectedIndex = 1;

-                    break;

-                default:

-                    drop_decomb.SelectedIndex = 2;

-                    text_custom.Text = value;

-                    text_custom.Visible = true;

-                    break;

-            }

-        }

-

-        public event EventHandler onChange;

-        protected virtual void valueChanged(EventArgs e)

-        {

-            if (onChange != null)

-                onChange(this, e);

-        }

-

-    }

-}

diff --git a/win/C#/Controls/Deinterlace.Designer.cs b/win/C#/Controls/Deinterlace.Designer.cs
deleted file mode 100644
index 3792cc308..000000000
--- a/win/C#/Controls/Deinterlace.Designer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Deinterlace.designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-namespace Handbrake

-{

-    partial class Deinterlace

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.label18 = new System.Windows.Forms.Label();

-            this.drop_deinterlace = new System.Windows.Forms.ComboBox();

-            this.text_custom = new System.Windows.Forms.TextBox();

-            this.SuspendLayout();

-            // 

-            // label18

-            // 

-            this.label18.AutoSize = true;

-            this.label18.BackColor = System.Drawing.Color.Transparent;

-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label18.Location = new System.Drawing.Point(3, 7);

-            this.label18.Name = "label18";

-            this.label18.Size = new System.Drawing.Size(72, 13);

-            this.label18.TabIndex = 43;

-            this.label18.Text = "Deinterlace:";

-            // 

-            // drop_deinterlace

-            // 

-            this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_deinterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drop_deinterlace.FormattingEnabled = true;

-            this.drop_deinterlace.Items.AddRange(new object[] {

-            "None",

-            "Fast",

-            "Slow",

-            "Slower",

-            "Custom"});

-            this.drop_deinterlace.Location = new System.Drawing.Point(111, 4);

-            this.drop_deinterlace.Name = "drop_deinterlace";

-            this.drop_deinterlace.Size = new System.Drawing.Size(161, 21);

-            this.drop_deinterlace.TabIndex = 42;

-            this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);

-            // 

-            // text_custom

-            // 

-            this.text_custom.Location = new System.Drawing.Point(278, 4);

-            this.text_custom.Name = "text_custom";

-            this.text_custom.Size = new System.Drawing.Size(115, 20);

-            this.text_custom.TabIndex = 44;

-            this.text_custom.Visible = false;

-            // 

-            // Deinterlace

-            // 

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

-            this.AutoSize = true;

-            this.Controls.Add(this.text_custom);

-            this.Controls.Add(this.label18);

-            this.Controls.Add(this.drop_deinterlace);

-            this.Margin = new System.Windows.Forms.Padding(0);

-            this.MaximumSize = new System.Drawing.Size(400, 30);

-            this.Name = "Deinterlace";

-            this.Size = new System.Drawing.Size(400, 30);

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        internal System.Windows.Forms.Label label18;

-        internal System.Windows.Forms.ComboBox drop_deinterlace;

-        private System.Windows.Forms.TextBox text_custom;

-    }

-}

diff --git a/win/C#/Controls/Deinterlace.cs b/win/C#/Controls/Deinterlace.cs
deleted file mode 100644
index 2ff9b33ef..000000000
--- a/win/C#/Controls/Deinterlace.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  Deinterlace.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-using System;

-using System.Windows.Forms;

-

-namespace Handbrake

-{

-    public partial class Deinterlace : UserControl

-    {

-        public Deinterlace()

-        {

-            InitializeComponent();

-            drop_deinterlace.SelectedIndex = 0;

-        }

-

-        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            text_custom.Visible = drop_deinterlace.Text == "Custom";

-

-            valueChanged(null);

-        }

-

-        public string getDropValue

-        {

-            get { return drop_deinterlace.Text; }

-        }

-

-        public string getCustomValue

-        {

-            get { return text_custom.Text; }

-        }

-

-        public string getCLIQuery

-        {

-            get

-            {

-                string query;

-                switch (drop_deinterlace.Text)

-                {

-                    case "None":

-                        query = "";

-                        break;

-                    case "Fast":

-                        query = " --deinterlace=\"fast\"";

-                        break;

-                    case "Slow":

-                        query = " --deinterlace=\"slow\"";

-                        break;

-                    case "Slower":

-                        query = " --deinterlace=\"slower\"";

-                        break;

-                    case "Custom":

-                        query = " --deinterlace=\"" + text_custom.Text + "\"";

-                        break;

-                    default:

-                        query = "";

-                        break;

-                }

-                return query;

-            }

-        }

-

-        public void setOption(string value)

-        {

-            text_custom.Text = "";

-            text_custom.Visible = false;

-            switch (value)

-            {

-

-                case "None":

-                    drop_deinterlace.SelectedIndex = 0;

-                    break;

-                case "Fast":

-                    drop_deinterlace.SelectedIndex = 1;

-                    break;

-                case "Slow":

-                    drop_deinterlace.SelectedIndex = 2;

-                    break;

-                case "Slower":

-                    drop_deinterlace.SelectedIndex = 3;

-

-                    break;

-                default:

-                    drop_deinterlace.SelectedIndex = 4;

-                    text_custom.Text = value;

-                    text_custom.Visible = true;

-                    break;

-            }

-        }

-

-        public event EventHandler onChange;

-        protected virtual void valueChanged(EventArgs e)

-        {

-            if (onChange != null)

-                onChange(this, e);

-        }

-

-    }

-}

diff --git a/win/C#/Controls/Deinterlace.resx b/win/C#/Controls/Deinterlace.resx
deleted file mode 100644
index ff31a6db5..000000000
--- a/win/C#/Controls/Deinterlace.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-</root>
\ No newline at end of file
diff --git a/win/C#/Controls/Denoise.Designer.cs b/win/C#/Controls/Denoise.Designer.cs
deleted file mode 100644
index e4b96219e..000000000
--- a/win/C#/Controls/Denoise.Designer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Denoise.designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-namespace Handbrake

-{

-    partial class Denoise

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.label18 = new System.Windows.Forms.Label();

-            this.drop_denoise = new System.Windows.Forms.ComboBox();

-            this.text_custom = new System.Windows.Forms.TextBox();

-            this.SuspendLayout();

-            // 

-            // label18

-            // 

-            this.label18.AutoSize = true;

-            this.label18.BackColor = System.Drawing.Color.Transparent;

-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label18.Location = new System.Drawing.Point(3, 7);

-            this.label18.Name = "label18";

-            this.label18.Size = new System.Drawing.Size(58, 13);

-            this.label18.TabIndex = 43;

-            this.label18.Text = "Denoise:";

-            // 

-            // drop_denoise

-            // 

-            this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_denoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drop_denoise.FormattingEnabled = true;

-            this.drop_denoise.Items.AddRange(new object[] {

-            "None",

-            "Weak",

-            "Medium",

-            "Strong",

-            "Custom"});

-            this.drop_denoise.Location = new System.Drawing.Point(111, 4);

-            this.drop_denoise.Name = "drop_denoise";

-            this.drop_denoise.Size = new System.Drawing.Size(161, 21);

-            this.drop_denoise.TabIndex = 42;

-            this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);

-            // 

-            // text_custom

-            // 

-            this.text_custom.Location = new System.Drawing.Point(278, 4);

-            this.text_custom.Name = "text_custom";

-            this.text_custom.Size = new System.Drawing.Size(115, 20);

-            this.text_custom.TabIndex = 44;

-            this.text_custom.Visible = false;

-            // 

-            // Denoise

-            // 

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

-            this.AutoSize = true;

-            this.Controls.Add(this.text_custom);

-            this.Controls.Add(this.label18);

-            this.Controls.Add(this.drop_denoise);

-            this.Margin = new System.Windows.Forms.Padding(0);

-            this.MaximumSize = new System.Drawing.Size(400, 30);

-            this.Name = "Denoise";

-            this.Size = new System.Drawing.Size(400, 30);

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        internal System.Windows.Forms.Label label18;

-        internal System.Windows.Forms.ComboBox drop_denoise;

-        private System.Windows.Forms.TextBox text_custom;

-    }

-}

diff --git a/win/C#/Controls/Denoise.cs b/win/C#/Controls/Denoise.cs
deleted file mode 100644
index d8b7e9162..000000000
--- a/win/C#/Controls/Denoise.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  DeNoise.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-using System;

-using System.Windows.Forms;

-

-namespace Handbrake

-{

-    public partial class Denoise : UserControl

-    {

-        public Denoise()

-        {

-            InitializeComponent();

-            drop_denoise.SelectedIndex = 0;

-        }

-

-        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if (drop_denoise.Text == "Custom")

-                text_custom.Visible = true;

-            else

-                text_custom.Visible = false;

-        }

-

-        public string getDropValue

-        {

-            get { return drop_denoise.Text; }

-        }

-

-        public string getCustomValue

-        {

-            get { return text_custom.Text; }

-        }

-

-        public string getCLIQuery

-        {

-            get

-            {

-                string query;

-                switch (drop_denoise.Text)

-                {

-                    case "None":

-                        query = "";

-                        break;

-                    case "Weak":

-                        query = " --denoise=\"weak\"";

-                        break;

-                    case "Medium":

-                        query = " --denoise=\"medium\"";

-                        break;

-                    case "Strong":

-                        query = " --denoise=\"strong\"";

-                        break;

-                    case "Custom":

-                        query = " --denoise=\"" + text_custom.Text + "\"";

-                        break;

-                    default:

-                        query = "";

-                        break;

-                }

-                return query;

-            }

-        }

-

-        public void setOption(string value)

-        {

-            text_custom.Text = "";

-            text_custom.Visible = false;

-            switch (value)

-            {

-                case "None":

-                    drop_denoise.SelectedIndex = 0;

-                    break;

-                case "Weak":

-                    drop_denoise.SelectedIndex = 1;

-                    break;

-                case "Medium":

-                    drop_denoise.SelectedIndex = 2;

-                    break;

-                case "Strong":

-                    drop_denoise.SelectedIndex = 3;

-                    break;

-                default:

-                    drop_denoise.SelectedIndex = 4;

-                    text_custom.Text = value;

-                    text_custom.Visible = true;

-                    break;

-            }

-        }

-

-    }

-}

diff --git a/win/C#/Controls/Denoise.resx b/win/C#/Controls/Denoise.resx
deleted file mode 100644
index ff31a6db5..000000000
--- a/win/C#/Controls/Denoise.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-</root>
\ No newline at end of file
diff --git a/win/C#/Controls/Detelecine.Designer.cs b/win/C#/Controls/Detelecine.Designer.cs
deleted file mode 100644
index 71983b32d..000000000
--- a/win/C#/Controls/Detelecine.Designer.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Detelecine.Designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-namespace Handbrake

-{

-    partial class Detelecine

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.label18 = new System.Windows.Forms.Label();

-            this.drop_detelecine = new System.Windows.Forms.ComboBox();

-            this.text_custom = new System.Windows.Forms.TextBox();

-            this.SuspendLayout();

-            // 

-            // label18

-            // 

-            this.label18.AutoSize = true;

-            this.label18.BackColor = System.Drawing.Color.Transparent;

-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label18.Location = new System.Drawing.Point(3, 7);

-            this.label18.Name = "label18";

-            this.label18.Size = new System.Drawing.Size(72, 13);

-            this.label18.TabIndex = 43;

-            this.label18.Text = "Detelecine:";

-            // 

-            // drop_detelecine

-            // 

-            this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drop_detelecine.FormattingEnabled = true;

-            this.drop_detelecine.Items.AddRange(new object[] {

-            "Off",

-            "Default",

-            "Custom"});

-            this.drop_detelecine.Location = new System.Drawing.Point(111, 4);

-            this.drop_detelecine.Name = "drop_detelecine";

-            this.drop_detelecine.Size = new System.Drawing.Size(161, 21);

-            this.drop_detelecine.TabIndex = 42;

-            this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);

-            // 

-            // text_custom

-            // 

-            this.text_custom.Location = new System.Drawing.Point(278, 4);

-            this.text_custom.Name = "text_custom";

-            this.text_custom.Size = new System.Drawing.Size(115, 20);

-            this.text_custom.TabIndex = 44;

-            this.text_custom.Visible = false;

-            // 

-            // Detelecine

-            // 

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

-            this.AutoSize = true;

-            this.Controls.Add(this.text_custom);

-            this.Controls.Add(this.label18);

-            this.Controls.Add(this.drop_detelecine);

-            this.Margin = new System.Windows.Forms.Padding(0);

-            this.MaximumSize = new System.Drawing.Size(400, 30);

-            this.Name = "Detelecine";

-            this.Size = new System.Drawing.Size(400, 30);

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        internal System.Windows.Forms.ComboBox drop_detelecine;

-        private System.Windows.Forms.TextBox text_custom;

-        private System.Windows.Forms.Label label18;

-    }

-}

diff --git a/win/C#/Controls/Detelecine.cs b/win/C#/Controls/Detelecine.cs
deleted file mode 100644
index 4c2e0b237..000000000
--- a/win/C#/Controls/Detelecine.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Detelecine.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr/>.

- 	   It may be used under the terms of the GNU General Public License. */

-

-using System;

-using System.Windows.Forms;

-

-namespace Handbrake

-{

-    public partial class Detelecine : UserControl

-    {

-        public Detelecine()

-        {

-            InitializeComponent();

-            drop_detelecine.SelectedIndex = 0;

-        }

-

-        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            text_custom.Visible = drop_detelecine.Text == "Custom";

-        }

-

-        public string getDropValue

-        {

-            get { return drop_detelecine.Text; }

-        }

-

-        public string getCustomValue

-        {

-            get { return text_custom.Text; }

-        }

-

-        public string getCLIQuery

-        {

-            get

-            {

-                string query;

-                switch (drop_detelecine.Text)

-                {

-                    case "Off":

-                        query = "";

-                        break;

-                    case "Default":

-                        query = " --detelecine";

-                        break;

-                    case "Custom":

-                        query = " --detelecine=\"" + text_custom.Text + "\"";

-                        break;

-                    default:

-                        query = "";

-                        break;

-                }

-                return query;

-            }

-        }

-

-        public void setOption(string value)

-        {

-            text_custom.Text = "";

-            text_custom.Visible = false;

-            switch (value)

-            {

-                case "Off":

-                    drop_detelecine.SelectedIndex = 0;

-                    break;

-                case "Default":

-                    drop_detelecine.SelectedIndex = 1;

-                    break;

-                default:

-                    drop_detelecine.SelectedIndex = 2;

-                    text_custom.Text = value;

-                    text_custom.Visible = true;

-                    break;

-            }

-        }

-

-    }

-}

diff --git a/win/C#/Controls/Detelecine.resx b/win/C#/Controls/Detelecine.resx
deleted file mode 100644
index ff31a6db5..000000000
--- a/win/C#/Controls/Detelecine.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-</root>
\ No newline at end of file
diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs
new file mode 100644
index 000000000..a395778b8
--- /dev/null
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -0,0 +1,296 @@
+namespace Handbrake.Controls

+{

+    partial class Filters

+    {

+        /// <summary> 

+        /// Required designer variable.

+        /// </summary>

+        private System.ComponentModel.IContainer components = null;

+

+        /// <summary> 

+        /// Clean up any resources being used.

+        /// </summary>

+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

+        protected override void Dispose(bool disposing)

+        {

+            if (disposing && (components != null))

+            {

+                components.Dispose();

+            }

+            base.Dispose(disposing);

+        }

+

+        #region Component Designer generated code

+

+        /// <summary> 

+        /// Required method for Designer support - do not modify 

+        /// the contents of this method with the code editor.

+        /// </summary>

+        private void InitializeComponent()

+        {

+            this.text_customDT = new System.Windows.Forms.TextBox();

+            this.label18 = new System.Windows.Forms.Label();

+            this.drop_detelecine = new System.Windows.Forms.ComboBox();

+            this.text_customDC = new System.Windows.Forms.TextBox();

+            this.label1 = new System.Windows.Forms.Label();

+            this.drop_decomb = new System.Windows.Forms.ComboBox();

+            this.text_customDI = new System.Windows.Forms.TextBox();

+            this.label2 = new System.Windows.Forms.Label();

+            this.drop_deinterlace = new System.Windows.Forms.ComboBox();

+            this.text_customDN = new System.Windows.Forms.TextBox();

+            this.label3 = new System.Windows.Forms.Label();

+            this.drop_denoise = new System.Windows.Forms.ComboBox();

+            this.slider_deblock = new System.Windows.Forms.TrackBar();

+            this.check_grayscale = new System.Windows.Forms.CheckBox();

+            this.label8 = new System.Windows.Forms.Label();

+            this.lbl_deblockVal = new System.Windows.Forms.Label();

+            this.label68 = new System.Windows.Forms.Label();

+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();

+            this.SuspendLayout();

+            // 

+            // text_customDT

+            // 

+            this.text_customDT.Location = new System.Drawing.Point(288, 32);

+            this.text_customDT.Name = "text_customDT";

+            this.text_customDT.Size = new System.Drawing.Size(115, 20);

+            this.text_customDT.TabIndex = 47;

+            this.text_customDT.Visible = false;

+            // 

+            // label18

+            // 

+            this.label18.AutoSize = true;

+            this.label18.BackColor = System.Drawing.Color.Transparent;

+            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label18.Location = new System.Drawing.Point(13, 35);

+            this.label18.Name = "label18";

+            this.label18.Size = new System.Drawing.Size(72, 13);

+            this.label18.TabIndex = 46;

+            this.label18.Text = "Detelecine:";

+            // 

+            // drop_detelecine

+            // 

+            this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drop_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.drop_detelecine.FormattingEnabled = true;

+            this.drop_detelecine.Items.AddRange(new object[] {

+            "Off",

+            "Default",

+            "Custom"});

+            this.drop_detelecine.Location = new System.Drawing.Point(121, 32);

+            this.drop_detelecine.Name = "drop_detelecine";

+            this.drop_detelecine.Size = new System.Drawing.Size(161, 21);

+            this.drop_detelecine.TabIndex = 45;

+            this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);

+            // 

+            // text_customDC

+            // 

+            this.text_customDC.Location = new System.Drawing.Point(288, 59);

+            this.text_customDC.Name = "text_customDC";

+            this.text_customDC.Size = new System.Drawing.Size(115, 20);

+            this.text_customDC.TabIndex = 50;

+            this.text_customDC.Visible = false;

+            // 

+            // label1

+            // 

+            this.label1.AutoSize = true;

+            this.label1.BackColor = System.Drawing.Color.Transparent;

+            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Location = new System.Drawing.Point(13, 62);

+            this.label1.Name = "label1";

+            this.label1.Size = new System.Drawing.Size(59, 13);

+            this.label1.TabIndex = 49;

+            this.label1.Text = "Decomb:";

+            // 

+            // drop_decomb

+            // 

+            this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drop_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.drop_decomb.FormattingEnabled = true;

+            this.drop_decomb.Items.AddRange(new object[] {

+            "Off",

+            "Default",

+            "Custom"});

+            this.drop_decomb.Location = new System.Drawing.Point(121, 59);

+            this.drop_decomb.Name = "drop_decomb";

+            this.drop_decomb.Size = new System.Drawing.Size(161, 21);

+            this.drop_decomb.TabIndex = 48;

+            this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);

+            // 

+            // text_customDI

+            // 

+            this.text_customDI.Location = new System.Drawing.Point(288, 86);

+            this.text_customDI.Name = "text_customDI";

+            this.text_customDI.Size = new System.Drawing.Size(115, 20);

+            this.text_customDI.TabIndex = 53;

+            this.text_customDI.Visible = false;

+            // 

+            // label2

+            // 

+            this.label2.AutoSize = true;

+            this.label2.BackColor = System.Drawing.Color.Transparent;

+            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label2.Location = new System.Drawing.Point(13, 89);

+            this.label2.Name = "label2";

+            this.label2.Size = new System.Drawing.Size(77, 13);

+            this.label2.TabIndex = 52;

+            this.label2.Text = "Deinterlace:";

+            // 

+            // drop_deinterlace

+            // 

+            this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drop_deinterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.drop_deinterlace.FormattingEnabled = true;

+            this.drop_deinterlace.Items.AddRange(new object[] {

+            "None",

+            "Fast",

+            "Slow",

+            "Slower",

+            "Custom"});

+            this.drop_deinterlace.Location = new System.Drawing.Point(121, 86);

+            this.drop_deinterlace.Name = "drop_deinterlace";

+            this.drop_deinterlace.Size = new System.Drawing.Size(161, 21);

+            this.drop_deinterlace.TabIndex = 51;

+            this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_deinterlace_SelectedIndexChanged);

+            // 

+            // text_customDN

+            // 

+            this.text_customDN.Location = new System.Drawing.Point(288, 113);

+            this.text_customDN.Name = "text_customDN";

+            this.text_customDN.Size = new System.Drawing.Size(115, 20);

+            this.text_customDN.TabIndex = 56;

+            this.text_customDN.Visible = false;

+            // 

+            // label3

+            // 

+            this.label3.AutoSize = true;

+            this.label3.BackColor = System.Drawing.Color.Transparent;

+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label3.Location = new System.Drawing.Point(13, 116);

+            this.label3.Name = "label3";

+            this.label3.Size = new System.Drawing.Size(58, 13);

+            this.label3.TabIndex = 55;

+            this.label3.Text = "Denoise:";

+            // 

+            // drop_denoise

+            // 

+            this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drop_denoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.drop_denoise.FormattingEnabled = true;

+            this.drop_denoise.Items.AddRange(new object[] {

+            "None",

+            "Weak",

+            "Medium",

+            "Strong",

+            "Custom"});

+            this.drop_denoise.Location = new System.Drawing.Point(121, 113);

+            this.drop_denoise.Name = "drop_denoise";

+            this.drop_denoise.Size = new System.Drawing.Size(161, 21);

+            this.drop_denoise.TabIndex = 54;

+            this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_denoise_SelectedIndexChanged);

+            // 

+            // slider_deblock

+            // 

+            this.slider_deblock.Location = new System.Drawing.Point(121, 140);

+            this.slider_deblock.Maximum = 15;

+            this.slider_deblock.Minimum = 4;

+            this.slider_deblock.Name = "slider_deblock";

+            this.slider_deblock.Size = new System.Drawing.Size(174, 45);

+            this.slider_deblock.TabIndex = 58;

+            this.slider_deblock.Value = 4;

+            this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);

+            // 

+            // check_grayscale

+            // 

+            this.check_grayscale.AutoSize = true;

+            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;

+            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.check_grayscale.Location = new System.Drawing.Point(121, 191);

+            this.check_grayscale.Name = "check_grayscale";

+            this.check_grayscale.Size = new System.Drawing.Size(138, 17);

+            this.check_grayscale.TabIndex = 57;

+            this.check_grayscale.Text = "Grayscale Encoding";

+            this.check_grayscale.UseVisualStyleBackColor = false;

+            // 

+            // label8

+            // 

+            this.label8.AutoSize = true;

+            this.label8.BackColor = System.Drawing.Color.Transparent;

+            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label8.Location = new System.Drawing.Point(13, 147);

+            this.label8.Name = "label8";

+            this.label8.Size = new System.Drawing.Size(58, 13);

+            this.label8.TabIndex = 60;

+            this.label8.Text = "Deblock:";

+            // 

+            // lbl_deblockVal

+            // 

+            this.lbl_deblockVal.AutoSize = true;

+            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;

+            this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.lbl_deblockVal.Location = new System.Drawing.Point(301, 147);

+            this.lbl_deblockVal.Name = "lbl_deblockVal";

+            this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13);

+            this.lbl_deblockVal.TabIndex = 59;

+            this.lbl_deblockVal.Text = "Off";

+            // 

+            // label68

+            // 

+            this.label68.AutoSize = true;

+            this.label68.BackColor = System.Drawing.Color.Transparent;

+            this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label68.Location = new System.Drawing.Point(13, 13);

+            this.label68.Name = "label68";

+            this.label68.Size = new System.Drawing.Size(49, 13);

+            this.label68.TabIndex = 61;

+            this.label68.Text = "Filters";

+            // 

+            // Filters

+            // 

+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

+            this.BackColor = System.Drawing.Color.Transparent;

+            this.Controls.Add(this.label68);

+            this.Controls.Add(this.slider_deblock);

+            this.Controls.Add(this.check_grayscale);

+            this.Controls.Add(this.label8);

+            this.Controls.Add(this.lbl_deblockVal);

+            this.Controls.Add(this.text_customDN);

+            this.Controls.Add(this.label3);

+            this.Controls.Add(this.drop_denoise);

+            this.Controls.Add(this.text_customDI);

+            this.Controls.Add(this.label2);

+            this.Controls.Add(this.drop_deinterlace);

+            this.Controls.Add(this.text_customDC);

+            this.Controls.Add(this.label1);

+            this.Controls.Add(this.drop_decomb);

+            this.Controls.Add(this.text_customDT);

+            this.Controls.Add(this.label18);

+            this.Controls.Add(this.drop_detelecine);

+            this.Name = "Filters";

+            this.Size = new System.Drawing.Size(592, 270);

+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();

+            this.ResumeLayout(false);

+            this.PerformLayout();

+

+        }

+

+        #endregion

+

+        private System.Windows.Forms.TextBox text_customDT;

+        private System.Windows.Forms.Label label18;

+        internal System.Windows.Forms.ComboBox drop_detelecine;

+        private System.Windows.Forms.TextBox text_customDC;

+        internal System.Windows.Forms.Label label1;

+        internal System.Windows.Forms.ComboBox drop_decomb;

+        private System.Windows.Forms.TextBox text_customDI;

+        internal System.Windows.Forms.Label label2;

+        internal System.Windows.Forms.ComboBox drop_deinterlace;

+        private System.Windows.Forms.TextBox text_customDN;

+        internal System.Windows.Forms.Label label3;

+        internal System.Windows.Forms.ComboBox drop_denoise;

+        internal System.Windows.Forms.TrackBar slider_deblock;

+        internal System.Windows.Forms.CheckBox check_grayscale;

+        internal System.Windows.Forms.Label label8;

+        internal System.Windows.Forms.Label lbl_deblockVal;

+        internal System.Windows.Forms.Label label68;

+    }

+}

diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
new file mode 100644
index 000000000..22d2c5771
--- /dev/null
+++ b/win/C#/Controls/Filters.cs
@@ -0,0 +1,246 @@
+using System;

+using System.Windows.Forms;

+

+namespace Handbrake.Controls

+{

+    public partial class Filters : UserControl

+    {

+        public Filters()

+        {

+            InitializeComponent();

+            drop_decomb.SelectedIndex = 0;

+            drop_deinterlace.SelectedIndex = 0;

+            drop_denoise.SelectedIndex = 0;

+            drop_detelecine.SelectedIndex = 0;

+        }

+

+        // Controls

+        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            text_customDT.Visible = drop_detelecine.Text == "Custom";

+        }

+        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            text_customDC.Visible = drop_decomb.Text == "Custom";

+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)

+                drop_deinterlace.SelectedIndex = 0;

+        }

+        private void drop_deinterlace_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            text_customDI.Visible = drop_deinterlace.Text == "Custom";

+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)

+                drop_decomb.SelectedIndex = 0;

+        }

+        private void drop_denoise_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            text_customDN.Visible = drop_denoise.Text == "Custom";

+        }

+        private void slider_deblock_Scroll(object sender, EventArgs e)

+        {

+            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();

+        }

+

+        // Returns the CLI query for the query generator.

+        public string getCLIQuery

+        {

+            get

+            {

+                string query = "";

+

+                switch (drop_detelecine.Text)  // DeTelecine

+                {

+                    case "Off":

+                        query += "";

+                        break;

+                    case "Default":

+                        query += " --detelecine";

+                        break;

+                    case "Custom":

+                        query += " --detelecine=\"" + text_customDT.Text + "\"";

+                        break;

+                    default:

+                        query += "";

+                        break;

+                }

+

+

+                switch (drop_decomb.Text) // Decomb

+                {

+                    case "Off":

+                        query += "";

+                        break;

+                    case "Default":

+                        query += " --decomb";

+                        break;

+                    case "Custom":

+                        query += " --decomb=\"" + text_customDC.Text + "\"";

+                        break;

+                    default:

+                        query += "";

+                        break;

+                }

+

+                switch (drop_deinterlace.Text) // DeInterlace

+                {

+                    case "None":

+                        query += "";

+                        break;

+                    case "Fast":

+                        query += " --deinterlace=\"fast\"";

+                        break;

+                    case "Slow":

+                        query += " --deinterlace=\"slow\"";

+                        break;

+                    case "Slower":

+                        query += " --deinterlace=\"slower\"";

+                        break;

+                    case "Custom":

+                        query += " --deinterlace=\"" + text_customDI.Text + "\"";

+                        break;

+                    default:

+                        query += "";

+                        break;

+                }

+

+                switch (drop_denoise.Text) // Denoise

+                {

+                    case "None":

+                        query += "";

+                        break;

+                    case "Weak":

+                        query += " --denoise=\"weak\"";

+                        break;

+                    case "Medium":

+                        query += " --denoise=\"medium\"";

+                        break;

+                    case "Strong":

+                        query += " --denoise=\"strong\"";

+                        break;

+                    case "Custom":

+                        query += " --denoise=\"" + text_customDN.Text + "\"";

+                        break;

+                    default:

+                        query += "";

+                        break;

+                }

+

+                if (slider_deblock.Value != 4)

+                    query += " --deblock=" + slider_deblock.Value;

+

+                if (check_grayscale.Checked)

+                    query += " -g ";

+

+                return query;

+            }

+        }

+

+        // Setup for each component for the preset loader.

+        public void setDeTelecine(string value)

+        {

+            text_customDT.Text = "";

+            text_customDT.Visible = false;

+            switch (value)

+            {

+                case "Off":

+                    drop_detelecine.SelectedIndex = 0;

+                    break;

+                case "Default":

+                    drop_detelecine.SelectedIndex = 1;

+                    break;

+                default:

+                    drop_detelecine.SelectedIndex = 2;

+                    text_customDT.Text = value;

+                    text_customDT.Visible = true;

+                    break;

+            }

+        }

+        public void setDeNoise(string value)

+        {

+            text_customDN.Text = "";

+            text_customDN.Visible = false;

+            switch (value)

+            {

+                case "None":

+                    drop_denoise.SelectedIndex = 0;

+                    break;

+                case "Weak":

+                    drop_denoise.SelectedIndex = 1;

+                    break;

+                case "Medium":

+                    drop_denoise.SelectedIndex = 2;

+                    break;

+                case "Strong":

+                    drop_denoise.SelectedIndex = 3;

+                    break;

+                default:

+                    drop_denoise.SelectedIndex = 4;

+                    text_customDN.Text = value;

+                    text_customDN.Visible = true;

+                    break;

+            }

+        }

+        public void setDeInterlace(string value)

+        {

+            text_customDI.Text = "";

+            text_customDI.Visible = false;

+            switch (value)

+            {

+

+                case "None":

+                    drop_deinterlace.SelectedIndex = 0;

+                    break;

+                case "Fast":

+                    drop_deinterlace.SelectedIndex = 1;

+                    break;

+                case "Slow":

+                    drop_deinterlace.SelectedIndex = 2;

+                    break;

+                case "Slower":

+                    drop_deinterlace.SelectedIndex = 3;

+

+                    break;

+                default:

+                    drop_deinterlace.SelectedIndex = 4;

+                    text_customDI.Text = value;

+                    text_customDI.Visible = true;

+                    break;

+            }

+        }

+        public void setDecomb(string value)

+        {

+            text_customDC.Text = "";

+            text_customDC.Visible = false;

+            switch (value)

+            {

+                case "Off":

+                    drop_decomb.SelectedIndex = 0;

+                    break;

+                case "Default":

+                    drop_decomb.SelectedIndex = 1;

+                    break;

+                default:

+                    drop_decomb.SelectedIndex = 2;

+                    text_customDC.Text = value;

+                    text_customDC.Visible = true;

+                    break;

+            }

+        }

+        public void setDeBlock(int value)

+        {

+            if (value != 0)

+            {

+                slider_deblock.Value = value;

+                lbl_deblockVal.Text = value.ToString();

+            }

+            else

+            {

+                slider_deblock.Value = 4;

+                lbl_deblockVal.Text = "Off";

+            }

+        }

+        public void setGrayScale(bool value)

+        {

+            check_grayscale.CheckState = value ? CheckState.Checked : CheckState.Unchecked;

+        } 

+    }

+}

diff --git a/win/C#/Controls/Decomb.resx b/win/C#/Controls/Filters.resx
index ff31a6db5..ff31a6db5 100644
--- a/win/C#/Controls/Decomb.resx
+++ b/win/C#/Controls/Filters.resx
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 4952e5d3d..bcc4b1b26 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -67,10 +67,10 @@ namespace Handbrake.Functions
             #endregion

 

             #region Picture

-            mainWindow.pictureSettings.check_autoCrop.Checked = true;

+            mainWindow.PictureSettings.check_autoCrop.Checked = true;

             if (presetQuery.CropBottom == "0" && presetQuery.CropTop == "0")

                 if (presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")

-                    mainWindow.pictureSettings.check_customCrop.Checked = true;

+                    mainWindow.PictureSettings.check_customCrop.Checked = true;

 

             if (pictureSettings) // only Load picture settings if the perset requires it

             {

@@ -82,75 +82,60 @@ namespace Handbrake.Functions
                     int.TryParse(presetQuery.CropLeft, out left);

                     int.TryParse(presetQuery.CropRight, out right);

 

-                    mainWindow.pictureSettings.check_customCrop.Checked = true;

-                    mainWindow.pictureSettings.crop_top.Value = top;

-                    mainWindow.pictureSettings.crop_bottom.Value = bottom;

-                    mainWindow.pictureSettings.crop_left.Value = left;

-                    mainWindow.pictureSettings.crop_right.Value = right;

+                    mainWindow.PictureSettings.check_customCrop.Checked = true;

+                    mainWindow.PictureSettings.crop_top.Value = top;

+                    mainWindow.PictureSettings.crop_bottom.Value = bottom;

+                    mainWindow.PictureSettings.crop_left.Value = left;

+                    mainWindow.PictureSettings.crop_right.Value = right;

                 }

             }

 

             // Reset maxWidth and MaxHeight to 0

-            mainWindow.pictureSettings.maxWidth = 0;

-            mainWindow.pictureSettings.maxHeight = 0;

+            mainWindow.PictureSettings.maxWidth = 0;

+            mainWindow.PictureSettings.maxHeight = 0;

 

             // Set the width and height

             if (presetQuery.Width != 0)

-                mainWindow.pictureSettings.text_width.Value = presetQuery.Width;

+                mainWindow.PictureSettings.text_width.Value = presetQuery.Width;

             else if (presetQuery.MaxWidth == 0)

-                mainWindow.pictureSettings.text_width.Value = 0;

+                mainWindow.PictureSettings.text_width.Value = 0;

 

-            mainWindow.pictureSettings.text_height.Value = presetQuery.Height != 0 ? presetQuery.Height : 0;

+            mainWindow.PictureSettings.text_height.Value = presetQuery.Height != 0 ? presetQuery.Height : 0;

 

             // Max Width/Height override Width/Height

             if (presetQuery.MaxWidth != 0)

             {

-                mainWindow.pictureSettings.text_width.Value = presetQuery.MaxWidth;

-                mainWindow.pictureSettings.maxWidth = presetQuery.MaxWidth;

+                mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth;

+                mainWindow.PictureSettings.maxWidth = presetQuery.MaxWidth;

             }

 

             if (presetQuery.MaxHeight != 0)

             {

-                mainWindow.pictureSettings.text_height.Value = presetQuery.MaxHeight;

-                mainWindow.pictureSettings.maxHeight = presetQuery.MaxHeight;

+                mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight;

+                mainWindow.PictureSettings.maxHeight = presetQuery.MaxHeight;

             }

-            mainWindow.pictureSettings.setMax();

+            mainWindow.PictureSettings.setMax();

 

             // Set the anamorphic mode 0,1,2,3

-            mainWindow.pictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;

+            mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;

 

             // Custom Anamorphic Controls

-            mainWindow.pictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

-            mainWindow.pictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();

-            mainWindow.pictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();

-            mainWindow.pictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();

-            mainWindow.pictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;

+            mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

+            mainWindow.PictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();

+            mainWindow.PictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();

+            mainWindow.PictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();

+            mainWindow.PictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;

 

 

             #endregion

 

             #region Filters

-

-            mainWindow.ctl_decomb.setOption(presetQuery.Decomb);

-

-            if (mainWindow.ctl_decomb.getDropValue == "Off")

-                mainWindow.ctl_deinterlace.setOption(presetQuery.DeInterlace);

-            else

-                mainWindow.ctl_deinterlace.setOption("None"); // Don't want decomb and deinterlace on at the same time

-

-            mainWindow.ctl_denoise.setOption(presetQuery.DeNoise);

-            mainWindow.ctl_detelecine.setOption(presetQuery.DeTelecine);

-

-            if (presetQuery.DeBlock != 0)

-            {

-                mainWindow.slider_deblock.Value = presetQuery.DeBlock;

-                mainWindow.lbl_deblockVal.Text = presetQuery.DeBlock.ToString();

-            }

-            else

-            {

-                mainWindow.slider_deblock.Value = 4;

-                mainWindow.lbl_deblockVal.Text = "Off";

-            }

+            mainWindow.Filters.setDecomb(presetQuery.Decomb);

+            mainWindow.Filters.setDeInterlace(presetQuery.DeInterlace);

+            mainWindow.Filters.setDeNoise(presetQuery.DeNoise);

+            mainWindow.Filters.setDeTelecine(presetQuery.DeTelecine);

+            mainWindow.Filters.setDeBlock(presetQuery.DeBlock);

+            mainWindow.Filters.setGrayScale(presetQuery.Grayscale);

             #endregion

 

             #region Video

@@ -210,7 +195,6 @@ namespace Handbrake.Functions
 

             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;

 

-            mainWindow.check_grayscale.CheckState = presetQuery.Grayscale ? CheckState.Checked : CheckState.Unchecked;

 

             mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;

 

@@ -232,12 +216,12 @@ namespace Handbrake.Functions
 

             #region Audio

             // Clear the audio listing

-            mainWindow.audioPanel.clearAudioList();

+            mainWindow.AudioSettings.clearAudioList();

 

             if (presetQuery.AudioInformation != null)

                 foreach (AudioTrack track in presetQuery.AudioInformation)

                 {

-                    ListViewItem newTrack = new ListViewItem(mainWindow.audioPanel.getNewID().ToString());

+                    ListViewItem newTrack = new ListViewItem(mainWindow.AudioSettings.getNewID().ToString());

 

                     newTrack.SubItems.Add("Automatic");

                     newTrack.SubItems.Add(track.Encoder);

@@ -248,7 +232,7 @@ namespace Handbrake.Functions
                     else

                         newTrack.SubItems.Add(track.Bitrate);

                     newTrack.SubItems.Add(track.DRC);

-                    mainWindow.audioPanel.addTrackForPreset(newTrack);

+                    mainWindow.AudioSettings.addTrackForPreset(newTrack);

                 }

             #endregion

 

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index b81842438..604688612 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -117,53 +117,53 @@ namespace Handbrake.Functions
             #region Picture Settings Tab

 

             // Use MaxWidth for built-in presets and width for user settings.

-            if (mainWindow.pictureSettings.maxWidth == 0)

+            if (mainWindow.PictureSettings.maxWidth == 0)

             {

 

-                if (mainWindow.pictureSettings.text_width.Text != "")

-                    if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic

-                        query += " -w " + mainWindow.pictureSettings.text_width.Text;

+                if (mainWindow.PictureSettings.text_width.Text != "")

+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic

+                        query += " -w " + mainWindow.PictureSettings.text_width.Text;

             }

             else

             {

-                if (mainWindow.pictureSettings.text_width.Text != "")

-                    query += " -X " + mainWindow.pictureSettings.text_width.Text;

+                if (mainWindow.PictureSettings.text_width.Text != "")

+                    query += " -X " + mainWindow.PictureSettings.text_width.Text;

             }

 

             // Use MaxHeight for built-in presets and height for user settings.

-            if (mainWindow.pictureSettings.maxHeight == 0)

+            if (mainWindow.PictureSettings.maxHeight == 0)

             {

-                if (mainWindow.pictureSettings.text_height.Text != "0")

-                    if (mainWindow.pictureSettings.text_height.Text != "")

-                        if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic

-                            query += " -l " + mainWindow.pictureSettings.text_height.Text;

+                if (mainWindow.PictureSettings.text_height.Text != "0")

+                    if (mainWindow.PictureSettings.text_height.Text != "")

+                        if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic

+                            query += " -l " + mainWindow.PictureSettings.text_height.Text;

             }

             else

             {

-                if (mainWindow.pictureSettings.text_height.Text != "")

-                    query += " -Y " + mainWindow.pictureSettings.text_height.Text;

+                if (mainWindow.PictureSettings.text_height.Text != "")

+                    query += " -Y " + mainWindow.PictureSettings.text_height.Text;

             }

 

-            string cropTop = mainWindow.pictureSettings.crop_top.Text;

-            string cropBottom = mainWindow.pictureSettings.crop_bottom.Text;

-            string cropLeft = mainWindow.pictureSettings.crop_left.Text;

-            string cropRight = mainWindow.pictureSettings.crop_right.Text;

+            string cropTop = mainWindow.PictureSettings.crop_top.Text;

+            string cropBottom = mainWindow.PictureSettings.crop_bottom.Text;

+            string cropLeft = mainWindow.PictureSettings.crop_left.Text;

+            string cropRight = mainWindow.PictureSettings.crop_right.Text;

 

-            if (mainWindow.pictureSettings.check_customCrop.Checked)

+            if (mainWindow.PictureSettings.check_customCrop.Checked)

             {

-                if (mainWindow.pictureSettings.crop_top.Text == string.Empty)

+                if (mainWindow.PictureSettings.crop_top.Text == string.Empty)

                     cropTop = "0";

-                if (mainWindow.pictureSettings.crop_bottom.Text == string.Empty)

+                if (mainWindow.PictureSettings.crop_bottom.Text == string.Empty)

                     cropBottom = "0";

-                if (mainWindow.pictureSettings.crop_left.Text == string.Empty)

+                if (mainWindow.PictureSettings.crop_left.Text == string.Empty)

                     cropLeft = "0";

-                if (mainWindow.pictureSettings.crop_right.Text == string.Empty)

+                if (mainWindow.PictureSettings.crop_right.Text == string.Empty)

                     cropRight = "0";

 

                 query += " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;

             }

 

-            switch (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex)

+            switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)

             {

                 case 1:

                     query += " --strict-anamorphic ";

@@ -173,23 +173,17 @@ namespace Handbrake.Functions
                     break;

                 case 3:

                     query += " --custom-anamorphic ";

-                    query += " --display-width " + mainWindow.pictureSettings.txt_displayWidth.Text + " ";

-                    if (mainWindow.pictureSettings.check_KeepAR.Checked)

+                    query += " --display-width " + mainWindow.PictureSettings.txt_displayWidth.Text + " ";

+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)

                         query += " --keep-display-aspect ";

-                    if (mainWindow.pictureSettings.txt_parWidth.Text != "" && mainWindow.pictureSettings.txt_parHeight.Text != "")

-                        query += " --pixel-aspect " + mainWindow.pictureSettings.txt_parWidth.Text + ":" + mainWindow.pictureSettings.txt_parHeight.Text + " ";

+                    if (mainWindow.PictureSettings.txt_parWidth.Text != "" && mainWindow.PictureSettings.txt_parHeight.Text != "")

+                        query += " --pixel-aspect " + mainWindow.PictureSettings.txt_parWidth.Text + ":" + mainWindow.PictureSettings.txt_parHeight.Text + " ";

                     break;

             }

             #endregion

 

             #region Filters

-            query += mainWindow.ctl_detelecine.getCLIQuery;

-            query += mainWindow.ctl_decomb.getCLIQuery;

-            query += mainWindow.ctl_deinterlace.getCLIQuery;

-            query += mainWindow.ctl_denoise.getCLIQuery;

-

-            if (mainWindow.slider_deblock.Value != 4)

-                query += " --deblock=" + mainWindow.slider_deblock.Value;

+            query += mainWindow.Filters.getCLIQuery;           

             #endregion

 

             #region Video Settings Tab

@@ -210,9 +204,6 @@ namespace Handbrake.Functions
                     break;

             }

 

-            if (mainWindow.check_grayscale.Checked)

-                query += " -g ";

-

             // Video Settings

             if (mainWindow.radio_avgBitrate.Checked)

                 query += " -b " + mainWindow.text_bitrate.Text;

@@ -260,7 +251,7 @@ namespace Handbrake.Functions
 

             #region Audio Settings Tab

 

-            ListView audioTracks = mainWindow.audioPanel.getAudioPanel();

+            ListView audioTracks = mainWindow.AudioSettings.getAudioPanel();

             List<string> tracks = new List<string>();

             List<string> codecs = new List<string>();

             List<string> mixdowns = new List<string>();

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 9f0b793c8..a9727def5 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -112,29 +112,11 @@
     <Compile Include="Controls\AudioPanel.Designer.cs">

       <DependentUpon>AudioPanel.cs</DependentUpon>

     </Compile>

-    <Compile Include="Controls\Denoise.cs">

+    <Compile Include="Controls\Filters.cs">

       <SubType>UserControl</SubType>

     </Compile>

-    <Compile Include="Controls\Denoise.Designer.cs">

-      <DependentUpon>Denoise.cs</DependentUpon>

-    </Compile>

-    <Compile Include="Controls\Decomb.cs">

-      <SubType>UserControl</SubType>

-    </Compile>

-    <Compile Include="Controls\Decomb.Designer.cs">

-      <DependentUpon>Decomb.cs</DependentUpon>

-    </Compile>

-    <Compile Include="Controls\Detelecine.cs">

-      <SubType>UserControl</SubType>

-    </Compile>

-    <Compile Include="Controls\Detelecine.Designer.cs">

-      <DependentUpon>Detelecine.cs</DependentUpon>

-    </Compile>

-    <Compile Include="Controls\Deinterlace.cs">

-      <SubType>UserControl</SubType>

-    </Compile>

-    <Compile Include="Controls\Deinterlace.Designer.cs">

-      <DependentUpon>Deinterlace.cs</DependentUpon>

+    <Compile Include="Controls\Filters.Designer.cs">

+      <DependentUpon>Filters.cs</DependentUpon>

     </Compile>

     <Compile Include="Controls\PictureSettings.cs">

       <SubType>UserControl</SubType>

@@ -230,20 +212,8 @@
       <DependentUpon>AudioPanel.cs</DependentUpon>

       <SubType>Designer</SubType>

     </EmbeddedResource>

-    <EmbeddedResource Include="Controls\Denoise.resx">

-      <DependentUpon>Denoise.cs</DependentUpon>

-      <SubType>Designer</SubType>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Controls\Decomb.resx">

-      <DependentUpon>Decomb.cs</DependentUpon>

-      <SubType>Designer</SubType>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Controls\Detelecine.resx">

-      <DependentUpon>Detelecine.cs</DependentUpon>

-      <SubType>Designer</SubType>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Controls\Deinterlace.resx">

-      <DependentUpon>Deinterlace.cs</DependentUpon>

+    <EmbeddedResource Include="Controls\Filters.resx">

+      <DependentUpon>Filters.cs</DependentUpon>

       <SubType>Designer</SubType>

     </EmbeddedResource>

     <EmbeddedResource Include="Controls\PictureSettings.resx">

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index d7af96a67..b500e3648 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -107,7 +107,7 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();

             this.Label3 = new System.Windows.Forms.Label();

             this.tab_audio = new System.Windows.Forms.TabPage();

-            this.audioPanel = new Handbrake.Controls.AudioPanel();

+            this.AudioSettings = new Handbrake.Controls.AudioPanel();

             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);

             this.tab_video = new System.Windows.Forms.TabPage();

             this.radio_cq = new System.Windows.Forms.RadioButton();

@@ -118,20 +118,11 @@ namespace Handbrake
             this.Label2 = new System.Windows.Forms.Label();

             this.SliderValue = new System.Windows.Forms.Label();

             this.Label46 = new System.Windows.Forms.Label();

-            this.check_grayscale = new System.Windows.Forms.CheckBox();

             this.tab_picture = new System.Windows.Forms.TabPage();

-            this.pictureSettings = new Handbrake.Controls.PictureSettings();

-            this.slider_deblock = new System.Windows.Forms.TrackBar();

-            this.label8 = new System.Windows.Forms.Label();

-            this.lbl_deblockVal = new System.Windows.Forms.Label();

-            this.label24 = new System.Windows.Forms.Label();

+            this.PictureSettings = new Handbrake.Controls.PictureSettings();

             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();

             this.tabs_panel = new System.Windows.Forms.TabControl();

             this.tab_filters = new System.Windows.Forms.TabPage();

-            this.ctl_deinterlace = new Handbrake.Deinterlace();

-            this.ctl_denoise = new Handbrake.Denoise();

-            this.ctl_decomb = new Handbrake.Decomb();

-            this.ctl_detelecine = new Handbrake.Detelecine();

             this.tab_subtitles = new System.Windows.Forms.TabPage();

             this.Subtitles = new Handbrake.Controls.Subtitles();

             this.tab_chapters = new System.Windows.Forms.TabPage();

@@ -172,6 +163,7 @@ namespace Handbrake
             this.StatusStrip = new System.Windows.Forms.StatusStrip();

             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();

             this.hbproc = new System.Diagnostics.Process();

+            this.Filters = new Handbrake.Controls.Filters();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -182,7 +174,6 @@ namespace Handbrake
             this.tab_audio.SuspendLayout();

             this.tab_video.SuspendLayout();

             this.tab_picture.SuspendLayout();

-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();

             this.tabs_panel.SuspendLayout();

             this.tab_filters.SuspendLayout();

             this.tab_subtitles.SuspendLayout();

@@ -443,9 +434,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle3.Format = "N0";

+            dataGridViewCellStyle3.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle3;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -889,7 +880,7 @@ namespace Handbrake
             // tab_audio

             // 

             this.tab_audio.BackColor = System.Drawing.Color.Transparent;

-            this.tab_audio.Controls.Add(this.audioPanel);

+            this.tab_audio.Controls.Add(this.AudioSettings);

             this.tab_audio.Location = new System.Drawing.Point(4, 22);

             this.tab_audio.Name = "tab_audio";

             this.tab_audio.Padding = new System.Windows.Forms.Padding(3);

@@ -898,13 +889,13 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";

             this.tab_audio.UseVisualStyleBackColor = true;

             // 

-            // audioPanel

+            // AudioSettings

             // 

-            this.audioPanel.BackColor = System.Drawing.Color.Transparent;

-            this.audioPanel.Location = new System.Drawing.Point(0, 0);

-            this.audioPanel.Name = "audioPanel";

-            this.audioPanel.Size = new System.Drawing.Size(715, 310);

-            this.audioPanel.TabIndex = 0;

+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

+            this.AudioSettings.Name = "AudioSettings";

+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

+            this.AudioSettings.TabIndex = 0;

             // 

             // AudioMenuRowHeightHack

             // 

@@ -1030,22 +1021,10 @@ namespace Handbrake
             this.Label46.TabIndex = 1;

             this.Label46.Text = "Framerate (FPS):";

             // 

-            // check_grayscale

-            // 

-            this.check_grayscale.AutoSize = true;

-            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;

-            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_grayscale.Location = new System.Drawing.Point(25, 210);

-            this.check_grayscale.Name = "check_grayscale";

-            this.check_grayscale.Size = new System.Drawing.Size(138, 17);

-            this.check_grayscale.TabIndex = 5;

-            this.check_grayscale.Text = "Grayscale Encoding";

-            this.check_grayscale.UseVisualStyleBackColor = false;

-            // 

             // tab_picture

             // 

             this.tab_picture.BackColor = System.Drawing.Color.Transparent;

-            this.tab_picture.Controls.Add(this.pictureSettings);

+            this.tab_picture.Controls.Add(this.PictureSettings);

             this.tab_picture.Location = new System.Drawing.Point(4, 22);

             this.tab_picture.Name = "tab_picture";

             this.tab_picture.Padding = new System.Windows.Forms.Padding(3);

@@ -1054,56 +1033,12 @@ namespace Handbrake
             this.tab_picture.Text = "Picture Settings";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

-            // pictureSettings

-            // 

-            this.pictureSettings.Location = new System.Drawing.Point(0, 0);

-            this.pictureSettings.Name = "pictureSettings";

-            this.pictureSettings.Size = new System.Drawing.Size(713, 310);

-            this.pictureSettings.TabIndex = 0;

-            // 

-            // slider_deblock

-            // 

-            this.slider_deblock.Location = new System.Drawing.Point(118, 162);

-            this.slider_deblock.Maximum = 15;

-            this.slider_deblock.Minimum = 4;

-            this.slider_deblock.Name = "slider_deblock";

-            this.slider_deblock.Size = new System.Drawing.Size(174, 45);

-            this.slider_deblock.TabIndex = 35;

-            this.slider_deblock.Value = 4;

-            this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);

-            // 

-            // label8

-            // 

-            this.label8.AutoSize = true;

-            this.label8.BackColor = System.Drawing.Color.Transparent;

-            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label8.Location = new System.Drawing.Point(22, 167);

-            this.label8.Name = "label8";

-            this.label8.Size = new System.Drawing.Size(58, 13);

-            this.label8.TabIndex = 37;

-            this.label8.Text = "Deblock:";

-            // 

-            // lbl_deblockVal

-            // 

-            this.lbl_deblockVal.AutoSize = true;

-            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;

-            this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_deblockVal.Location = new System.Drawing.Point(296, 167);

-            this.lbl_deblockVal.Name = "lbl_deblockVal";

-            this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13);

-            this.lbl_deblockVal.TabIndex = 36;

-            this.lbl_deblockVal.Text = "Off";

-            // 

-            // label24

-            // 

-            this.label24.AutoSize = true;

-            this.label24.BackColor = System.Drawing.Color.Transparent;

-            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label24.Location = new System.Drawing.Point(13, 13);

-            this.label24.Name = "label24";

-            this.label24.Size = new System.Drawing.Size(49, 13);

-            this.label24.TabIndex = 22;

-            this.label24.Text = "Filters";

+            // PictureSettings

+            // 

+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

+            this.PictureSettings.Name = "PictureSettings";

+            this.PictureSettings.Size = new System.Drawing.Size(713, 310);

+            this.PictureSettings.TabIndex = 0;

             // 

             // Check_ChapterMarkers

             // 

@@ -1138,15 +1073,7 @@ namespace Handbrake
             // 

             // tab_filters

             // 

-            this.tab_filters.Controls.Add(this.ctl_deinterlace);

-            this.tab_filters.Controls.Add(this.ctl_denoise);

-            this.tab_filters.Controls.Add(this.ctl_decomb);

-            this.tab_filters.Controls.Add(this.ctl_detelecine);

-            this.tab_filters.Controls.Add(this.slider_deblock);

-            this.tab_filters.Controls.Add(this.label24);

-            this.tab_filters.Controls.Add(this.check_grayscale);

-            this.tab_filters.Controls.Add(this.label8);

-            this.tab_filters.Controls.Add(this.lbl_deblockVal);

+            this.tab_filters.Controls.Add(this.Filters);

             this.tab_filters.Location = new System.Drawing.Point(4, 22);

             this.tab_filters.Name = "tab_filters";

             this.tab_filters.Size = new System.Drawing.Size(724, 316);

@@ -1154,48 +1081,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";

             this.tab_filters.UseVisualStyleBackColor = true;

             // 

-            // ctl_deinterlace

-            // 

-            this.ctl_deinterlace.AutoSize = true;

-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);

-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_deinterlace.Name = "ctl_deinterlace";

-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);

-            this.ctl_deinterlace.TabIndex = 41;

-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);

-            // 

-            // ctl_denoise

-            // 

-            this.ctl_denoise.AutoSize = true;

-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);

-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_denoise.Name = "ctl_denoise";

-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);

-            this.ctl_denoise.TabIndex = 40;

-            // 

-            // ctl_decomb

-            // 

-            this.ctl_decomb.AutoSize = true;

-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);

-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_decomb.Name = "ctl_decomb";

-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);

-            this.ctl_decomb.TabIndex = 39;

-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);

-            // 

-            // ctl_detelecine

-            // 

-            this.ctl_detelecine.AutoSize = true;

-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);

-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_detelecine.Name = "ctl_detelecine";

-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);

-            this.ctl_detelecine.TabIndex = 38;

-            // 

             // tab_subtitles

             // 

             this.tab_subtitles.Controls.Add(this.Subtitles);

@@ -1619,6 +1504,13 @@ namespace Handbrake
             this.hbproc.StartInfo.UserName = "";

             this.hbproc.SynchronizingObject = this;

             // 

+            // Filters

+            // 

+            this.Filters.Location = new System.Drawing.Point(0, 0);

+            this.Filters.Name = "Filters";

+            this.Filters.Size = new System.Drawing.Size(519, 275);

+            this.Filters.TabIndex = 0;

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

@@ -1652,10 +1544,8 @@ namespace Handbrake
             this.tab_video.ResumeLayout(false);

             this.tab_video.PerformLayout();

             this.tab_picture.ResumeLayout(false);

-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();

             this.tabs_panel.ResumeLayout(false);

             this.tab_filters.ResumeLayout(false);

-            this.tab_filters.PerformLayout();

             this.tab_subtitles.ResumeLayout(false);

             this.tab_chapters.ResumeLayout(false);

             this.tab_chapters.PerformLayout();

@@ -1724,8 +1614,6 @@ namespace Handbrake
         internal System.Windows.Forms.TabControl tabs_panel;

         internal System.Windows.Forms.Label Label46;

         private System.Windows.Forms.GroupBox groupBox_dest;

-        internal System.Windows.Forms.CheckBox check_grayscale;

-        internal System.Windows.Forms.Label label24;

         private System.Windows.Forms.GroupBox groupBox2;

         internal System.Windows.Forms.Button btn_setDefault;

         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;

@@ -1776,9 +1664,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;

         private System.Windows.Forms.StatusStrip StatusStrip;

         private System.Windows.Forms.ToolStripStatusLabel lbl_encode;

-        internal System.Windows.Forms.Label lbl_deblockVal;

-        internal System.Windows.Forms.TrackBar slider_deblock;

-        internal System.Windows.Forms.Label label8;

         internal System.Windows.Forms.OpenFileDialog ISO_Open;

         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;

         internal System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive;

@@ -1792,10 +1677,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem pmnu_saveChanges;

         private System.Windows.Forms.ToolStripMenuItem mnu_killCLI;

         private System.Windows.Forms.TabPage tab_filters;

-        internal Deinterlace ctl_deinterlace;

-        internal Denoise ctl_denoise;

-        internal Decomb ctl_decomb;

-        internal Detelecine ctl_detelecine;

         internal System.Windows.Forms.RadioButton radio_cq;

         internal System.Windows.Forms.RadioButton radio_avgBitrate;

         internal System.Windows.Forms.RadioButton radio_targetFilesize;

@@ -1808,9 +1689,10 @@ namespace Handbrake
         internal ComboBox drop_angle;

         internal Label lbl_angle;

         private TabPage tab_subtitles;

-        internal Handbrake.Controls.AudioPanel audioPanel;

-        internal Handbrake.Controls.PictureSettings pictureSettings;

+        internal Handbrake.Controls.AudioPanel AudioSettings;

+        internal Handbrake.Controls.PictureSettings PictureSettings;

         internal Handbrake.Controls.Subtitles Subtitles;

+        internal Handbrake.Controls.Filters Filters;

 

  

     }

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 55da10ae3..29622cb0a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -751,7 +751,7 @@ namespace Handbrake
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)

         {

             // Reset some values on the form

-            pictureSettings.lbl_Aspect.Text = "Select a Title";

+            PictureSettings.lbl_Aspect.Text = "Select a Title";

             //lbl_RecomendedCrop.Text = "Select a Title";

             drop_chapterStart.Items.Clear();

             drop_chapterFinish.Items.Clear();

@@ -762,7 +762,7 @@ namespace Handbrake
             {

                 selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;

                 lbl_duration.Text = selectedTitle.Duration.ToString();

-                pictureSettings.setComponentsAfterScan(selectedTitle);  // Setup Picture Settings Tab Control

+                PictureSettings.setComponentsAfterScan(selectedTitle);  // Setup Picture Settings Tab Control

 

                 // Populate the Angles dropdown

                 drop_angle.Items.Clear();

@@ -793,7 +793,7 @@ namespace Handbrake
                     drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();

 

                 // Populate the Audio Channels Dropdown

-                audioPanel.setTrackList(selectedTitle);

+                AudioSettings.setTrackList(selectedTitle);

 

                 // Populate the Subtitles dropdown

                 Subtitles.drp_subtitleTracks.Items.Clear();

@@ -983,7 +983,7 @@ namespace Handbrake
             else if (drop_format.SelectedIndex == 2)

                 setExtension(".mkv");

 

-            audioPanel.setAudioByContainer(drop_format.Text);

+            AudioSettings.setAudioByContainer(drop_format.Text);

             Subtitles.setContainer(drop_format.SelectedIndex);

 

             string oldval;

@@ -1179,24 +1179,6 @@ namespace Handbrake
             }

         }

 

-        // Filter Tab

-        private void ctl_decomb_changed(object sender, EventArgs e)

-        {

-            if (ctl_decomb.getDropValue != "Off")

-                if (ctl_deinterlace.getDropValue != "None")

-                    ctl_deinterlace.setOption("None");

-        }

-        private void ctl_deinterlace_changed(object sender, EventArgs e)

-        {

-            if (ctl_detelecine.getDropValue != "None")

-                if (ctl_decomb.getDropValue != "Off")

-                    ctl_decomb.setOption("Off");

-        }

-        private void slider_deblock_Scroll(object sender, EventArgs e)

-        {

-            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();

-        }

-

         // Chapter Marker Tab

         private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)

         {

@@ -1420,8 +1402,8 @@ namespace Handbrake
             drop_chapterFinish.Items.Clear();

             drop_chapterFinish.Text = "Auto";

             lbl_duration.Text = "Select a Title";

-            pictureSettings.lbl_src_res.Text = "Select a Title";

-            pictureSettings.lbl_Aspect.Text = "Select a Title";

+            PictureSettings.lbl_src_res.Text = "Select a Title";

+            PictureSettings.lbl_Aspect.Text = "Select a Title";

             text_source.Text = "Click 'Source' to continue";

             text_destination.Text = "";

             thisDVD = null;

@@ -1596,7 +1578,6 @@ namespace Handbrake
         }

         #endregion

 

-

         // This is the END of the road ****************************************

     }

 }
\ No newline at end of file