WinGui:

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

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 8bb0e19..89303b6 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -237,17 +237,17 @@ namespace Handbrake
                 QueryParser parsed = Functions.QueryParser.Parse(qItem);\r
 \r
                 // Get the DVD Title\r
-                string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
+                string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();\r
 \r
                 // Get the DVD Chapters\r
                 string chapters;\r
-                if (parsed.DVDChapterStart == 0)\r
+                if (parsed.ChapterStart == 0)\r
                     chapters = "Auto";\r
                 else\r
                 {\r
-                    chapters = parsed.DVDChapterStart.ToString();\r
-                    if (parsed.DVDChapterFinish != 0)\r
-                        chapters = chapters + " - " + parsed.DVDChapterFinish;\r
+                    chapters = parsed.ChapterStart.ToString();\r
+                    if (parsed.ChapterFinish != 0)\r
+                        chapters = chapters + " - " + parsed.ChapterFinish;\r
                 }\r
 \r
                 ListViewItem item = new ListViewItem();\r
@@ -300,19 +300,19 @@ namespace Handbrake
                 }\r
 \r
                 // found query is a global varible\r
-                QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query);\r
+                QueryParser parsed = QueryParser.Parse(queue.LastEncode.Query);\r
                 lbl_source.Text = queue.LastEncode.Source;\r
                 lbl_dest.Text = queue.LastEncode.Destination;\r
 \r
-                lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
+                lbl_title.Text = parsed.Title == 0 ? "Auto" : parsed.Title.ToString();\r
 \r
-                if (Equals(parsed.DVDChapterStart, 0))\r
+                if (Equals(parsed.ChapterStart, 0))\r
                     lbl_chapt.Text = "Auto";\r
                 else\r
                 {\r
-                    string chapters = parsed.DVDChapterStart.ToString();\r
-                    if (parsed.DVDChapterFinish != 0)\r
-                        chapters = chapters + " - " + parsed.DVDChapterFinish;\r
+                    string chapters = parsed.ChapterStart.ToString();\r
+                    if (parsed.ChapterFinish != 0)\r
+                        chapters = chapters + " - " + parsed.ChapterFinish;\r
                     lbl_chapt.Text = chapters;\r
                 }\r
 \r
@@ -397,6 +397,32 @@ namespace Handbrake
         }\r
 \r
         /// <summary>\r
+        /// Edit a job\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
+        private void MnuEditClick(object sender, EventArgs e)\r
+        {\r
+            if (list_queue.SelectedIndices != null)\r
+            {\r
+                lock (queue)\r
+                {\r
+                    lock (list_queue)\r
+                    {\r
+                        int index = list_queue.SelectedIndices[0];\r
+                        mainWindow.RecievingJob(queue.GetJob(index));\r
+                        queue.Remove(index);\r
+                        RedrawQueue();\r
+                    }\r
+                }\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
         /// Handle the delete Menu Item\r
         /// </summary>\r
         /// <param name="sender">\r
@@ -596,39 +622,17 @@ namespace Handbrake
         {\r
             if (!queue.LastEncode.IsEmpty)\r
             {\r
-                queue.Add(queue.LastEncode.Query, queue.LastEncode.Source, queue.LastEncode.Destination,\r
-                          queue.LastEncode.CustomQuery);\r
+                queue.Add(\r
+                    queue.LastEncode.Query, \r
+                    queue.LastEncode.Title, \r
+                    queue.LastEncode.Source,\r
+                    queue.LastEncode.Destination,\r
+                    queue.LastEncode.CustomQuery);\r
                 UpdateUiElements();\r
             }\r
         }\r
 \r
         /// <summary>\r
-        /// Edit Job\r
-        /// </summary>\r
-        /// <param name="sender">\r
-        /// The sender.\r
-        /// </param>\r
-        /// <param name="e">\r
-        /// The e.\r
-        /// </param>\r
-        private void MnuReconfigureJobClick(object sender, EventArgs e)\r
-        {\r
-            if (list_queue.SelectedIndices != null)\r
-            {\r
-                lock (queue)\r
-                {\r
-                    lock (list_queue)\r
-                    {\r
-                        int index = list_queue.SelectedIndices[0];\r
-                        mainWindow.RecievingJob(queue.GetJob(index));\r
-                        queue.Remove(index);\r
-                        RedrawQueue();\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
-        /// <summary>\r
         /// Hide's the window when the user tries to "x" out of the window instead of closing it.\r
         /// </summary>\r
         /// <param name="e">\r