WinGui:

- Right Click menu for subtitles Panel. Move Up/Down and remove options.
- Confirmation dialog for the new clear logs option.

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

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 86e60fe..6a3b122 100644 (file)
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -28,6 +28,7 @@
         /// </summary>\r
         private void InitializeComponent()\r
         {\r
+            this.components = new System.ComponentModel.Container();\r
             this.drp_subtitleTracks = new System.Windows.Forms.ComboBox();\r
             this.AudioTrackGroup = new System.Windows.Forms.GroupBox();\r
             this.label1 = new System.Windows.Forms.Label();\r
@@ -43,7 +44,13 @@
             this.burned = new System.Windows.Forms.ColumnHeader();\r
             this.defaultTrack = new System.Windows.Forms.ColumnHeader();\r
             this.label68 = new System.Windows.Forms.Label();\r
+            this.subMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            this.mnu_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_remove = new System.Windows.Forms.ToolStripMenuItem();\r
             this.AudioTrackGroup.SuspendLayout();\r
+            this.subMenu.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // drp_subtitleTracks\r
@@ -154,6 +161,7 @@
             this.forced,\r
             this.burned,\r
             this.defaultTrack});\r
+            this.lv_subList.ContextMenuStrip = this.subMenu;\r
             this.lv_subList.FullRowSelect = true;\r
             this.lv_subList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
             this.lv_subList.HideSelection = false;\r
@@ -203,6 +211,43 @@
             this.label68.TabIndex = 67;\r
             this.label68.Text = "Subtitles";\r
             // \r
+            // subMenu\r
+            // \r
+            this.subMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_moveup,\r
+            this.mnu_movedown,\r
+            this.toolStripSeparator2,\r
+            this.mnu_remove});\r
+            this.subMenu.Name = "audioMenu";\r
+            this.subMenu.Size = new System.Drawing.Size(142, 76);\r
+            // \r
+            // mnu_moveup\r
+            // \r
+            this.mnu_moveup.Name = "mnu_moveup";\r
+            this.mnu_moveup.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_moveup.Text = "Move Up";\r
+            this.mnu_moveup.Click += new System.EventHandler(this.mnu_moveup_Click);\r
+            // \r
+            // mnu_movedown\r
+            // \r
+            this.mnu_movedown.Name = "mnu_movedown";\r
+            this.mnu_movedown.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_movedown.Text = "Move Down";\r
+            this.mnu_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.mnu_movedown.Click += new System.EventHandler(this.mnu_movedown_Click);\r
+            // \r
+            // toolStripSeparator2\r
+            // \r
+            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6);\r
+            // \r
+            // mnu_remove\r
+            // \r
+            this.mnu_remove.Name = "mnu_remove";\r
+            this.mnu_remove.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_remove.Text = "Remove";\r
+            this.mnu_remove.Click += new System.EventHandler(this.mnu_remove_Click);\r
+            // \r
             // Subtitles\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
@@ -216,6 +261,7 @@
             this.Size = new System.Drawing.Size(719, 300);\r
             this.AudioTrackGroup.ResumeLayout(false);\r
             this.AudioTrackGroup.PerformLayout();\r
+            this.subMenu.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -238,5 +284,10 @@
         private System.Windows.Forms.CheckBox check_default;\r
         private System.Windows.Forms.CheckBox check_burned;\r
         private System.Windows.Forms.CheckBox check_forced;\r
+        private System.Windows.Forms.ContextMenuStrip subMenu;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_moveup;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_movedown;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_remove;\r
     }\r
 }\r

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index b5dfeef..47864f2 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -6,10 +6,6 @@ namespace Handbrake.Controls
     public partial class Subtitles : UserControl\r
     {\r
 \r
-        // TODO\r
-        // - Right click menu for adding/removal of tracks.\r
-        // - Multi-select for removal.\r
-\r
         public Subtitles()\r
         {\r
             InitializeComponent();\r
@@ -171,6 +167,46 @@ namespace Handbrake.Controls
                 lv_subList.Select();\r
             }\r
         }\r
+        \r
+        // Right Click Menu\r
+        private void mnu_moveup_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_subList.SelectedIndices.Count != 0)\r
+            {\r
+                ListViewItem item = lv_subList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index--;\r
+\r
+                if (lv_subList.Items.Count > index && index >= 0)\r
+                {\r
+                    lv_subList.Items.Remove(item);\r
+                    lv_subList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_subList.Focus();\r
+                }\r
+            }\r
+        }\r
+        private void mnu_movedown_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_subList.SelectedIndices.Count != 0)\r
+            {\r
+                ListViewItem item = lv_subList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index++;\r
+\r
+                if (index < lv_subList.Items.Count)\r
+                {\r
+                    lv_subList.Items.Remove(item);\r
+                    lv_subList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_subList.Focus();\r
+                }\r
+            }\r
+        }\r
+        private void mnu_remove_Click(object sender, EventArgs e)\r
+        {\r
+            removeTrack();\r
+        }\r
 \r
         // Functions\r
         private void setNoDefault()\r
@@ -229,6 +265,5 @@ namespace Handbrake.Controls
                 i++;\r
             }\r
         }\r
-\r
     }\r
 }\r

diff --git a/win/C#/Controls/Subtitles.resx b/win/C#/Controls/Subtitles.resx
index ff31a6d..4a57b12 100644 (file)
--- a/win/C#/Controls/Subtitles.resx
+++ b/win/C#/Controls/Subtitles.resx
@@ -117,4 +117,7 @@
   <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="subMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index de73978..7529291 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -212,6 +212,7 @@ namespace Handbrake
         {\r
             Properties.Settings.Default.saveLogWithVideo = check_saveLogWithVideo.Checked;\r
         }\r
+\r
         private void check_logsInSpecifiedLocation_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.saveLogToSpecifiedPath = check_logsInSpecifiedLocation.Checked;\r
@@ -242,9 +243,13 @@ namespace Handbrake
 \r
         private void btn_clearLogs_Click(object sender, EventArgs e)\r
         {\r
-            Main.clearLogs();\r
-            MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,\r
-                            MessageBoxIcon.Information);\r
+            DialogResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+            {\r
+                Main.clearLogs();\r
+                MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,\r
+                                MessageBoxIcon.Information);\r
+            }\r
         }\r
         #endregion\r
 \r