]> granicus.if.org Git - handbrake/commitdiff
WinGui:
authorsr55 <sr55.hb@outlook.com>
Mon, 22 Jun 2009 20:02:09 +0000 (20:02 +0000)
committersr55 <sr55.hb@outlook.com>
Mon, 22 Jun 2009 20:02:09 +0000 (20:02 +0000)
- 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:
win/C#/Controls/Decomb.Designer.cs [deleted file]
win/C#/Controls/Decomb.cs [deleted file]
win/C#/Controls/Deinterlace.Designer.cs [deleted file]
win/C#/Controls/Deinterlace.cs [deleted file]
win/C#/Controls/Deinterlace.resx [deleted file]
win/C#/Controls/Denoise.Designer.cs [deleted file]
win/C#/Controls/Denoise.cs [deleted file]
win/C#/Controls/Denoise.resx [deleted file]
win/C#/Controls/Detelecine.Designer.cs [deleted file]
win/C#/Controls/Detelecine.cs [deleted file]
win/C#/Controls/Detelecine.resx [deleted file]
win/C#/Controls/Filters.Designer.cs [new file with mode: 0644]
win/C#/Controls/Filters.cs [new file with mode: 0644]
win/C#/Controls/Filters.resx [moved from win/C#/Controls/Decomb.resx with 100% similarity]
win/C#/Functions/PresetLoader.cs
win/C#/Functions/QueryGenerator.cs
win/C#/HandBrakeCS.csproj
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs

diff --git a/win/C#/Controls/Decomb.Designer.cs b/win/C#/Controls/Decomb.Designer.cs
deleted file mode 100644 (file)
index 7826c27..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Decomb.designer.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-namespace Handbrake\r
-{\r
-    partial class Decomb\r
-    {\r
-        /// <summary> \r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary> \r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            if (disposing && (components != null))\r
-            {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Component Designer generated code\r
-\r
-        /// <summary> \r
-        /// Required method for Designer support - do not modify \r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent()\r
-        {\r
-            this.label18 = new System.Windows.Forms.Label();\r
-            this.drop_decomb = new System.Windows.Forms.ComboBox();\r
-            this.text_custom = new System.Windows.Forms.TextBox();\r
-            this.SuspendLayout();\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(3, 7);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(59, 13);\r
-            this.label18.TabIndex = 43;\r
-            this.label18.Text = "Decomb:";\r
-            // \r
-            // drop_decomb\r
-            // \r
-            this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drop_decomb.FormattingEnabled = true;\r
-            this.drop_decomb.Items.AddRange(new object[] {\r
-            "Off",\r
-            "Default",\r
-            "Custom"});\r
-            this.drop_decomb.Location = new System.Drawing.Point(111, 4);\r
-            this.drop_decomb.Name = "drop_decomb";\r
-            this.drop_decomb.Size = new System.Drawing.Size(161, 21);\r
-            this.drop_decomb.TabIndex = 42;\r
-            this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);\r
-            // \r
-            // text_custom\r
-            // \r
-            this.text_custom.Location = new System.Drawing.Point(278, 4);\r
-            this.text_custom.Name = "text_custom";\r
-            this.text_custom.Size = new System.Drawing.Size(115, 20);\r
-            this.text_custom.TabIndex = 44;\r
-            this.text_custom.Visible = false;\r
-            // \r
-            // Decomb\r
-            // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
-            this.AutoSize = true;\r
-            this.Controls.Add(this.text_custom);\r
-            this.Controls.Add(this.label18);\r
-            this.Controls.Add(this.drop_decomb);\r
-            this.Margin = new System.Windows.Forms.Padding(0);\r
-            this.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.Name = "Decomb";\r
-            this.Size = new System.Drawing.Size(400, 30);\r
-            this.ResumeLayout(false);\r
-            this.PerformLayout();\r
-\r
-        }\r
-\r
-        #endregion\r
-\r
-        internal System.Windows.Forms.Label label18;\r
-        internal System.Windows.Forms.ComboBox drop_decomb;\r
-        private System.Windows.Forms.TextBox text_custom;\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Decomb.cs b/win/C#/Controls/Decomb.cs
deleted file mode 100644 (file)
index 35c613a..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Decomb.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-using System;\r
-using System.Windows.Forms;\r
-\r
-namespace Handbrake\r
-{\r
-    public partial class Decomb : UserControl\r
-    {\r
-        public Decomb()\r
-        {\r
-            InitializeComponent();\r
-            drop_decomb.SelectedIndex = 0;\r
-        }\r
-\r
-        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_custom.Visible = drop_decomb.Text == "Custom";\r
-\r
-            valueChanged(null);\r
-        }\r
-\r
-        public string getDropValue\r
-        {\r
-            get { return drop_decomb.Text; }\r
-        }\r
-\r
-        public string getCustomValue\r
-        {\r
-            get { return text_custom.Text; }\r
-        }\r
-\r
-        public string getCLIQuery\r
-        {\r
-            get\r
-            {\r
-                string query;\r
-                switch (drop_decomb.Text)\r
-                {\r
-                    case "Off":\r
-                        query = "";\r
-                        break;\r
-                    case "Default":\r
-                        query = " --decomb";\r
-                        break;\r
-                    case "Custom":\r
-                        query = " --decomb=\"" + text_custom.Text + "\"";\r
-                        break;\r
-                    default:\r
-                        query = "";\r
-                        break;\r
-                }\r
-                return query;\r
-            }\r
-        }\r
-\r
-        public void setOption(string value)\r
-        {\r
-            text_custom.Text = "";\r
-            text_custom.Visible = false;\r
-            switch (value)\r
-            {\r
-                case "Off":\r
-                    drop_decomb.SelectedIndex = 0;\r
-                    break;\r
-                case "Default":\r
-                    drop_decomb.SelectedIndex = 1;\r
-                    break;\r
-                default:\r
-                    drop_decomb.SelectedIndex = 2;\r
-                    text_custom.Text = value;\r
-                    text_custom.Visible = true;\r
-                    break;\r
-            }\r
-        }\r
-\r
-        public event EventHandler onChange;\r
-        protected virtual void valueChanged(EventArgs e)\r
-        {\r
-            if (onChange != null)\r
-                onChange(this, e);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Deinterlace.Designer.cs b/win/C#/Controls/Deinterlace.Designer.cs
deleted file mode 100644 (file)
index 3792cc3..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Deinterlace.designer.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-namespace Handbrake\r
-{\r
-    partial class Deinterlace\r
-    {\r
-        /// <summary> \r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary> \r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            if (disposing && (components != null))\r
-            {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Component Designer generated code\r
-\r
-        /// <summary> \r
-        /// Required method for Designer support - do not modify \r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent()\r
-        {\r
-            this.label18 = new System.Windows.Forms.Label();\r
-            this.drop_deinterlace = new System.Windows.Forms.ComboBox();\r
-            this.text_custom = new System.Windows.Forms.TextBox();\r
-            this.SuspendLayout();\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(3, 7);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(72, 13);\r
-            this.label18.TabIndex = 43;\r
-            this.label18.Text = "Deinterlace:";\r
-            // \r
-            // drop_deinterlace\r
-            // \r
-            this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deinterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drop_deinterlace.FormattingEnabled = true;\r
-            this.drop_deinterlace.Items.AddRange(new object[] {\r
-            "None",\r
-            "Fast",\r
-            "Slow",\r
-            "Slower",\r
-            "Custom"});\r
-            this.drop_deinterlace.Location = new System.Drawing.Point(111, 4);\r
-            this.drop_deinterlace.Name = "drop_deinterlace";\r
-            this.drop_deinterlace.Size = new System.Drawing.Size(161, 21);\r
-            this.drop_deinterlace.TabIndex = 42;\r
-            this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);\r
-            // \r
-            // text_custom\r
-            // \r
-            this.text_custom.Location = new System.Drawing.Point(278, 4);\r
-            this.text_custom.Name = "text_custom";\r
-            this.text_custom.Size = new System.Drawing.Size(115, 20);\r
-            this.text_custom.TabIndex = 44;\r
-            this.text_custom.Visible = false;\r
-            // \r
-            // Deinterlace\r
-            // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
-            this.AutoSize = true;\r
-            this.Controls.Add(this.text_custom);\r
-            this.Controls.Add(this.label18);\r
-            this.Controls.Add(this.drop_deinterlace);\r
-            this.Margin = new System.Windows.Forms.Padding(0);\r
-            this.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.Name = "Deinterlace";\r
-            this.Size = new System.Drawing.Size(400, 30);\r
-            this.ResumeLayout(false);\r
-            this.PerformLayout();\r
-\r
-        }\r
-\r
-        #endregion\r
-\r
-        internal System.Windows.Forms.Label label18;\r
-        internal System.Windows.Forms.ComboBox drop_deinterlace;\r
-        private System.Windows.Forms.TextBox text_custom;\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Deinterlace.cs b/win/C#/Controls/Deinterlace.cs
deleted file mode 100644 (file)
index 2ff9b33..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  Deinterlace.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-using System;\r
-using System.Windows.Forms;\r
-\r
-namespace Handbrake\r
-{\r
-    public partial class Deinterlace : UserControl\r
-    {\r
-        public Deinterlace()\r
-        {\r
-            InitializeComponent();\r
-            drop_deinterlace.SelectedIndex = 0;\r
-        }\r
-\r
-        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_custom.Visible = drop_deinterlace.Text == "Custom";\r
-\r
-            valueChanged(null);\r
-        }\r
-\r
-        public string getDropValue\r
-        {\r
-            get { return drop_deinterlace.Text; }\r
-        }\r
-\r
-        public string getCustomValue\r
-        {\r
-            get { return text_custom.Text; }\r
-        }\r
-\r
-        public string getCLIQuery\r
-        {\r
-            get\r
-            {\r
-                string query;\r
-                switch (drop_deinterlace.Text)\r
-                {\r
-                    case "None":\r
-                        query = "";\r
-                        break;\r
-                    case "Fast":\r
-                        query = " --deinterlace=\"fast\"";\r
-                        break;\r
-                    case "Slow":\r
-                        query = " --deinterlace=\"slow\"";\r
-                        break;\r
-                    case "Slower":\r
-                        query = " --deinterlace=\"slower\"";\r
-                        break;\r
-                    case "Custom":\r
-                        query = " --deinterlace=\"" + text_custom.Text + "\"";\r
-                        break;\r
-                    default:\r
-                        query = "";\r
-                        break;\r
-                }\r
-                return query;\r
-            }\r
-        }\r
-\r
-        public void setOption(string value)\r
-        {\r
-            text_custom.Text = "";\r
-            text_custom.Visible = false;\r
-            switch (value)\r
-            {\r
-\r
-                case "None":\r
-                    drop_deinterlace.SelectedIndex = 0;\r
-                    break;\r
-                case "Fast":\r
-                    drop_deinterlace.SelectedIndex = 1;\r
-                    break;\r
-                case "Slow":\r
-                    drop_deinterlace.SelectedIndex = 2;\r
-                    break;\r
-                case "Slower":\r
-                    drop_deinterlace.SelectedIndex = 3;\r
-\r
-                    break;\r
-                default:\r
-                    drop_deinterlace.SelectedIndex = 4;\r
-                    text_custom.Text = value;\r
-                    text_custom.Visible = true;\r
-                    break;\r
-            }\r
-        }\r
-\r
-        public event EventHandler onChange;\r
-        protected virtual void valueChanged(EventArgs e)\r
-        {\r
-            if (onChange != null)\r
-                onChange(this, e);\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Deinterlace.resx b/win/C#/Controls/Deinterlace.resx
deleted file mode 100644 (file)
index ff31a6d..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-</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 (file)
index e4b9621..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Denoise.designer.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-namespace Handbrake\r
-{\r
-    partial class Denoise\r
-    {\r
-        /// <summary> \r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary> \r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            if (disposing && (components != null))\r
-            {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Component Designer generated code\r
-\r
-        /// <summary> \r
-        /// Required method for Designer support - do not modify \r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent()\r
-        {\r
-            this.label18 = new System.Windows.Forms.Label();\r
-            this.drop_denoise = new System.Windows.Forms.ComboBox();\r
-            this.text_custom = new System.Windows.Forms.TextBox();\r
-            this.SuspendLayout();\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(3, 7);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(58, 13);\r
-            this.label18.TabIndex = 43;\r
-            this.label18.Text = "Denoise:";\r
-            // \r
-            // drop_denoise\r
-            // \r
-            this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_denoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drop_denoise.FormattingEnabled = true;\r
-            this.drop_denoise.Items.AddRange(new object[] {\r
-            "None",\r
-            "Weak",\r
-            "Medium",\r
-            "Strong",\r
-            "Custom"});\r
-            this.drop_denoise.Location = new System.Drawing.Point(111, 4);\r
-            this.drop_denoise.Name = "drop_denoise";\r
-            this.drop_denoise.Size = new System.Drawing.Size(161, 21);\r
-            this.drop_denoise.TabIndex = 42;\r
-            this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);\r
-            // \r
-            // text_custom\r
-            // \r
-            this.text_custom.Location = new System.Drawing.Point(278, 4);\r
-            this.text_custom.Name = "text_custom";\r
-            this.text_custom.Size = new System.Drawing.Size(115, 20);\r
-            this.text_custom.TabIndex = 44;\r
-            this.text_custom.Visible = false;\r
-            // \r
-            // Denoise\r
-            // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
-            this.AutoSize = true;\r
-            this.Controls.Add(this.text_custom);\r
-            this.Controls.Add(this.label18);\r
-            this.Controls.Add(this.drop_denoise);\r
-            this.Margin = new System.Windows.Forms.Padding(0);\r
-            this.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.Name = "Denoise";\r
-            this.Size = new System.Drawing.Size(400, 30);\r
-            this.ResumeLayout(false);\r
-            this.PerformLayout();\r
-\r
-        }\r
-\r
-        #endregion\r
-\r
-        internal System.Windows.Forms.Label label18;\r
-        internal System.Windows.Forms.ComboBox drop_denoise;\r
-        private System.Windows.Forms.TextBox text_custom;\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Denoise.cs b/win/C#/Controls/Denoise.cs
deleted file mode 100644 (file)
index d8b7e91..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  DeNoise.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-using System;\r
-using System.Windows.Forms;\r
-\r
-namespace Handbrake\r
-{\r
-    public partial class Denoise : UserControl\r
-    {\r
-        public Denoise()\r
-        {\r
-            InitializeComponent();\r
-            drop_denoise.SelectedIndex = 0;\r
-        }\r
-\r
-        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drop_denoise.Text == "Custom")\r
-                text_custom.Visible = true;\r
-            else\r
-                text_custom.Visible = false;\r
-        }\r
-\r
-        public string getDropValue\r
-        {\r
-            get { return drop_denoise.Text; }\r
-        }\r
-\r
-        public string getCustomValue\r
-        {\r
-            get { return text_custom.Text; }\r
-        }\r
-\r
-        public string getCLIQuery\r
-        {\r
-            get\r
-            {\r
-                string query;\r
-                switch (drop_denoise.Text)\r
-                {\r
-                    case "None":\r
-                        query = "";\r
-                        break;\r
-                    case "Weak":\r
-                        query = " --denoise=\"weak\"";\r
-                        break;\r
-                    case "Medium":\r
-                        query = " --denoise=\"medium\"";\r
-                        break;\r
-                    case "Strong":\r
-                        query = " --denoise=\"strong\"";\r
-                        break;\r
-                    case "Custom":\r
-                        query = " --denoise=\"" + text_custom.Text + "\"";\r
-                        break;\r
-                    default:\r
-                        query = "";\r
-                        break;\r
-                }\r
-                return query;\r
-            }\r
-        }\r
-\r
-        public void setOption(string value)\r
-        {\r
-            text_custom.Text = "";\r
-            text_custom.Visible = false;\r
-            switch (value)\r
-            {\r
-                case "None":\r
-                    drop_denoise.SelectedIndex = 0;\r
-                    break;\r
-                case "Weak":\r
-                    drop_denoise.SelectedIndex = 1;\r
-                    break;\r
-                case "Medium":\r
-                    drop_denoise.SelectedIndex = 2;\r
-                    break;\r
-                case "Strong":\r
-                    drop_denoise.SelectedIndex = 3;\r
-                    break;\r
-                default:\r
-                    drop_denoise.SelectedIndex = 4;\r
-                    text_custom.Text = value;\r
-                    text_custom.Visible = true;\r
-                    break;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Denoise.resx b/win/C#/Controls/Denoise.resx
deleted file mode 100644 (file)
index ff31a6d..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-</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 (file)
index 71983b3..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Detelecine.Designer.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-namespace Handbrake\r
-{\r
-    partial class Detelecine\r
-    {\r
-        /// <summary> \r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary> \r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing)\r
-        {\r
-            if (disposing && (components != null))\r
-            {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Component Designer generated code\r
-\r
-        /// <summary> \r
-        /// Required method for Designer support - do not modify \r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent()\r
-        {\r
-            this.label18 = new System.Windows.Forms.Label();\r
-            this.drop_detelecine = new System.Windows.Forms.ComboBox();\r
-            this.text_custom = new System.Windows.Forms.TextBox();\r
-            this.SuspendLayout();\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(3, 7);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(72, 13);\r
-            this.label18.TabIndex = 43;\r
-            this.label18.Text = "Detelecine:";\r
-            // \r
-            // drop_detelecine\r
-            // \r
-            this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drop_detelecine.FormattingEnabled = true;\r
-            this.drop_detelecine.Items.AddRange(new object[] {\r
-            "Off",\r
-            "Default",\r
-            "Custom"});\r
-            this.drop_detelecine.Location = new System.Drawing.Point(111, 4);\r
-            this.drop_detelecine.Name = "drop_detelecine";\r
-            this.drop_detelecine.Size = new System.Drawing.Size(161, 21);\r
-            this.drop_detelecine.TabIndex = 42;\r
-            this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);\r
-            // \r
-            // text_custom\r
-            // \r
-            this.text_custom.Location = new System.Drawing.Point(278, 4);\r
-            this.text_custom.Name = "text_custom";\r
-            this.text_custom.Size = new System.Drawing.Size(115, 20);\r
-            this.text_custom.TabIndex = 44;\r
-            this.text_custom.Visible = false;\r
-            // \r
-            // Detelecine\r
-            // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
-            this.AutoSize = true;\r
-            this.Controls.Add(this.text_custom);\r
-            this.Controls.Add(this.label18);\r
-            this.Controls.Add(this.drop_detelecine);\r
-            this.Margin = new System.Windows.Forms.Padding(0);\r
-            this.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.Name = "Detelecine";\r
-            this.Size = new System.Drawing.Size(400, 30);\r
-            this.ResumeLayout(false);\r
-            this.PerformLayout();\r
-\r
-        }\r
-\r
-        #endregion\r
-\r
-        internal System.Windows.Forms.ComboBox drop_detelecine;\r
-        private System.Windows.Forms.TextBox text_custom;\r
-        private System.Windows.Forms.Label label18;\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Detelecine.cs b/win/C#/Controls/Detelecine.cs
deleted file mode 100644 (file)
index 4c2e0b2..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Detelecine.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-using System;\r
-using System.Windows.Forms;\r
-\r
-namespace Handbrake\r
-{\r
-    public partial class Detelecine : UserControl\r
-    {\r
-        public Detelecine()\r
-        {\r
-            InitializeComponent();\r
-            drop_detelecine.SelectedIndex = 0;\r
-        }\r
-\r
-        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_custom.Visible = drop_detelecine.Text == "Custom";\r
-        }\r
-\r
-        public string getDropValue\r
-        {\r
-            get { return drop_detelecine.Text; }\r
-        }\r
-\r
-        public string getCustomValue\r
-        {\r
-            get { return text_custom.Text; }\r
-        }\r
-\r
-        public string getCLIQuery\r
-        {\r
-            get\r
-            {\r
-                string query;\r
-                switch (drop_detelecine.Text)\r
-                {\r
-                    case "Off":\r
-                        query = "";\r
-                        break;\r
-                    case "Default":\r
-                        query = " --detelecine";\r
-                        break;\r
-                    case "Custom":\r
-                        query = " --detelecine=\"" + text_custom.Text + "\"";\r
-                        break;\r
-                    default:\r
-                        query = "";\r
-                        break;\r
-                }\r
-                return query;\r
-            }\r
-        }\r
-\r
-        public void setOption(string value)\r
-        {\r
-            text_custom.Text = "";\r
-            text_custom.Visible = false;\r
-            switch (value)\r
-            {\r
-                case "Off":\r
-                    drop_detelecine.SelectedIndex = 0;\r
-                    break;\r
-                case "Default":\r
-                    drop_detelecine.SelectedIndex = 1;\r
-                    break;\r
-                default:\r
-                    drop_detelecine.SelectedIndex = 2;\r
-                    text_custom.Text = value;\r
-                    text_custom.Visible = true;\r
-                    break;\r
-            }\r
-        }\r
-\r
-    }\r
-}\r
diff --git a/win/C#/Controls/Detelecine.resx b/win/C#/Controls/Detelecine.resx
deleted file mode 100644 (file)
index ff31a6d..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-</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 (file)
index 0000000..a395778
--- /dev/null
@@ -0,0 +1,296 @@
+namespace Handbrake.Controls\r
+{\r
+    partial class Filters\r
+    {\r
+        /// <summary> \r
+        /// Required designer variable.\r
+        /// </summary>\r
+        private System.ComponentModel.IContainer components = null;\r
+\r
+        /// <summary> \r
+        /// Clean up any resources being used.\r
+        /// </summary>\r
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
+        protected override void Dispose(bool disposing)\r
+        {\r
+            if (disposing && (components != null))\r
+            {\r
+                components.Dispose();\r
+            }\r
+            base.Dispose(disposing);\r
+        }\r
+\r
+        #region Component Designer generated code\r
+\r
+        /// <summary> \r
+        /// Required method for Designer support - do not modify \r
+        /// the contents of this method with the code editor.\r
+        /// </summary>\r
+        private void InitializeComponent()\r
+        {\r
+            this.text_customDT = new System.Windows.Forms.TextBox();\r
+            this.label18 = new System.Windows.Forms.Label();\r
+            this.drop_detelecine = new System.Windows.Forms.ComboBox();\r
+            this.text_customDC = new System.Windows.Forms.TextBox();\r
+            this.label1 = new System.Windows.Forms.Label();\r
+            this.drop_decomb = new System.Windows.Forms.ComboBox();\r
+            this.text_customDI = new System.Windows.Forms.TextBox();\r
+            this.label2 = new System.Windows.Forms.Label();\r
+            this.drop_deinterlace = new System.Windows.Forms.ComboBox();\r
+            this.text_customDN = new System.Windows.Forms.TextBox();\r
+            this.label3 = new System.Windows.Forms.Label();\r
+            this.drop_denoise = new System.Windows.Forms.ComboBox();\r
+            this.slider_deblock = new System.Windows.Forms.TrackBar();\r
+            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
+            this.label8 = new System.Windows.Forms.Label();\r
+            this.lbl_deblockVal = new System.Windows.Forms.Label();\r
+            this.label68 = new System.Windows.Forms.Label();\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();\r
+            this.SuspendLayout();\r
+            // \r
+            // text_customDT\r
+            // \r
+            this.text_customDT.Location = new System.Drawing.Point(288, 32);\r
+            this.text_customDT.Name = "text_customDT";\r
+            this.text_customDT.Size = new System.Drawing.Size(115, 20);\r
+            this.text_customDT.TabIndex = 47;\r
+            this.text_customDT.Visible = false;\r
+            // \r
+            // label18\r
+            // \r
+            this.label18.AutoSize = true;\r
+            this.label18.BackColor = System.Drawing.Color.Transparent;\r
+            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label18.Location = new System.Drawing.Point(13, 35);\r
+            this.label18.Name = "label18";\r
+            this.label18.Size = new System.Drawing.Size(72, 13);\r
+            this.label18.TabIndex = 46;\r
+            this.label18.Text = "Detelecine:";\r
+            // \r
+            // drop_detelecine\r
+            // \r
+            this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_detelecine.FormattingEnabled = true;\r
+            this.drop_detelecine.Items.AddRange(new object[] {\r
+            "Off",\r
+            "Default",\r
+            "Custom"});\r
+            this.drop_detelecine.Location = new System.Drawing.Point(121, 32);\r
+            this.drop_detelecine.Name = "drop_detelecine";\r
+            this.drop_detelecine.Size = new System.Drawing.Size(161, 21);\r
+            this.drop_detelecine.TabIndex = 45;\r
+            this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);\r
+            // \r
+            // text_customDC\r
+            // \r
+            this.text_customDC.Location = new System.Drawing.Point(288, 59);\r
+            this.text_customDC.Name = "text_customDC";\r
+            this.text_customDC.Size = new System.Drawing.Size(115, 20);\r
+            this.text_customDC.TabIndex = 50;\r
+            this.text_customDC.Visible = false;\r
+            // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.BackColor = System.Drawing.Color.Transparent;\r
+            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label1.Location = new System.Drawing.Point(13, 62);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(59, 13);\r
+            this.label1.TabIndex = 49;\r
+            this.label1.Text = "Decomb:";\r
+            // \r
+            // drop_decomb\r
+            // \r
+            this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_decomb.FormattingEnabled = true;\r
+            this.drop_decomb.Items.AddRange(new object[] {\r
+            "Off",\r
+            "Default",\r
+            "Custom"});\r
+            this.drop_decomb.Location = new System.Drawing.Point(121, 59);\r
+            this.drop_decomb.Name = "drop_decomb";\r
+            this.drop_decomb.Size = new System.Drawing.Size(161, 21);\r
+            this.drop_decomb.TabIndex = 48;\r
+            this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);\r
+            // \r
+            // text_customDI\r
+            // \r
+            this.text_customDI.Location = new System.Drawing.Point(288, 86);\r
+            this.text_customDI.Name = "text_customDI";\r
+            this.text_customDI.Size = new System.Drawing.Size(115, 20);\r
+            this.text_customDI.TabIndex = 53;\r
+            this.text_customDI.Visible = false;\r
+            // \r
+            // label2\r
+            // \r
+            this.label2.AutoSize = true;\r
+            this.label2.BackColor = System.Drawing.Color.Transparent;\r
+            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label2.Location = new System.Drawing.Point(13, 89);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(77, 13);\r
+            this.label2.TabIndex = 52;\r
+            this.label2.Text = "Deinterlace:";\r
+            // \r
+            // drop_deinterlace\r
+            // \r
+            this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_deinterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_deinterlace.FormattingEnabled = true;\r
+            this.drop_deinterlace.Items.AddRange(new object[] {\r
+            "None",\r
+            "Fast",\r
+            "Slow",\r
+            "Slower",\r
+            "Custom"});\r
+            this.drop_deinterlace.Location = new System.Drawing.Point(121, 86);\r
+            this.drop_deinterlace.Name = "drop_deinterlace";\r
+            this.drop_deinterlace.Size = new System.Drawing.Size(161, 21);\r
+            this.drop_deinterlace.TabIndex = 51;\r
+            this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_deinterlace_SelectedIndexChanged);\r
+            // \r
+            // text_customDN\r
+            // \r
+            this.text_customDN.Location = new System.Drawing.Point(288, 113);\r
+            this.text_customDN.Name = "text_customDN";\r
+            this.text_customDN.Size = new System.Drawing.Size(115, 20);\r
+            this.text_customDN.TabIndex = 56;\r
+            this.text_customDN.Visible = false;\r
+            // \r
+            // label3\r
+            // \r
+            this.label3.AutoSize = true;\r
+            this.label3.BackColor = System.Drawing.Color.Transparent;\r
+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label3.Location = new System.Drawing.Point(13, 116);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(58, 13);\r
+            this.label3.TabIndex = 55;\r
+            this.label3.Text = "Denoise:";\r
+            // \r
+            // drop_denoise\r
+            // \r
+            this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_denoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_denoise.FormattingEnabled = true;\r
+            this.drop_denoise.Items.AddRange(new object[] {\r
+            "None",\r
+            "Weak",\r
+            "Medium",\r
+            "Strong",\r
+            "Custom"});\r
+            this.drop_denoise.Location = new System.Drawing.Point(121, 113);\r
+            this.drop_denoise.Name = "drop_denoise";\r
+            this.drop_denoise.Size = new System.Drawing.Size(161, 21);\r
+            this.drop_denoise.TabIndex = 54;\r
+            this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_denoise_SelectedIndexChanged);\r
+            // \r
+            // slider_deblock\r
+            // \r
+            this.slider_deblock.Location = new System.Drawing.Point(121, 140);\r
+            this.slider_deblock.Maximum = 15;\r
+            this.slider_deblock.Minimum = 4;\r
+            this.slider_deblock.Name = "slider_deblock";\r
+            this.slider_deblock.Size = new System.Drawing.Size(174, 45);\r
+            this.slider_deblock.TabIndex = 58;\r
+            this.slider_deblock.Value = 4;\r
+            this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);\r
+            // \r
+            // check_grayscale\r
+            // \r
+            this.check_grayscale.AutoSize = true;\r
+            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_grayscale.Location = new System.Drawing.Point(121, 191);\r
+            this.check_grayscale.Name = "check_grayscale";\r
+            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
+            this.check_grayscale.TabIndex = 57;\r
+            this.check_grayscale.Text = "Grayscale Encoding";\r
+            this.check_grayscale.UseVisualStyleBackColor = false;\r
+            // \r
+            // label8\r
+            // \r
+            this.label8.AutoSize = true;\r
+            this.label8.BackColor = System.Drawing.Color.Transparent;\r
+            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label8.Location = new System.Drawing.Point(13, 147);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(58, 13);\r
+            this.label8.TabIndex = 60;\r
+            this.label8.Text = "Deblock:";\r
+            // \r
+            // lbl_deblockVal\r
+            // \r
+            this.lbl_deblockVal.AutoSize = true;\r
+            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_deblockVal.Location = new System.Drawing.Point(301, 147);\r
+            this.lbl_deblockVal.Name = "lbl_deblockVal";\r
+            this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13);\r
+            this.lbl_deblockVal.TabIndex = 59;\r
+            this.lbl_deblockVal.Text = "Off";\r
+            // \r
+            // label68\r
+            // \r
+            this.label68.AutoSize = true;\r
+            this.label68.BackColor = System.Drawing.Color.Transparent;\r
+            this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label68.Location = new System.Drawing.Point(13, 13);\r
+            this.label68.Name = "label68";\r
+            this.label68.Size = new System.Drawing.Size(49, 13);\r
+            this.label68.TabIndex = 61;\r
+            this.label68.Text = "Filters";\r
+            // \r
+            // Filters\r
+            // \r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            this.BackColor = System.Drawing.Color.Transparent;\r
+            this.Controls.Add(this.label68);\r
+            this.Controls.Add(this.slider_deblock);\r
+            this.Controls.Add(this.check_grayscale);\r
+            this.Controls.Add(this.label8);\r
+            this.Controls.Add(this.lbl_deblockVal);\r
+            this.Controls.Add(this.text_customDN);\r
+            this.Controls.Add(this.label3);\r
+            this.Controls.Add(this.drop_denoise);\r
+            this.Controls.Add(this.text_customDI);\r
+            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.drop_deinterlace);\r
+            this.Controls.Add(this.text_customDC);\r
+            this.Controls.Add(this.label1);\r
+            this.Controls.Add(this.drop_decomb);\r
+            this.Controls.Add(this.text_customDT);\r
+            this.Controls.Add(this.label18);\r
+            this.Controls.Add(this.drop_detelecine);\r
+            this.Name = "Filters";\r
+            this.Size = new System.Drawing.Size(592, 270);\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();\r
+            this.ResumeLayout(false);\r
+            this.PerformLayout();\r
+\r
+        }\r
+\r
+        #endregion\r
+\r
+        private System.Windows.Forms.TextBox text_customDT;\r
+        private System.Windows.Forms.Label label18;\r
+        internal System.Windows.Forms.ComboBox drop_detelecine;\r
+        private System.Windows.Forms.TextBox text_customDC;\r
+        internal System.Windows.Forms.Label label1;\r
+        internal System.Windows.Forms.ComboBox drop_decomb;\r
+        private System.Windows.Forms.TextBox text_customDI;\r
+        internal System.Windows.Forms.Label label2;\r
+        internal System.Windows.Forms.ComboBox drop_deinterlace;\r
+        private System.Windows.Forms.TextBox text_customDN;\r
+        internal System.Windows.Forms.Label label3;\r
+        internal System.Windows.Forms.ComboBox drop_denoise;\r
+        internal System.Windows.Forms.TrackBar slider_deblock;\r
+        internal System.Windows.Forms.CheckBox check_grayscale;\r
+        internal System.Windows.Forms.Label label8;\r
+        internal System.Windows.Forms.Label lbl_deblockVal;\r
+        internal System.Windows.Forms.Label label68;\r
+    }\r
+}\r
diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
new file mode 100644 (file)
index 0000000..22d2c57
--- /dev/null
@@ -0,0 +1,246 @@
+using System;\r
+using System.Windows.Forms;\r
+\r
+namespace Handbrake.Controls\r
+{\r
+    public partial class Filters : UserControl\r
+    {\r
+        public Filters()\r
+        {\r
+            InitializeComponent();\r
+            drop_decomb.SelectedIndex = 0;\r
+            drop_deinterlace.SelectedIndex = 0;\r
+            drop_denoise.SelectedIndex = 0;\r
+            drop_detelecine.SelectedIndex = 0;\r
+        }\r
+\r
+        // Controls\r
+        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDT.Visible = drop_detelecine.Text == "Custom";\r
+        }\r
+        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDC.Visible = drop_decomb.Text == "Custom";\r
+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
+                drop_deinterlace.SelectedIndex = 0;\r
+        }\r
+        private void drop_deinterlace_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDI.Visible = drop_deinterlace.Text == "Custom";\r
+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
+                drop_decomb.SelectedIndex = 0;\r
+        }\r
+        private void drop_denoise_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDN.Visible = drop_denoise.Text == "Custom";\r
+        }\r
+        private void slider_deblock_Scroll(object sender, EventArgs e)\r
+        {\r
+            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();\r
+        }\r
+\r
+        // Returns the CLI query for the query generator.\r
+        public string getCLIQuery\r
+        {\r
+            get\r
+            {\r
+                string query = "";\r
+\r
+                switch (drop_detelecine.Text)  // DeTelecine\r
+                {\r
+                    case "Off":\r
+                        query += "";\r
+                        break;\r
+                    case "Default":\r
+                        query += " --detelecine";\r
+                        break;\r
+                    case "Custom":\r
+                        query += " --detelecine=\"" + text_customDT.Text + "\"";\r
+                        break;\r
+                    default:\r
+                        query += "";\r
+                        break;\r
+                }\r
+\r
+\r
+                switch (drop_decomb.Text) // Decomb\r
+                {\r
+                    case "Off":\r
+                        query += "";\r
+                        break;\r
+                    case "Default":\r
+                        query += " --decomb";\r
+                        break;\r
+                    case "Custom":\r
+                        query += " --decomb=\"" + text_customDC.Text + "\"";\r
+                        break;\r
+                    default:\r
+                        query += "";\r
+                        break;\r
+                }\r
+\r
+                switch (drop_deinterlace.Text) // DeInterlace\r
+                {\r
+                    case "None":\r
+                        query += "";\r
+                        break;\r
+                    case "Fast":\r
+                        query += " --deinterlace=\"fast\"";\r
+                        break;\r
+                    case "Slow":\r
+                        query += " --deinterlace=\"slow\"";\r
+                        break;\r
+                    case "Slower":\r
+                        query += " --deinterlace=\"slower\"";\r
+                        break;\r
+                    case "Custom":\r
+                        query += " --deinterlace=\"" + text_customDI.Text + "\"";\r
+                        break;\r
+                    default:\r
+                        query += "";\r
+                        break;\r
+                }\r
+\r
+                switch (drop_denoise.Text) // Denoise\r
+                {\r
+                    case "None":\r
+                        query += "";\r
+                        break;\r
+                    case "Weak":\r
+                        query += " --denoise=\"weak\"";\r
+                        break;\r
+                    case "Medium":\r
+                        query += " --denoise=\"medium\"";\r
+                        break;\r
+                    case "Strong":\r
+                        query += " --denoise=\"strong\"";\r
+                        break;\r
+                    case "Custom":\r
+                        query += " --denoise=\"" + text_customDN.Text + "\"";\r
+                        break;\r
+                    default:\r
+                        query += "";\r
+                        break;\r
+                }\r
+\r
+                if (slider_deblock.Value != 4)\r
+                    query += " --deblock=" + slider_deblock.Value;\r
+\r
+                if (check_grayscale.Checked)\r
+                    query += " -g ";\r
+\r
+                return query;\r
+            }\r
+        }\r
+\r
+        // Setup for each component for the preset loader.\r
+        public void setDeTelecine(string value)\r
+        {\r
+            text_customDT.Text = "";\r
+            text_customDT.Visible = false;\r
+            switch (value)\r
+            {\r
+                case "Off":\r
+                    drop_detelecine.SelectedIndex = 0;\r
+                    break;\r
+                case "Default":\r
+                    drop_detelecine.SelectedIndex = 1;\r
+                    break;\r
+                default:\r
+                    drop_detelecine.SelectedIndex = 2;\r
+                    text_customDT.Text = value;\r
+                    text_customDT.Visible = true;\r
+                    break;\r
+            }\r
+        }\r
+        public void setDeNoise(string value)\r
+        {\r
+            text_customDN.Text = "";\r
+            text_customDN.Visible = false;\r
+            switch (value)\r
+            {\r
+                case "None":\r
+                    drop_denoise.SelectedIndex = 0;\r
+                    break;\r
+                case "Weak":\r
+                    drop_denoise.SelectedIndex = 1;\r
+                    break;\r
+                case "Medium":\r
+                    drop_denoise.SelectedIndex = 2;\r
+                    break;\r
+                case "Strong":\r
+                    drop_denoise.SelectedIndex = 3;\r
+                    break;\r
+                default:\r
+                    drop_denoise.SelectedIndex = 4;\r
+                    text_customDN.Text = value;\r
+                    text_customDN.Visible = true;\r
+                    break;\r
+            }\r
+        }\r
+        public void setDeInterlace(string value)\r
+        {\r
+            text_customDI.Text = "";\r
+            text_customDI.Visible = false;\r
+            switch (value)\r
+            {\r
+\r
+                case "None":\r
+                    drop_deinterlace.SelectedIndex = 0;\r
+                    break;\r
+                case "Fast":\r
+                    drop_deinterlace.SelectedIndex = 1;\r
+                    break;\r
+                case "Slow":\r
+                    drop_deinterlace.SelectedIndex = 2;\r
+                    break;\r
+                case "Slower":\r
+                    drop_deinterlace.SelectedIndex = 3;\r
+\r
+                    break;\r
+                default:\r
+                    drop_deinterlace.SelectedIndex = 4;\r
+                    text_customDI.Text = value;\r
+                    text_customDI.Visible = true;\r
+                    break;\r
+            }\r
+        }\r
+        public void setDecomb(string value)\r
+        {\r
+            text_customDC.Text = "";\r
+            text_customDC.Visible = false;\r
+            switch (value)\r
+            {\r
+                case "Off":\r
+                    drop_decomb.SelectedIndex = 0;\r
+                    break;\r
+                case "Default":\r
+                    drop_decomb.SelectedIndex = 1;\r
+                    break;\r
+                default:\r
+                    drop_decomb.SelectedIndex = 2;\r
+                    text_customDC.Text = value;\r
+                    text_customDC.Visible = true;\r
+                    break;\r
+            }\r
+        }\r
+        public void setDeBlock(int value)\r
+        {\r
+            if (value != 0)\r
+            {\r
+                slider_deblock.Value = value;\r
+                lbl_deblockVal.Text = value.ToString();\r
+            }\r
+            else\r
+            {\r
+                slider_deblock.Value = 4;\r
+                lbl_deblockVal.Text = "Off";\r
+            }\r
+        }\r
+        public void setGrayScale(bool value)\r
+        {\r
+            check_grayscale.CheckState = value ? CheckState.Checked : CheckState.Unchecked;\r
+        } \r
+    }\r
+}\r
index 4952e5d3d8c661c5ffe049a79c3efb96207f9a5c..bcc4b1b2658f6a348b3efec6c1403317046499a1 100644 (file)
@@ -67,10 +67,10 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Picture\r
-            mainWindow.pictureSettings.check_autoCrop.Checked = true;\r
+            mainWindow.PictureSettings.check_autoCrop.Checked = true;\r
             if (presetQuery.CropBottom == "0" && presetQuery.CropTop == "0")\r
                 if (presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")\r
-                    mainWindow.pictureSettings.check_customCrop.Checked = true;\r
+                    mainWindow.PictureSettings.check_customCrop.Checked = true;\r
 \r
             if (pictureSettings) // only Load picture settings if the perset requires it\r
             {\r
@@ -82,75 +82,60 @@ namespace Handbrake.Functions
                     int.TryParse(presetQuery.CropLeft, out left);\r
                     int.TryParse(presetQuery.CropRight, out right);\r
 \r
-                    mainWindow.pictureSettings.check_customCrop.Checked = true;\r
-                    mainWindow.pictureSettings.crop_top.Value = top;\r
-                    mainWindow.pictureSettings.crop_bottom.Value = bottom;\r
-                    mainWindow.pictureSettings.crop_left.Value = left;\r
-                    mainWindow.pictureSettings.crop_right.Value = right;\r
+                    mainWindow.PictureSettings.check_customCrop.Checked = true;\r
+                    mainWindow.PictureSettings.crop_top.Value = top;\r
+                    mainWindow.PictureSettings.crop_bottom.Value = bottom;\r
+                    mainWindow.PictureSettings.crop_left.Value = left;\r
+                    mainWindow.PictureSettings.crop_right.Value = right;\r
                 }\r
             }\r
 \r
             // Reset maxWidth and MaxHeight to 0\r
-            mainWindow.pictureSettings.maxWidth = 0;\r
-            mainWindow.pictureSettings.maxHeight = 0;\r
+            mainWindow.PictureSettings.maxWidth = 0;\r
+            mainWindow.PictureSettings.maxHeight = 0;\r
 \r
             // Set the width and height\r
             if (presetQuery.Width != 0)\r
-                mainWindow.pictureSettings.text_width.Value = presetQuery.Width;\r
+                mainWindow.PictureSettings.text_width.Value = presetQuery.Width;\r
             else if (presetQuery.MaxWidth == 0)\r
-                mainWindow.pictureSettings.text_width.Value = 0;\r
+                mainWindow.PictureSettings.text_width.Value = 0;\r
 \r
-            mainWindow.pictureSettings.text_height.Value = presetQuery.Height != 0 ? presetQuery.Height : 0;\r
+            mainWindow.PictureSettings.text_height.Value = presetQuery.Height != 0 ? presetQuery.Height : 0;\r
 \r
             // Max Width/Height override Width/Height\r
             if (presetQuery.MaxWidth != 0)\r
             {\r
-                mainWindow.pictureSettings.text_width.Value = presetQuery.MaxWidth;\r
-                mainWindow.pictureSettings.maxWidth = presetQuery.MaxWidth;\r
+                mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth;\r
+                mainWindow.PictureSettings.maxWidth = presetQuery.MaxWidth;\r
             }\r
 \r
             if (presetQuery.MaxHeight != 0)\r
             {\r
-                mainWindow.pictureSettings.text_height.Value = presetQuery.MaxHeight;\r
-                mainWindow.pictureSettings.maxHeight = presetQuery.MaxHeight;\r
+                mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight;\r
+                mainWindow.PictureSettings.maxHeight = presetQuery.MaxHeight;\r
             }\r
-            mainWindow.pictureSettings.setMax();\r
+            mainWindow.PictureSettings.setMax();\r
 \r
             // Set the anamorphic mode 0,1,2,3\r
-            mainWindow.pictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;\r
+            mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;\r
 \r
             // Custom Anamorphic Controls\r
-            mainWindow.pictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;\r
-            mainWindow.pictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();\r
-            mainWindow.pictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();\r
-            mainWindow.pictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();\r
-            mainWindow.pictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;\r
+            mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;\r
+            mainWindow.PictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();\r
+            mainWindow.PictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();\r
+            mainWindow.PictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();\r
+            mainWindow.PictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;\r
 \r
 \r
             #endregion\r
 \r
             #region Filters\r
-\r
-            mainWindow.ctl_decomb.setOption(presetQuery.Decomb);\r
-\r
-            if (mainWindow.ctl_decomb.getDropValue == "Off")\r
-                mainWindow.ctl_deinterlace.setOption(presetQuery.DeInterlace);\r
-            else\r
-                mainWindow.ctl_deinterlace.setOption("None"); // Don't want decomb and deinterlace on at the same time\r
-\r
-            mainWindow.ctl_denoise.setOption(presetQuery.DeNoise);\r
-            mainWindow.ctl_detelecine.setOption(presetQuery.DeTelecine);\r
-\r
-            if (presetQuery.DeBlock != 0)\r
-            {\r
-                mainWindow.slider_deblock.Value = presetQuery.DeBlock;\r
-                mainWindow.lbl_deblockVal.Text = presetQuery.DeBlock.ToString();\r
-            }\r
-            else\r
-            {\r
-                mainWindow.slider_deblock.Value = 4;\r
-                mainWindow.lbl_deblockVal.Text = "Off";\r
-            }\r
+            mainWindow.Filters.setDecomb(presetQuery.Decomb);\r
+            mainWindow.Filters.setDeInterlace(presetQuery.DeInterlace);\r
+            mainWindow.Filters.setDeNoise(presetQuery.DeNoise);\r
+            mainWindow.Filters.setDeTelecine(presetQuery.DeTelecine);\r
+            mainWindow.Filters.setDeBlock(presetQuery.DeBlock);\r
+            mainWindow.Filters.setGrayScale(presetQuery.Grayscale);\r
             #endregion\r
 \r
             #region Video\r
@@ -210,7 +195,6 @@ namespace Handbrake.Functions
 \r
             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;\r
 \r
-            mainWindow.check_grayscale.CheckState = presetQuery.Grayscale ? CheckState.Checked : CheckState.Unchecked;\r
 \r
             mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;\r
 \r
@@ -232,12 +216,12 @@ namespace Handbrake.Functions
 \r
             #region Audio\r
             // Clear the audio listing\r
-            mainWindow.audioPanel.clearAudioList();\r
+            mainWindow.AudioSettings.clearAudioList();\r
 \r
             if (presetQuery.AudioInformation != null)\r
                 foreach (AudioTrack track in presetQuery.AudioInformation)\r
                 {\r
-                    ListViewItem newTrack = new ListViewItem(mainWindow.audioPanel.getNewID().ToString());\r
+                    ListViewItem newTrack = new ListViewItem(mainWindow.AudioSettings.getNewID().ToString());\r
 \r
                     newTrack.SubItems.Add("Automatic");\r
                     newTrack.SubItems.Add(track.Encoder);\r
@@ -248,7 +232,7 @@ namespace Handbrake.Functions
                     else\r
                         newTrack.SubItems.Add(track.Bitrate);\r
                     newTrack.SubItems.Add(track.DRC);\r
-                    mainWindow.audioPanel.addTrackForPreset(newTrack);\r
+                    mainWindow.AudioSettings.addTrackForPreset(newTrack);\r
                 }\r
             #endregion\r
 \r
index b818424386e17e996042c926162288d32b816d37..604688612ad27ffe36d283b662081ea88fc7b6b7 100644 (file)
@@ -117,53 +117,53 @@ namespace Handbrake.Functions
             #region Picture Settings Tab\r
 \r
             // Use MaxWidth for built-in presets and width for user settings.\r
-            if (mainWindow.pictureSettings.maxWidth == 0)\r
+            if (mainWindow.PictureSettings.maxWidth == 0)\r
             {\r
 \r
-                if (mainWindow.pictureSettings.text_width.Text != "")\r
-                    if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic\r
-                        query += " -w " + mainWindow.pictureSettings.text_width.Text;\r
+                if (mainWindow.PictureSettings.text_width.Text != "")\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic\r
+                        query += " -w " + mainWindow.PictureSettings.text_width.Text;\r
             }\r
             else\r
             {\r
-                if (mainWindow.pictureSettings.text_width.Text != "")\r
-                    query += " -X " + mainWindow.pictureSettings.text_width.Text;\r
+                if (mainWindow.PictureSettings.text_width.Text != "")\r
+                    query += " -X " + mainWindow.PictureSettings.text_width.Text;\r
             }\r
 \r
             // Use MaxHeight for built-in presets and height for user settings.\r
-            if (mainWindow.pictureSettings.maxHeight == 0)\r
+            if (mainWindow.PictureSettings.maxHeight == 0)\r
             {\r
-                if (mainWindow.pictureSettings.text_height.Text != "0")\r
-                    if (mainWindow.pictureSettings.text_height.Text != "")\r
-                        if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
-                            query += " -l " + mainWindow.pictureSettings.text_height.Text;\r
+                if (mainWindow.PictureSettings.text_height.Text != "0")\r
+                    if (mainWindow.PictureSettings.text_height.Text != "")\r
+                        if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
+                            query += " -l " + mainWindow.PictureSettings.text_height.Text;\r
             }\r
             else\r
             {\r
-                if (mainWindow.pictureSettings.text_height.Text != "")\r
-                    query += " -Y " + mainWindow.pictureSettings.text_height.Text;\r
+                if (mainWindow.PictureSettings.text_height.Text != "")\r
+                    query += " -Y " + mainWindow.PictureSettings.text_height.Text;\r
             }\r
 \r
-            string cropTop = mainWindow.pictureSettings.crop_top.Text;\r
-            string cropBottom = mainWindow.pictureSettings.crop_bottom.Text;\r
-            string cropLeft = mainWindow.pictureSettings.crop_left.Text;\r
-            string cropRight = mainWindow.pictureSettings.crop_right.Text;\r
+            string cropTop = mainWindow.PictureSettings.crop_top.Text;\r
+            string cropBottom = mainWindow.PictureSettings.crop_bottom.Text;\r
+            string cropLeft = mainWindow.PictureSettings.crop_left.Text;\r
+            string cropRight = mainWindow.PictureSettings.crop_right.Text;\r
 \r
-            if (mainWindow.pictureSettings.check_customCrop.Checked)\r
+            if (mainWindow.PictureSettings.check_customCrop.Checked)\r
             {\r
-                if (mainWindow.pictureSettings.crop_top.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_top.Text == string.Empty)\r
                     cropTop = "0";\r
-                if (mainWindow.pictureSettings.crop_bottom.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_bottom.Text == string.Empty)\r
                     cropBottom = "0";\r
-                if (mainWindow.pictureSettings.crop_left.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_left.Text == string.Empty)\r
                     cropLeft = "0";\r
-                if (mainWindow.pictureSettings.crop_right.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_right.Text == string.Empty)\r
                     cropRight = "0";\r
 \r
                 query += " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;\r
             }\r
 \r
-            switch (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex)\r
+            switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)\r
             {\r
                 case 1:\r
                     query += " --strict-anamorphic ";\r
@@ -173,23 +173,17 @@ namespace Handbrake.Functions
                     break;\r
                 case 3:\r
                     query += " --custom-anamorphic ";\r
-                    query += " --display-width " + mainWindow.pictureSettings.txt_displayWidth.Text + " ";\r
-                    if (mainWindow.pictureSettings.check_KeepAR.Checked)\r
+                    query += " --display-width " + mainWindow.PictureSettings.txt_displayWidth.Text + " ";\r
+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
                         query += " --keep-display-aspect ";\r
-                    if (mainWindow.pictureSettings.txt_parWidth.Text != "" && mainWindow.pictureSettings.txt_parHeight.Text != "")\r
-                        query += " --pixel-aspect " + mainWindow.pictureSettings.txt_parWidth.Text + ":" + mainWindow.pictureSettings.txt_parHeight.Text + " ";\r
+                    if (mainWindow.PictureSettings.txt_parWidth.Text != "" && mainWindow.PictureSettings.txt_parHeight.Text != "")\r
+                        query += " --pixel-aspect " + mainWindow.PictureSettings.txt_parWidth.Text + ":" + mainWindow.PictureSettings.txt_parHeight.Text + " ";\r
                     break;\r
             }\r
             #endregion\r
 \r
             #region Filters\r
-            query += mainWindow.ctl_detelecine.getCLIQuery;\r
-            query += mainWindow.ctl_decomb.getCLIQuery;\r
-            query += mainWindow.ctl_deinterlace.getCLIQuery;\r
-            query += mainWindow.ctl_denoise.getCLIQuery;\r
-\r
-            if (mainWindow.slider_deblock.Value != 4)\r
-                query += " --deblock=" + mainWindow.slider_deblock.Value;\r
+            query += mainWindow.Filters.getCLIQuery;           \r
             #endregion\r
 \r
             #region Video Settings Tab\r
@@ -210,9 +204,6 @@ namespace Handbrake.Functions
                     break;\r
             }\r
 \r
-            if (mainWindow.check_grayscale.Checked)\r
-                query += " -g ";\r
-\r
             // Video Settings\r
             if (mainWindow.radio_avgBitrate.Checked)\r
                 query += " -b " + mainWindow.text_bitrate.Text;\r
@@ -260,7 +251,7 @@ namespace Handbrake.Functions
 \r
             #region Audio Settings Tab\r
 \r
-            ListView audioTracks = mainWindow.audioPanel.getAudioPanel();\r
+            ListView audioTracks = mainWindow.AudioSettings.getAudioPanel();\r
             List<string> tracks = new List<string>();\r
             List<string> codecs = new List<string>();\r
             List<string> mixdowns = new List<string>();\r
index 9f0b793c8ba1ca7269e4a216f49325a1eb091fd8..a9727def5175d6c59777a7ff3405fdeda6cee0cf 100644 (file)
     <Compile Include="Controls\AudioPanel.Designer.cs">\r
       <DependentUpon>AudioPanel.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Controls\Denoise.cs">\r
+    <Compile Include="Controls\Filters.cs">\r
       <SubType>UserControl</SubType>\r
     </Compile>\r
-    <Compile Include="Controls\Denoise.Designer.cs">\r
-      <DependentUpon>Denoise.cs</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\Decomb.cs">\r
-      <SubType>UserControl</SubType>\r
-    </Compile>\r
-    <Compile Include="Controls\Decomb.Designer.cs">\r
-      <DependentUpon>Decomb.cs</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\Detelecine.cs">\r
-      <SubType>UserControl</SubType>\r
-    </Compile>\r
-    <Compile Include="Controls\Detelecine.Designer.cs">\r
-      <DependentUpon>Detelecine.cs</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\Deinterlace.cs">\r
-      <SubType>UserControl</SubType>\r
-    </Compile>\r
-    <Compile Include="Controls\Deinterlace.Designer.cs">\r
-      <DependentUpon>Deinterlace.cs</DependentUpon>\r
+    <Compile Include="Controls\Filters.Designer.cs">\r
+      <DependentUpon>Filters.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Controls\PictureSettings.cs">\r
       <SubType>UserControl</SubType>\r
       <DependentUpon>AudioPanel.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Controls\Denoise.resx">\r
-      <DependentUpon>Denoise.cs</DependentUpon>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Controls\Decomb.resx">\r
-      <DependentUpon>Decomb.cs</DependentUpon>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Controls\Detelecine.resx">\r
-      <DependentUpon>Detelecine.cs</DependentUpon>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Controls\Deinterlace.resx">\r
-      <DependentUpon>Deinterlace.cs</DependentUpon>\r
+    <EmbeddedResource Include="Controls\Filters.resx">\r
+      <DependentUpon>Filters.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="Controls\PictureSettings.resx">\r
index d7af96a671ad8911fb52b52e3ffd875001edca79..b500e364806ab7b2ed66716316ca7651a70b0186 100644 (file)
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -107,7 +107,7 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
-            this.audioPanel = new Handbrake.Controls.AudioPanel();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
@@ -118,20 +118,11 @@ namespace Handbrake
             this.Label2 = new System.Windows.Forms.Label();\r
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
-            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
-            this.pictureSettings = new Handbrake.Controls.PictureSettings();\r
-            this.slider_deblock = new System.Windows.Forms.TrackBar();\r
-            this.label8 = new System.Windows.Forms.Label();\r
-            this.lbl_deblockVal = new System.Windows.Forms.Label();\r
-            this.label24 = new System.Windows.Forms.Label();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
-            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
-            this.ctl_denoise = new Handbrake.Denoise();\r
-            this.ctl_decomb = new Handbrake.Decomb();\r
-            this.ctl_detelecine = new Handbrake.Detelecine();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
             this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
@@ -172,6 +163,7 @@ namespace Handbrake
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.hbproc = new System.Diagnostics.Process();\r
+            this.Filters = new Handbrake.Controls.Filters();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -182,7 +174,6 @@ namespace Handbrake
             this.tab_audio.SuspendLayout();\r
             this.tab_video.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();\r
             this.tabs_panel.SuspendLayout();\r
             this.tab_filters.SuspendLayout();\r
             this.tab_subtitles.SuspendLayout();\r
@@ -443,9 +434,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -889,7 +880,7 @@ namespace Handbrake
             // tab_audio\r
             // \r
             this.tab_audio.BackColor = System.Drawing.Color.Transparent;\r
-            this.tab_audio.Controls.Add(this.audioPanel);\r
+            this.tab_audio.Controls.Add(this.AudioSettings);\r
             this.tab_audio.Location = new System.Drawing.Point(4, 22);\r
             this.tab_audio.Name = "tab_audio";\r
             this.tab_audio.Padding = new System.Windows.Forms.Padding(3);\r
@@ -898,13 +889,13 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
-            // audioPanel\r
+            // AudioSettings\r
             // \r
-            this.audioPanel.BackColor = System.Drawing.Color.Transparent;\r
-            this.audioPanel.Location = new System.Drawing.Point(0, 0);\r
-            this.audioPanel.Name = "audioPanel";\r
-            this.audioPanel.Size = new System.Drawing.Size(715, 310);\r
-            this.audioPanel.TabIndex = 0;\r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
             // \r
             // AudioMenuRowHeightHack\r
             // \r
@@ -1030,22 +1021,10 @@ namespace Handbrake
             this.Label46.TabIndex = 1;\r
             this.Label46.Text = "Framerate (FPS):";\r
             // \r
-            // check_grayscale\r
-            // \r
-            this.check_grayscale.AutoSize = true;\r
-            this.check_grayscale.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_grayscale.Location = new System.Drawing.Point(25, 210);\r
-            this.check_grayscale.Name = "check_grayscale";\r
-            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
-            this.check_grayscale.TabIndex = 5;\r
-            this.check_grayscale.Text = "Grayscale Encoding";\r
-            this.check_grayscale.UseVisualStyleBackColor = false;\r
-            // \r
             // tab_picture\r
             // \r
             this.tab_picture.BackColor = System.Drawing.Color.Transparent;\r
-            this.tab_picture.Controls.Add(this.pictureSettings);\r
+            this.tab_picture.Controls.Add(this.PictureSettings);\r
             this.tab_picture.Location = new System.Drawing.Point(4, 22);\r
             this.tab_picture.Name = "tab_picture";\r
             this.tab_picture.Padding = new System.Windows.Forms.Padding(3);\r
@@ -1054,56 +1033,12 @@ namespace Handbrake
             this.tab_picture.Text = "Picture Settings";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
-            // pictureSettings\r
-            // \r
-            this.pictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.pictureSettings.Name = "pictureSettings";\r
-            this.pictureSettings.Size = new System.Drawing.Size(713, 310);\r
-            this.pictureSettings.TabIndex = 0;\r
-            // \r
-            // slider_deblock\r
-            // \r
-            this.slider_deblock.Location = new System.Drawing.Point(118, 162);\r
-            this.slider_deblock.Maximum = 15;\r
-            this.slider_deblock.Minimum = 4;\r
-            this.slider_deblock.Name = "slider_deblock";\r
-            this.slider_deblock.Size = new System.Drawing.Size(174, 45);\r
-            this.slider_deblock.TabIndex = 35;\r
-            this.slider_deblock.Value = 4;\r
-            this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);\r
-            // \r
-            // label8\r
-            // \r
-            this.label8.AutoSize = true;\r
-            this.label8.BackColor = System.Drawing.Color.Transparent;\r
-            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(22, 167);\r
-            this.label8.Name = "label8";\r
-            this.label8.Size = new System.Drawing.Size(58, 13);\r
-            this.label8.TabIndex = 37;\r
-            this.label8.Text = "Deblock:";\r
-            // \r
-            // lbl_deblockVal\r
-            // \r
-            this.lbl_deblockVal.AutoSize = true;\r
-            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_deblockVal.Location = new System.Drawing.Point(296, 167);\r
-            this.lbl_deblockVal.Name = "lbl_deblockVal";\r
-            this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13);\r
-            this.lbl_deblockVal.TabIndex = 36;\r
-            this.lbl_deblockVal.Text = "Off";\r
-            // \r
-            // label24\r
-            // \r
-            this.label24.AutoSize = true;\r
-            this.label24.BackColor = System.Drawing.Color.Transparent;\r
-            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(13, 13);\r
-            this.label24.Name = "label24";\r
-            this.label24.Size = new System.Drawing.Size(49, 13);\r
-            this.label24.TabIndex = 22;\r
-            this.label24.Text = "Filters";\r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r
+            this.PictureSettings.TabIndex = 0;\r
             // \r
             // Check_ChapterMarkers\r
             // \r
@@ -1138,15 +1073,7 @@ namespace Handbrake
             // \r
             // tab_filters\r
             // \r
-            this.tab_filters.Controls.Add(this.ctl_deinterlace);\r
-            this.tab_filters.Controls.Add(this.ctl_denoise);\r
-            this.tab_filters.Controls.Add(this.ctl_decomb);\r
-            this.tab_filters.Controls.Add(this.ctl_detelecine);\r
-            this.tab_filters.Controls.Add(this.slider_deblock);\r
-            this.tab_filters.Controls.Add(this.label24);\r
-            this.tab_filters.Controls.Add(this.check_grayscale);\r
-            this.tab_filters.Controls.Add(this.label8);\r
-            this.tab_filters.Controls.Add(this.lbl_deblockVal);\r
+            this.tab_filters.Controls.Add(this.Filters);\r
             this.tab_filters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_filters.Name = "tab_filters";\r
             this.tab_filters.Size = new System.Drawing.Size(724, 316);\r
@@ -1154,48 +1081,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
-            // ctl_deinterlace\r
-            // \r
-            this.ctl_deinterlace.AutoSize = true;\r
-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_deinterlace.TabIndex = 41;\r
-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
-            // \r
-            // ctl_denoise\r
-            // \r
-            this.ctl_denoise.AutoSize = true;\r
-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_denoise.Name = "ctl_denoise";\r
-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_denoise.TabIndex = 40;\r
-            // \r
-            // ctl_decomb\r
-            // \r
-            this.ctl_decomb.AutoSize = true;\r
-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_decomb.Name = "ctl_decomb";\r
-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_decomb.TabIndex = 39;\r
-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
-            // \r
-            // ctl_detelecine\r
-            // \r
-            this.ctl_detelecine.AutoSize = true;\r
-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_detelecine.Name = "ctl_detelecine";\r
-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_detelecine.TabIndex = 38;\r
-            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -1619,6 +1504,13 @@ namespace Handbrake
             this.hbproc.StartInfo.UserName = "";\r
             this.hbproc.SynchronizingObject = this;\r
             // \r
+            // Filters\r
+            // \r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(519, 275);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -1652,10 +1544,8 @@ namespace Handbrake
             this.tab_video.ResumeLayout(false);\r
             this.tab_video.PerformLayout();\r
             this.tab_picture.ResumeLayout(false);\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();\r
             this.tabs_panel.ResumeLayout(false);\r
             this.tab_filters.ResumeLayout(false);\r
-            this.tab_filters.PerformLayout();\r
             this.tab_subtitles.ResumeLayout(false);\r
             this.tab_chapters.ResumeLayout(false);\r
             this.tab_chapters.PerformLayout();\r
@@ -1724,8 +1614,6 @@ namespace Handbrake
         internal System.Windows.Forms.TabControl tabs_panel;\r
         internal System.Windows.Forms.Label Label46;\r
         private System.Windows.Forms.GroupBox groupBox_dest;\r
-        internal System.Windows.Forms.CheckBox check_grayscale;\r
-        internal System.Windows.Forms.Label label24;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
         internal System.Windows.Forms.Button btn_setDefault;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;\r
@@ -1776,9 +1664,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;\r
         private System.Windows.Forms.StatusStrip StatusStrip;\r
         private System.Windows.Forms.ToolStripStatusLabel lbl_encode;\r
-        internal System.Windows.Forms.Label lbl_deblockVal;\r
-        internal System.Windows.Forms.TrackBar slider_deblock;\r
-        internal System.Windows.Forms.Label label8;\r
         internal System.Windows.Forms.OpenFileDialog ISO_Open;\r
         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive;\r
@@ -1792,10 +1677,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem pmnu_saveChanges;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_killCLI;\r
         private System.Windows.Forms.TabPage tab_filters;\r
-        internal Deinterlace ctl_deinterlace;\r
-        internal Denoise ctl_denoise;\r
-        internal Decomb ctl_decomb;\r
-        internal Detelecine ctl_detelecine;\r
         internal System.Windows.Forms.RadioButton radio_cq;\r
         internal System.Windows.Forms.RadioButton radio_avgBitrate;\r
         internal System.Windows.Forms.RadioButton radio_targetFilesize;\r
@@ -1808,9 +1689,10 @@ namespace Handbrake
         internal ComboBox drop_angle;\r
         internal Label lbl_angle;\r
         private TabPage tab_subtitles;\r
-        internal Handbrake.Controls.AudioPanel audioPanel;\r
-        internal Handbrake.Controls.PictureSettings pictureSettings;\r
+        internal Handbrake.Controls.AudioPanel AudioSettings;\r
+        internal Handbrake.Controls.PictureSettings PictureSettings;\r
         internal Handbrake.Controls.Subtitles Subtitles;\r
+        internal Handbrake.Controls.Filters Filters;\r
 \r
  \r
     }\r
index 55da10ae337faf54b384e3f892d0997007eec56b..29622cb0af4b9a019a1ad79c1afc70ecd7b231e9 100644 (file)
@@ -751,7 +751,7 @@ namespace Handbrake
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             // Reset some values on the form\r
-            pictureSettings.lbl_Aspect.Text = "Select a Title";\r
+            PictureSettings.lbl_Aspect.Text = "Select a Title";\r
             //lbl_RecomendedCrop.Text = "Select a Title";\r
             drop_chapterStart.Items.Clear();\r
             drop_chapterFinish.Items.Clear();\r
@@ -762,7 +762,7 @@ namespace Handbrake
             {\r
                 selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;\r
                 lbl_duration.Text = selectedTitle.Duration.ToString();\r
-                pictureSettings.setComponentsAfterScan(selectedTitle);  // Setup Picture Settings Tab Control\r
+                PictureSettings.setComponentsAfterScan(selectedTitle);  // Setup Picture Settings Tab Control\r
 \r
                 // Populate the Angles dropdown\r
                 drop_angle.Items.Clear();\r
@@ -793,7 +793,7 @@ namespace Handbrake
                     drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
 \r
                 // Populate the Audio Channels Dropdown\r
-                audioPanel.setTrackList(selectedTitle);\r
+                AudioSettings.setTrackList(selectedTitle);\r
 \r
                 // Populate the Subtitles dropdown\r
                 Subtitles.drp_subtitleTracks.Items.Clear();\r
@@ -983,7 +983,7 @@ namespace Handbrake
             else if (drop_format.SelectedIndex == 2)\r
                 setExtension(".mkv");\r
 \r
-            audioPanel.setAudioByContainer(drop_format.Text);\r
+            AudioSettings.setAudioByContainer(drop_format.Text);\r
             Subtitles.setContainer(drop_format.SelectedIndex);\r
 \r
             string oldval;\r
@@ -1179,24 +1179,6 @@ namespace Handbrake
             }\r
         }\r
 \r
-        // Filter Tab\r
-        private void ctl_decomb_changed(object sender, EventArgs e)\r
-        {\r
-            if (ctl_decomb.getDropValue != "Off")\r
-                if (ctl_deinterlace.getDropValue != "None")\r
-                    ctl_deinterlace.setOption("None");\r
-        }\r
-        private void ctl_deinterlace_changed(object sender, EventArgs e)\r
-        {\r
-            if (ctl_detelecine.getDropValue != "None")\r
-                if (ctl_decomb.getDropValue != "Off")\r
-                    ctl_decomb.setOption("Off");\r
-        }\r
-        private void slider_deblock_Scroll(object sender, EventArgs e)\r
-        {\r
-            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();\r
-        }\r
-\r
         // Chapter Marker Tab\r
         private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)\r
         {\r
@@ -1420,8 +1402,8 @@ namespace Handbrake
             drop_chapterFinish.Items.Clear();\r
             drop_chapterFinish.Text = "Auto";\r
             lbl_duration.Text = "Select a Title";\r
-            pictureSettings.lbl_src_res.Text = "Select a Title";\r
-            pictureSettings.lbl_Aspect.Text = "Select a Title";\r
+            PictureSettings.lbl_src_res.Text = "Select a Title";\r
+            PictureSettings.lbl_Aspect.Text = "Select a Title";\r
             text_source.Text = "Click 'Source' to continue";\r
             text_destination.Text = "";\r
             thisDVD = null;\r
@@ -1596,7 +1578,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-\r
         // This is the END of the road ****************************************\r
     }\r
 }
\ No newline at end of file