CLI: update the built in presets

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c25a996..2f14676 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -223,6 +223,10 @@ namespace Handbrake
             encodeQueue.EncodeStarted += new EventHandler(encodeStarted);\r
             encodeQueue.EncodeEnded += new EventHandler(encodeEnded);\r
 \r
+            // Scan Started and Completed Events\r
+            SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);\r
+            SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);\r
+\r
             // Handle a file being draged onto the GUI.\r
             this.DragEnter += new DragEventHandler(frmMain_DragEnter);\r
             this.DragDrop += new DragEventHandler(frmMain_DragDrop);\r
@@ -793,6 +797,29 @@ namespace Handbrake
         }\r
 \r
         /// <summary>\r
+        /// When the mouse moves, display a preset\r
+        /// </summary>\r
+        /// <param name="sender">The Sender</param>\r
+        /// <param name="e">the MouseEventArgs</param>\r
+        private void TreeViewPresetsMouseMove(object sender, MouseEventArgs e)\r
+        {\r
+            TreeNode theNode = this.treeView_presets.GetNodeAt(e.X, e.Y);\r
+\r
+            if ((theNode != null))\r
+            {\r
+                // Change the ToolTip only if the pointer moved to a new node.\r
+                if (theNode.ToolTipText != this.ToolTip.GetToolTip(this.treeView_presets))\r
+                {\r
+                    this.ToolTip.SetToolTip(this.treeView_presets, theNode.ToolTipText);\r
+                }\r
+            }\r
+            else     // Pointer is not over a node so clear the ToolTip.\r
+            {\r
+                this.ToolTip.SetToolTip(this.treeView_presets, string.Empty);\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
         /// Preset Bar - Handle the Delete Key\r
         /// </summary>\r
         /// <param name="sender">\r
@@ -912,7 +939,7 @@ namespace Handbrake
                     PresetLoader.LoadPreset(this, parsed, parsed.PresetName);\r
                     if (presetHandler.Add(parsed.PresetName + " (Imported)",\r
                                           QueryGenerator.GenerateFullQuery(this),\r
-                                          parsed.UsesPictureSettings))\r
+                                          parsed.UsesPictureSettings, string.Empty))\r
                     {\r
                         TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)")\r
                                                        {\r
@@ -1202,13 +1229,13 @@ namespace Handbrake
                             MessageBoxIcon.Warning);\r
 \r
                     if (result != DialogResult.Yes) return false;\r
-                } \r
+                }\r
                 else\r
                 {\r
                     return false;\r
                 }\r
             }\r
-            \r
+\r
             // Add the job.\r
             encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty));\r
 \r
@@ -1529,7 +1556,7 @@ namespace Handbrake
             data_chpt.Rows.Clear();\r
             if (selectedTitle.Chapters.Count != 1)\r
             {\r
-                DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text);\r
+                DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);\r
                 if (chapterGridView != null)\r
                     data_chpt = chapterGridView;\r
             }\r
@@ -2031,7 +2058,7 @@ namespace Handbrake
         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
+            DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);\r
             if (chapterGridView != null)\r
             {\r
                 data_chpt = chapterGridView;\r
@@ -2075,8 +2102,6 @@ namespace Handbrake
             try\r
             {\r
                 SourceScan.Scan(sourcePath, title);\r
-                SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);\r
-                SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);\r
             }\r
             catch (Exception exc)\r
             {\r