WinGui:

- Further improvements to Chapter Marker tab usability, including a reset chapter marker names option on a right click menu.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 46c3f2a..87e3620 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -172,6 +172,8 @@ namespace Handbrake
             this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.x264Panel = new Handbrake.Controls.x264Panel();\r
+            this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -197,6 +199,7 @@ namespace Handbrake
             this.tableLayoutPanel3.SuspendLayout();\r
             this.tableLayoutPanel1.SuspendLayout();\r
             this.flowLayoutPanel1.SuspendLayout();\r
+            this.ChaptersMenu.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // notifyIconMenu\r
@@ -384,6 +387,7 @@ namespace Handbrake
             this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.number,\r
             this.name});\r
+            this.data_chpt.ContextMenuStrip = this.ChaptersMenu;\r
             this.data_chpt.Location = new System.Drawing.Point(16, 55);\r
             this.data_chpt.MultiSelect = false;\r
             this.data_chpt.Name = "data_chpt";\r
@@ -529,7 +533,7 @@ namespace Handbrake
             // mnu_killCLI\r
             // \r
             this.mnu_killCLI.Name = "mnu_killCLI";\r
-            this.mnu_killCLI.Size = new System.Drawing.Size(152, 22);\r
+            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);\r
             this.mnu_killCLI.Text = "Cancel Scan";\r
             this.mnu_killCLI.Visible = false;\r
             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);\r
@@ -537,7 +541,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(143, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -1605,6 +1609,21 @@ namespace Handbrake
             this.x264Panel.TabIndex = 0;\r
             this.x264Panel.x264Query = "";\r
             // \r
+            // ChaptersMenu\r
+            // \r
+            this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_resetChapters});\r
+            this.ChaptersMenu.Name = "presets_menu";\r
+            this.ChaptersMenu.Size = new System.Drawing.Size(191, 26);\r
+            this.ChaptersMenu.Text = ";";\r
+            // \r
+            // mnu_resetChapters\r
+            // \r
+            this.mnu_resetChapters.Name = "mnu_resetChapters";\r
+            this.mnu_resetChapters.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_resetChapters.Text = "Reset Chapter Names";\r
+            this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -1662,6 +1681,7 @@ namespace Handbrake
             this.tableLayoutPanel1.PerformLayout();\r
             this.flowLayoutPanel1.ResumeLayout(false);\r
             this.flowLayoutPanel1.PerformLayout();\r
+            this.ChaptersMenu.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -1800,5 +1820,7 @@ namespace Handbrake
         private OpenFileDialog openPreset;\r
         private Button btn_importChapters;\r
         private OpenFileDialog File_ChapterImport;\r
+        private ContextMenuStrip ChaptersMenu;\r
+        private ToolStripMenuItem mnu_resetChapters;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b80ae3b..c000818 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1011,13 +1011,18 @@ namespace Handbrake
             // Disable chapter markers if only 1 chapter is selected.\r
             if (chapterStart == chapterEnd)\r
             {\r
-                btn_importChapters.Enabled = false;\r
                 Check_ChapterMarkers.Enabled = false;\r
+                btn_importChapters.Enabled = false;\r
+                data_chpt.Enabled = false;\r
             }\r
             else\r
             {\r
-                btn_importChapters.Enabled = true;\r
                 Check_ChapterMarkers.Enabled = true;\r
+                if (Check_ChapterMarkers.Checked)\r
+                {\r
+                    btn_importChapters.Enabled = true;\r
+                    data_chpt.Enabled = true;\r
+                }\r
             }\r
         }\r
 \r
@@ -1334,18 +1339,13 @@ namespace Handbrake
             {\r
                 if (drop_format.SelectedIndex != 1)\r
                     setExtension(".m4v");\r
-                data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = true;\r
                 btn_importChapters.Enabled = true;\r
-                DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
-                if (chapterGridView != null)\r
-                    data_chpt = chapterGridView;\r
             }\r
             else\r
             {\r
                 if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
                     setExtension(".mp4");\r
-                data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = false;\r
                 btn_importChapters.Enabled = false;\r
             }\r
@@ -1360,6 +1360,15 @@ namespace Handbrake
                     data_chpt = imported;\r
             }\r
         }\r
+        private void mnu_resetChapters_Click(object sender, EventArgs e)\r
+        {\r
+            data_chpt.Rows.Clear();\r
+            DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
+            if (chapterGridView != null)\r
+            {\r
+                data_chpt = chapterGridView;\r
+            }\r
+        }\r
 \r
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 00495e0..184e7a9 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -135,6 +135,9 @@
   <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
+  <metadata name="ChaptersMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>935, 54</value>\r
+  </metadata>\r
   <data name="data_chpt.ToolTip" xml:space="preserve">\r
     <value>Here you can name each chapter that the encoded video will contain.\r
 Make sure you have selected a "Title" from the "Source" box above otherwise \r