WinGui:

- Fix a minor display issue with the chapters tab grid.

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

2 files changed, 31 insertions, 31 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index fe903b02f..475635027 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -55,8 +55,6 @@ namespace Handbrake
             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.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

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

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

@@ -173,6 +171,8 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();

             this.openPreset = new System.Windows.Forms.OpenFileDialog();

             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();

+            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();

+            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

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

@@ -275,7 +275,7 @@ namespace Handbrake
             this.check_turbo.Enabled = false;

             this.check_turbo.Location = new System.Drawing.Point(146, 123);

             this.check_turbo.Name = "check_turbo";

-            this.check_turbo.Size = new System.Drawing.Size(99, 17);

+            this.check_turbo.Size = new System.Drawing.Size(101, 17);

             this.check_turbo.TabIndex = 7;

             this.check_turbo.Text = "Turbo first Pass";

             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");

@@ -395,24 +395,6 @@ namespace Handbrake
             this.data_chpt.TabIndex = 3;

             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));

             // 

-            // number

-            // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

-            this.number.Frozen = true;

-            this.number.HeaderText = "Chapter Number";

-            this.number.MaxInputLength = 3;

-            this.number.Name = "number";

-            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;

-            this.number.Width = 165;

-            // 

-            // name

-            // 

-            this.name.HeaderText = "Chapter Name";

-            this.name.Name = "name";

-            this.name.Width = 480;

-            // 

             // ChaptersMenu

             // 

             this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

@@ -855,7 +837,7 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;

             this.radio_cq.Location = new System.Drawing.Point(336, 97);

             this.radio_cq.Name = "radio_cq";

-            this.radio_cq.Size = new System.Drawing.Size(105, 17);

+            this.radio_cq.Size = new System.Drawing.Size(110, 17);

             this.radio_cq.TabIndex = 18;

             this.radio_cq.Text = "Constant Quality:";

             this.radio_cq.UseVisualStyleBackColor = false;

@@ -868,7 +850,7 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;

             this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64);

             this.radio_avgBitrate.Name = "radio_avgBitrate";

-            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);

+            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);

             this.radio_avgBitrate.TabIndex = 17;

             this.radio_avgBitrate.TabStop = true;

             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";

@@ -881,7 +863,7 @@ namespace Handbrake
             this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;

             this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37);

             this.radio_targetFilesize.Name = "radio_targetFilesize";

-            this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);

+            this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);

             this.radio_targetFilesize.TabIndex = 16;

             this.radio_targetFilesize.Text = "Target Size (MB):";

             this.radio_targetFilesize.UseVisualStyleBackColor = false;

@@ -904,7 +886,7 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;

             this.check_2PassEncode.Location = new System.Drawing.Point(125, 100);

             this.check_2PassEncode.Name = "check_2PassEncode";

-            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);

+            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);

             this.check_2PassEncode.TabIndex = 6;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.check_2PassEncode.UseVisualStyleBackColor = false;

@@ -1197,9 +1179,9 @@ namespace Handbrake
             this.treeView_presets.ShowLines = false;

             this.treeView_presets.Size = new System.Drawing.Size(240, 424);

             this.treeView_presets.TabIndex = 0;

+            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);

             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);

-            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);

             // 

             // presets_menu

             // 

@@ -1639,6 +1621,24 @@ namespace Handbrake
             // 

             this.File_ChapterImport.Filter = "CSV Files|*.csv";

             // 

+            // number

+            // 

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            this.number.Frozen = true;

+            this.number.HeaderText = "Chapter Number";

+            this.number.MaxInputLength = 3;

+            this.number.Name = "number";

+            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;

+            this.number.Width = 165;

+            // 

+            // name

+            // 

+            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;

+            this.name.HeaderText = "Chapter Name";

+            this.name.Name = "name";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

@@ -1802,8 +1802,6 @@ namespace Handbrake
         internal System.Windows.Forms.RadioButton radio_targetFilesize;

         internal Handbrake.Controls.x264Panel x264Panel;

         private System.Windows.Forms.ToolStripButton tb_preview;

-        private System.Windows.Forms.DataGridViewTextBoxColumn number;

-        private System.Windows.Forms.DataGridViewTextBoxColumn name;

         private System.Diagnostics.Process hbproc;

         private TabPage tab_subtitles;

         internal Handbrake.Controls.AudioPanel AudioSettings;

@@ -1840,5 +1838,7 @@ namespace Handbrake
         private ToolStripSeparator toolStripSeparator2;

         internal ComboBox drop_mode;

         private Button btn_export;

+        private DataGridViewTextBoxColumn number;

+        private DataGridViewTextBoxColumn name;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index aeb42c207..5ea49074f 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -117,12 +117,12 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>False</value>

-  </metadata>

   <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 54</value>

   </metadata>

+  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>False</value>

+  </metadata>

   <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>556, 15</value>

   </metadata>