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