WinGui:

- Updates Picture Settings code. A mix/match of old/new/libhb code.
- Custom anamorphic mode widgets are not hooked up yet, but if the user sets them manually, they will work just fine.
- Some of the logic has been simplified so that it works better however it's not bullet proof in terms of allowing users to misbehave.

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

1 files changed, 321 insertions, 242 deletions

diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs
index 9036eb5c2..51dd32c32 100644
--- a/win/C#/Controls/PictureSettings.Designer.cs
+++ b/win/C#/Controls/PictureSettings.Designer.cs
@@ -28,28 +28,28 @@ namespace Handbrake.Controls
         /// </summary>

         private void InitializeComponent()

         {

-            this.check_customCrop = new System.Windows.Forms.RadioButton();

-            this.check_autoCrop = new System.Windows.Forms.RadioButton();

-            this.crop_bottom = new System.Windows.Forms.NumericUpDown();

-            this.crop_top = new System.Windows.Forms.NumericUpDown();

+            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();

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

             this.crop_left = new System.Windows.Forms.NumericUpDown();

             this.crop_right = new System.Windows.Forms.NumericUpDown();

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

+            this.check_autoCrop = new System.Windows.Forms.RadioButton();

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

+            this.crop_top = new System.Windows.Forms.NumericUpDown();

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

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

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

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

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

-            this.text_height = new System.Windows.Forms.NumericUpDown();

-            this.text_width = new System.Windows.Forms.NumericUpDown();

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

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

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

+            this.crop_bottom = new System.Windows.Forms.NumericUpDown();

+            this.check_customCrop = new System.Windows.Forms.RadioButton();

+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();

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

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

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

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

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

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

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

+            this.text_width = new System.Windows.Forms.NumericUpDown();

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

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

+            this.text_height = new System.Windows.Forms.NumericUpDown();

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

             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

             this.updownParHeight = new System.Windows.Forms.NumericUpDown();

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

@@ -63,80 +63,66 @@ namespace Handbrake.Controls
             this.lbl_modulus = new System.Windows.Forms.Label();

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

             this.drp_modulus = new System.Windows.Forms.ComboBox();

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

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

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

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

+            this.tableLayoutPanel3.SuspendLayout();

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

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

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

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

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

+            this.tableLayoutPanel2.SuspendLayout();

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

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

             this.tableLayoutPanel1.SuspendLayout();

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

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

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

             this.SuspendLayout();

             // 

-            // check_customCrop

-            // 

-            this.check_customCrop.AutoSize = true;

-            this.check_customCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.check_customCrop.Location = new System.Drawing.Point(399, 57);

-            this.check_customCrop.Name = "check_customCrop";

-            this.check_customCrop.Size = new System.Drawing.Size(65, 17);

-            this.check_customCrop.TabIndex = 106;

-            this.check_customCrop.Text = "Custom:";

-            this.check_customCrop.UseVisualStyleBackColor = true;

-            // 

-            // check_autoCrop

-            // 

-            this.check_autoCrop.AutoSize = true;

-            this.check_autoCrop.Checked = true;

-            this.check_autoCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.check_autoCrop.Location = new System.Drawing.Point(399, 33);

-            this.check_autoCrop.Name = "check_autoCrop";

-            this.check_autoCrop.Size = new System.Drawing.Size(73, 17);

-            this.check_autoCrop.TabIndex = 105;

-            this.check_autoCrop.TabStop = true;

-            this.check_autoCrop.Text = "Automatic";

-            this.check_autoCrop.UseVisualStyleBackColor = true;

-            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);

-            // 

-            // crop_bottom

-            // 

-            this.crop_bottom.Enabled = false;

-            this.crop_bottom.Increment = new decimal(new int[] {

-            2,

-            0,

-            0,

-            0});

-            this.crop_bottom.Location = new System.Drawing.Point(479, 146);

-            this.crop_bottom.Maximum = new decimal(new int[] {

-            1080,

-            0,

-            0,

-            0});

-            this.crop_bottom.Name = "crop_bottom";

-            this.crop_bottom.Size = new System.Drawing.Size(44, 21);

-            this.crop_bottom.TabIndex = 103;

-            this.crop_bottom.ValueChanged += new System.EventHandler(this.crop_ValueChanged);

+            // tableLayoutPanel3

+            // 

+            this.tableLayoutPanel3.AutoSize = true;

+            this.tableLayoutPanel3.ColumnCount = 5;

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.Controls.Add(this.Label15, 0, 4);

+            this.tableLayoutPanel3.Controls.Add(this.crop_left, 1, 4);

+            this.tableLayoutPanel3.Controls.Add(this.crop_right, 3, 4);

+            this.tableLayoutPanel3.Controls.Add(this.check_autoCrop, 0, 0);

+            this.tableLayoutPanel3.Controls.Add(this.Label51, 4, 4);

+            this.tableLayoutPanel3.Controls.Add(this.crop_top, 2, 3);

+            this.tableLayoutPanel3.Controls.Add(this.Label53, 2, 6);

+            this.tableLayoutPanel3.Controls.Add(this.Label52, 2, 2);

+            this.tableLayoutPanel3.Controls.Add(this.crop_bottom, 2, 5);

+            this.tableLayoutPanel3.Controls.Add(this.check_customCrop, 0, 1);

+            this.tableLayoutPanel3.Location = new System.Drawing.Point(419, 35);

+            this.tableLayoutPanel3.Name = "tableLayoutPanel3";

+            this.tableLayoutPanel3.RowCount = 7;

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.Size = new System.Drawing.Size(217, 165);

+            this.tableLayoutPanel3.TabIndex = 117;

             // 

-            // crop_top

+            // Label15

             // 

-            this.crop_top.Enabled = false;

-            this.crop_top.Increment = new decimal(new int[] {

-            2,

-            0,

-            0,

-            0});

-            this.crop_top.Location = new System.Drawing.Point(479, 100);

-            this.crop_top.Maximum = new decimal(new int[] {

-            1080,

-            0,

-            0,

-            0});

-            this.crop_top.Name = "crop_top";

-            this.crop_top.Size = new System.Drawing.Size(44, 21);

-            this.crop_top.TabIndex = 100;

-            this.crop_top.ValueChanged += new System.EventHandler(this.crop_ValueChanged);

+            this.Label15.Anchor = System.Windows.Forms.AnchorStyles.Right;

+            this.Label15.AutoSize = true;

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

+            this.Label15.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

+            this.Label15.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

+            this.Label15.Name = "Label15";

+            this.Label15.Size = new System.Drawing.Size(26, 13);

+            this.Label15.TabIndex = 97;

+            this.Label15.Text = "Left";

             // 

             // crop_left

             // 

@@ -146,7 +132,7 @@ namespace Handbrake.Controls
             0,

             0,

             0});

-            this.crop_left.Location = new System.Drawing.Point(428, 122);

+            this.crop_left.Location = new System.Drawing.Point(32, 95);

             this.crop_left.Maximum = new decimal(new int[] {

             1920,

             0,

@@ -165,7 +151,7 @@ namespace Handbrake.Controls
             0,

             0,

             0});

-            this.crop_right.Location = new System.Drawing.Point(530, 122);

+            this.crop_right.Location = new System.Drawing.Point(132, 95);

             this.crop_right.Maximum = new decimal(new int[] {

             1920,

             0,

@@ -176,24 +162,62 @@ namespace Handbrake.Controls
             this.crop_right.TabIndex = 101;

             this.crop_right.ValueChanged += new System.EventHandler(this.crop_ValueChanged);

             // 

-            // label8

+            // check_autoCrop

             // 

-            this.label8.AutoSize = true;

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

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

-            this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

-            this.label8.Name = "label8";

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

-            this.label8.TabIndex = 96;

-            this.label8.Text = "Crop";

+            this.check_autoCrop.AutoSize = true;

+            this.check_autoCrop.Checked = true;

+            this.tableLayoutPanel3.SetColumnSpan(this.check_autoCrop, 5);

+            this.check_autoCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

+            this.check_autoCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

+            this.check_autoCrop.Name = "check_autoCrop";

+            this.check_autoCrop.Size = new System.Drawing.Size(73, 17);

+            this.check_autoCrop.TabIndex = 105;

+            this.check_autoCrop.TabStop = true;

+            this.check_autoCrop.Text = "Automatic";

+            this.check_autoCrop.UseVisualStyleBackColor = true;

+            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);

+            // 

+            // Label51

+            // 

+            this.Label51.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.Label51.AutoSize = true;

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

+            this.Label51.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.Label51.Location = new System.Drawing.Point(182, 99);

+            this.Label51.Margin = new System.Windows.Forms.Padding(3);

+            this.Label51.Name = "Label51";

+            this.Label51.Size = new System.Drawing.Size(32, 13);

+            this.Label51.TabIndex = 102;

+            this.Label51.Text = "Right";

+            // 

+            // crop_top

+            // 

+            this.crop_top.Enabled = false;

+            this.crop_top.Increment = new decimal(new int[] {

+            2,

+            0,

+            0,

+            0});

+            this.crop_top.Location = new System.Drawing.Point(82, 68);

+            this.crop_top.Maximum = new decimal(new int[] {

+            1080,

+            0,

+            0,

+            0});

+            this.crop_top.Name = "crop_top";

+            this.crop_top.Size = new System.Drawing.Size(44, 21);

+            this.crop_top.TabIndex = 100;

+            this.crop_top.ValueChanged += new System.EventHandler(this.crop_ValueChanged);

             // 

             // Label53

             // 

+            this.Label53.Anchor = System.Windows.Forms.AnchorStyles.Top;

             this.Label53.AutoSize = true;

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

             this.Label53.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.Label53.Location = new System.Drawing.Point(477, 170);

+            this.Label53.Location = new System.Drawing.Point(83, 149);

+            this.Label53.Margin = new System.Windows.Forms.Padding(3);

             this.Label53.Name = "Label53";

             this.Label53.Size = new System.Drawing.Size(41, 13);

             this.Label53.TabIndex = 104;

@@ -201,165 +225,210 @@ namespace Handbrake.Controls
             // 

             // Label52

             // 

+            this.Label52.Anchor = System.Windows.Forms.AnchorStyles.Bottom;

             this.Label52.AutoSize = true;

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

             this.Label52.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.Label52.Location = new System.Drawing.Point(486, 85);

+            this.Label52.Location = new System.Drawing.Point(91, 49);

+            this.Label52.Margin = new System.Windows.Forms.Padding(3);

             this.Label52.Name = "Label52";

             this.Label52.Size = new System.Drawing.Size(25, 13);

             this.Label52.TabIndex = 99;

             this.Label52.Text = "Top";

             // 

-            // Label51

-            // 

-            this.Label51.AutoSize = true;

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

-            this.Label51.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.Label51.Location = new System.Drawing.Point(580, 124);

-            this.Label51.Name = "Label51";

-            this.Label51.Size = new System.Drawing.Size(32, 13);

-            this.Label51.TabIndex = 102;

-            this.Label51.Text = "Right";

-            // 

-            // Label15

-            // 

-            this.Label15.AutoSize = true;

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

-            this.Label15.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.Label15.Location = new System.Drawing.Point(396, 124);

-            this.Label15.Name = "Label15";

-            this.Label15.Size = new System.Drawing.Size(26, 13);

-            this.Label15.TabIndex = 97;

-            this.Label15.Text = "Left";

-            // 

-            // check_KeepAR

-            // 

-            this.check_KeepAR.AutoSize = true;

-            this.check_KeepAR.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.check_KeepAR.Location = new System.Drawing.Point(68, 85);

-            this.check_KeepAR.Name = "check_KeepAR";

-            this.check_KeepAR.Size = new System.Drawing.Size(114, 17);

-            this.check_KeepAR.TabIndex = 95;

-            this.check_KeepAR.Text = "Keep Aspect Ratio";

-            this.check_KeepAR.UseVisualStyleBackColor = true;

-            this.check_KeepAR.CheckedChanged += new System.EventHandler(this.check_KeepAR_CheckedChanged);

-            // 

-            // text_height

+            // crop_bottom

             // 

-            this.text_height.Location = new System.Drawing.Point(206, 59);

-            this.text_height.Maximum = new decimal(new int[] {

-            2560,

+            this.crop_bottom.Enabled = false;

+            this.crop_bottom.Increment = new decimal(new int[] {

+            2,

             0,

             0,

             0});

-            this.text_height.Name = "text_height";

-            this.text_height.Size = new System.Drawing.Size(64, 21);

-            this.text_height.TabIndex = 86;

-            this.text_height.ValueChanged += new System.EventHandler(this.text_height_ValueChanged);

-            // 

-            // text_width

-            // 

-            this.text_width.Location = new System.Drawing.Point(68, 59);

-            this.text_width.Maximum = new decimal(new int[] {

-            2560,

+            this.crop_bottom.Location = new System.Drawing.Point(82, 122);

+            this.crop_bottom.Maximum = new decimal(new int[] {

+            1080,

             0,

             0,

             0});

-            this.text_width.Name = "text_width";

-            this.text_width.Size = new System.Drawing.Size(64, 21);

-            this.text_width.TabIndex = 85;

-            this.text_width.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);

-            // 

-            // label4

-            // 

-            this.label4.AutoSize = true;

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

-            this.label4.ForeColor = System.Drawing.Color.Black;

-            this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.label4.Location = new System.Drawing.Point(152, 63);

-            this.label4.Name = "label4";

-            this.label4.Size = new System.Drawing.Size(42, 13);

-            this.label4.TabIndex = 84;

-            this.label4.Text = "Height:";

-            // 

-            // lbl_max

+            this.crop_bottom.Name = "crop_bottom";

+            this.crop_bottom.Size = new System.Drawing.Size(44, 21);

+            this.crop_bottom.TabIndex = 103;

+            this.crop_bottom.ValueChanged += new System.EventHandler(this.crop_ValueChanged);

             // 

-            this.lbl_max.AutoSize = true;

-            this.lbl_max.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.lbl_max.Location = new System.Drawing.Point(279, 61);

-            this.lbl_max.Name = "lbl_max";

-            this.lbl_max.Size = new System.Drawing.Size(37, 13);

-            this.lbl_max.TabIndex = 83;

-            this.lbl_max.Text = "{max}";

+            // check_customCrop

             // 

-            // lbl_src_res

+            this.check_customCrop.AutoSize = true;

+            this.tableLayoutPanel3.SetColumnSpan(this.check_customCrop, 5);

+            this.check_customCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

+            this.check_customCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

+            this.check_customCrop.Name = "check_customCrop";

+            this.check_customCrop.Size = new System.Drawing.Size(61, 17);

+            this.check_customCrop.TabIndex = 106;

+            this.check_customCrop.Text = "Custom";

+            this.check_customCrop.UseVisualStyleBackColor = true;

             // 

-            this.lbl_src_res.AutoSize = true;

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

-            this.lbl_src_res.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.lbl_src_res.Location = new System.Drawing.Point(66, 36);

-            this.lbl_src_res.Name = "lbl_src_res";

-            this.lbl_src_res.Size = new System.Drawing.Size(68, 13);

-            this.lbl_src_res.TabIndex = 77;

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

+            // tableLayoutPanel2

+            // 

+            this.tableLayoutPanel2.AutoSize = true;

+            this.tableLayoutPanel2.ColumnCount = 5;

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.Controls.Add(this.label7, 0, 0);

+            this.tableLayoutPanel2.Controls.Add(this.lbl_src_res, 1, 0);

+            this.tableLayoutPanel2.Controls.Add(this.Label91, 2, 0);

+            this.tableLayoutPanel2.Controls.Add(this.lbl_Aspect, 3, 0);

+            this.tableLayoutPanel2.Controls.Add(this.Label55, 0, 1);

+            this.tableLayoutPanel2.Controls.Add(this.text_width, 1, 1);

+            this.tableLayoutPanel2.Controls.Add(this.lbl_max, 4, 1);

+            this.tableLayoutPanel2.Controls.Add(this.label4, 2, 1);

+            this.tableLayoutPanel2.Controls.Add(this.text_height, 3, 1);

+            this.tableLayoutPanel2.Controls.Add(this.check_KeepAR, 1, 2);

+            this.tableLayoutPanel2.Location = new System.Drawing.Point(16, 35);

+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";

+            this.tableLayoutPanel2.RowCount = 3;

+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel2.Size = new System.Drawing.Size(376, 69);

+            this.tableLayoutPanel2.TabIndex = 116;

             // 

             // label7

             // 

+            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label7.AutoSize = true;

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

             this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

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

+            this.label7.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.label7.Name = "label7";

             this.label7.Size = new System.Drawing.Size(44, 13);

             this.label7.TabIndex = 76;

             this.label7.Text = "Source:";

             // 

-            // label26

-            // 

-            this.label26.AutoSize = true;

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

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

-            this.label26.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

-            this.label26.Name = "label26";

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

-            this.label26.TabIndex = 75;

-            this.label26.Text = "Size";

-            // 

-            // lbl_Aspect

+            // lbl_src_res

             // 

-            this.lbl_Aspect.AutoSize = true;

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

-            this.lbl_Aspect.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.lbl_Aspect.Location = new System.Drawing.Point(241, 36);

-            this.lbl_Aspect.Name = "lbl_Aspect";

-            this.lbl_Aspect.Size = new System.Drawing.Size(68, 13);

-            this.lbl_Aspect.TabIndex = 79;

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

+            this.lbl_src_res.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.lbl_src_res.AutoSize = true;

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

+            this.lbl_src_res.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.lbl_src_res.Location = new System.Drawing.Point(50, 3);

+            this.lbl_src_res.Margin = new System.Windows.Forms.Padding(3);

+            this.lbl_src_res.Name = "lbl_src_res";

+            this.lbl_src_res.Size = new System.Drawing.Size(15, 13);

+            this.lbl_src_res.TabIndex = 77;

+            this.lbl_src_res.Text = "--";

             // 

             // Label91

             // 

+            this.Label91.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.Label91.AutoSize = true;

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

             this.Label91.ImeMode = System.Windows.Forms.ImeMode.NoControl;

-            this.Label91.Location = new System.Drawing.Point(152, 35);

+            this.Label91.Location = new System.Drawing.Point(120, 3);

+            this.Label91.Margin = new System.Windows.Forms.Padding(3);

             this.Label91.Name = "Label91";

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

             this.Label91.TabIndex = 78;

             this.Label91.Text = "Aspect Ratio:";

             // 

+            // lbl_Aspect

+            // 

+            this.lbl_Aspect.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.lbl_Aspect.AutoSize = true;

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

+            this.lbl_Aspect.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.lbl_Aspect.Location = new System.Drawing.Point(198, 3);

+            this.lbl_Aspect.Margin = new System.Windows.Forms.Padding(3);

+            this.lbl_Aspect.Name = "lbl_Aspect";

+            this.lbl_Aspect.Size = new System.Drawing.Size(15, 13);

+            this.lbl_Aspect.TabIndex = 79;

+            this.lbl_Aspect.Text = "--";

+            // 

             // Label55

             // 

+            this.Label55.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.Label55.AutoSize = true;

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

             this.Label55.ForeColor = System.Drawing.Color.Black;

             this.Label55.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

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

+            this.Label55.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.Label55.Name = "Label55";

             this.Label55.Size = new System.Drawing.Size(39, 13);

             this.Label55.TabIndex = 80;

             this.Label55.Text = "Width:";

             // 

+            // text_width

+            // 

+            this.text_width.Location = new System.Drawing.Point(50, 22);

+            this.text_width.Maximum = new decimal(new int[] {

+            2560,

+            0,

+            0,

+            0});

+            this.text_width.Name = "text_width";

+            this.text_width.Size = new System.Drawing.Size(64, 21);

+            this.text_width.TabIndex = 85;

+            this.text_width.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);

+            // 

+            // lbl_max

+            // 

+            this.lbl_max.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.lbl_max.AutoSize = true;

+            this.lbl_max.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.lbl_max.Location = new System.Drawing.Point(268, 26);

+            this.lbl_max.Margin = new System.Windows.Forms.Padding(3);

+            this.lbl_max.Name = "lbl_max";

+            this.lbl_max.Size = new System.Drawing.Size(15, 13);

+            this.lbl_max.TabIndex = 83;

+            this.lbl_max.Text = "--";

+            // 

+            // label4

+            // 

+            this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label4.AutoSize = true;

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

+            this.label4.ForeColor = System.Drawing.Color.Black;

+            this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.label4.Location = new System.Drawing.Point(120, 26);

+            this.label4.Margin = new System.Windows.Forms.Padding(3);

+            this.label4.Name = "label4";

+            this.label4.Size = new System.Drawing.Size(42, 13);

+            this.label4.TabIndex = 84;

+            this.label4.Text = "Height:";

+            // 

+            // text_height

+            // 

+            this.text_height.Location = new System.Drawing.Point(198, 22);

+            this.text_height.Maximum = new decimal(new int[] {

+            2560,

+            0,

+            0,

+            0});

+            this.text_height.Name = "text_height";

+            this.text_height.Size = new System.Drawing.Size(64, 21);

+            this.text_height.TabIndex = 86;

+            this.text_height.ValueChanged += new System.EventHandler(this.text_height_ValueChanged);

+            // 

+            // check_KeepAR

+            // 

+            this.check_KeepAR.AutoSize = true;

+            this.check_KeepAR.Checked = true;

+            this.check_KeepAR.CheckState = System.Windows.Forms.CheckState.Checked;

+            this.tableLayoutPanel2.SetColumnSpan(this.check_KeepAR, 3);

+            this.check_KeepAR.ImeMode = System.Windows.Forms.ImeMode.NoControl;

+            this.check_KeepAR.Location = new System.Drawing.Point(50, 49);

+            this.check_KeepAR.Name = "check_KeepAR";

+            this.check_KeepAR.Size = new System.Drawing.Size(114, 17);

+            this.check_KeepAR.TabIndex = 95;

+            this.check_KeepAR.Text = "Keep Aspect Ratio";

+            this.check_KeepAR.UseVisualStyleBackColor = true;

+            this.check_KeepAR.CheckedChanged += new System.EventHandler(this.check_KeepAR_CheckedChanged);

+            // 

             // tableLayoutPanel1

             // 

             this.tableLayoutPanel1.AutoSize = true;

@@ -379,7 +448,7 @@ namespace Handbrake.Controls
             this.tableLayoutPanel1.Controls.Add(this.lbl_modulus, 0, 1);

             this.tableLayoutPanel1.Controls.Add(this.lbl_displayWidth, 0, 2);

             this.tableLayoutPanel1.Controls.Add(this.drp_modulus, 1, 1);

-            this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 108);

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 110);

             this.tableLayoutPanel1.Name = "tableLayoutPanel1";

             this.tableLayoutPanel1.RowCount = 6;

             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

@@ -389,7 +458,7 @@ namespace Handbrake.Controls
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

             this.tableLayoutPanel1.Size = new System.Drawing.Size(195, 154);

-            this.tableLayoutPanel1.TabIndex = 110;

+            this.tableLayoutPanel1.TabIndex = 115;

             // 

             // updownParHeight

             // 

@@ -402,7 +471,6 @@ namespace Handbrake.Controls
             this.updownParHeight.Name = "updownParHeight";

             this.updownParHeight.Size = new System.Drawing.Size(53, 21);

             this.updownParHeight.TabIndex = 112;

-            this.updownParHeight.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);

             // 

             // label6

             // 

@@ -425,9 +493,9 @@ namespace Handbrake.Controls
             this.labelDisplaySize.Location = new System.Drawing.Point(82, 138);

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

             this.labelDisplaySize.Name = "labelDisplaySize";

-            this.labelDisplaySize.Size = new System.Drawing.Size(68, 13);

+            this.labelDisplaySize.Size = new System.Drawing.Size(15, 13);

             this.labelDisplaySize.TabIndex = 108;

-            this.labelDisplaySize.Text = "Select a Title";

+            this.labelDisplaySize.Text = "--";

             // 

             // lbl_parHeight

             // 

@@ -466,7 +534,6 @@ namespace Handbrake.Controls
             this.updownParWidth.Name = "updownParWidth";

             this.updownParWidth.Size = new System.Drawing.Size(53, 21);

             this.updownParWidth.TabIndex = 111;

-            this.updownParWidth.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);

             // 

             // drp_anamorphic

             // 

@@ -507,7 +574,6 @@ namespace Handbrake.Controls
             this.updownDisplayWidth.Name = "updownDisplayWidth";

             this.updownDisplayWidth.Size = new System.Drawing.Size(53, 21);

             this.updownDisplayWidth.TabIndex = 110;

-            this.updownDisplayWidth.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);

             // 

             // lbl_modulus

             // 

@@ -550,44 +616,54 @@ namespace Handbrake.Controls
             this.drp_modulus.TabIndex = 88;

             this.drp_modulus.SelectedIndexChanged += new System.EventHandler(this.drp_modulus_SelectedIndexChanged);

             // 

+            // label8

+            // 

+            this.label8.AutoSize = true;

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

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

+            this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

+            this.label8.Name = "label8";

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

+            this.label8.TabIndex = 114;

+            this.label8.Text = "Cropping";

+            // 

+            // label26

+            // 

+            this.label26.AutoSize = true;

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

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

+            this.label26.ImeMode = System.Windows.Forms.ImeMode.NoControl;

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

+            this.label26.Name = "label26";

+            this.label26.Size = new System.Drawing.Size(30, 13);

+            this.label26.TabIndex = 113;

+            this.label26.Text = "Size";

+            // 

             // PictureSettings

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

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

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

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

             this.Controls.Add(this.tableLayoutPanel1);

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

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

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

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

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

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

             this.Controls.Add(this.label8);

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

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

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

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

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

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

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

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

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

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

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

             this.Controls.Add(this.label26);

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

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

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

             this.Enabled = false;

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

             this.Name = "PictureSettings";

             this.Size = new System.Drawing.Size(666, 279);

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

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

+            this.tableLayoutPanel3.ResumeLayout(false);

+            this.tableLayoutPanel3.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.crop_left)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.crop_right)).EndInit();

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

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

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

+            this.tableLayoutPanel2.ResumeLayout(false);

+            this.tableLayoutPanel2.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.text_width)).EndInit();

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

             this.tableLayoutPanel1.ResumeLayout(false);

             this.tableLayoutPanel1.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.updownParHeight)).EndInit();

@@ -600,27 +676,26 @@ namespace Handbrake.Controls
 

         #endregion

 

-        internal System.Windows.Forms.RadioButton check_customCrop;

-        internal System.Windows.Forms.RadioButton check_autoCrop;

-        internal System.Windows.Forms.NumericUpDown crop_bottom;

-        internal System.Windows.Forms.NumericUpDown crop_top;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;

+        internal System.Windows.Forms.Label Label15;

         internal System.Windows.Forms.NumericUpDown crop_left;

         internal System.Windows.Forms.NumericUpDown crop_right;

-        internal System.Windows.Forms.Label label8;

+        internal System.Windows.Forms.RadioButton check_autoCrop;

+        internal System.Windows.Forms.Label Label51;

+        internal System.Windows.Forms.NumericUpDown crop_top;

         internal System.Windows.Forms.Label Label53;

         internal System.Windows.Forms.Label Label52;

-        internal System.Windows.Forms.Label Label51;

-        internal System.Windows.Forms.Label Label15;

-        internal System.Windows.Forms.CheckBox check_KeepAR;

-        internal System.Windows.Forms.NumericUpDown text_height;

-        internal System.Windows.Forms.Label label4;

-        private System.Windows.Forms.Label lbl_max;

-        internal System.Windows.Forms.Label lbl_src_res;

+        internal System.Windows.Forms.NumericUpDown crop_bottom;

+        internal System.Windows.Forms.RadioButton check_customCrop;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;

         internal System.Windows.Forms.Label label7;

-        internal System.Windows.Forms.Label label26;

-        internal System.Windows.Forms.Label lbl_Aspect;

+        internal System.Windows.Forms.Label lbl_src_res;

         internal System.Windows.Forms.Label Label91;

+        internal System.Windows.Forms.Label lbl_Aspect;

         internal System.Windows.Forms.Label Label55;

+        private System.Windows.Forms.Label lbl_max;

+        internal System.Windows.Forms.Label label4;

+        internal System.Windows.Forms.CheckBox check_KeepAR;

         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

         internal System.Windows.Forms.NumericUpDown updownParHeight;

         internal System.Windows.Forms.Label label6;

@@ -634,7 +709,11 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.Label lbl_modulus;

         internal System.Windows.Forms.Label lbl_displayWidth;

         internal System.Windows.Forms.ComboBox drp_modulus;

+        internal System.Windows.Forms.Label label8;

+        internal System.Windows.Forms.Label label26;

         internal System.Windows.Forms.NumericUpDown text_width;

+        internal System.Windows.Forms.NumericUpDown text_height;

+

 

 

     }