WinGui:

- Right Click menu for the new audio tab.
- Made the list rows a tad thicker to make it easier to right click them.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b742b85894e7f678b39a54fb6a844c79b68ed0b6..94ee4ce3ee43484090d6c327f6911f766e65add3 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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
@@ -243,6 +243,12 @@ 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.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.audioList_remove = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             Label38 = new System.Windows.Forms.Label();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
@@ -272,6 +278,7 @@ namespace Handbrake
             this.presets_menu.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
             this.StatusStrip.SuspendLayout();\r
+            this.audioMenu.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -635,9 +642,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle6.Format = "N0";\r
+            dataGridViewCellStyle6.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle6;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -1546,13 +1553,16 @@ namespace Handbrake
             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.LabelWrap = false;\r
             this.lv_audioList.Location = new System.Drawing.Point(16, 79);\r
             this.lv_audioList.MultiSelect = false;\r
             this.lv_audioList.Name = "lv_audioList";\r
             this.lv_audioList.Size = new System.Drawing.Size(668, 147);\r
+            this.lv_audioList.SmallImageList = this.AudioMenuRowHeightHack;\r
             this.lv_audioList.TabIndex = 48;\r
             this.lv_audioList.UseCompatibleStateImageBehavior = false;\r
             this.lv_audioList.View = System.Windows.Forms.View.Details;\r
@@ -2838,6 +2848,49 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
+            // audioMenu\r
+            // \r
+            this.audioMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.audioList_moveup,\r
+            this.audioList_movedown,\r
+            this.toolStripSeparator2,\r
+            this.audioList_remove});\r
+            this.audioMenu.Name = "audioMenu";\r
+            this.audioMenu.Size = new System.Drawing.Size(142, 76);\r
+            // \r
+            // audioList_movedown\r
+            // \r
+            this.audioList_movedown.Name = "audioList_movedown";\r
+            this.audioList_movedown.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_movedown.Text = "Move Down";\r
+            this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.audioList_movedown.Click += new System.EventHandler(this.audioList_movedown_Click);\r
+            // \r
+            // audioList_moveup\r
+            // \r
+            this.audioList_moveup.Name = "audioList_moveup";\r
+            this.audioList_moveup.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_moveup.Text = "Move Up";\r
+            this.audioList_moveup.Click += new System.EventHandler(this.audioList_moveup_Click);\r
+            // \r
+            // toolStripSeparator2\r
+            // \r
+            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6);\r
+            // \r
+            // audioList_remove\r
+            // \r
+            this.audioList_remove.Name = "audioList_remove";\r
+            this.audioList_remove.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_remove.Text = "Remove";\r
+            this.audioList_remove.Click += new System.EventHandler(this.audioList_remove_Click);\r
+            // \r
+            // AudioMenuRowHeightHack\r
+            // \r
+            this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
+            this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);\r
+            this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;\r
+            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -2896,6 +2949,7 @@ namespace Handbrake
             this.toolStrip1.PerformLayout();\r
             this.StatusStrip.ResumeLayout(false);\r
             this.StatusStrip.PerformLayout();\r
+            this.audioMenu.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -3107,6 +3161,12 @@ namespace Handbrake
         private System.Windows.Forms.ColumnHeader col_bitrate;\r
         private System.Windows.Forms.ColumnHeader col_drc;\r
         internal System.Windows.Forms.ListView lv_audioList;\r
+        private System.Windows.Forms.ContextMenuStrip audioMenu;\r
+        private System.Windows.Forms.ToolStripMenuItem audioList_movedown;\r
+        private System.Windows.Forms.ToolStripMenuItem audioList_moveup;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
+        private System.Windows.Forms.ToolStripMenuItem audioList_remove;\r
+        private System.Windows.Forms.ImageList AudioMenuRowHeightHack;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index faaa58d7bd44d34ad595030fc3d79d1fe4ab4482..aee2f2b5c5f02a38bb77cb5aae3bb74bceeb944d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1198,6 +1198,7 @@ namespace Handbrake
                 lv_audioList.Select();\r
             }\r
         }\r
+\r
         private void btn_addAudioTrack_Click(object sender, EventArgs e)\r
         {\r
             // Create a new row for the Audio list based on the currently selected items in the dropdown.\r
@@ -1214,6 +1215,50 @@ namespace Handbrake
             lv_audioList.Select();\r
         }\r
         private void btn_RemoveAudioTrack_Click(object sender, EventArgs e)\r
+        {\r
+            removeAudioTrack();\r
+        }\r
+        private void audioList_moveup_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_audioList.SelectedIndices.Count != 0)\r
+            {\r
+                ListViewItem item = lv_audioList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index--;\r
+\r
+                if (lv_audioList.Items.Count > index && index >= 0)\r
+                {\r
+                    lv_audioList.Items.Remove(item);\r
+                    lv_audioList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_audioList.Focus();\r
+                }\r
+            }\r
+        }\r
+        private void audioList_movedown_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_audioList.SelectedIndices.Count != 0)\r
+            {\r
+                ListViewItem item = lv_audioList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index++;\r
+\r
+                if (index < lv_audioList.Items.Count)\r
+                {\r
+                    lv_audioList.Items.Remove(item);\r
+                    lv_audioList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_audioList.Focus();\r
+                }\r
+            }\r
+\r
+        }\r
+        \r
+        private void audioList_remove_Click(object sender, EventArgs e)\r
+        {\r
+            removeAudioTrack();\r
+        }\r
+        private void removeAudioTrack()\r
         {\r
             // Remove the Item and reselect the control if the following conditions are met.\r
             if (lv_audioList.SelectedItems.Count != 0)\r
@@ -1235,6 +1280,7 @@ namespace Handbrake
                 }\r
             }\r
         }\r
+\r
         private void lv_audioList_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             // Set the dropdown controls based on the selected item in the Audio List.\r
@@ -1252,6 +1298,7 @@ namespace Handbrake
                 tb_drc.Value = drcCalculated;\r
             }\r
         }\r
+\r
         private void drp_subtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_subtitle.Text.Contains("None"))\r
@@ -1262,7 +1309,7 @@ namespace Handbrake
             else\r
                 check_forced.Enabled = true;\r
         }\r
-\r
+        \r
         // Chapter Marker Tab\r
         private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)\r
         {\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 1ae5e6636c65d3ecbe11ed60c877c140b3242649..0039ebd874ba1a7f9517d990420888ae5763a5cd 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ 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
   <data name="check_Cabac.ToolTip" xml:space="preserve">\r
     <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. \r
 This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle. \r
@@ -254,6 +260,12 @@ If you're going to choose between spatial and temporal, spatial is usually bette
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>106, 15</value>\r
   </metadata>\r
+  <metadata name="audioMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 36</value>\r
+  </metadata>\r
+  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>123, 36</value>\r
+  </metadata>\r
   <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>1224, 15</value>\r
   </metadata>\r