WinGui:

- Fix: Cropping setting incorrectly set if --crop 0:0:0:0 is used in a preset.

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

6 files changed, 28 insertions, 27 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 7b3e36fc9..8ef4b3b8d 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -110,7 +110,13 @@ namespace Handbrake.Functions
             #region Picture

 

             if (presetQuery.CropTop == "0" && presetQuery.CropBottom == "0" && presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")

-                mainWindow.check_autoCrop.Checked = true;

+            {

+                mainWindow.check_customCrop.Checked = true;

+                mainWindow.text_top.Text = "0";

+                mainWindow.text_bottom.Text = "0";

+                mainWindow.text_left.Text = "0";

+                mainWindow.text_right.Text = "0";

+            }

             else if (presetQuery.CropTop != null && presetQuery.CropBottom != null && presetQuery.CropLeft != null && presetQuery.CropRight != null)

             {

                 mainWindow.check_customCrop.Checked = true;

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 347e3f988..01302860a 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -818,7 +818,7 @@ namespace Handbrake.Functions
             Match detelecine = Regex.Match(input, @"--detelecine");

             Match anamorphic = Regex.Match(input, @" -p ");

             Match chapterMarkers = Regex.Match(input, @" -m");

-            Match crop = Regex.Match(input, @"--crop ([0-9]):([0-9]):([0-9]):([0-9])");

+            Match crop = Regex.Match(input, @"--crop ([0-9]*):([0-9]*):([0-9]*):([0-9]*)");

             Match vfr = Regex.Match(input, @" -V");

             Match lanamorphic = Regex.Match(input, @" -P");

             Match decomb = Regex.Match(input, @" --decomb");

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index b91ece1d8..00f33ba21 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -61,24 +61,24 @@ namespace Handbrake
             // 

             // btn_add

             // 

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

+            this.btn_add.BackColor = System.Drawing.SystemColors.Control;

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

             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(233, 44);

+            this.btn_add.Location = new System.Drawing.Point(284, 42);

             this.btn_add.Name = "btn_add";

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

-            this.btn_add.TabIndex = 4;

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

+            this.btn_add.TabIndex = 0;

             this.btn_add.TabStop = false;

-            this.btn_add.Text = "Add Preset";

-            this.btn_add.UseVisualStyleBackColor = true;

+            this.btn_add.Text = "Add";

+            this.btn_add.UseVisualStyleBackColor = false;

             this.btn_add.Click += new System.EventHandler(this.btn_add_Click);

             // 

             // frmAddPreset

             // 

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

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

-            this.ClientSize = new System.Drawing.Size(366, 76);

+            this.ClientSize = new System.Drawing.Size(362, 76);

             this.Controls.Add(this.btn_add);

             this.Controls.Add(this.txt_preset_name);

             this.Controls.Add(this.lbl_name);

diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index 898b067e7..1a18c0a17 100644
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -17,6 +17,7 @@ namespace Handbrake
 {

     public partial class frmAddPreset : Form

     {

+        Functions.Common hb_common_func = new Functions.Common();

         private frmMain frmMainWindow;

         Functions.Presets presetCode;

 

@@ -29,7 +30,6 @@ namespace Handbrake
 

         private void btn_add_Click(object sender, EventArgs e)

         {

-            Functions.Common hb_common_func = new Functions.Common();

             String query = hb_common_func.GenerateTheQuery(frmMainWindow);

 

             if (presetCode.addPreset(txt_preset_name.Text.Trim(), query) == true)

@@ -38,5 +38,6 @@ namespace Handbrake
                 this.Close();

             }

         }

+

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 1fef2e7c2..eb197e723 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -582,7 +582,7 @@ namespace Handbrake
             // 

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

             this.text_height.ForeColor = System.Drawing.SystemColors.InfoText;

-            this.text_height.Location = new System.Drawing.Point(498, 78);

+            this.text_height.Location = new System.Drawing.Point(498, 81);

             this.text_height.Name = "text_height";

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

             this.text_height.TabIndex = 19;

@@ -646,9 +646,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -1224,7 +1224,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(938, 24);

+            this.frmMainMenu.Size = new System.Drawing.Size(958, 24);

             this.frmMainMenu.TabIndex = 0;

             this.frmMainMenu.Text = "MenuStrip1";

             // 

@@ -2997,7 +2997,7 @@ namespace Handbrake
             this.groupBox2.ForeColor = System.Drawing.Color.Black;

             this.groupBox2.Location = new System.Drawing.Point(728, 70);

             this.groupBox2.Name = "groupBox2";

-            this.groupBox2.Size = new System.Drawing.Size(198, 537);

+            this.groupBox2.Size = new System.Drawing.Size(218, 537);

             this.groupBox2.TabIndex = 6;

             this.groupBox2.TabStop = false;

             this.groupBox2.Text = "Presets";

@@ -3011,7 +3011,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, 473);

+            this.treeView_presets.Size = new System.Drawing.Size(198, 473);

             this.treeView_presets.TabIndex = 0;

             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);

             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);

@@ -3032,7 +3032,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(938, 39);

+            this.toolStrip1.Size = new System.Drawing.Size(958, 39);

             this.toolStrip1.TabIndex = 1;

             this.toolStrip1.Text = "toolStrip1";

             // 

@@ -3167,7 +3167,7 @@ namespace Handbrake
             this.lbl_encode});

             this.StatusStrip.Location = new System.Drawing.Point(0, 619);

             this.StatusStrip.Name = "StatusStrip";

-            this.StatusStrip.Size = new System.Drawing.Size(938, 22);

+            this.StatusStrip.Size = new System.Drawing.Size(958, 22);

             this.StatusStrip.TabIndex = 7;

             this.StatusStrip.Text = "statusStrip1";

             // 

@@ -3182,7 +3182,7 @@ namespace Handbrake
             // 

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

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

-            this.ClientSize = new System.Drawing.Size(938, 641);

+            this.ClientSize = new System.Drawing.Size(958, 641);

             this.Controls.Add(this.GroupBox1);

             this.Controls.Add(this.groupBox_dest);

             this.Controls.Add(this.groupBox_output);

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index d0c9f18a9..1b5323eb3 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,12 +155,6 @@ 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>