OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 14 Mar 2008 19:47:17 +0000 (19:47 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 14 Mar 2008 19:47:17 +0000 (19:47 +0000)
- Users can now have their own presets appear in the presets bar. They can both add and remove their own presets.
- Anamorphic option is now a dropdown menu like the macgui.
- Video tab re-arrange  to be consistant with the macgui.
- Video Framerate dropdown: Changed Automatic to Same as soure (same as the macgui)

git-svn-id: svn://localhost/HandBrake/trunk@1338 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/Functions/Common.cs
win/C#/HandBrakeCS.csproj
win/C#/frmAddPreset.Designer.cs [new file with mode: 0644]
win/C#/frmAddPreset.cs [new file with mode: 0644]
win/C#/frmAddPreset.resx [new file with mode: 0644]
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmMain.resx

index 9b00fdc..8d70523 100644 (file)
@@ -206,21 +206,24 @@ namespace Handbrake.Functions
 \r
 \r
             if (presetQuery.Anamorphic == true)\r
-                mainWindow.CheckPixelRatio.CheckState = CheckState.Checked;\r
+                mainWindow.drp_anamorphic.SelectedIndex = 1;\r
             else\r
-                mainWindow.CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+                mainWindow.drp_anamorphic.SelectedIndex = 0;\r
 \r
             if (presetQuery.LooseAnamorphic == true)\r
-                mainWindow.check_lAnamorphic.CheckState = CheckState.Checked;\r
+                mainWindow.drp_anamorphic.SelectedIndex = 2;\r
             else\r
-                mainWindow.check_lAnamorphic.CheckState = CheckState.Unchecked;\r
+            {\r
+                if (presetQuery.Anamorphic != true)\r
+                    mainWindow.drp_anamorphic.SelectedIndex = 0;\r
+            }\r
+\r
 \r
             if (presetQuery.Width != 0)\r
                 mainWindow.text_width.Text = presetQuery.Width.ToString();\r
             else\r
             {\r
                 mainWindow.text_width.Text = "";\r
-                mainWindow.text_width.BackColor = Color.White;\r
             }\r
 \r
             if (presetQuery.Height != 0)\r
@@ -228,7 +231,6 @@ namespace Handbrake.Functions
             else\r
             {\r
                 mainWindow.text_height.Text = "";\r
-                mainWindow.text_height.BackColor = Color.White;\r
             }\r
 \r
             if (presetQuery.VFR == true)\r
@@ -268,7 +270,10 @@ namespace Handbrake.Functions
             if (presetQuery.LargeMP4 == true)\r
                 mainWindow.check_largeFile.CheckState = CheckState.Checked;\r
             else\r
+            {\r
                 mainWindow.check_largeFile.CheckState = CheckState.Unchecked;\r
+                mainWindow.check_largeFile.BackColor = Color.Transparent;\r
+            }\r
 \r
             \r
 \r
@@ -495,8 +500,13 @@ namespace Handbrake.Functions
             if (mainWindow.check_grayscale.Checked)\r
                 grayscale = " -g ";\r
 \r
-            if (mainWindow.CheckPixelRatio.Checked)\r
+            if (mainWindow.drp_anamorphic.SelectedIndex == 1)\r
                 pixelRatio = " -p ";\r
+            else if (mainWindow.drp_anamorphic.SelectedIndex == 2)\r
+                pixelRatio = " -P ";\r
+            else\r
+                pixelRatio = " ";\r
+                \r
 \r
             if (mainWindow.check_deblock.Checked)\r
                 deblock = " --deblock";\r
@@ -507,8 +517,7 @@ namespace Handbrake.Functions
             if (mainWindow.check_vfr.Checked)\r
                 vfr = " -V ";\r
 \r
-            if (mainWindow.check_lAnamorphic.Checked)\r
-                lanamorphic = " -P ";\r
+            \r
 \r
             string queryPictureSettings = cropOut + deinterlace + deblock + detelecine + vfr + grayscale + pixelRatio + lanamorphic;\r
             #endregion\r
@@ -552,7 +561,7 @@ namespace Handbrake.Functions
             if (mainWindow.check_2PassEncode.Checked)\r
                 twoPassEncoding = " -2 ";\r
 \r
-            if (videoFramerate == "Automatic")\r
+            if (videoFramerate == "Same as source")\r
                 vid_frame_rate = "";\r
             else\r
             {\r
index d9c3fe0..ed583a8 100644 (file)
     <PlatformTarget>x86</PlatformTarget>\r
   </PropertyGroup>\r
   <ItemGroup>\r
+    <Reference Include="C4F.DevKit.Contacts.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bdc1b65c439c6a1f, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>C:\Documents and Settings\Scott\My Documents\C4F\C4F Developer Kit 2008\Controls\C4F.DevKit.Contacts.Controls.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="C4F.DevKit.Messaging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=76ac60f2feb1ad78, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>C:\Documents and Settings\Scott\My Documents\C4F\C4F Developer Kit 2008\Controls\C4F.DevKit.Messaging.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="C4F.DevKit.Telephony, Version=1.0.0.0, Culture=neutral, PublicKeyToken=db6017b098a30de9, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>C:\Documents and Settings\Scott\My Documents\C4F\C4F Developer Kit 2008\Controls\C4F.DevKit.Telephony.dll</HintPath>\r
+    </Reference>\r
     <Reference Include="System" />\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Deployment" />\r
+    <Reference Include="System.Design" />\r
     <Reference Include="System.Drawing" />\r
     <Reference Include="System.Messaging" />\r
     <Reference Include="System.Windows.Forms" />\r
     <Compile Include="frmAbout.Designer.cs">\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="frmAddPreset.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="frmAddPreset.Designer.cs">\r
+      <DependentUpon>frmAddPreset.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmDownload.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="frmAddPreset.resx">\r
+      <DependentUpon>frmAddPreset.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmDownload.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmDownload.cs</DependentUpon>\r
diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
new file mode 100644 (file)
index 0000000..541c3a3
--- /dev/null
@@ -0,0 +1,94 @@
+namespace Handbrake\r
+{\r
+    partial class frmAddPreset\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 Windows Form 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
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAddPreset));\r
+            this.lbl_name = new System.Windows.Forms.Label();\r
+            this.txt_preset_name = new System.Windows.Forms.TextBox();\r
+            this.btn_add = new System.Windows.Forms.Button();\r
+            this.SuspendLayout();\r
+            // \r
+            // lbl_name\r
+            // \r
+            this.lbl_name.AutoSize = true;\r
+            this.lbl_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_name.Location = new System.Drawing.Point(12, 20);\r
+            this.lbl_name.Name = "lbl_name";\r
+            this.lbl_name.Size = new System.Drawing.Size(89, 13);\r
+            this.lbl_name.TabIndex = 1;\r
+            this.lbl_name.Text = "Preset Name: ";\r
+            // \r
+            // txt_preset_name\r
+            // \r
+            this.txt_preset_name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.txt_preset_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.txt_preset_name.Location = new System.Drawing.Point(107, 17);\r
+            this.txt_preset_name.Name = "txt_preset_name";\r
+            this.txt_preset_name.Size = new System.Drawing.Size(193, 21);\r
+            this.txt_preset_name.TabIndex = 2;\r
+            // \r
+            // btn_add\r
+            // \r
+            this.btn_add.BackColor = System.Drawing.Color.Transparent;\r
+            this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_add.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_add.Location = new System.Drawing.Point(200, 44);\r
+            this.btn_add.Name = "btn_add";\r
+            this.btn_add.Size = new System.Drawing.Size(100, 22);\r
+            this.btn_add.TabIndex = 4;\r
+            this.btn_add.TabStop = false;\r
+            this.btn_add.Text = "Add Preset";\r
+            this.btn_add.UseVisualStyleBackColor = false;\r
+            this.btn_add.Click += new System.EventHandler(this.btn_add_Click);\r
+            // \r
+            // frmAddPreset\r
+            // \r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+            this.ClientSize = new System.Drawing.Size(314, 76);\r
+            this.Controls.Add(this.btn_add);\r
+            this.Controls.Add(this.txt_preset_name);\r
+            this.Controls.Add(this.lbl_name);\r
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.Name = "frmAddPreset";\r
+            this.Text = "Add Preset";\r
+            this.ResumeLayout(false);\r
+            this.PerformLayout();\r
+\r
+        }\r
+\r
+        #endregion\r
+\r
+        private System.Windows.Forms.Label lbl_name;\r
+        private System.Windows.Forms.TextBox txt_preset_name;\r
+        internal System.Windows.Forms.Button btn_add;\r
+    }\r
+}
\ No newline at end of file
diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
new file mode 100644 (file)
index 0000000..cf9b513
--- /dev/null
@@ -0,0 +1,59 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.ComponentModel;\r
+using System.Data;\r
+using System.Drawing;\r
+using System.Text;\r
+using System.Windows.Forms;\r
+using System.IO;\r
+\r
+namespace Handbrake\r
+{\r
+    public partial class frmAddPreset : Form\r
+    {\r
+        private frmMain frmMainWindow;\r
+        public frmAddPreset(frmMain fmw)\r
+        {\r
+            InitializeComponent();\r
+            frmMainWindow = fmw;\r
+        }\r
+\r
+        private void btn_add_Click(object sender, EventArgs e)\r
+        {\r
+            if (txt_preset_name.Text.Trim() == "")\r
+                MessageBox.Show("You have not entered a name for the preset.","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else if (txt_preset_name.Text.Trim().Contains("--"))\r
+                MessageBox.Show("The preset name can not contain two dashes '--'","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
+            {\r
+                Functions.Common hb_common_func = new Functions.Common();\r
+\r
+                string userPresets = Application.StartupPath.ToString() + "\\user_presets.dat";\r
+                try\r
+                {\r
+                    // Create a StreamWriter and open the file\r
+                    StreamWriter line = File.AppendText(userPresets);\r
+\r
+                    // Generate and write the preset string to the file\r
+                    String query = hb_common_func.GenerateTheQuery(frmMainWindow);\r
+                    String preset = "+ " + txt_preset_name.Text + ":  " + query;\r
+                    line.WriteLine(preset);\r
+\r
+                    // close the stream\r
+                    line.Close();\r
+                    line.Dispose();\r
+                    MessageBox.Show("Your profile has been sucessfully added.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                }\r
+                catch (Exception exc)\r
+                {\r
+                    MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                }\r
+                frmMainWindow.loadPresetPanel();\r
+                this.Close();\r
+            }\r
+        }\r
+    }\r
+}\r
+\r
+\r
+\r
diff --git a/win/C#/frmAddPreset.resx b/win/C#/frmAddPreset.resx
new file mode 100644 (file)
index 0000000..37f9290
--- /dev/null
@@ -0,0 +1,500 @@
+<?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
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
+        IACoJQAAHh0AACAgAAABACAAqBAAAMZCAAAQEAAAAQAgAGgEAABuUwAAKAAAADAAAABgAAAAAQAIAAAA\r
+        AACACgAAAAAAAAAAAAAAAQAAAAAAAAAAAAD///8A/wAAAAD/AAAAAIAAgICAAICAAAAAgAAAAICAAIAA\r
+        AACAAIAAgP//ACAgIADg4OAAIAAAAAAgAABg4CAAQOBAAGBgYAAgYAAAQKDgAAAAIABAwCAAIEAAAECg\r
+        AABg4AAAIGCAAECAoABgoMAAYECgAGDAAABgICAAoKCgAOAAAAAgIAAAAGAAAEDgAABgAAAAIAAgAEAg\r
+        IAAgQGAAIIDAAADg4ABgAGAAgOD/ACCA/wCgAAAAQGAAACCAAAAAoAAAYCAAAAAgIAAgIEAAYGBAAEBg\r
+        YAAAIIAAAGCAAGCAgABAAKAAAICgAACgoACAoKAAIKDAAECgwAAAAOAAQADgAADA4ABgwOAAIODgAADg\r
+        AADA4AAAAEAgAKDgIAAA4EAAYABAAABAYACAAGAAgCBgAGAggABA4KAAAECgAGBAwADgIOAAIEDgAACA\r
+        4ADgoOAAYAD/ACBg/wAAoP8A4KD/AGD//wAICAgACAAAAAgIAAAAAJgACAAIAAAACAAACAAACBAQACA4\r
+        SAAgYIgAOHCIADhw+AAIGAAAEBAIACg4QAAwYHgAAACIACA4QAAoQFAAKFh4AHh4eAAwaIAAIGiQADh4\r
+        mAAACAgAEAgIABAYGAAgGBgASEhIABhIYAAoUGAAIFBoAChQaAAoWGgAMFhoAChoiAAweJgAKHioACiA\r
+        sAAIEAAACAgQAAgQGAAQGCAAGCAoABhAUAAoSFgAaGhoABhQcAAgWHAAKFhwADhgcAAYWIAAOGiAAIiI\r
+        iAAoaJAAKHCYACh4oAA4gKAAMICoAKioqAAwmNAAEDgAAChYAAAweAAAMIgQAAgYGAAYGBgACBggABAg\r
+        KAAgKCgAKCgoACAwOAA4ODgAKDhIADBQWABYWFgAGEhoADBYcAAYUHgAGFh4ACBYeAAoYHgAKGCAABhY\r
+        iAAgaJgAKICoACiIuAC4uLgAMJDIADiw6AAQCAAAABgAAAggAAAAOAAAMGgAABgQCAAwgAgAEAgQABgQ\r
+        EAAwmBgAGBggAAgYKAAAICgACCAoABgoMAAgKDAAGDBAABg4QAAYOFAAEEBYACBIWAAwSFgAOEhYACBI\r
+        YAAQSGgAOFhoABhIcAAoUHAAQFhwACBgeABAaIAAIGiIADBwiABAcIgAGGCQADhwkABYeJAACBCgAChw\r
+        oAAweKAAKIC4ACiQwAAwmMgAOKjgADBg6ABAsOgAELD4AAgoAAAIMAAAGDAAABhIAAAYUAAAKHgAAACY\r
+        AAAwmAAAAMgAABAACAAIEAgAEBgIABA4CAAYOAgAMHgIABAYEAAYGBAAIBgQACh4EAAwmBAAEBAYABgg\r
+        GAAoIBgAGCAgAAgIKAAgICgAGAgwAAggMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAn2KfdXV1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoo2+QIJCJb28Sd3em\r
+        nQAAAFuKqW0aqsd6Y5/DXAAAAAAAAAAAAAAAAAAAAAAAAAB3kAWQkG8SpqaJb28gsncAbIeSroyii21x\r
+        kczIwwAAAAAAAAAAAAAAAAAAAAAAAABoo4mJkLKylm9vb5BvdwwAcZO/fox7z2NjqsOss2MAWwAAAAAA\r
+        AAAAAAAAAAAAAAAAvaGmo5ANlgUFEiBvo1xjq3p6qMTJroBkxXt9cGzFnAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAL2ylgV3vQAAAGOvxMXXq41uh6yVjxqp1YhknwAAAAAAAAAAAAAAAAAAAAAAAAAAAABvsolbAAAA\r
+        +5KneouS2Kx4pZF9ndywsXuvkocAAAAAAAAAAAAAAAAAAAAAAAAAAAB3sncAAAAAdayHca95bH9+cKmv\r
+        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\r
+        eAAoaIgAMICoAChggAAACAgAEAgIABgYGAAoUGgAKFhwAChwkAAIGAgACBAQABAgKAAQKDgAIEhgACBQ\r
+        aAAAAHgAIFh4AChgeAAAeHgAeHh4AChogAAwaIAAIGCIADBoiAA4cIgAIGiQADhwkAAoeKgAKICwAAgQ\r
+        AAAIIAAACAAIABhICAAICBAAMIgQABAYGAAYICgAGCgwAEhISAAwSFgAGFBoAChYaAAICHgAOGiAACh4\r
+        oAAweKAAGAAAAAAIAAAAGAAACBgAABAoAAAYUAAAKGAAAChoAAAAeAAAAAAIAAgQCAAQEAgAGP8IACAY\r
+        EAAIEBgAMJAYABggIAAAACgACBAoACgwMAAAKDgAEDA4ADg4OAAoOEAAGDhIACA4SAAAQEgAMEBIAEhQ\r
+        UAAISFgAIEhYAChIWAAwUFgAIEhoAEhYaAAYUHAAMFhwABhYeAAoWHgAIFiAAEhwgACIiIgAGGCQAAAA\r
+        mAAgcJgAKHCYADB4mACYmJgAACjIAEBw+ACo//8ASAAAAFgAAABoAAAAeAAAABAIAABICAAAGCgAAAA4\r
+        AAAYOAAACEAAAAhIAAAoUAAAAFgAACBYAAAAaAAAIGgAADB4AAAAiAAAMIgAAGiIAACAmAAAGAAIADAI\r
+        CABgCAgAEBgIAAggCAAQIAgAECgIAAgwCAAQMAgAODAIABA4CAAYOAgAEEAIABhACAAgQAgAIFAIAChg\r
+        CAAwgAgAMJAIADCoCAAACBAAGBAQABggEAAoIBAAKGAQAChoEAAgeBAAKHgQAEh4EAAY+BAACAAYAAAI\r
+        GAAICBgAEAgYAAAQGAAQEBgAABgYAAgYGAAYMBgAKHgYADCYGAAwoBgAMKgYAGj/GABgCCAACBAgAAgY\r
+        IAAQGCAAGBggACggIABIcCAACAAoABAAKAAAECgAEBAoAAggKAAACDAASAgwAAgQMAAIKDAAECgwAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAARxBSUlJHAAAAAABYWFlY8kYAAAAAAAAAAAAAAAAAAJFgqqRLSzAwBXMAkKJbW1pdSVmE\r
+        AAAAAAAAAAAAAAAAEJdLqhpgYKQFkf9NmVRanHVJVZRQAAAAAAAAAAAAAAAAUY6RO6qXMHNYW5MxdFpm\r
+        TVtPSpAAAAAAAAAAAAAAAAAAAAAFpIYAAFSeW09PU15KU05MaEkAAAAAAAAAAAAAAAAAAEtgAAAAk55j\r
+        ml5Mp2haXUqpW3IAAAAAAAAAAAAAAAAAS0sAAEpJoE5PpZpMZVWnMZyZVQAAAAAAAAAAAAAAAABLMAAA\r
+        cqCeSnppZGZKWzFNaV2ecAAAAAAAAAAAAAAAAEtLAACLVF6iZHROp2eiW1paeWnxAAAAAAAAAAAAAABI\r
+        GmAAAElJSmh6SWNVSk5hZqJ1VXUAAAAAAAAAAAAAlpmjeJAAk12eZXZ5p3WndnZpaUlbZgAAAAAAAAAA\r
+        m2lFRTw8PDZeWV1OlE0xeWlNeVVdZmmZUAAAAAAAjzYKRaysRUVFRa02SXSnYaFNTUxpTFSoTmKTAAAA\r
+        AI8KOkSrrKysrKxErDullF6fVWhiVakLaVWbVZoAAAAAqK2sRKZEqyCsRKummKBZT0xPTHppZVMLqVN4\r
+        cQAAAAA6O6sYGKYYGKsYphgELjejY09KTTZNaWdMNpkAAAAA+zc6XFxcd3d3XASmXEw6PZZiZ6g2ZUw2\r
+        T2QLnwAAAAAdoTtcLcV3pndfLi2jraMtcmNkT05np0xnaXhUAAAAAAD5NKL87xgYd1+eLZ06+1wAVE6o\r
+        p2cKZ2WjjgAAAAAAAAAQo67EcuZuj5jkACue9gAAkTEKeJfbioptRgAAAAAAAACIr0dLVwBXmEeL5Qg4\r
+        AAAAAOnqwNbVb9O5AAAAAAAAAP38RmDae3tfkDqIX0UAAABq3W9v6+2BtssAAAAAAAD9q6v7AFl1dV9f\r
+        mpgIXwAAAABrtG9v7O2BagAAAACSF52fL/AAAAAAAHUAAAAAAAAAAACC1NS+3s/ZzAAAAJ03MjqjdJ0A\r
+        AAC3FIMUtwAAAAAAzr27goK5awAAAAAAWaNgGho3dAAAyr+/v4ODtQAAAMmAAM+2zxMTawAAAAAAAK6z\r
+        kZ1xAAC1un3HVwAAAAAAAAAAawB/ftAAAAAAAABCNUIAAAAAAAAAAF8AAAAAAAAAAEcAAGpGAAAAAAAA\r
+        AEKsEQAAAAAAAAAAlZUAAAAAAAAAAAAAAEgAAAAAAAAAAC3hAAAAAAAAAAAAAAAAAAAAAAAAAAAARgAA\r
+        AAD///////////4BwH/8AAAf/AAAD/4AAA//xgAP/84AB//MAAf/zAAD/8wAA/+MAAP/BAAD/AAAAfAA\r
+        AAHgAAAB4AAAAeAAAAPAAAADwAAAA+AAIAfgADAD8AA8A/gAOAPwgDwDwPv+AcBwfAfAYDkD8GD/Q+P9\r
+        /s/j/P/v8///7ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAA////AFEl\r
+        swBJDW0ABEMwAAJHSQAFDwIAXl9ZAHJtagBwfYQAQVNqAAFtAAAAZgAAAz0CABQ/AQAXQwAAGkAAAA8g\r
+        AQAhSJQAM1SRABw6fgAFVk0ADE48AAplaQAgWgIAMYcMACl7CwAOJwMAAAMtABwPNwAhIQAABxACAA9S\r
+        UAAnQUgAAISfACRoDAAxmwQAK4MHABMpAAA8P1kATBMbACQSVwAKL1EADS5CADFMVQABIF4AJ3CGADB2\r
+        kAAzdlEAMnY1ABMnEwBARooAVVq5ABgATwAWBn0ABh56AAULaQBOeKYAT3WSACpNZwAucpgAMHifADFx\r
+        nwA1b5YAMF93AEBalgBvjecADCLAAAkPpQAbJr4AFiLGAAAJjgAzbIEANGh8AClhgAAzfKEAMHWWADJz\r
+        kwAsW3MAQ4mvADyY9AAtgf8AIpr/ACuk/wBdk9UAG0tkACladQAqbI4AK3GUAC5vjwArbpEALWJ7ACdl\r
+        aAAOaoQAJJ20ABx0gQAeTF8AJ116ACViggAgZosAJmeJAChvlAAhZIgAH1ZyAHVmYwAaPVMAJ19+ACto\r
+        hgAmaIwAKGB9ACFdfAAgY4YAGU5qAFtgYQAYQVgAIVx7ACtrjgAtZYIAJmKAACNhgQAmX3wAIUpdAHp6\r
+        ewARN0wAH1R0ACdXcgApXnoAJ2B+ACligQAdSmAAKiopAGZlZQCRkZEAbm9vAFFSUwAWO08AJFRuACFP\r
+        agAhUm0AHD9RAAMKDgA3NjUAWlpaADk5OQA3NzcAPDk3AAYSGQAVNUgAFjFAAA8jLwABAgQAVQAAAP//\r
+        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\r
+</value>\r
+  </data>\r
+</root>
\ No newline at end of file
index 54845cc..315d13a 100644 (file)
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -64,9 +64,16 @@ namespace Handbrake
             this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
             this.text_height = new System.Windows.Forms.TextBox();\r
             this.text_width = new System.Windows.Forms.TextBox();\r
-            this.slider_drc = new System.Windows.Forms.TrackBar();\r
             this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
             this.RadioDVD = new System.Windows.Forms.RadioButton();\r
+            this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
+            this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
+            this.data_chpt = new System.Windows.Forms.DataGridView();\r
+            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.btn_addPreset = new System.Windows.Forms.Button();\r
+            this.btn_removePreset = new System.Windows.Forms.Button();\r
+            this.slider_drc = new System.Windows.Forms.TrackBar();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -104,7 +111,6 @@ namespace Handbrake
             this.groupBox_output = new System.Windows.Forms.GroupBox();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label12 = new System.Windows.Forms.Label();\r
-            this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.lbl_encode = new System.Windows.Forms.Label();\r
             this.TabPage2 = new System.Windows.Forms.TabPage();\r
@@ -127,7 +133,6 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();\r
             this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
-            this.label25 = new System.Windows.Forms.Label();\r
             this.lbl_vfr = new System.Windows.Forms.Label();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.Label22 = new System.Windows.Forms.Label();\r
@@ -137,7 +142,6 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
-            this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
             this.text_bottom = new System.Windows.Forms.NumericUpDown();\r
             this.text_top = new System.Windows.Forms.NumericUpDown();\r
@@ -148,7 +152,6 @@ namespace Handbrake
             this.lbl_Aspect = new System.Windows.Forms.Label();\r
             this.Label91 = new System.Windows.Forms.Label();\r
             this.Label55 = new System.Windows.Forms.Label();\r
-            this.check_lAnamorphic = new System.Windows.Forms.CheckBox();\r
             this.check_vfr = new System.Windows.Forms.CheckBox();\r
             this.label24 = new System.Windows.Forms.Label();\r
             this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
@@ -157,7 +160,6 @@ namespace Handbrake
             this.check_detelecine = new System.Windows.Forms.CheckBox();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
-            this.CheckPixelRatio = new System.Windows.Forms.CheckBox();\r
             this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
             this.Label8 = new System.Windows.Forms.Label();\r
             this.Label1 = new System.Windows.Forms.Label();\r
@@ -172,9 +174,6 @@ namespace Handbrake
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.lbl_warn_chapt = new System.Windows.Forms.Label();\r
             this.label31 = new System.Windows.Forms.Label();\r
-            this.data_chpt = new System.Windows.Forms.DataGridView();\r
-            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.h264Tab = new System.Windows.Forms.TabPage();\r
             this.Label43 = new System.Windows.Forms.Label();\r
             this.label_h264 = new System.Windows.Forms.LinkLabel();\r
@@ -200,8 +199,12 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.label25 = new System.Windows.Forms.Label();\r
+            this.drp_anamorphic = new System.Windows.Forms.ComboBox();\r
+            this.label6 = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
@@ -215,7 +218,6 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.text_right)).BeginInit();\r
             this.advancedOptions.SuspendLayout();\r
             this.tab_chapters.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();\r
             this.h264Tab.SuspendLayout();\r
             this.tabPage4.SuspendLayout();\r
             this.groupBox_dest.SuspendLayout();\r
@@ -364,7 +366,7 @@ namespace Handbrake
             "Mpeg 4",\r
             "Xvid",\r
             "H.264"});\r
-            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);\r
+            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 23);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
             this.drp_videoEncoder.TabIndex = 1;\r
@@ -383,7 +385,7 @@ namespace Handbrake
             "Vorbis",\r
             "AC3",\r
             "AAC + AC3"});\r
-            this.drp_audioCodec.Location = new System.Drawing.Point(370, 19);\r
+            this.drp_audioCodec.Location = new System.Drawing.Point(370, 22);\r
             this.drp_audioCodec.Name = "drp_audioCodec";\r
             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
             this.drp_audioCodec.TabIndex = 3;\r
@@ -436,7 +438,7 @@ namespace Handbrake
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.BackColor = System.Drawing.Color.Transparent;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(16, 80);\r
+            this.check_largeFile.Location = new System.Drawing.Point(16, 174);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(82, 17);\r
             this.check_largeFile.TabIndex = 4;\r
@@ -452,7 +454,7 @@ namespace Handbrake
             this.check_turbo.BackColor = System.Drawing.Color.Transparent;\r
             this.check_turbo.Enabled = false;\r
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_turbo.Location = new System.Drawing.Point(37, 57);\r
+            this.check_turbo.Location = new System.Drawing.Point(37, 151);\r
             this.check_turbo.Name = "check_turbo";\r
             this.check_turbo.Size = new System.Drawing.Size(115, 17);\r
             this.check_turbo.TabIndex = 3;\r
@@ -466,7 +468,7 @@ namespace Handbrake
             this.drp_videoFramerate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_videoFramerate.FormattingEnabled = true;\r
             this.drp_videoFramerate.Items.AddRange(new object[] {\r
-            "Automatic",\r
+            "Same as source",\r
             "5",\r
             "10",\r
             "12",\r
@@ -475,11 +477,11 @@ namespace Handbrake
             "24",\r
             "25",\r
             "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(446, 167);\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 35);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
-            this.drp_videoFramerate.Size = new System.Drawing.Size(81, 21);\r
+            this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21);\r
             this.drp_videoFramerate.TabIndex = 7;\r
-            this.drp_videoFramerate.Text = "Automatic";\r
+            this.drp_videoFramerate.Text = "Same as source";\r
             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
             // \r
             // slider_videoQuality\r
@@ -538,7 +540,7 @@ namespace Handbrake
             this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(115, 486);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(115, 483);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
             this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
@@ -592,17 +594,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)");\r
             this.text_width.TextChanged += new System.EventHandler(this.text_width_TextChanged);\r
             // \r
-            // slider_drc\r
-            // \r
-            this.slider_drc.LargeChange = 0;\r
-            this.slider_drc.Location = new System.Drawing.Point(317, 137);\r
-            this.slider_drc.Maximum = 30;\r
-            this.slider_drc.Name = "slider_drc";\r
-            this.slider_drc.Size = new System.Drawing.Size(241, 42);\r
-            this.slider_drc.TabIndex = 18;\r
-            this.slider_drc.TickFrequency = 10;\r
-            this.slider_drc.Scroll += new System.EventHandler(this.slider_drc_Scroll);\r
-            // \r
             // rtf_h264advanced\r
             // \r
             this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
@@ -627,6 +618,114 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD");\r
             this.RadioDVD.UseVisualStyleBackColor = true;\r
             // \r
+            // check_optimiseMP4\r
+            // \r
+            this.check_optimiseMP4.AutoSize = true;\r
+            this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(501, 13);\r
+            this.check_optimiseMP4.Name = "check_optimiseMP4";\r
+            this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
+            this.check_optimiseMP4.TabIndex = 25;\r
+            this.check_optimiseMP4.Text = "HTTP Optimized MP4";\r
+            this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web, but note that " +\r
+                    "QuickTime can only read the files as long as the file extension is .mp4.");\r
+            this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
+            this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);\r
+            // \r
+            // check_iPodAtom\r
+            // \r
+            this.check_iPodAtom.AutoSize = true;\r
+            this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(501, 32);\r
+            this.check_iPodAtom.Name = "check_iPodAtom";\r
+            this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
+            this.check_iPodAtom.TabIndex = 26;\r
+            this.check_iPodAtom.Text = "Insert iPod Atom";\r
+            this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods. Encodes will not sync if this is not e" +\r
+                    "nabled for H.264 encodes");\r
+            this.check_iPodAtom.UseVisualStyleBackColor = false;\r
+            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
+            // \r
+            // data_chpt\r
+            // \r
+            this.data_chpt.AllowUserToAddRows = false;\r
+            this.data_chpt.AllowUserToDeleteRows = false;\r
+            this.data_chpt.AllowUserToResizeRows = false;\r
+            this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
+            this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
+            this.number,\r
+            this.name});\r
+            this.data_chpt.Location = new System.Drawing.Point(16, 72);\r
+            this.data_chpt.Name = "data_chpt";\r
+            this.data_chpt.Size = new System.Drawing.Size(607, 182);\r
+            this.data_chpt.TabIndex = 2;\r
+            this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
+            // \r
+            // number\r
+            // \r
+            dataGridViewCellStyle6.Format = "N0";\r
+            dataGridViewCellStyle6.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle6;\r
+            this.number.HeaderText = "Chapter Number";\r
+            this.number.MaxInputLength = 3;\r
+            this.number.Name = "number";\r
+            this.number.Width = 135;\r
+            // \r
+            // name\r
+            // \r
+            this.name.HeaderText = "Chapter Name";\r
+            this.name.Name = "name";\r
+            this.name.Width = 410;\r
+            // \r
+            // btn_addPreset\r
+            // \r
+            this.btn_addPreset.BackColor = System.Drawing.Color.Transparent;\r
+            this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_addPreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_addPreset.Location = new System.Drawing.Point(10, 483);\r
+            this.btn_addPreset.Name = "btn_addPreset";\r
+            this.btn_addPreset.Size = new System.Drawing.Size(35, 22);\r
+            this.btn_addPreset.TabIndex = 3;\r
+            this.btn_addPreset.TabStop = false;\r
+            this.btn_addPreset.Text = "Add";\r
+            this.ToolTip.SetToolTip(this.btn_addPreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
+                    " > Options");\r
+            this.btn_addPreset.UseVisualStyleBackColor = false;\r
+            this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
+            // \r
+            // btn_removePreset\r
+            // \r
+            this.btn_removePreset.BackColor = System.Drawing.Color.Transparent;\r
+            this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_removePreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_removePreset.Location = new System.Drawing.Point(51, 483);\r
+            this.btn_removePreset.Name = "btn_removePreset";\r
+            this.btn_removePreset.Size = new System.Drawing.Size(58, 22);\r
+            this.btn_removePreset.TabIndex = 4;\r
+            this.btn_removePreset.TabStop = false;\r
+            this.btn_removePreset.Text = "Remove";\r
+            this.ToolTip.SetToolTip(this.btn_removePreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
+                    " > Options");\r
+            this.btn_removePreset.UseVisualStyleBackColor = false;\r
+            this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
+            // \r
+            // slider_drc\r
+            // \r
+            this.slider_drc.LargeChange = 0;\r
+            this.slider_drc.Location = new System.Drawing.Point(317, 137);\r
+            this.slider_drc.Maximum = 30;\r
+            this.slider_drc.Name = "slider_drc";\r
+            this.slider_drc.Size = new System.Drawing.Size(241, 42);\r
+            this.slider_drc.TabIndex = 18;\r
+            this.slider_drc.TickFrequency = 10;\r
+            this.slider_drc.Scroll += new System.EventHandler(this.slider_drc_Scroll);\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
@@ -852,7 +951,7 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(890, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(900, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
@@ -928,13 +1027,14 @@ namespace Handbrake
             this.groupBox_output.Controls.Add(this.drp_videoEncoder);\r
             this.groupBox_output.Controls.Add(this.Label47);\r
             this.groupBox_output.Controls.Add(this.drp_audioCodec);\r
+            this.groupBox_output.Controls.Add(this.check_iPodAtom);\r
             this.groupBox_output.Controls.Add(this.Label12);\r
             this.groupBox_output.Controls.Add(this.check_optimiseMP4);\r
             this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_output.Location = new System.Drawing.Point(14, 223);\r
+            this.groupBox_output.Location = new System.Drawing.Point(14, 217);\r
             this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(657, 53);\r
+            this.groupBox_output.Size = new System.Drawing.Size(657, 58);\r
             this.groupBox_output.TabIndex = 3;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
@@ -944,7 +1044,7 @@ namespace Handbrake
             this.Label47.AutoSize = true;\r
             this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label47.ForeColor = System.Drawing.Color.Black;\r
-            this.Label47.Location = new System.Drawing.Point(17, 24);\r
+            this.Label47.Location = new System.Drawing.Point(17, 27);\r
             this.Label47.Name = "Label47";\r
             this.Label47.Size = new System.Drawing.Size(62, 13);\r
             this.Label47.TabIndex = 0;\r
@@ -955,27 +1055,12 @@ namespace Handbrake
             this.Label12.AutoSize = true;\r
             this.Label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label12.ForeColor = System.Drawing.Color.Black;\r
-            this.Label12.Location = new System.Drawing.Point(270, 24);\r
+            this.Label12.Location = new System.Drawing.Point(270, 27);\r
             this.Label12.Name = "Label12";\r
             this.Label12.Size = new System.Drawing.Size(94, 13);\r
             this.Label12.TabIndex = 2;\r
             this.Label12.Text = "Audio Encoder:";\r
             // \r
-            // check_optimiseMP4\r
-            // \r
-            this.check_optimiseMP4.AutoSize = true;\r
-            this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(502, 14);\r
-            this.check_optimiseMP4.Name = "check_optimiseMP4";\r
-            this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
-            this.check_optimiseMP4.TabIndex = 25;\r
-            this.check_optimiseMP4.Text = "HTTP Optimized MP4";\r
-            this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web, but note that " +\r
-                    "QuickTime can only read the files as long as the file extension is .mp4.");\r
-            this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
-            this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);\r
-            // \r
             // Label3\r
             // \r
             this.Label3.AutoSize = true;\r
@@ -1258,27 +1343,16 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(649, 274);\r
+            this.TabPage3.Size = new System.Drawing.Size(649, 302);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video";\r
             // \r
-            // label25\r
-            // \r
-            this.label25.AutoSize = true;\r
-            this.label25.BackColor = System.Drawing.Color.Transparent;\r
-            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label25.Location = new System.Drawing.Point(304, 146);\r
-            this.label25.Name = "label25";\r
-            this.label25.Size = new System.Drawing.Size(76, 13);\r
-            this.label25.TabIndex = 28;\r
-            this.label25.Text = "Framerate";\r
-            // \r
             // lbl_vfr\r
             // \r
             this.lbl_vfr.AutoSize = true;\r
             this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_vfr.Location = new System.Drawing.Point(533, 171);\r
+            this.lbl_vfr.Location = new System.Drawing.Point(123, 64);\r
             this.lbl_vfr.Name = "lbl_vfr";\r
             this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
             this.lbl_vfr.TabIndex = 27;\r
@@ -1290,7 +1364,7 @@ namespace Handbrake
             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(16, 103);\r
+            this.check_grayscale.Location = new System.Drawing.Point(16, 105);\r
             this.check_grayscale.Name = "check_grayscale";\r
             this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
             this.check_grayscale.TabIndex = 1;\r
@@ -1302,7 +1376,7 @@ namespace Handbrake
             this.Label22.AutoSize = true;\r
             this.Label22.BackColor = System.Drawing.Color.Transparent;\r
             this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label22.Location = new System.Drawing.Point(13, 13);\r
+            this.Label22.Location = new System.Drawing.Point(13, 85);\r
             this.Label22.Name = "Label22";\r
             this.Label22.Size = new System.Drawing.Size(191, 13);\r
             this.Label22.TabIndex = 0;\r
@@ -1313,7 +1387,7 @@ namespace Handbrake
             this.check_2PassEncode.AutoSize = true;\r
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_2PassEncode.Location = new System.Drawing.Point(16, 34);\r
+            this.check_2PassEncode.Location = new System.Drawing.Point(16, 128);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
             this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);\r
             this.check_2PassEncode.TabIndex = 2;\r
@@ -1359,11 +1433,11 @@ namespace Handbrake
             this.Label46.AutoSize = true;\r
             this.Label46.BackColor = System.Drawing.Color.Transparent;\r
             this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label46.Location = new System.Drawing.Point(304, 170);\r
+            this.Label46.Location = new System.Drawing.Point(13, 38);\r
             this.Label46.Name = "Label46";\r
-            this.Label46.Size = new System.Drawing.Size(107, 13);\r
+            this.Label46.Size = new System.Drawing.Size(106, 13);\r
             this.Label46.TabIndex = 6;\r
-            this.Label46.Text = "Video Framerate:";\r
+            this.Label46.Text = "Framerate (FPS):";\r
             // \r
             // Label40\r
             // \r
@@ -1376,24 +1450,11 @@ namespace Handbrake
             this.Label40.TabIndex = 13;\r
             this.Label40.Text = "Constant Quality:";\r
             // \r
-            // check_iPodAtom\r
-            // \r
-            this.check_iPodAtom.AutoSize = true;\r
-            this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(516, 255);\r
-            this.check_iPodAtom.Name = "check_iPodAtom";\r
-            this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
-            this.check_iPodAtom.TabIndex = 26;\r
-            this.check_iPodAtom.Text = "Insert iPod Atom";\r
-            this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods. Encodes will not sync if this is not e" +\r
-                    "nabled for H.264 encodes");\r
-            this.check_iPodAtom.UseVisualStyleBackColor = false;\r
-            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
-            // \r
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage1.Controls.Add(this.label6);\r
+            this.TabPage1.Controls.Add(this.drp_anamorphic);\r
             this.TabPage1.Controls.Add(this.text_bottom);\r
             this.TabPage1.Controls.Add(this.text_top);\r
             this.TabPage1.Controls.Add(this.text_left);\r
@@ -1405,7 +1466,6 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.text_height);\r
             this.TabPage1.Controls.Add(this.Label55);\r
             this.TabPage1.Controls.Add(this.text_width);\r
-            this.TabPage1.Controls.Add(this.check_lAnamorphic);\r
             this.TabPage1.Controls.Add(this.check_vfr);\r
             this.TabPage1.Controls.Add(this.label24);\r
             this.TabPage1.Controls.Add(this.drp_deNoise);\r
@@ -1414,7 +1474,6 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.check_detelecine);\r
             this.TabPage1.Controls.Add(this.label4);\r
             this.TabPage1.Controls.Add(this.drp_deInterlace_option);\r
-            this.TabPage1.Controls.Add(this.CheckPixelRatio);\r
             this.TabPage1.Controls.Add(this.lbl_RecomendedCrop);\r
             this.TabPage1.Controls.Add(this.Label8);\r
             this.TabPage1.Controls.Add(this.Label1);\r
@@ -1427,7 +1486,7 @@ namespace Handbrake
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(649, 274);\r
+            this.TabPage1.Size = new System.Drawing.Size(649, 283);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
@@ -1540,19 +1599,6 @@ namespace Handbrake
             this.Label55.TabIndex = 25;\r
             this.Label55.Text = "Width/Height:";\r
             // \r
-            // check_lAnamorphic\r
-            // \r
-            this.check_lAnamorphic.AutoSize = true;\r
-            this.check_lAnamorphic.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_lAnamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_lAnamorphic.Location = new System.Drawing.Point(441, 88);\r
-            this.check_lAnamorphic.Name = "check_lAnamorphic";\r
-            this.check_lAnamorphic.Size = new System.Drawing.Size(131, 17);\r
-            this.check_lAnamorphic.TabIndex = 24;\r
-            this.check_lAnamorphic.Text = "Loose Anamorphic";\r
-            this.check_lAnamorphic.UseVisualStyleBackColor = false;\r
-            this.check_lAnamorphic.CheckedChanged += new System.EventHandler(this.check_lAnamorphic_CheckedChanged);\r
-            // \r
             // check_vfr\r
             // \r
             this.check_vfr.AutoSize = true;\r
@@ -1655,19 +1701,6 @@ namespace Handbrake
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 17;\r
             // \r
-            // CheckPixelRatio\r
-            // \r
-            this.CheckPixelRatio.AutoSize = true;\r
-            this.CheckPixelRatio.BackColor = System.Drawing.Color.Transparent;\r
-            this.CheckPixelRatio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.CheckPixelRatio.Location = new System.Drawing.Point(314, 88);\r
-            this.CheckPixelRatio.Name = "CheckPixelRatio";\r
-            this.CheckPixelRatio.Size = new System.Drawing.Size(121, 17);\r
-            this.CheckPixelRatio.TabIndex = 21;\r
-            this.CheckPixelRatio.Text = "Anamorphic PAR";\r
-            this.CheckPixelRatio.UseVisualStyleBackColor = false;\r
-            this.CheckPixelRatio.CheckedChanged += new System.EventHandler(this.CheckPixelRatio_CheckedChanged);\r
-            // \r
             // lbl_RecomendedCrop\r
             // \r
             this.lbl_RecomendedCrop.AutoSize = true;\r
@@ -1793,10 +1826,10 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.h264Tab);\r
             this.advancedOptions.Controls.Add(this.tabPage4);\r
             this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.advancedOptions.Location = new System.Drawing.Point(14, 287);\r
+            this.advancedOptions.Location = new System.Drawing.Point(14, 281);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(657, 300);\r
+            this.advancedOptions.Size = new System.Drawing.Size(657, 309);\r
             this.advancedOptions.TabIndex = 5;\r
             this.advancedOptions.TabStop = false;\r
             // \r
@@ -1833,37 +1866,6 @@ namespace Handbrake
             this.label31.TabIndex = 15;\r
             this.label31.Text = "Chapter Markers";\r
             // \r
-            // data_chpt\r
-            // \r
-            this.data_chpt.AllowUserToAddRows = false;\r
-            this.data_chpt.AllowUserToDeleteRows = false;\r
-            this.data_chpt.AllowUserToResizeRows = false;\r
-            this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
-            this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
-            this.number,\r
-            this.name});\r
-            this.data_chpt.Location = new System.Drawing.Point(16, 72);\r
-            this.data_chpt.Name = "data_chpt";\r
-            this.data_chpt.Size = new System.Drawing.Size(607, 182);\r
-            this.data_chpt.TabIndex = 2;\r
-            this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
-            // \r
-            // number\r
-            // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
-            this.number.HeaderText = "Chapter Number";\r
-            this.number.MaxInputLength = 3;\r
-            this.number.Name = "number";\r
-            this.number.Width = 135;\r
-            // \r
-            // name\r
-            // \r
-            this.name.HeaderText = "Chapter Name";\r
-            this.name.Name = "name";\r
-            this.name.Width = 410;\r
-            // \r
             // h264Tab\r
             // \r
             this.h264Tab.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -2055,13 +2057,15 @@ namespace Handbrake
             // \r
             // groupBox2\r
             // \r
+            this.groupBox2.Controls.Add(this.btn_removePreset);\r
+            this.groupBox2.Controls.Add(this.btn_addPreset);\r
             this.groupBox2.Controls.Add(this.treeView_presets);\r
             this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox2.Location = new System.Drawing.Point(687, 73);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(193, 514);\r
+            this.groupBox2.Size = new System.Drawing.Size(198, 517);\r
             this.groupBox2.TabIndex = 11;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
@@ -2076,7 +2080,7 @@ namespace Handbrake
             this.treeView_presets.Location = new System.Drawing.Point(10, 23);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
-            this.treeView_presets.Size = new System.Drawing.Size(177, 457);\r
+            this.treeView_presets.Size = new System.Drawing.Size(177, 454);\r
             this.treeView_presets.TabIndex = 2;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             // \r
@@ -2095,7 +2099,7 @@ namespace Handbrake
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
-            this.toolStrip1.Size = new System.Drawing.Size(890, 39);\r
+            this.toolStrip1.Size = new System.Drawing.Size(900, 39);\r
             this.toolStrip1.TabIndex = 13;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
@@ -2159,17 +2163,54 @@ namespace Handbrake
             this.toolStripSeparator8.Name = "toolStripSeparator8";\r
             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // label25\r
+            // \r
+            this.label25.AutoSize = true;\r
+            this.label25.BackColor = System.Drawing.Color.Transparent;\r
+            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label25.Location = new System.Drawing.Point(13, 13);\r
+            this.label25.Name = "label25";\r
+            this.label25.Size = new System.Drawing.Size(76, 13);\r
+            this.label25.TabIndex = 28;\r
+            this.label25.Text = "Framerate";\r
+            // \r
+            // drp_anamorphic\r
+            // \r
+            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_anamorphic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_anamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_anamorphic.FormattingEnabled = true;\r
+            this.drp_anamorphic.Items.AddRange(new object[] {\r
+            "None",\r
+            "Strict",\r
+            "Loose"});\r
+            this.drp_anamorphic.Location = new System.Drawing.Point(414, 86);\r
+            this.drp_anamorphic.Name = "drp_anamorphic";\r
+            this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);\r
+            this.drp_anamorphic.TabIndex = 36;\r
+            this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);\r
+            // \r
+            // label6\r
+            // \r
+            this.label6.AutoSize = true;\r
+            this.label6.BackColor = System.Drawing.Color.Transparent;\r
+            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label6.Location = new System.Drawing.Point(311, 89);\r
+            this.label6.Name = "label6";\r
+            this.label6.Size = new System.Drawing.Size(80, 13);\r
+            this.label6.TabIndex = 37;\r
+            this.label6.Text = "Anamorphic:";\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(890, 601);\r
+            this.ClientSize = new System.Drawing.Size(900, 621);\r
             this.Controls.Add(this.lbl_encode);\r
             this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.groupBox2);\r
-            this.Controls.Add(this.check_iPodAtom);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.groupBox_output);\r
@@ -2182,6 +2223,7 @@ namespace Handbrake
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Handbrake";\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).EndInit();\r
             this.frmMainMenu.ResumeLayout(false);\r
             this.frmMainMenu.PerformLayout();\r
@@ -2202,7 +2244,6 @@ namespace Handbrake
             this.advancedOptions.ResumeLayout(false);\r
             this.tab_chapters.ResumeLayout(false);\r
             this.tab_chapters.PerformLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();\r
             this.h264Tab.ResumeLayout(false);\r
             this.h264Tab.PerformLayout();\r
             this.tabPage4.ResumeLayout(false);\r
@@ -2285,7 +2326,6 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label42;\r
         internal System.Windows.Forms.TabPage TabPage1;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
-        internal System.Windows.Forms.CheckBox CheckPixelRatio;\r
         internal System.Windows.Forms.Label lbl_RecomendedCrop;\r
         internal System.Windows.Forms.Label Label8;\r
         internal System.Windows.Forms.Label Label1;\r
@@ -2323,11 +2363,9 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_save;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
         private System.Windows.Forms.TreeView treeView_presets;\r
-        internal System.Windows.Forms.CheckBox check_lAnamorphic;\r
         internal System.Windows.Forms.CheckBox check_vfr;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
         internal System.Windows.Forms.Label lbl_vfr;\r
-        internal System.Windows.Forms.Label label25;\r
         internal System.Windows.Forms.Label label26;\r
         internal System.Windows.Forms.Label Label56;\r
         internal System.Windows.Forms.Label lbl_Aspect;\r
@@ -2381,6 +2419,11 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;\r
         private System.Windows.Forms.Label lbl_warn_chapt;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_home;\r
+        internal System.Windows.Forms.Button btn_removePreset;\r
+        internal System.Windows.Forms.Button btn_addPreset;\r
+        internal System.Windows.Forms.Label label25;\r
+        internal System.Windows.Forms.Label label6;\r
+        internal System.Windows.Forms.ComboBox drp_anamorphic;\r
 \r
     }\r
 }
\ No newline at end of file
index 3c945b9..424142e 100644 (file)
@@ -77,7 +77,7 @@ namespace Handbrake
             drp_crop.SelectedIndex = 0;\r
             loadPresetPanel();\r
             Thread.Sleep(200);\r
-      \r
+\r
             // Now load the users default if required. (Will overide the above setting)\r
             lblStatus.Text = "Loading Preset Settings ...";\r
             Application.DoEvents();\r
@@ -112,7 +112,7 @@ namespace Handbrake
             // Turn the interface back to the user\r
             this.Enabled = true;\r
         }\r
-    \r
+\r
         private void startupUpdateCheck()\r
         {\r
             try\r
@@ -122,7 +122,7 @@ namespace Handbrake
                     this.BeginInvoke(new updateStatusChanger(startupUpdateCheck));\r
                     return;\r
                 }\r
-                \r
+\r
                 Boolean update = hb_common_func.updateCheck(false);\r
                 if (update == true)\r
                 {\r
@@ -152,9 +152,6 @@ namespace Handbrake
             string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
             try\r
             {\r
-                // Some things that need to be done to reset some gui components:\r
-                CheckPixelRatio.CheckState = CheckState.Unchecked;\r
-\r
                 // Send the query from the file to the Query Parser class Then load the preset\r
                 Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
                 hb_common_func.presetLoader(this, presetQuery, "User Defaults ");\r
@@ -304,7 +301,7 @@ namespace Handbrake
         {\r
             Process.Start("http://handbrake.fr");\r
         }\r
-        \r
+\r
         private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
         {\r
             Boolean update = hb_common_func.updateCheck(true);\r
@@ -539,19 +536,12 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                if (CheckPixelRatio.Checked)\r
-                {\r
-                    text_width.Text = "";\r
+\r
+                if ((int.Parse(text_width.Text) % 16) != 0)\r
                     text_width.BackColor = Color.LightCoral;\r
-                    CheckPixelRatio.BackColor = Color.LightCoral;\r
-                }\r
                 else\r
-                {\r
-                    if ((int.Parse(text_width.Text) % 16) != 0)\r
-                        text_width.BackColor = Color.LightCoral;\r
-                    else\r
-                        text_width.BackColor = Color.LightGreen;\r
-                }\r
+                    text_width.BackColor = Color.LightGreen;\r
+\r
 \r
                 if ((lbl_Aspect.Text != "Select a Title") && (drp_crop.SelectedIndex == 2))\r
                 {\r
@@ -578,20 +568,10 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                if (CheckPixelRatio.Checked)\r
-                {\r
-                    text_height.Text = "";\r
+                if ((int.Parse(text_height.Text) % 16) != 0)\r
                     text_height.BackColor = Color.LightCoral;\r
-                    CheckPixelRatio.BackColor = Color.LightCoral;\r
-                }\r
                 else\r
-                {\r
-                    if ((int.Parse(text_height.Text) % 16) != 0)\r
-                        text_height.BackColor = Color.LightCoral;\r
-                    else\r
-                        text_height.BackColor = Color.LightGreen;\r
-                }\r
-\r
+                    text_height.BackColor = Color.LightGreen;\r
             }\r
             catch (Exception)\r
             {\r
@@ -671,48 +651,34 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void CheckPixelRatio_CheckedChanged(object sender, EventArgs e)\r
+        private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            text_width.Text = "";\r
-            text_height.Text = "";\r
-            text_width.BackColor = Color.White;\r
-            text_height.BackColor = Color.White;\r
-            CheckPixelRatio.BackColor = TabPage1.BackColor;\r
-\r
-            if (CheckPixelRatio.Checked)\r
+            if (drp_anamorphic.SelectedIndex == 1)\r
             {\r
-                check_lAnamorphic.Enabled = false;\r
-                check_lAnamorphic.Checked = false;\r
                 text_height.BackColor = Color.LightGray;\r
                 text_width.BackColor = Color.LightGray;\r
+                text_height.Text = "";\r
+                text_width.Text = "";\r
                 text_height.Enabled = false;\r
                 text_width.Enabled = false;\r
             }\r
-            else\r
-            {\r
-                check_lAnamorphic.Enabled = true;\r
-                text_height.BackColor = Color.White;\r
-                text_width.BackColor = Color.White;\r
-                text_height.Enabled = true;\r
-                text_width.Enabled = true;\r
-            }\r
-        }\r
 \r
-        private void check_lAnamorphic_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (check_lAnamorphic.Checked)\r
+            if (drp_anamorphic.SelectedIndex == 2)\r
             {\r
-                CheckPixelRatio.Enabled = false;\r
-                CheckPixelRatio.Checked = false;\r
                 text_height.Text = "";\r
                 text_height.Enabled = false;\r
                 text_height.BackColor = Color.LightGray;\r
+\r
+                text_width.Enabled = true;\r
+                text_width.BackColor = Color.White;\r
             }\r
-            else\r
+\r
+            if (drp_anamorphic.SelectedIndex == 0)\r
             {\r
-                CheckPixelRatio.Enabled = true;\r
-                text_height.Enabled = true;\r
                 text_height.BackColor = Color.White;\r
+                text_width.BackColor = Color.White;\r
+                text_height.Enabled = true;\r
+                text_width.Enabled = true;\r
             }\r
         }\r
 \r
@@ -928,8 +894,8 @@ namespace Handbrake
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
                 check_optimiseMP4.Enabled = false;\r
-                check_lAnamorphic.Enabled = false;\r
-                check_lAnamorphic.Checked = false;\r
+                if (drp_anamorphic.Items.Count == 3)\r
+                    drp_anamorphic.Items.RemoveAt(2);\r
             }\r
             else\r
             {\r
@@ -939,7 +905,8 @@ namespace Handbrake
                 h264Tab.Enabled = true;\r
                 check_iPodAtom.Enabled = true;\r
                 check_optimiseMP4.Enabled = true;\r
-                check_lAnamorphic.Enabled = true;\r
+                if (!drp_anamorphic.Items.Contains("Loose"))\r
+                    drp_anamorphic.Items.Add("Loose");\r
             }\r
 \r
         }\r
@@ -973,27 +940,59 @@ namespace Handbrake
         #region Preset System\r
 \r
         // Import Current Presets\r
-        private void loadPresetPanel()\r
+        public void loadPresetPanel()\r
         {\r
+            treeView_presets.Nodes.Clear();\r
             ArrayList presetNameList = new ArrayList();\r
-       \r
-                string appPath = Application.StartupPath.ToString() + "\\presets.dat";\r
-                if (File.Exists(appPath))\r
+\r
+            // Load in the built in presets from presets.dat\r
+            string filePath = Application.StartupPath.ToString() + "\\presets.dat";\r
+            if (File.Exists(filePath))\r
+            {\r
+                StreamReader presetInput = new StreamReader(filePath);\r
+                while (!presetInput.EndOfStream)\r
                 {\r
-                    StreamReader presetInput = new StreamReader(appPath);\r
-                    while (!presetInput.EndOfStream)\r
+                    if ((char)presetInput.Peek() == '+')\r
                     {\r
-                        if ((char)presetInput.Peek() == '+')\r
-                        {\r
-                            string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                            Regex r = new Regex("(:  )"); // Split on hyphens. \r
-                            presetNameList.Add(r.Split(preset));\r
-                        }\r
-                        else\r
-                            presetInput.ReadLine();\r
+                        string preset = presetInput.ReadLine().Replace("+ ", "");\r
+                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
+                        presetNameList.Add(r.Split(preset));\r
                     }\r
+                    else\r
+                        presetInput.ReadLine();\r
                 }\r
-         \r
+\r
+                presetInput.Close();\r
+                presetInput.Dispose();\r
+            }\r
+            addPresetToList(presetNameList);\r
+            presetNameList.Clear();\r
+\r
+            // Load in the users presets from user_presets.dat\r
+            filePath = Application.StartupPath.ToString() + "\\user_presets.dat";\r
+            if (File.Exists(filePath))\r
+            {\r
+                StreamReader presetInput = new StreamReader(filePath);\r
+                while (!presetInput.EndOfStream)\r
+                {\r
+                    if ((char)presetInput.Peek() == '+')\r
+                    {\r
+                        string preset = "--" + presetInput.ReadLine().Replace("+ ", "");\r
+                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
+                        presetNameList.Add(r.Split(preset));\r
+                    }\r
+                    else\r
+                        presetInput.ReadLine();\r
+                }\r
+\r
+                presetInput.Close();\r
+                presetInput.Dispose();\r
+            }\r
+            addPresetToList(presetNameList);\r
+        }\r
+\r
+        private void addPresetToList(ArrayList presetNameList)\r
+        {\r
             TreeNode preset_treeview = new TreeNode();\r
             foreach (string[] preset in presetNameList)\r
             {\r
@@ -1055,38 +1054,45 @@ namespace Handbrake
         // When the user select a preset from the treeview, load it\r
         private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
         {\r
-            string selectedPreset = null;\r
-            selectedPreset = treeView_presets.SelectedNode.Text;\r
-\r
             try\r
             {\r
-                string appPath = Application.StartupPath.ToString() + "\\presets.dat";\r
-                if (File.Exists(appPath))\r
+                // Scan through the built in presets\r
+                string builtInPresets = Application.StartupPath.ToString() + "\\presets.dat";\r
+                if (File.Exists(builtInPresets))\r
                 {\r
-                    StreamReader presetInput = new StreamReader(appPath);\r
+                    StreamReader presetInput = new StreamReader(builtInPresets);\r
                     while (!presetInput.EndOfStream)\r
                     {\r
                         if ((char)presetInput.Peek() == '+')\r
                         {\r
                             string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                            Regex r = new Regex("(:  )"); // Split on hyphens. \r
-                            string[] presetName = r.Split(preset);\r
-\r
-                            if (selectedPreset == presetName[0])\r
-                            {\r
-                                // Need to disable anamorphic now, otherwise it may overide the width / height values later.\r
-                                CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+                            checkSelectedPreset(preset);\r
+                        }\r
+                        else\r
+                            presetInput.ReadLine();\r
+                    }\r
 \r
-                                // Send the query from the file to the Query Parser class\r
-                                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(preset);\r
+                    presetInput.Close();\r
+                }\r
 \r
-                                // Now load the preset\r
-                                hb_common_func.presetLoader(this, presetQuery, selectedPreset);\r
-                            }\r
+                // Scan through the users presets\r
+                string userPresets = Application.StartupPath.ToString() + "\\user_presets.dat";\r
+                if (File.Exists(userPresets))\r
+                {\r
+                    StreamReader presetInput = new StreamReader(userPresets);\r
+                    while (!presetInput.EndOfStream)\r
+                    {\r
+                        if ((char)presetInput.Peek() == '+')\r
+                        {\r
+                            string preset = presetInput.ReadLine().Replace("+ ", "");\r
+                            checkSelectedPreset(preset);\r
                         }\r
                         else\r
                             presetInput.ReadLine();\r
                     }\r
+\r
+                    presetInput.Close();\r
+                    presetInput.Dispose();\r
                 }\r
             }\r
             catch (Exception exc)\r
@@ -1095,6 +1101,87 @@ namespace Handbrake
             }\r
         }\r
 \r
+        private void checkSelectedPreset(string preset)\r
+        {\r
+            string selectedPreset = null;\r
+            selectedPreset = treeView_presets.SelectedNode.Text;\r
+\r
+            Regex r = new Regex("(:  )"); // Split on hyphens. \r
+            string[] presetName = r.Split(preset);\r
+\r
+            if ((selectedPreset == (presetName[0])) || (selectedPreset == ("--" + presetName[0])))\r
+            {\r
+                // Send the query from the file to the Query Parser class\r
+                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(preset);\r
+\r
+                // Now load the preset\r
+                hb_common_func.presetLoader(this, presetQuery, selectedPreset);\r
+            }\r
+\r
+        }\r
+\r
+        private void btn_addPreset_Click(object sender, EventArgs e)\r
+        {\r
+            Form preset = new frmAddPreset(this);\r
+            preset.ShowDialog();\r
+        }\r
+\r
+        private void btn_removePreset_Click(object sender, EventArgs e)\r
+        {\r
+            ArrayList user_presets = new ArrayList();\r
+            ArrayList modified_presets_list = new ArrayList();\r
+            string selectedPreset = null;\r
+            selectedPreset = treeView_presets.SelectedNode.Text;\r
+\r
+            if (!selectedPreset.StartsWith("--"))\r
+                MessageBox.Show("Sorry, You can not remove any of the built in presets.","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+\r
+\r
+            // Scan through the users presets and dump them all in an arraylist\r
+            string userPresets = Application.StartupPath.ToString() + "\\user_presets.dat";\r
+            if (File.Exists(userPresets))\r
+            {\r
+                StreamReader presetInput = new StreamReader(userPresets);\r
+                while (!presetInput.EndOfStream)\r
+                {\r
+                    if ((char)presetInput.Peek() == '+')\r
+                    {\r
+                        string item = presetInput.ReadLine();\r
+                        user_presets.Add(item);\r
+                        modified_presets_list.Add(item);\r
+                    }\r
+                    else\r
+                        presetInput.ReadLine();\r
+                }\r
+\r
+                presetInput.Close();\r
+                presetInput.Dispose();\r
+            }\r
+\r
+            // now lets scan through the arraylist and remove the preset with the\r
+            // same name as the one selected.\r
+            int c = 0;\r
+            foreach (string item in user_presets)\r
+            {\r
+                string preset_name = selectedPreset.Replace("--","");\r
+                if (item.Contains(preset_name))\r
+                    modified_presets_list.RemoveAt(c);\r
+                c++;\r
+            }\r
+\r
+            // Now we need to rebuilt the user presets file.\r
+            StreamWriter line = new StreamWriter(userPresets);\r
+            foreach (string item in modified_presets_list)\r
+            {\r
+                line.WriteLine(item);\r
+            }\r
+            line.Close();\r
+            line.Dispose();\r
+\r
+            // Now reload the preset panel\r
+            loadPresetPanel();\r
+        }\r
+\r
         #endregion\r
 \r
         //---------------------------------------------------\r
@@ -1209,10 +1296,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-\r
-\r
-\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file
index 807a16b..4ed516e 100644 (file)
@@ -137,6 +137,24 @@ the one that's only used 10 percent of the time or less.
 This should locate subtitles for short foreign language segments. \r
 Best used in conjunction with forced subtitles.</value>\r
   </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <data name="data_chpt.ToolTip" xml:space="preserve">\r
+    <value>Here you can name each chapter that the encoded video will contain.\r
+Make sure you have selected a "Title" from the "Source" box above otherwise \r
+the list will not be populated with the correct amount of chapters.\r
+Note: Do not change any of the chapter numbers!</value>\r
+  </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r
@@ -183,24 +201,6 @@ Best used in conjunction with forced subtitles.</value>
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>106, 15</value>\r
   </metadata>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <data name="data_chpt.ToolTip" xml:space="preserve">\r
-    <value>Here you can name each chapter that the encoded video will contain.\r
-Make sure you have selected a "Title" from the "Source" box above otherwise \r
-the list will not be populated with the correct amount of chapters.\r
-Note: Do not change any of the chapter numbers!</value>\r
-  </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r