WinGui:

- Next step in the new Add Presets Window.  Now added Picture Size modes "None" and "Source Maximum". Note cropping values are stored with "Source Maximum" if custom crop is selected. Also included option to include filter settings.

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

1 files changed, 65 insertions, 70 deletions

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index 348c430b9..530122101 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -40,18 +40,17 @@ namespace Handbrake
             this.txt_preset_name = new System.Windows.Forms.TextBox();

             this.btn_add = new System.Windows.Forms.Button();

             this.btn_cancel = new System.Windows.Forms.Button();

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

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

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

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

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

-            this.tableLayoutPanel1.SuspendLayout();

+            this.cb_usePictureSettings = new System.Windows.Forms.ComboBox();

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

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

             this.SuspendLayout();

             // 

             // lbl_name

             // 

-            this.lbl_name.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.lbl_name.AutoSize = true;

-            this.lbl_name.Location = new System.Drawing.Point(3, 7);

+            this.lbl_name.Location = new System.Drawing.Point(12, 18);

             this.lbl_name.Name = "lbl_name";

             this.lbl_name.Size = new System.Drawing.Size(75, 13);

             this.lbl_name.TabIndex = 1;

@@ -59,21 +58,18 @@ namespace Handbrake
             // 

             // txt_preset_name

             // 

-            this.txt_preset_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

-            this.tableLayoutPanel1.SetColumnSpan(this.txt_preset_name, 2);

-            this.txt_preset_name.Location = new System.Drawing.Point(84, 3);

+            this.txt_preset_name.Location = new System.Drawing.Point(130, 15);

             this.txt_preset_name.Name = "txt_preset_name";

-            this.txt_preset_name.Size = new System.Drawing.Size(208, 21);

+            this.txt_preset_name.Size = new System.Drawing.Size(172, 21);

             this.txt_preset_name.TabIndex = 0;

             // 

             // btn_add

             // 

-            this.btn_add.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

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

             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_add.Font = new System.Drawing.Font("Tahoma", 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(172, 72);

+            this.btn_add.Location = new System.Drawing.Point(185, 133);

             this.btn_add.Name = "btn_add";

             this.btn_add.Size = new System.Drawing.Size(57, 22);

             this.btn_add.TabIndex = 2;

@@ -87,7 +83,7 @@ namespace Handbrake
             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

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

             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_cancel.Location = new System.Drawing.Point(235, 72);

+            this.btn_cancel.Location = new System.Drawing.Point(248, 133);

             this.btn_cancel.Name = "btn_cancel";

             this.btn_cancel.Size = new System.Drawing.Size(57, 22);

             this.btn_cancel.TabIndex = 3;

@@ -95,55 +91,48 @@ namespace Handbrake
             this.btn_cancel.UseVisualStyleBackColor = false;

             this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);

             // 

-            // check_pictureSettings

-            // 

-            this.check_pictureSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;

-            this.check_pictureSettings.AutoSize = true;

-            this.tableLayoutPanel1.SetColumnSpan(this.check_pictureSettings, 2);

-            this.check_pictureSettings.Location = new System.Drawing.Point(84, 30);

-            this.check_pictureSettings.Name = "check_pictureSettings";

-            this.check_pictureSettings.Size = new System.Drawing.Size(132, 17);

-            this.check_pictureSettings.TabIndex = 1;

-            this.check_pictureSettings.Text = "Store Cropping Values";

-            this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");

-            this.check_pictureSettings.UseVisualStyleBackColor = true;

-            // 

-            // label1

-            // 

-            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;

-            this.label1.AutoSize = true;

-            this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);

-            this.label1.Location = new System.Drawing.Point(84, 53);

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

-            this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(200, 13);

-            this.label1.TabIndex = 4;

-            this.label1.Text = "Note: Subtitles are not stored in presets";

-            // 

-            // tableLayoutPanel1

-            // 

-            this.tableLayoutPanel1.AutoSize = true;

-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

-            this.tableLayoutPanel1.ColumnCount = 3;

-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

-            this.tableLayoutPanel1.Controls.Add(this.lbl_name, 0, 0);

-            this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 2, 3);

-            this.tableLayoutPanel1.Controls.Add(this.label1, 1, 2);

-            this.tableLayoutPanel1.Controls.Add(this.btn_add, 1, 3);

-            this.tableLayoutPanel1.Controls.Add(this.txt_preset_name, 1, 0);

-            this.tableLayoutPanel1.Controls.Add(this.check_pictureSettings, 1, 1);

-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;

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

-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

-            this.tableLayoutPanel1.RowCount = 4;

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

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

-            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(295, 125);

-            this.tableLayoutPanel1.TabIndex = 5;

+            // check_useFilters

+            // 

+            this.check_useFilters.AutoSize = true;

+            this.check_useFilters.Location = new System.Drawing.Point(130, 106);

+            this.check_useFilters.Name = "check_useFilters";

+            this.check_useFilters.Size = new System.Drawing.Size(112, 17);

+            this.check_useFilters.TabIndex = 1;

+            this.check_useFilters.Text = "Use Picture Filters";

+            this.toolTip.SetToolTip(this.check_useFilters, "Save Picture Width/Height and Crop Values");

+            this.check_useFilters.UseVisualStyleBackColor = true;

+            // 

+            // cb_usePictureSettings

+            // 

+            this.cb_usePictureSettings.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.cb_usePictureSettings.FormattingEnabled = true;

+            this.cb_usePictureSettings.Items.AddRange(new object[] {

+            "None",

+            "Source Maximum"});

+            this.cb_usePictureSettings.Location = new System.Drawing.Point(130, 79);

+            this.cb_usePictureSettings.Name = "cb_usePictureSettings";

+            this.cb_usePictureSettings.Size = new System.Drawing.Size(172, 21);

+            this.cb_usePictureSettings.TabIndex = 6;

+            // 

+            // label2

+            // 

+            this.label2.AutoSize = true;

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

+            this.label2.Location = new System.Drawing.Point(12, 57);

+            this.label2.Name = "label2";

+            this.label2.Size = new System.Drawing.Size(100, 13);

+            this.label2.TabIndex = 7;

+            this.label2.Text = "Picture Settings:";

+            // 

+            // label3

+            // 

+            this.label3.AutoSize = true;

+            this.label3.Location = new System.Drawing.Point(12, 82);

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

+            this.label3.Name = "label3";

+            this.label3.Size = new System.Drawing.Size(87, 13);

+            this.label3.TabIndex = 8;

+            this.label3.Text = "Use Picture Size:";

             // 

             // frmAddPreset

             // 

@@ -151,8 +140,15 @@ namespace Handbrake
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;

             this.AutoSize = true;

             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

-            this.ClientSize = new System.Drawing.Size(313, 143);

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

+            this.ClientSize = new System.Drawing.Size(319, 166);

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

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

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

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

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

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

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

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

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

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

@@ -164,10 +160,8 @@ namespace Handbrake
             this.ShowInTaskbar = false;

             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Add Preset";

+            this.Text = "Add New Preset";

             this.TopMost = true;

-            this.tableLayoutPanel1.ResumeLayout(false);

-            this.tableLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -179,9 +173,10 @@ namespace Handbrake
         private System.Windows.Forms.TextBox txt_preset_name;

         internal System.Windows.Forms.Button btn_add;

         internal System.Windows.Forms.Button btn_cancel;

-        private System.Windows.Forms.CheckBox check_pictureSettings;

+        private System.Windows.Forms.CheckBox check_useFilters;

         private System.Windows.Forms.ToolTip toolTip;

-        private System.Windows.Forms.Label label1;

-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

+        private System.Windows.Forms.ComboBox cb_usePictureSettings;

+        private System.Windows.Forms.Label label2;

+        private System.Windows.Forms.Label label3;

     }

 }
\ No newline at end of file