WinGui:

- Advanced options panel for ffmpeg mpeg-4 encoder options.
- Bug fixes in the new preset service and handling code.

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

3 files changed, 282 insertions, 0 deletions

diff --git a/win/C#/Controls/AdvancedEncoderOpts.Designer.cs b/win/C#/Controls/AdvancedEncoderOpts.Designer.cs
new file mode 100644
index 000000000..4ee6d85cf
--- /dev/null
+++ b/win/C#/Controls/AdvancedEncoderOpts.Designer.cs
@@ -0,0 +1,100 @@
+/*  x264Panel.Designer.cs $

+ 	

+ 	   This file is part of the HandBrake source code.

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

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

+

+namespace Handbrake.Controls

+{

+    partial class AdvancedEncoderOpts

+    {

+        /// <summary> 

+        /// Required designer variable.

+        /// </summary>

+        private System.ComponentModel.IContainer components = null;

+

+        /// <summary> 

+        /// Clean up any resources being used.

+        /// </summary>

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

+        protected override void Dispose(bool disposing)

+        {

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

+            {

+                components.Dispose();

+            }

+            base.Dispose(disposing);

+        }

+

+        #region Component Designer generated code

+

+        /// <summary> 

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

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

+        /// </summary>

+        private void InitializeComponent()

+        {

+            this.components = new System.ComponentModel.Container();

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

+            this.advancedQuery = new System.Windows.Forms.RichTextBox();

+            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

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

+            this.SuspendLayout();

+            // 

+            // label43

+            // 

+            this.label43.AutoSize = true;

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

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

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

+            this.label43.Name = "label43";

+            this.label43.Size = new System.Drawing.Size(63, 13);

+            this.label43.TabIndex = 49;

+            this.label43.Text = "Advanced";

+            // 

+            // advancedQuery

+            // 

+            this.advancedQuery.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

+            this.advancedQuery.Location = new System.Drawing.Point(16, 53);

+            this.advancedQuery.Name = "advancedQuery";

+            this.advancedQuery.Size = new System.Drawing.Size(688, 128);

+            this.advancedQuery.TabIndex = 80;

+            this.advancedQuery.Text = "";

+            // 

+            // ToolTip

+            // 

+            this.ToolTip.Active = false;

+            this.ToolTip.AutomaticDelay = 1000;

+            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;

+            // 

+            // label64

+            // 

+            this.label64.AutoSize = true;

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

+            this.label64.Name = "label64";

+            this.label64.Size = new System.Drawing.Size(163, 13);

+            this.label64.TabIndex = 81;

+            this.label64.Text = "Encoder advanced option string:";

+            // 

+            // x264Panel

+            // 

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

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

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

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

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

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

+            this.Size = new System.Drawing.Size(720, 305);

+            this.ResumeLayout(false);

+            this.PerformLayout();

+

+        }

+

+        #endregion

+

+        internal System.Windows.Forms.Label label43;

+        internal System.Windows.Forms.RichTextBox advancedQuery;

+        private System.Windows.Forms.ToolTip ToolTip;

+        internal System.Windows.Forms.Label label64;

+    }

+}

diff --git a/win/C#/Controls/AdvancedEncoderOpts.cs b/win/C#/Controls/AdvancedEncoderOpts.cs
new file mode 100644
index 000000000..8eb2e8ae7
--- /dev/null
+++ b/win/C#/Controls/AdvancedEncoderOpts.cs
@@ -0,0 +1,59 @@
+/*  AdvancedEncoderOpts.cs $

+    This file is part of the HandBrake source code.

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

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

+

+namespace Handbrake.Controls

+{

+    using System.Windows.Forms;

+

+    /// <summary>

+    /// The x264 Panel

+    /// </summary>

+    public partial class AdvancedEncoderOpts : UserControl

+    {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="AdvancedEncoderOpts"/> class. 

+        /// </summary>

+        public AdvancedEncoderOpts()

+        {

+            InitializeComponent();

+

+            if (Properties.Settings.Default.tooltipEnable)

+                ToolTip.Active = true;

+        }

+

+        /// <summary>

+        /// Gets or sets the X264 query string

+        /// </summary>

+        public string AdavancedQuery

+        {

+            get

+            {

+                return advancedQuery.Text;

+            }

+

+            set

+            {

+                advancedQuery.Text = value;

+            }

+        }

+

+        public bool IsDisabled

+        {

+            set

+            {

+                if (value)

+                {

+                    this.advancedQuery.Enabled = false;

+                    this.advancedQuery.Text = "Advanced encoder option passthrough is not currently supported for the encoder you have chosen.";

+                }

+                else

+                {

+                    this.advancedQuery.Enabled = true;

+                    this.advancedQuery.Text = string.Empty;

+                }

+            }

+        }

+    }

+}
\ No newline at end of file
diff --git a/win/C#/Controls/AdvancedEncoderOpts.resx b/win/C#/Controls/AdvancedEncoderOpts.resx
new file mode 100644
index 000000000..89a8b3473
--- /dev/null
+++ b/win/C#/Controls/AdvancedEncoderOpts.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

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

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

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

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

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

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

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

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

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

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

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

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

+    </data>

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

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

+        <comment>This is a comment</comment>

+    </data>

+                

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

+    name/value pairs.

+    

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

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

+    text/value conversion through the TypeConverter architecture. 

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

+    mimetype set.

+    

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

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

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

+    

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

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

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

+    value   : The object must be serialized with 

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

+            : and then encoded with base64 encoding.

+    

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

+    value   : The object must be serialized with 

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

+            : and then encoded with base64 encoding.

+

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

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

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

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

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

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

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

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

+              </xsd:sequence>

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

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

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

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

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

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

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

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

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

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

+              </xsd:sequence>

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

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

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

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

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

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

+              </xsd:sequence>

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

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

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

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

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

+  </resheader>

+  <resheader name="writer">

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

+  </resheader>

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>17, 17</value>

+  </metadata>

+</root>
\ No newline at end of file