merge 0.9.4 to jp

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

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 3529789..a7bc0fb 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -49,6 +49,11 @@ namespace Handbrake
         /// </summary>\r
         public void setQueue()\r
         {\r
+/* HEAD:\r
+            queue = qw;\r
+            redrawQueue();\r
+            lbl_encodesPending.Text = list_queue.Items.Count + "\8cÂ\82Ì\83W\83\87\83u\82ª\91Ò\8b@\92\86";\r
+*/\r
             updateUIElements();\r
         }\r
 \r
@@ -66,6 +71,40 @@ namespace Handbrake
         /// <param name="doSetQueue">Indicates whether to call setQueue() before showing the window</param>\r
         public void Show(bool doSetQueue)\r
         {\r
+/* HEAD:\r
+            list_queue.Items.Clear();\r
+            ArrayList theQueue = queue.getQueue();\r
+            foreach (ArrayList queue_item in theQueue)\r
+            {\r
+                string q_item = queue_item[1].ToString();\r
+                Functions.QueryParser parsed = Functions.QueryParser.Parse(q_item);\r
+\r
+                // Get the DVD Title\r
+                string title = "";\r
+                if (parsed.DVDTitle == 0)\r
+                    title = "Automatic";\r
+                else\r
+                    title = parsed.DVDTitle.ToString();\r
+\r
+                // Get the DVD Chapters\r
+                string chapters = "";\r
+                if (parsed.DVDChapterStart == 0)\r
+                    chapters = "Auto";\r
+                else\r
+                {\r
+                    chapters = parsed.DVDChapterStart.ToString();\r
+                    if (parsed.DVDChapterFinish != 0)\r
+                        chapters = chapters + " - " + parsed.DVDChapterFinish;\r
+                }\r
+\r
+                ListViewItem item = new ListViewItem();\r
+                item.Text = title; // Title\r
+                item.SubItems.Add(chapters); // Chapters\r
+                item.SubItems.Add(parsed.Source); // Source\r
+                item.SubItems.Add(parsed.Destination); // Destination\r
+                item.SubItems.Add(parsed.VideoEncoder); // Video\r
+                item.SubItems.Add(parsed.AudioEncoder1); // Audio\r
+*/\r
             if (doSetQueue) setQueue();\r
             base.Show();\r
 \r
@@ -151,6 +190,15 @@ namespace Handbrake
                 // Get the DVD Title\r
                 string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
 \r
+/* HEAD\r
+                if (cancel == true)\r
+                {\r
+                    lbl_progressValue.Text = "\83G\83\93\83R\81[\83h\82ª\83L\83\83\83\93\83Z\83\8b\82³\82ê\82Ü\82µ\82½";\r
+                }\r
+                else\r
+                {\r
+                    lbl_progressValue.Text = "\83G\83\93\83R\81[\83h\8dì\8bÆ\82ð\8a®\97¹\82µ\82Ü\82µ\82½";\r
+*/\r
                 // Get the DVD Chapters\r
                 string chapters;\r
                 if (parsed.DVDChapterStart == 0)\r
@@ -180,6 +228,43 @@ namespace Handbrake
                 }\r
                 item.SubItems.Add(audio); // Audio\r
 \r
+/* HEAD\r
+                lbl_encodesPending.Text = list_queue.Items.Count + "\8cÂ\82Ì\83W\83\87\83u\82ª\91Ò\8b@\92\86";\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show(exc.ToString());\r
+            }\r
+        }\r
+\r
+        // Stop's the queue from continuing. \r
+        private void btn_stop_Click(object sender, EventArgs e)\r
+        {\r
+            cancel = true;\r
+            btn_stop.Visible = false;\r
+            btn_encode.Enabled = true;\r
+            MessageBox.Show("\83L\83\85\81[\82Ì\8eÀ\8ds\82ª\92â\8e~\82³\82ê\82Ü\82µ\82½\81B. \8c»\8dÝ\83G\83\93\83R\81[\83h\92\86\82Ì\8f\88\97\9d\82Í\8a®\97¹\82·\82é\82Ü\82Å\8cp\91±\82³\82ê\82Ü\82·\81B\n\83L\83\85\81[\82Ì\8dì\8bÆ\82ð\8dÄ\8aJ\82µ\82½\82¢\8fê\8d\87\82Í\81u\83G\83\93\83R\81[\83h\81v\82ð\83N\83\8a\83b\83N\82µ\82Ä\82­\82¾\82³\82¢\81B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+        }\r
+\r
+        // Updates the progress bar and progress label for a new status.\r
+        private void updateUIElements()\r
+        {\r
+            try\r
+            {\r
+                if (this.InvokeRequired)\r
+                {\r
+                    this.BeginInvoke(new ProgressUpdateHandler(updateUIElements));\r
+                    return;\r
+                }\r
+\r
+                redrawQueue();\r
+\r
+                progressBar.PerformStep();\r
+                lbl_progressValue.Text = string.Format("{0} %", progressBar.Value);\r
+                lbl_encodesPending.Text = list_queue.Items.Count + "\8cÂ\82Ì\83W\83\87\83u\82ª\91Ò\8b@\92\86";\r
+            }\r
+            catch (Exception exc)\r
+*/\r
                 list_queue.Items.Add(item);\r
             }\r
         }\r
@@ -210,6 +295,16 @@ namespace Handbrake
 \r
                 lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
 \r
+/* HEAD\r
+                if (parsed.DVDTitle == 0)\r
+                    lbl_title.Text = "Automatic";\r
+                else\r
+                    lbl_title.Text = parsed.DVDTitle.ToString();\r
+\r
+                string chapters = "";\r
+                if (parsed.DVDChapterStart == 0)\r
+                {\r
+*/\r
                 if (Equals(parsed.DVDChapterStart, 0))\r
                     lbl_chapt.Text = "Auto";\r
                 else\r
@@ -327,6 +422,12 @@ namespace Handbrake
             if (list_queue.SelectedIndices.Count > 0 &&\r
                 !list_queue.SelectedIndices.Contains(list_queue.Items[list_queue.Items.Count - 1].Index))\r
             {\r
+/* HEAD\r
+                queue.remove(list_queue.SelectedIndices[0]);\r
+                queue.write2disk("hb_queue_recovery.dat"); // Update the queue recovery file\r
+                redrawQueue();\r
+                lbl_encodesPending.Text = list_queue.Items.Count + "\8cÂ\82Ì\83W\83\87\83u\82ª\91Ò\8b@\92\86";\r
+*/\r
                 // Copy the selected indices to preserve them during the movement\r
                 List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);\r
                 foreach (int selectedIndex in list_queue.SelectedIndices)\r