OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 18 May 2010 15:19:42 +0000 (15:19 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 18 May 2010 15:19:42 +0000 (15:19 +0000)
- Switch the Audio Panel over to a DataGridView for more flexibility in possible upcoming changes.
- Few UI tweaks to other panels to make look / behave similarly.

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

win/C#/Controls/AudioPanel.Designer.cs
win/C#/Controls/AudioPanel.cs
win/C#/Controls/AudioPanel.resx
win/C#/Functions/QueryGenerator.cs
win/C#/frmMain.Designer.cs
win/C#/frmMain.resx

index 42d3858..5c64628 100644 (file)
@@ -35,14 +35,6 @@ namespace Handbrake.Controls
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\r
-            this.lv_audioList = new System.Windows.Forms.ListView();\r
-            this.col_id = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_Source = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_codec = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_mixdown = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_samplerate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_bitrate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
-            this.col_drc = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));\r
             this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
             this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -66,69 +58,20 @@ namespace Handbrake.Controls
             this.drp_audioSample = new System.Windows.Forms.ComboBox();\r
             this.AudioTrackGroup = new System.Windows.Forms.GroupBox();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
+            this.audioList = new System.Windows.Forms.DataGridView();\r
+            this.Track = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.audioMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();\r
             this.AudioTrackGroup.SuspendLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.audioList)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
-            // lv_audioList\r
-            // \r
-            this.lv_audioList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {\r
-            this.col_id,\r
-            this.col_Source,\r
-            this.col_codec,\r
-            this.col_mixdown,\r
-            this.col_samplerate,\r
-            this.col_bitrate,\r
-            this.col_drc});\r
-            this.lv_audioList.ContextMenuStrip = this.audioMenu;\r
-            this.lv_audioList.FullRowSelect = true;\r
-            this.lv_audioList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
-            this.lv_audioList.HideSelection = false;\r
-            this.lv_audioList.Location = new System.Drawing.Point(16, 150);\r
-            this.lv_audioList.MultiSelect = false;\r
-            this.lv_audioList.Name = "lv_audioList";\r
-            this.lv_audioList.Size = new System.Drawing.Size(689, 140);\r
-            this.lv_audioList.TabIndex = 65;\r
-            this.lv_audioList.UseCompatibleStateImageBehavior = false;\r
-            this.lv_audioList.View = System.Windows.Forms.View.Details;\r
-            this.lv_audioList.SelectedIndexChanged += new System.EventHandler(this.lv_audioList_SelectedIndexChanged);\r
-            // \r
-            // col_id\r
-            // \r
-            this.col_id.Text = "Track";\r
-            this.col_id.Width = 47;\r
-            // \r
-            // col_Source\r
-            // \r
-            this.col_Source.Text = "Source";\r
-            this.col_Source.Width = 170;\r
-            // \r
-            // col_codec\r
-            // \r
-            this.col_codec.Text = "Audio Codec";\r
-            this.col_codec.Width = 88;\r
-            // \r
-            // col_mixdown\r
-            // \r
-            this.col_mixdown.Text = "Mixdown";\r
-            this.col_mixdown.Width = 127;\r
-            // \r
-            // col_samplerate\r
-            // \r
-            this.col_samplerate.Text = "Samplerate (kHz)";\r
-            this.col_samplerate.Width = 101;\r
-            // \r
-            // col_bitrate\r
-            // \r
-            this.col_bitrate.Text = "Bitrate (Kbps)";\r
-            this.col_bitrate.Width = 95;\r
-            // \r
-            // col_drc\r
-            // \r
-            this.col_drc.Text = "DRC";\r
-            this.col_drc.Width = 57;\r
-            // \r
             // audioMenu\r
             // \r
             this.audioMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -386,7 +329,7 @@ namespace Handbrake.Controls
             this.AudioTrackGroup.Controls.Add(this.lbl_bitrate);\r
             this.AudioTrackGroup.Location = new System.Drawing.Point(16, 67);\r
             this.AudioTrackGroup.Name = "AudioTrackGroup";\r
-            this.AudioTrackGroup.Size = new System.Drawing.Size(689, 77);\r
+            this.AudioTrackGroup.Size = new System.Drawing.Size(685, 77);\r
             this.AudioTrackGroup.TabIndex = 66;\r
             this.AudioTrackGroup.TabStop = false;\r
             this.AudioTrackGroup.Text = "Selected Track: New Track";\r
@@ -397,13 +340,104 @@ namespace Handbrake.Controls
             this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);\r
             this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;\r
             // \r
+            // audioList\r
+            // \r
+            this.audioList.AllowUserToAddRows = false;\r
+            this.audioList.AllowUserToResizeColumns = false;\r
+            this.audioList.BackgroundColor = System.Drawing.Color.White;\r
+            this.audioList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;\r
+            this.audioList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;\r
+            this.audioList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
+            this.Track,\r
+            this.Source,\r
+            this.AudioCodec,\r
+            this.Mixdown,\r
+            this.Samplerate,\r
+            this.Bitrate,\r
+            this.DRC});\r
+            this.audioList.ContextMenuStrip = this.audioMenu;\r
+            this.audioList.GridColor = System.Drawing.Color.White;\r
+            this.audioList.Location = new System.Drawing.Point(16, 150);\r
+            this.audioList.Name = "audioList";\r
+            this.audioList.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;\r
+            this.audioList.RowHeadersVisible = false;\r
+            this.audioList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;\r
+            this.audioList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
+            this.audioList.ShowCellErrors = false;\r
+            this.audioList.ShowCellToolTips = false;\r
+            this.audioList.ShowEditingIcon = false;\r
+            this.audioList.ShowRowErrors = false;\r
+            this.audioList.Size = new System.Drawing.Size(685, 140);\r
+            this.audioList.TabIndex = 67;\r
+            this.audioList.SelectionChanged += new System.EventHandler(this.audioList_SelectionChanged);\r
+            // \r
+            // Track\r
+            // \r
+            this.Track.FillWeight = 304.2808F;\r
+            this.Track.HeaderText = "Track";\r
+            this.Track.Name = "Track";\r
+            this.Track.ReadOnly = true;\r
+            this.Track.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Track.Width = 50;\r
+            // \r
+            // Source\r
+            // \r
+            this.Source.FillWeight = 49.69727F;\r
+            this.Source.HeaderText = "Source";\r
+            this.Source.Name = "Source";\r
+            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Source.Width = 150;\r
+            // \r
+            // AudioCodec\r
+            // \r
+            this.AudioCodec.HeaderText = "Audio Codec";\r
+            this.AudioCodec.Name = "AudioCodec";\r
+            this.AudioCodec.ReadOnly = true;\r
+            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            // \r
+            // Mixdown\r
+            // \r
+            this.Mixdown.FillWeight = 49.69727F;\r
+            this.Mixdown.HeaderText = "Mixdown";\r
+            this.Mixdown.Name = "Mixdown";\r
+            this.Mixdown.ReadOnly = true;\r
+            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Mixdown.Width = 150;\r
+            // \r
+            // Samplerate\r
+            // \r
+            this.Samplerate.FillWeight = 49.69727F;\r
+            this.Samplerate.HeaderText = "Samplerate";\r
+            this.Samplerate.Name = "Samplerate";\r
+            this.Samplerate.ReadOnly = true;\r
+            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Samplerate.Width = 75;\r
+            // \r
+            // Bitrate\r
+            // \r
+            this.Bitrate.FillWeight = 49.69727F;\r
+            this.Bitrate.HeaderText = "Bitrate";\r
+            this.Bitrate.Name = "Bitrate";\r
+            this.Bitrate.ReadOnly = true;\r
+            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Bitrate.Width = 75;\r
+            // \r
+            // DRC\r
+            // \r
+            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+            this.DRC.FillWeight = 96.36334F;\r
+            this.DRC.HeaderText = "DRC";\r
+            this.DRC.Name = "DRC";\r
+            this.DRC.ReadOnly = true;\r
+            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            // \r
             // AudioPanel\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
+            this.Controls.Add(this.audioList);\r
             this.Controls.Add(this.label68);\r
             this.Controls.Add(this.btn_addAudioTrack);\r
-            this.Controls.Add(this.lv_audioList);\r
             this.Controls.Add(this.AudioTrackGroup);\r
             this.Controls.Add(this.btn_RemoveAudioTrack);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -413,6 +447,7 @@ namespace Handbrake.Controls
             ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();\r
             this.AudioTrackGroup.ResumeLayout(false);\r
             this.AudioTrackGroup.PerformLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.audioList)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -420,13 +455,6 @@ namespace Handbrake.Controls
 \r
         #endregion\r
 \r
-        internal System.Windows.Forms.ListView lv_audioList;\r
-        private System.Windows.Forms.ColumnHeader col_Source;\r
-        private System.Windows.Forms.ColumnHeader col_codec;\r
-        private System.Windows.Forms.ColumnHeader col_mixdown;\r
-        private System.Windows.Forms.ColumnHeader col_samplerate;\r
-        private System.Windows.Forms.ColumnHeader col_bitrate;\r
-        private System.Windows.Forms.ColumnHeader col_drc;\r
         private System.Windows.Forms.Button btn_RemoveAudioTrack;\r
         private System.Windows.Forms.Button btn_addAudioTrack;\r
         internal System.Windows.Forms.Label lbl_drc;\r
@@ -442,7 +470,6 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.ComboBox drp_audioMix;\r
         internal System.Windows.Forms.ComboBox drp_audioTrack;\r
         internal System.Windows.Forms.ComboBox drp_audioSample;\r
-        private System.Windows.Forms.ColumnHeader col_id;\r
         private System.Windows.Forms.GroupBox AudioTrackGroup;\r
         private System.Windows.Forms.ImageList AudioMenuRowHeightHack;\r
         private System.Windows.Forms.ContextMenuStrip audioMenu;\r
@@ -451,5 +478,13 @@ namespace Handbrake.Controls
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
         private System.Windows.Forms.ToolStripMenuItem audioList_remove;\r
         internal System.Windows.Forms.ComboBox drp_audioBitrate;\r
+        private System.Windows.Forms.DataGridView audioList;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Track;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Source;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn AudioCodec;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Mixdown;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Samplerate;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Bitrate;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn DRC;\r
     }\r
 }\r
index 9a4938b..9159105 100644 (file)
@@ -39,9 +39,9 @@ namespace Handbrake.Controls
         /// Get the audio panel\r
         /// </summary>\r
         /// <returns>A listview containing the audio tracks</returns>\r
-        public ListView GetAudioPanel()\r
+        public DataGridView GetAudioPanel()\r
         {\r
-            return lv_audioList;\r
+            return audioList;\r
         }\r
 \r
         /// <summary>\r
@@ -79,10 +79,10 @@ namespace Handbrake.Controls
             }\r
 \r
             // Make sure the table is updated with new audio codecs\r
-            foreach (ListViewItem row in lv_audioList.Items)\r
+            foreach (DataGridViewRow row in audioList.Rows)\r
             {\r
-                if (!drp_audioEncoder.Items.Contains(row.SubItems[2].Text))\r
-                    row.SubItems[2].Text = drp_audioEncoder.Items[0].ToString();\r
+                if (!drp_audioEncoder.Items.Contains(row.Cells[2].Value))\r
+                    row.Cells[2].Value = drp_audioEncoder.Items[0].ToString();\r
             }\r
         }\r
 \r
@@ -92,7 +92,7 @@ namespace Handbrake.Controls
         /// <returns>True if m4v is required</returns>\r
         public bool RequiresM4V()\r
         {\r
-            return lv_audioList.Items.Cast<ListViewItem>().Any(item => item.SubItems[2].Text.Contains("AC3"));\r
+            return this.audioList.Rows.Cast<DataGridViewRow>().Any(row => row.Cells[2].Value.ToString().Contains("AC3"));\r
         }\r
 \r
         /// <summary>\r
@@ -108,14 +108,15 @@ namespace Handbrake.Controls
 \r
             foreach (AudioTrack track in audioTracks)\r
             {\r
-                ListViewItem newTrack = new ListViewItem(GetNewID().ToString());\r
-\r
-                newTrack.SubItems.Add("Automatic");\r
-                newTrack.SubItems.Add(track.Encoder);\r
-                newTrack.SubItems.Add(track.MixDown);\r
-                newTrack.SubItems.Add(track.SampleRate);\r
-                newTrack.SubItems.Add(track.Encoder.Contains("AC3") ? "Auto" : track.Bitrate);\r
-                newTrack.SubItems.Add(track.DRC);\r
+                DataGridViewRow newTrack = new DataGridViewRow();\r
+                newTrack.CreateCells(audioList);\r
+                newTrack.Cells[0].Value = GetNewID().ToString();\r
+                newTrack.Cells[1].Value = "Automatic";\r
+                newTrack.Cells[2].Value = track.Encoder;\r
+                newTrack.Cells[3].Value = track.MixDown;\r
+                newTrack.Cells[4].Value = track.SampleRate;\r
+                newTrack.Cells[5].Value = track.Encoder.Contains("AC3") ? "Auto" : track.Bitrate;\r
+                newTrack.Cells[6].Value = track.DRC;\r
                 AddTrackForPreset(newTrack);\r
             }\r
         }\r
@@ -129,30 +130,40 @@ namespace Handbrake.Controls
         {\r
             if (selectedTitle.AudioTracks.Count == 0)\r
             {\r
-                lv_audioList.Items.Clear();\r
+                audioList.Rows.Clear();\r
                 drp_audioTrack.Items.Clear();\r
                 drp_audioTrack.Items.Add("None Found");\r
                 drp_audioTrack.SelectedIndex = 0;\r
                 return;\r
             }\r
 \r
+            // The Source Information for the title will have changed, so set all the tracks to Automatic.\r
+            foreach (DataGridViewRow row in this.audioList.Rows)\r
+            {\r
+                row.Cells[1].Value = "Automatic";\r
+            }\r
+\r
+            // Setup the Audio track source dropdown with the new audio tracks.\r
             drp_audioTrack.Items.Clear();\r
             drp_audioTrack.Items.Add("Automatic");\r
             drp_audioTrack.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
 \r
-            if (lv_audioList.Items.Count == 0 && preset != null)\r
+            // Re-add any audio tracks that the preset has.\r
+            if (audioList.Rows.Count == 0 && preset != null)\r
             {\r
                 QueryParser parsed = QueryParser.Parse(preset.Query);\r
                 foreach (AudioTrack audioTrack in parsed.AudioInformation)\r
                 {\r
-                    ListViewItem newTrack = new ListViewItem(GetNewID().ToString());\r
-                    newTrack.SubItems.Add(audioTrack.Track);\r
-                    newTrack.SubItems.Add(audioTrack.Encoder);\r
-                    newTrack.SubItems.Add(audioTrack.MixDown);\r
-                    newTrack.SubItems.Add(audioTrack.SampleRate);\r
-                    newTrack.SubItems.Add(audioTrack.Bitrate);\r
-                    newTrack.SubItems.Add(audioTrack.DRC);\r
-                    lv_audioList.Items.Add(newTrack);\r
+                    DataGridViewRow newTrack = new DataGridViewRow();\r
+                    newTrack.CreateCells(audioList);\r
+                    newTrack.Cells[0].Value = GetNewID().ToString();\r
+                    newTrack.Cells[1].Value = (audioTrack.Track);\r
+                    newTrack.Cells[2].Value = (audioTrack.Encoder);\r
+                    newTrack.Cells[3].Value = (audioTrack.MixDown);\r
+                    newTrack.Cells[4].Value = (audioTrack.SampleRate);\r
+                    newTrack.Cells[5].Value = (audioTrack.Bitrate);\r
+                    newTrack.Cells[6].Value = (audioTrack.DRC);\r
+                    audioList.Rows.Add(newTrack);\r
                 }\r
             }\r
 \r
@@ -176,14 +187,14 @@ namespace Handbrake.Controls
                     }\r
 \r
                     if (drp_audioTrack.SelectedItem != null)\r
-                        foreach (ListViewItem item in lv_audioList.Items)\r
-                            item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                        foreach (DataGridViewRow item in audioList.Rows)\r
+                            item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
                     else\r
                     {\r
                         drp_audioTrack.SelectedIndex = 0;\r
                         if (drp_audioTrack.SelectedItem != null)\r
-                            foreach (ListViewItem item in lv_audioList.Items)\r
-                                item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();\r
+                            foreach (DataGridViewRow item in audioList.Rows)\r
+                                item.Cells[1].Value = drp_audioTrack.SelectedItem.ToString();\r
                     }\r
                 }\r
                 else\r
@@ -210,8 +221,8 @@ namespace Handbrake.Controls
             switch (ctl.Name)\r
             {\r
                 case "drp_audioTrack":\r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[1].Text = drp_audioTrack.Text;\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
+                        audioList.SelectedRows[0].Cells[1].Value = drp_audioTrack.Text;\r
                     break;\r
                 case "drp_audioEncoder":\r
                     SetMixDown();\r
@@ -236,23 +247,23 @@ namespace Handbrake.Controls
                     }\r
 \r
                     // Update an item in the Audio list if required.\r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[2].Text = drp_audioEncoder.Text;\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
+                        audioList.SelectedRows[0].Cells[2].Value = drp_audioEncoder.Text;\r
                     break;\r
                 case "drp_audioMix":\r
                     SetBitrate();\r
 \r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[3].Text = drp_audioMix.Text;\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
+                        audioList.SelectedRows[0].Cells[3].Value = drp_audioMix.Text;\r
                     break;\r
                 case "drp_audioSample":\r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text = drp_audioSample.Text;\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
+                        audioList.SelectedRows[0].Cells[4].Value = drp_audioSample.Text;\r
                     break;\r
                 case "drp_audioBitrate":\r
                     // Update an item in the Audio list if required.\r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text = drp_audioBitrate.Text;\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
+                        audioList.SelectedRows[0].Cells[5].Value = drp_audioBitrate.Text;\r
                     break;\r
                 case "tb_drc":\r
                     double value;\r
@@ -263,15 +274,15 @@ namespace Handbrake.Controls
                     lbl_drc.Text = value.ToString();\r
 \r
                     // Update an item in the Audio list if required.\r
-                    if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
                     {\r
-                        lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[6].Text = value.ToString();\r
-                        lv_audioList.Select();\r
+                        audioList.SelectedRows[0].Cells[6].Value = value.ToString();\r
+                        audioList.Select();\r
                     }\r
                     break;\r
             }\r
 \r
-            lv_audioList.Select();\r
+            audioList.Select();\r
         }\r
 \r
         /// <summary>\r
@@ -283,27 +294,26 @@ namespace Handbrake.Controls
         /// <param name="e">\r
         /// The e.\r
         /// </param>\r
-        private void lv_audioList_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void audioList_SelectionChanged(object sender, EventArgs e)\r
         {\r
             // Set the dropdown controls based on the selected item in the Audio List.\r
-            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
+            if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)\r
             {\r
-                drp_audioTrack.SelectedItem = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[1].Text;\r
-                drp_audioEncoder.SelectedItem = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[2].Text;\r
-                drp_audioMix.SelectedItem = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[3].Text;\r
-                drp_audioSample.SelectedItem = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text;\r
-                drp_audioBitrate.SelectedItem = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text;\r
+                drp_audioTrack.SelectedItem = audioList.SelectedRows[0].Cells[1].Value;\r
+                drp_audioEncoder.SelectedItem = audioList.SelectedRows[0].Cells[2].Value;\r
+                drp_audioMix.SelectedItem = audioList.SelectedRows[0].Cells[3].Value;\r
+                drp_audioSample.SelectedItem = audioList.SelectedRows[0].Cells[4].Value;\r
+                drp_audioBitrate.SelectedItem = audioList.SelectedRows[0].Cells[5].Value;\r
                 double drcValue;\r
                 int drcCalculated;\r
-                double.TryParse(lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[6].Text, out drcValue);\r
+                double.TryParse(audioList.SelectedRows[0].Cells[6].Value.ToString(), out drcValue);\r
                 if (drcValue != 0)\r
                     drcValue = ((drcValue * 10) + 1) - 10;\r
                 int.TryParse(drcValue.ToString(), out drcCalculated);\r
                 tb_drc.Value = drcCalculated;\r
-                lbl_drc.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[6].Text;\r
+                lbl_drc.Text = audioList.SelectedRows[0].Cells[6].Value.ToString();\r
 \r
-                AudioTrackGroup.Text = "Selected Track: " +\r
-                                       lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[0].Text;\r
+                AudioTrackGroup.Text = "Selected Track: " + audioList.SelectedRows[0].Cells[0].Value;\r
             }\r
             else\r
                 AudioTrackGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
@@ -337,22 +347,25 @@ namespace Handbrake.Controls
                 value = ((tb_drc.Value - 1) / 10.0) + 1;\r
 \r
             // Create a new row for the Audio list based on the currently selected items in the dropdown.\r
-            ListViewItem newTrack = new ListViewItem(GetNewID().ToString());\r
-            newTrack.SubItems.Add(drp_audioTrack.Text);\r
-            newTrack.SubItems.Add(drp_audioEncoder.Text);\r
-            newTrack.SubItems.Add(drp_audioMix.Text);\r
-            newTrack.SubItems.Add(drp_audioSample.Text);\r
-            newTrack.SubItems.Add(drp_audioBitrate.Text);\r
-            newTrack.SubItems.Add(value.ToString());\r
-            lv_audioList.Items.Add(newTrack);\r
+            DataGridViewRow newTrack = new DataGridViewRow();\r
+            newTrack.CreateCells(audioList);\r
+            newTrack.Cells[0].Value = GetNewID().ToString();\r
+            newTrack.Cells[1].Value = drp_audioTrack.Text;\r
+            newTrack.Cells[2].Value = drp_audioEncoder.Text;\r
+            newTrack.Cells[3].Value = drp_audioMix.Text;\r
+            newTrack.Cells[4].Value = drp_audioSample.Text;\r
+            newTrack.Cells[5].Value = drp_audioBitrate.Text;\r
+            newTrack.Cells[6].Value = value.ToString();\r
+            audioList.Rows.Add(newTrack);\r
 \r
             // The Audio List has changed to raise the event.\r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r
 \r
             // Select the newly added track and select the control       \r
-            lv_audioList.Items[lv_audioList.Items.Count - 1].Selected = true;\r
-            lv_audioList.Select();\r
+            audioList.ClearSelection();\r
+            audioList.Rows[audioList.Rows.Count - 1].Selected = true;\r
+            audioList.Select();\r
         }\r
 \r
         /// <summary>\r
@@ -413,7 +426,7 @@ namespace Handbrake.Controls
             RemoveTrack();\r
         }\r
 \r
-        // Public Functions\r
+        // Private Functions\r
 \r
         /// <summary>\r
         /// Add track for preset\r
@@ -421,9 +434,9 @@ namespace Handbrake.Controls
         /// <param name="item">\r
         /// The item.\r
         /// </param>\r
-        private void AddTrackForPreset(ListViewItem item)\r
+        private void AddTrackForPreset(DataGridViewRow item)\r
         {\r
-            lv_audioList.Items.Add(item);\r
+            audioList.Rows.Add(item);\r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r
         }\r
@@ -433,7 +446,7 @@ namespace Handbrake.Controls
         /// </summary>\r
         private void ClearAudioList()\r
         {\r
-            lv_audioList.Items.Clear();\r
+            audioList.Rows.Clear();\r
             if (this.AudioListChanged != null)\r
                 this.AudioListChanged(this, new EventArgs());\r
         }\r
@@ -446,7 +459,7 @@ namespace Handbrake.Controls
         /// </returns>\r
         private int GetNewID()\r
         {\r
-            return lv_audioList.Items.Count + 1;\r
+            return audioList.Rows.Count + 1;\r
         }\r
 \r
         /// <summary>\r
@@ -455,26 +468,27 @@ namespace Handbrake.Controls
         private void RemoveTrack()\r
         {\r
             // Remove the Item and reselect the control if the following conditions are met.\r
-            if (lv_audioList.SelectedItems.Count != 0)\r
+            if (audioList.SelectedRows.Count != 0)\r
             {\r
                 // The Audio List is about to change so raise the event.\r
                 if (this.AudioListChanged != null)\r
                     this.AudioListChanged(this, new EventArgs());\r
 \r
                 // Record the current selected index.\r
-                int currentPosition = lv_audioList.SelectedIndices[0];\r
+                int currentPosition = audioList.SelectedRows[0].Index;\r
 \r
-                lv_audioList.Items.RemoveAt(lv_audioList.SelectedIndices[0]);\r
+                audioList.Rows.Remove(audioList.SelectedRows[0]);\r
 \r
                 // Now reslect the correct item and give focus to the audio list.\r
-                if (lv_audioList.Items.Count != 0)\r
+                if (audioList.Rows.Count != 0)\r
                 {\r
-                    if (currentPosition <= (lv_audioList.Items.Count - 1))\r
-                        lv_audioList.Items[currentPosition].Selected = true;\r
-                    else if (currentPosition > (lv_audioList.Items.Count - 1))\r
-                        lv_audioList.Items[lv_audioList.Items.Count - 1].Selected = true;\r
+                    audioList.ClearSelection();\r
+                    if (currentPosition <= (audioList.Rows.Count - 1))\r
+                        audioList.Rows[currentPosition].Selected = true;\r
+                    else if (currentPosition > (audioList.Rows.Count - 1))\r
+                        audioList.Rows[audioList.Rows.Count - 1].Selected = true;\r
 \r
-                    lv_audioList.Select();\r
+                    audioList.Select();\r
                 }\r
                 // Regenerate the ID numers\r
                 ReGenerateListIDs();\r
@@ -489,20 +503,20 @@ namespace Handbrake.Controls
         /// </param>\r
         private void MoveTrack(bool up)\r
         {\r
-            if (lv_audioList.SelectedIndices.Count == 0) return;\r
+            if (audioList.SelectedRows.Count == 0) return;\r
 \r
-            ListViewItem item = lv_audioList.SelectedItems[0];\r
+            DataGridViewRow item = audioList.SelectedRows[0];\r
             int index = item.Index;\r
 \r
             if (up) index--;\r
             else index++;\r
-\r
-            if (index < lv_audioList.Items.Count || (lv_audioList.Items.Count > index && index >= 0))\r
+    \r
+            if (index < audioList.Rows.Count || (audioList.Rows.Count > index && index >= 0))\r
             {\r
-                lv_audioList.Items.Remove(item);\r
-                lv_audioList.Items.Insert(index, item);\r
+                audioList.Rows.Remove(item);\r
+                audioList.Rows.Insert(index, item);\r
+                audioList.ClearSelection();\r
                 item.Selected = true;\r
-                lv_audioList.Focus();\r
             }\r
         }\r
 \r
@@ -512,9 +526,9 @@ namespace Handbrake.Controls
         private void ReGenerateListIDs()\r
         {\r
             int i = 1;\r
-            foreach (ListViewItem item in lv_audioList.Items)\r
+            foreach (DataGridViewRow item in audioList.Rows)\r
             {\r
-                item.SubItems[0].Text = i.ToString();\r
+                item.Cells[0].Value = i.ToString();\r
                 i++;\r
             }\r
         }\r
index 07fd5e2..1a22734 100644 (file)
   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>35, 17</value>\r
   </metadata>\r
+  <metadata name="Track.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="Source.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="AudioCodec.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="Mixdown.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="Samplerate.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="Bitrate.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="DRC.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
 </root>
\ No newline at end of file
index d9aaf07..2edfc9e 100644 (file)
@@ -252,7 +252,7 @@ namespace Handbrake.Functions
 \r
             #region Audio Settings Tab\r
 \r
-            ListView audioTracks = mainWindow.AudioSettings.GetAudioPanel();\r
+            DataGridView audioTracks = mainWindow.AudioSettings.GetAudioPanel();\r
             List<string> tracks = new List<string>();\r
             List<string> codecs = new List<string>();\r
             List<string> mixdowns = new List<string>();\r
@@ -261,40 +261,40 @@ namespace Handbrake.Functions
             List<string> drcs = new List<string>();\r
 \r
             // No Audio\r
-            if (audioTracks.Items.Count == 0)\r
+            if (audioTracks.Rows.Count == 0)\r
                 query += " -a none ";\r
 \r
             // Gather information about each audio track and store them in the declared lists.\r
-            foreach (ListViewItem row in audioTracks.Items)\r
+            foreach (DataGridViewRow row in audioTracks.Rows)\r
             {\r
                 // Audio Track (-a)\r
-                if (row.SubItems[1].Text == "Automatic")\r
+                if (row.Cells[1].Value.ToString() == "Automatic")\r
                     tracks.Add("1");\r
-                else if (row.Text != "None")\r
+                else if (row.Cells[1].Value.ToString() != "None")\r
                 {\r
-                    string[] tempSub = row.SubItems[1].Text.Split(' ');\r
+                    string[] tempSub = row.Cells[1].Value.ToString().Split(' ');\r
                     tracks.Add(tempSub[0]);\r
                 }\r
 \r
                 // Audio Codec (-E)\r
-                if (row.SubItems[2].Text != String.Empty)\r
-                    codecs.Add(GetAudioEncoder(row.SubItems[2].Text));\r
+                if (row.Cells[2].Value.ToString() != String.Empty)\r
+                    codecs.Add(GetAudioEncoder(row.Cells[2].Value.ToString()));\r
 \r
                 // Audio Mixdown (-6)\r
-                if (row.SubItems[3].Text != String.Empty)\r
-                    mixdowns.Add(GetMixDown(row.SubItems[3].Text));\r
+                if (row.Cells[3].Value.ToString() != String.Empty)\r
+                    mixdowns.Add(GetMixDown(row.Cells[3].Value.ToString()));\r
 \r
                 // Sample Rate (-R)\r
-                if (row.SubItems[4].Text != String.Empty)\r
-                    samplerates.Add(row.SubItems[4].Text);\r
+                if (row.Cells[4].Value.ToString() != String.Empty)\r
+                    samplerates.Add(row.Cells[4].Value.ToString());\r
 \r
                 // Audio Bitrate (-B)\r
-                if (row.SubItems[5].Text != String.Empty)\r
-                    bitrates.Add(row.SubItems[5].Text.Replace("Auto", "auto"));\r
+                if (row.Cells[5].Value.ToString() != String.Empty)\r
+                    bitrates.Add(row.Cells[5].Value.ToString().Replace("Auto", "auto"));\r
 \r
                 // DRC (-D)\r
-                if (row.SubItems[6].Text != String.Empty)\r
-                    drcs.Add(row.SubItems[6].Text);\r
+                if (row.Cells[6].Value.ToString() != String.Empty)\r
+                    drcs.Add(row.Cells[6].Value.ToString());\r
             }\r
 \r
             // Audio Track (-a)\r
index 5bad68d..a8069e3 100644 (file)
@@ -55,8 +55,6 @@ namespace Handbrake
             this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.data_chpt = new System.Windows.Forms.DataGridView();\r
-            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\r
             this.btn_addPreset = new System.Windows.Forms.Button();\r
@@ -77,7 +75,10 @@ namespace Handbrake
             this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
             this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -86,9 +87,11 @@ namespace Handbrake
             this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.label5 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
@@ -135,8 +138,17 @@ namespace Handbrake
             this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem();\r
             this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
+            this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             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
@@ -159,20 +171,8 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
-            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
-            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
-            this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -207,13 +207,13 @@ namespace Handbrake
             this.btn_restore});\r
             notifyIconMenu.Name = "notifyIconMenu";\r
             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
-            notifyIconMenu.Size = new System.Drawing.Size(153, 48);\r
+            notifyIconMenu.Size = new System.Drawing.Size(114, 26);\r
             // \r
             // btn_restore\r
             // \r
             this.btn_restore.Image = global::Handbrake.Properties.Resources.Restore;\r
             this.btn_restore.Name = "btn_restore";\r
-            this.btn_restore.Size = new System.Drawing.Size(152, 22);\r
+            this.btn_restore.Size = new System.Drawing.Size(113, 22);\r
             this.btn_restore.Text = "Restore";\r
             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);\r
             // \r
@@ -276,7 +276,7 @@ namespace Handbrake
             this.check_turbo.Enabled = false;\r
             this.check_turbo.Location = new System.Drawing.Point(146, 123);\r
             this.check_turbo.Name = "check_turbo";\r
-            this.check_turbo.Size = new System.Drawing.Size(101, 17);\r
+            this.check_turbo.Size = new System.Drawing.Size(99, 17);\r
             this.check_turbo.TabIndex = 7;\r
             this.check_turbo.Text = "Turbo first Pass";\r
             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
@@ -383,7 +383,9 @@ namespace Handbrake
             this.data_chpt.AllowUserToAddRows = false;\r
             this.data_chpt.AllowUserToDeleteRows = false;\r
             this.data_chpt.AllowUserToResizeRows = false;\r
-            this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
+            this.data_chpt.BackgroundColor = System.Drawing.Color.White;\r
+            this.data_chpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;\r
+            this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;\r
             this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.number,\r
             this.name});\r
@@ -396,24 +398,6 @@ namespace Handbrake
             this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
-            // number\r
-            // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
-            this.number.Frozen = true;\r
-            this.number.HeaderText = "Chapter Number";\r
-            this.number.MaxInputLength = 3;\r
-            this.number.Name = "number";\r
-            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.number.Width = 165;\r
-            // \r
-            // name\r
-            // \r
-            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
-            this.name.HeaderText = "Chapter Name";\r
-            this.name.Name = "name";\r
-            // \r
             // ChaptersMenu\r
             // \r
             this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -619,11 +603,37 @@ namespace Handbrake
             this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);\r
             this.ToolsToolStripMenuItem.Text = "&Tools";\r
             // \r
+            // mnu_encode\r
+            // \r
+            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
+            this.mnu_encode.Name = "mnu_encode";\r
+            this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));\r
+            this.mnu_encode.Size = new System.Drawing.Size(201, 22);\r
+            this.mnu_encode.Text = "Show Queue";\r
+            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
+            // \r
+            // mnu_encodeLog\r
+            // \r
+            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
+            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
+            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));\r
+            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);\r
+            this.mnu_encodeLog.Text = "Activity Window";\r
+            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
+            // \r
             // ToolStripSeparator5\r
             // \r
             this.ToolStripSeparator5.Name = "ToolStripSeparator5";\r
             this.ToolStripSeparator5.Size = new System.Drawing.Size(198, 6);\r
             // \r
+            // mnu_options\r
+            // \r
+            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
+            this.mnu_options.Name = "mnu_options";\r
+            this.mnu_options.Size = new System.Drawing.Size(201, 22);\r
+            this.mnu_options.Text = "Options";\r
+            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
+            // \r
             // PresetsToolStripMenuItem\r
             // \r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -691,6 +701,14 @@ namespace Handbrake
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
             this.HelpToolStripMenuItem.Text = "&Help";\r
             // \r
+            // mnu_user_guide\r
+            // \r
+            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
+            this.mnu_user_guide.Name = "mnu_user_guide";\r
+            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_user_guide.Text = "HandBrake User Guide";\r
+            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
+            // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
@@ -708,6 +726,14 @@ namespace Handbrake
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
             this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);\r
             // \r
+            // mnu_about\r
+            // \r
+            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
+            this.mnu_about.Name = "mnu_about";\r
+            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_about.Text = "About...";\r
+            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
+            // \r
             // frmMainMenu\r
             // \r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -814,7 +840,7 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
             this.radio_cq.Location = new System.Drawing.Point(336, 97);\r
             this.radio_cq.Name = "radio_cq";\r
-            this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
+            this.radio_cq.Size = new System.Drawing.Size(105, 17);\r
             this.radio_cq.TabIndex = 18;\r
             this.radio_cq.Text = "Constant Quality:";\r
             this.radio_cq.UseVisualStyleBackColor = false;\r
@@ -827,7 +853,7 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;\r
             this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64);\r
             this.radio_avgBitrate.Name = "radio_avgBitrate";\r
-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
+            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);\r
             this.radio_avgBitrate.TabIndex = 17;\r
             this.radio_avgBitrate.TabStop = true;\r
             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
@@ -840,7 +866,7 @@ namespace Handbrake
             this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;\r
             this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37);\r
             this.radio_targetFilesize.Name = "radio_targetFilesize";\r
-            this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);\r
+            this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);\r
             this.radio_targetFilesize.TabIndex = 16;\r
             this.radio_targetFilesize.Text = "Target Size (MB):";\r
             this.radio_targetFilesize.UseVisualStyleBackColor = false;\r
@@ -863,7 +889,7 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_2PassEncode.Location = new System.Drawing.Point(125, 100);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
+            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);\r
             this.check_2PassEncode.TabIndex = 6;\r
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.check_2PassEncode.UseVisualStyleBackColor = false;\r
@@ -1156,9 +1182,9 @@ namespace Handbrake
             this.treeView_presets.ShowLines = false;\r
             this.treeView_presets.Size = new System.Drawing.Size(240, 424);\r
             this.treeView_presets.TabIndex = 0;\r
-            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);\r
+            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);\r
             // \r
             // presets_menu\r
             // \r
@@ -1239,16 +1265,111 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
+            // btn_source\r
+            // \r
+            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_file_source,\r
+            this.btn_dvd_source,\r
+            this.toolStripSeparator1});\r
+            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\r
+            this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_source.Name = "btn_source";\r
+            this.btn_source.Size = new System.Drawing.Size(88, 36);\r
+            this.btn_source.Text = "Source";\r
+            this.btn_source.ToolTipText = "Open a new source file or folder.";\r
+            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
+            // \r
+            // btn_file_source\r
+            // \r
+            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
+            this.btn_file_source.Name = "btn_file_source";\r
+            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
+            this.btn_file_source.Size = new System.Drawing.Size(182, 22);\r
+            this.btn_file_source.Text = "Video File";\r
+            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
+            // \r
+            // btn_dvd_source\r
+            // \r
+            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;\r
+            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_dvd_source.Name = "btn_dvd_source";\r
+            this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)\r
+                        | System.Windows.Forms.Keys.O)));\r
+            this.btn_dvd_source.Size = new System.Drawing.Size(182, 22);\r
+            this.btn_dvd_source.Text = "Folder";\r
+            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
+            // \r
+            // toolStripSeparator1\r
+            // \r
+            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6);\r
+            // \r
             // toolStripSeparator10\r
             // \r
             this.toolStripSeparator10.Name = "toolStripSeparator10";\r
             this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // btn_start\r
+            // \r
+            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\r
+            this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_start.Name = "btn_start";\r
+            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
+            this.btn_start.Text = "Start";\r
+            this.btn_start.ToolTipText = "Start the encoding process";\r
+            this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
+            // \r
+            // btn_add2Queue\r
+            // \r
+            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\r
+            this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_add2Queue.Name = "btn_add2Queue";\r
+            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);\r
+            this.btn_add2Queue.Text = "Add to Queue";\r
+            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
+            this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
+            // \r
+            // btn_showQueue\r
+            // \r
+            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;\r
+            this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_showQueue.Name = "btn_showQueue";\r
+            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);\r
+            this.btn_showQueue.Tag = "";\r
+            this.btn_showQueue.Text = "Show Queue";\r
+            this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
+            // \r
             // toolStripSeparator4\r
             // \r
             this.toolStripSeparator4.Name = "toolStripSeparator4";\r
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // tb_preview\r
+            // \r
+            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
+            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.tb_preview.Name = "tb_preview";\r
+            this.tb_preview.Size = new System.Drawing.Size(84, 36);\r
+            this.tb_preview.Text = "Preview";\r
+            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
+            // \r
+            // btn_ActivityWindow\r
+            // \r
+            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
+            this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);\r
+            this.btn_ActivityWindow.Text = "Activity Window";\r
+            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
+                "ently running encode.";\r
+            this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
+            // \r
             // notifyIcon\r
             // \r
             this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
@@ -1503,142 +1624,25 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // btn_source\r
-            // \r
-            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.btn_file_source,\r
-            this.btn_dvd_source,\r
-            this.toolStripSeparator1});\r
-            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\r
-            this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_source.Name = "btn_source";\r
-            this.btn_source.Size = new System.Drawing.Size(88, 36);\r
-            this.btn_source.Text = "Source";\r
-            this.btn_source.ToolTipText = "Open a new source file or folder.";\r
-            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
-            // \r
-            // btn_file_source\r
-            // \r
-            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
-            this.btn_file_source.Name = "btn_file_source";\r
-            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
-            this.btn_file_source.Size = new System.Drawing.Size(182, 22);\r
-            this.btn_file_source.Text = "Video File";\r
-            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
-            // \r
-            // btn_dvd_source\r
-            // \r
-            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;\r
-            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_dvd_source.Name = "btn_dvd_source";\r
-            this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)\r
-                        | System.Windows.Forms.Keys.O)));\r
-            this.btn_dvd_source.Size = new System.Drawing.Size(182, 22);\r
-            this.btn_dvd_source.Text = "Folder";\r
-            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
-            // \r
-            // toolStripSeparator1\r
-            // \r
-            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6);\r
-            // \r
-            // btn_start\r
-            // \r
-            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\r
-            this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_start.Name = "btn_start";\r
-            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
-            this.btn_start.Text = "Start";\r
-            this.btn_start.ToolTipText = "Start the encoding process";\r
-            this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
-            // \r
-            // btn_add2Queue\r
-            // \r
-            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\r
-            this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_add2Queue.Name = "btn_add2Queue";\r
-            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);\r
-            this.btn_add2Queue.Text = "Add to Queue";\r
-            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
-            this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
-            // \r
-            // btn_showQueue\r
-            // \r
-            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;\r
-            this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_showQueue.Name = "btn_showQueue";\r
-            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);\r
-            this.btn_showQueue.Tag = "";\r
-            this.btn_showQueue.Text = "Show Queue";\r
-            this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
-            // \r
-            // tb_preview\r
-            // \r
-            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
-            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.tb_preview.Name = "tb_preview";\r
-            this.tb_preview.Size = new System.Drawing.Size(84, 36);\r
-            this.tb_preview.Text = "Preview";\r
-            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
-            // \r
-            // btn_ActivityWindow\r
-            // \r
-            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
-            this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);\r
-            this.btn_ActivityWindow.Text = "Activity Window";\r
-            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
-                "ently running encode.";\r
-            this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
-            // \r
-            // mnu_encode\r
-            // \r
-            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
-            this.mnu_encode.Name = "mnu_encode";\r
-            this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));\r
-            this.mnu_encode.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_encode.Text = "Show Queue";\r
-            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
-            // \r
-            // mnu_encodeLog\r
-            // \r
-            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
-            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
-            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));\r
-            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_encodeLog.Text = "Activity Window";\r
-            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
-            // \r
-            // mnu_options\r
-            // \r
-            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
-            this.mnu_options.Name = "mnu_options";\r
-            this.mnu_options.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_options.Text = "Options";\r
-            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
-            // \r
-            // mnu_user_guide\r
+            // number\r
             // \r
-            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
-            this.mnu_user_guide.Name = "mnu_user_guide";\r
-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_user_guide.Text = "HandBrake User Guide";\r
-            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            this.number.Frozen = true;\r
+            this.number.HeaderText = "Chapter Number";\r
+            this.number.MaxInputLength = 3;\r
+            this.number.Name = "number";\r
+            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.number.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.number.Width = 165;\r
             // \r
-            // mnu_about\r
+            // name\r
             // \r
-            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
-            this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_about.Text = "About...";\r
-            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
+            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+            this.name.HeaderText = "Chapter Name";\r
+            this.name.Name = "name";\r
+            this.name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
             // \r
             // frmMain\r
             // \r
index 7f7acfb..49b97dd 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 54</value>\r
-  </metadata>\r
   <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>False</value>\r
   </metadata>\r
+  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 54</value>\r
+  </metadata>\r
   <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>556, 15</value>\r
   </metadata>\r