WinGui:

- Removed invalid tooltip text from Size -> Source label.
- Moved deblock slider up a few px. The control has a horrible amount of uncontrollable padding which may overlap the de interlace control in some cases.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 6867232..a70386b 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -165,6 +165,7 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
+            this.label8 = new System.Windows.Forms.Label();\r
             this.lbl_deblockVal = new System.Windows.Forms.Label();\r
             this.slider_deblock = new System.Windows.Forms.TrackBar();\r
             this.check_customCrop = new System.Windows.Forms.RadioButton();\r
@@ -259,7 +260,6 @@ namespace Handbrake
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
-            this.label8 = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
@@ -582,7 +582,7 @@ namespace Handbrake
             // \r
             this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_height.ForeColor = System.Drawing.SystemColors.InfoText;\r
-            this.text_height.Location = new System.Drawing.Point(498, 81);\r
+            this.text_height.Location = new System.Drawing.Point(498, 78);\r
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
             this.text_height.TabIndex = 19;\r
@@ -646,9 +646,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -954,7 +954,6 @@ namespace Handbrake
             this.label7.Size = new System.Drawing.Size(52, 13);\r
             this.label7.TabIndex = 12;\r
             this.label7.Text = "Source:";\r
-            this.ToolTip.SetToolTip(this.label7, "Top / Bottom / Left / Right");\r
             // \r
             // lbl_src_res\r
             // \r
@@ -1854,9 +1853,9 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage1.Controls.Add(this.slider_deblock);\r
             this.TabPage1.Controls.Add(this.label8);\r
             this.TabPage1.Controls.Add(this.lbl_deblockVal);\r
-            this.TabPage1.Controls.Add(this.slider_deblock);\r
             this.TabPage1.Controls.Add(this.check_customCrop);\r
             this.TabPage1.Controls.Add(this.check_autoCrop);\r
             this.TabPage1.Controls.Add(this.check_decomb);\r
@@ -1894,12 +1893,23 @@ namespace Handbrake
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
+            // label8\r
+            // \r
+            this.label8.AutoSize = true;\r
+            this.label8.BackColor = System.Drawing.Color.Transparent;\r
+            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label8.Location = new System.Drawing.Point(311, 215);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(58, 13);\r
+            this.label8.TabIndex = 37;\r
+            this.label8.Text = "Deblock:";\r
+            // \r
             // lbl_deblockVal\r
             // \r
             this.lbl_deblockVal.AutoSize = true;\r
             this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_deblockVal.Location = new System.Drawing.Point(586, 213);\r
+            this.lbl_deblockVal.Location = new System.Drawing.Point(584, 215);\r
             this.lbl_deblockVal.Name = "lbl_deblockVal";\r
             this.lbl_deblockVal.Size = new System.Drawing.Size(14, 13);\r
             this.lbl_deblockVal.TabIndex = 36;\r
@@ -1907,7 +1917,7 @@ namespace Handbrake
             // \r
             // slider_deblock\r
             // \r
-            this.slider_deblock.Location = new System.Drawing.Point(406, 204);\r
+            this.slider_deblock.Location = new System.Drawing.Point(406, 201);\r
             this.slider_deblock.Maximum = 15;\r
             this.slider_deblock.Name = "slider_deblock";\r
             this.slider_deblock.Size = new System.Drawing.Size(174, 42);\r
@@ -3167,17 +3177,6 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
-            // label8\r
-            // \r
-            this.label8.AutoSize = true;\r
-            this.label8.BackColor = System.Drawing.Color.Transparent;\r
-            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(311, 213);\r
-            this.label8.Name = "label8";\r
-            this.label8.Size = new System.Drawing.Size(58, 13);\r
-            this.label8.TabIndex = 37;\r
-            this.label8.Text = "Deblock:";\r
-            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index d0c9f18..1b5323e 100644 (file)
--- 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.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r