X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmQueue.cs;h=2684772bbd8cfedbadf1b3a2d5ede9526ee010c6;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=51dafd032718a2b2655e177f9809adf1f46e3754;hpb=09f854c0f5519faa2cc67f364ee747888d948d24;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 51dafd03..2684772b 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -1,8 +1,7 @@ /* frmQueue.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ + This file is part of the HandBrake source code. + Homepage: . + It may be used under the terms of the GNU General Public License. */ namespace Handbrake { @@ -10,19 +9,46 @@ namespace Handbrake using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; + using System.IO; using System.Windows.Forms; using Functions; + + using HandBrake.ApplicationServices.Model; + using HandBrake.ApplicationServices.Services; + using HandBrake.ApplicationServices.Services.Interfaces; + using Model; - using Services; + /// + /// The Queue Window + /// public partial class frmQueue : Form { + /// + /// Update Handler Delegate + /// private delegate void UpdateHandler(); - private Queue queue; - private frmMain mainWindow; + /// + /// An instance of the Queue service + /// + private readonly IQueue queue; - public frmQueue(Queue q, frmMain mw) + /// + /// A reference to the main application window + /// + private readonly frmMain mainWindow; + + /// + /// Initializes a new instance of the class. + /// + /// + /// An instance of the queue service. + /// + /// + /// The main window. + /// + public frmQueue(IQueue q, frmMain mw) { InitializeComponent(); @@ -32,25 +58,127 @@ namespace Handbrake queue.EncodeStarted += new EventHandler(QueueOnEncodeStart); queue.QueueCompleted += new EventHandler(QueueOnQueueFinished); queue.QueuePauseRequested += new EventHandler(QueueOnPaused); + queue.QueueListChanged += new EventHandler(queue_QueueListChanged); + + queue.EncodeStarted += new EventHandler(queue_EncodeStarted); + queue.EncodeEnded += new EventHandler(queue_EncodeEnded); + + drp_completeOption.Text = Properties.Settings.Default.CompletionOption; } + /// + /// Queue Changed + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void queue_QueueListChanged(object sender, EventArgs e) + { + UpdateUiElementsOnQueueChange(); + } + + /// + /// Encode Ended + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void queue_EncodeEnded(object sender, EventArgs e) + { + queue.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged; + ResetEncodeText(); + } + + /// + /// Queue Started + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void queue_EncodeStarted(object sender, EventArgs e) + { + this.SetCurrentEncodeInformation(); + queue.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged; + } + + /// + /// Display the Encode Status + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void EncodeQueue_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EncodeProgressEventArgs e) + { + if (this.InvokeRequired) + { + this.BeginInvoke(new Encode.EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e }); + return; + } + + lbl_encodeStatus.Text = + string.Format( + "Encoding: Pass {0} of {1}, {2:00.00}% Time Remaining: {3}", + e.Task, + e.TaskCount, + e.PercentComplete, + e.EstimatedTimeLeft); + } + + /// + /// Handle the Queue Paused event + /// + /// + /// The sender. + /// + /// + /// The EventArgs. + /// private void QueueOnPaused(object sender, EventArgs e) { - SetUIEncodeFinished(); - UpdateUIElements(); + SetUiEncodeFinished(); + UpdateUiElementsOnQueueChange(); } + /// + /// Handle the Queue Finished event. + /// + /// + /// The sender. + /// + /// + /// The EventArgs. + /// private void QueueOnQueueFinished(object sender, EventArgs e) { - SetUIEncodeFinished(); + SetUiEncodeFinished(); ResetQueue(); // Reset the Queue Window } + /// + /// Handle the Encode Started event + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void QueueOnEncodeStart(object sender, EventArgs e) { - SetUIEncodeStarted(); // make sure the UI is set correctly - SetCurrentEncodeInformation(); - UpdateUIElements(); // Redraw the Queue, a new encode has started. + SetUiEncodeStarted(); // make sure the UI is set correctly + UpdateUiElementsOnQueueChange(); // Redraw the Queue, a new encode has started. } /// @@ -58,7 +186,7 @@ namespace Handbrake /// public void SetQueue() { - UpdateUIElements(); + UpdateUiElementsOnQueueChange(); } /// @@ -77,57 +205,74 @@ namespace Handbrake { if (doSetQueue) SetQueue(); base.Show(); - - // Activate(); } - // Start and Stop Controls - private void btn_encode_Click(object sender, EventArgs e) + /// + /// Handle the Encode button Click event + /// + /// The sender + /// the EventArgs + private void BtnEncodeClick(object sender, EventArgs e) { - if (queue.PauseRequested) + if (queue.Paused) { - SetUIEncodeStarted(); - MessageBox.Show("Encoding restarted", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); + SetUiEncodeStarted(); } - if (!queue.IsEncoding) - queue.Start(); + lbl_encodeStatus.Text = "Encoding ..."; + queue.Start(); } - private void btn_pause_Click(object sender, EventArgs e) + /// + /// Handle the Pause button click event. + /// + /// + /// The sender. + /// + /// + /// The EventArgs. + /// + private void BtnPauseClick(object sender, EventArgs e) { queue.Pause(); - SetUIEncodeFinished(); - ResetQueue(); MessageBox.Show( - "No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", + "No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } + // UI Work - // Window Display Management - private void SetUIEncodeStarted() + /// + /// Setup the UI to show that an encode has started + /// + private void SetUiEncodeStarted() { if (InvokeRequired) { - BeginInvoke(new UpdateHandler(SetUIEncodeStarted)); + BeginInvoke(new UpdateHandler(SetUiEncodeStarted)); return; } btn_encode.Enabled = false; btn_pause.Visible = true; } - private void SetUIEncodeFinished() + /// + /// Setup the UI to indicate that an encode has finished. + /// + private void SetUiEncodeFinished() { if (InvokeRequired) { - BeginInvoke(new UpdateHandler(SetUIEncodeFinished)); + BeginInvoke(new UpdateHandler(SetUiEncodeFinished)); return; } btn_pause.Visible = false; btn_encode.Enabled = true; } + /// + /// Reset the Queue Window display + /// private void ResetQueue() { if (InvokeRequired) @@ -138,16 +283,31 @@ namespace Handbrake btn_pause.Visible = false; btn_encode.Enabled = true; + ResetEncodeText(); + } + + /// + /// Reset the current job text + /// + private void ResetEncodeText() + { + if (InvokeRequired) + { + BeginInvoke(new UpdateHandler(ResetEncodeText)); + return; + } + lbl_encodeStatus.Text = "Ready"; + lbl_source.Text = "-"; lbl_dest.Text = "-"; - lbl_vEnc.Text = "-"; - lbl_aEnc.Text = "-"; - lbl_title.Text = "-"; - lbl_chapt.Text = "-"; + lbl_encodeOptions.Text = "-"; lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending"; } + /// + /// Redraw the Queue window with the latest information about HandBrakes status + /// private void RedrawQueue() { if (InvokeRequired) @@ -158,30 +318,30 @@ namespace Handbrake list_queue.Items.Clear(); ReadOnlyCollection theQueue = queue.CurrentQueue; - foreach (Job queue_item in theQueue) + foreach (Job queueItem in theQueue) { - string q_item = queue_item.Query; - QueryParser parsed = Functions.QueryParser.Parse(q_item); + string qItem = queueItem.Query; + QueryParser parsed = Functions.QueryParser.Parse(qItem); // Get the DVD Title - string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString(); + string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString(); // Get the DVD Chapters string chapters; - if (parsed.DVDChapterStart == 0) + if (parsed.ChapterStart == 0) chapters = "Auto"; else { - chapters = parsed.DVDChapterStart.ToString(); - if (parsed.DVDChapterFinish != 0) - chapters = chapters + " - " + parsed.DVDChapterFinish; + chapters = parsed.ChapterStart.ToString(); + if (parsed.ChapterFinish != 0) + chapters = chapters + " - " + parsed.ChapterFinish; } ListViewItem item = new ListViewItem(); item.Text = title; // Title item.SubItems.Add(chapters); // Chapters - item.SubItems.Add(queue_item.Source); // Source - item.SubItems.Add(queue_item.Destination); // Destination + item.SubItems.Add(queueItem.Source); // Source + item.SubItems.Add(queueItem.Destination); // Destination item.SubItems.Add(parsed.VideoEncoder); // Video // Display The Audio Track Information @@ -199,11 +359,14 @@ namespace Handbrake } } - private void UpdateUIElements() + /// + /// Update the UI elements + /// + private void UpdateUiElementsOnQueueChange() { if (InvokeRequired) { - BeginInvoke(new UpdateHandler(UpdateUIElements)); + BeginInvoke(new UpdateHandler(UpdateUiElementsOnQueueChange)); return; } @@ -211,6 +374,9 @@ namespace Handbrake lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending"; } + /// + /// Set the window up with the current encode information + /// private void SetCurrentEncodeInformation() { try @@ -220,108 +386,136 @@ namespace Handbrake BeginInvoke(new UpdateHandler(SetCurrentEncodeInformation)); } - // found query is a global varible - QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query); - lbl_source.Text = queue.LastEncode.Source; - lbl_dest.Text = queue.LastEncode.Destination; + QueryParser parsed = QueryParser.Parse(queue.LastEncode.Query); - lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString(); - - if (Equals(parsed.DVDChapterStart, 0)) - lbl_chapt.Text = "Auto"; + // Get title and chapters + string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString(); + string chapterlbl; + if (Equals(parsed.ChapterStart, 0)) + chapterlbl = "Auto"; else { - string chapters = parsed.DVDChapterStart.ToString(); - if (parsed.DVDChapterFinish != 0) - chapters = chapters + " - " + parsed.DVDChapterFinish; - lbl_chapt.Text = chapters; + string chapters = parsed.ChapterStart.ToString(); + if (parsed.ChapterFinish != 0) + chapters = chapters + " - " + parsed.ChapterFinish; + chapterlbl = chapters; } - lbl_vEnc.Text = parsed.VideoEncoder; - - // Display The Audio Track Information + // Get audio information string audio = string.Empty; foreach (AudioTrack track in parsed.AudioInformation) { - if (audio != string.Empty) + if (audio != string.Empty) audio += ", " + track.Encoder; else audio = track.Encoder; } - lbl_aEnc.Text = audio; - } + + // found query is a global varible + lbl_encodeStatus.Text = "Encoding ..."; + lbl_source.Text = queue.LastEncode.Source + "(Title: " + title + " Chapters: " + chapterlbl + ")"; + lbl_dest.Text = queue.LastEncode.Destination; + lbl_encodeOptions.Text = "Video: " + parsed.VideoEncoder + " Audio: " + audio + Environment.NewLine + + "x264 Options: " + parsed.H264Query; + } catch (Exception) { // Do Nothing } } - private void DeleteSelectedItems() - { - // If there are selected items - if (list_queue.SelectedIndices.Count > 0) - { - // Save the selected indices to select them after the move - List selectedIndices = new List(list_queue.SelectedIndices.Count); - foreach (int selectedIndex in list_queue.SelectedIndices) - selectedIndices.Add(selectedIndex); - - int firstSelectedIndex = selectedIndices[0]; - - // Reverse the list to delete the items from last to first (preserves indices) - selectedIndices.Reverse(); - - // Remove each selected item - foreach (int selectedIndex in selectedIndices) - queue.Remove(selectedIndex); - - UpdateUIElements(); - - // Select the item where the first deleted item was previously - if (firstSelectedIndex < list_queue.Items.Count) - list_queue.Items[firstSelectedIndex].Selected = true; - } - - list_queue.Select(); // Activate the control to show the selected items - } + /* Right Click Menu */ - // Queue Management - private void mnu_up_Click(object sender, EventArgs e) + /// + /// Handle the Move Up Menu Item + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuUpClick(object sender, EventArgs e) { MoveUp(); } - private void mnu_Down_Click(object sender, EventArgs e) + /// + /// Handle the Move down Menu Item + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuDownClick(object sender, EventArgs e) { MoveDown(); } - private void mnu_delete_Click(object sender, EventArgs e) - { - DeleteSelectedItems(); - } - - private void btn_up_Click(object sender, EventArgs e) - { - MoveUp(); - } - - private void btn_down_Click(object sender, EventArgs e) + /// + /// Edit a job + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuEditClick(object sender, EventArgs e) { - MoveDown(); + if (list_queue.SelectedIndices != null && list_queue.SelectedIndices.Count != 0) + { + lock (queue) + { + lock (list_queue) + { + int index = list_queue.SelectedIndices[0]; + mainWindow.RecievingJob(queue.GetJob(index)); + queue.Remove(index); + RedrawQueue(); + } + } + } } - private void btn_delete_Click(object sender, EventArgs e) + /// + /// Handle the delete Menu Item + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuDeleteClick(object sender, EventArgs e) { DeleteSelectedItems(); } - private void list_queue_deleteKey(object sender, KeyEventArgs e) + /* Keyboard Shortcuts */ + + /// + /// Handle the delete keyboard press + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void ListQueueDeleteKey(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Delete) + if (e.KeyCode == Keys.Delete && e.Modifiers == Keys.None) DeleteSelectedItems(); } + /* Queue Management */ + + /// + /// Move items up in the queue + /// private void MoveUp() { // If there are selected items and the first item is not selected @@ -336,8 +530,6 @@ namespace Handbrake foreach (int selectedIndex in selectedIndices) queue.MoveUp(selectedIndex); - UpdateUIElements(); - // Keep the selected item(s) selected, now moved up one index foreach (int selectedIndex in selectedIndices) if (selectedIndex - 1 > -1) // Defensive programming: ensure index is good @@ -347,6 +539,9 @@ namespace Handbrake list_queue.Select(); // Activate the control to show the selected items } + /// + /// Move items down in the queue + /// private void MoveDown() { // If there are selected items and the last item is not selected @@ -365,8 +560,6 @@ namespace Handbrake foreach (int selectedIndex in selectedIndices) queue.MoveDown(selectedIndex); - UpdateUIElements(); - // Keep the selected item(s) selected, now moved down one index foreach (int selectedIndex in selectedIndices) if (selectedIndex + 1 < list_queue.Items.Count) // Defensive programming: ensure index is good @@ -376,8 +569,48 @@ namespace Handbrake list_queue.Select(); // Activate the control to show the selected items } - // Queue Import/Export Features - private void mnu_batch_Click(object sender, EventArgs e) + /// + /// Delete the currently selected items on the queue + /// + private void DeleteSelectedItems() + { + // If there are selected items + if (list_queue.SelectedIndices.Count > 0) + { + // Save the selected indices to select them after the move + List selectedIndices = new List(list_queue.SelectedIndices.Count); + foreach (int selectedIndex in list_queue.SelectedIndices) + selectedIndices.Add(selectedIndex); + + int firstSelectedIndex = selectedIndices[0]; + + // Reverse the list to delete the items from last to first (preserves indices) + selectedIndices.Reverse(); + + // Remove each selected item + foreach (int selectedIndex in selectedIndices) + queue.Remove(selectedIndex); + + // Select the item where the first deleted item was previously + if (firstSelectedIndex < list_queue.Items.Count) + list_queue.Items[firstSelectedIndex].Selected = true; + } + + list_queue.Select(); // Activate the control to show the selected items + } + + /* Queue Import / Export features */ + + /// + /// Create a batch script + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuBatchClick(object sender, EventArgs e) { SaveFile.FileName = string.Empty; SaveFile.Filter = "Batch|.bat"; @@ -386,7 +619,16 @@ namespace Handbrake queue.WriteBatchScriptToFile(SaveFile.FileName); } - private void mnu_export_Click(object sender, EventArgs e) + /// + /// Export Queue + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuExportClick(object sender, EventArgs e) { SaveFile.FileName = string.Empty; SaveFile.Filter = "HandBrake Queue|*.queue"; @@ -395,49 +637,74 @@ namespace Handbrake queue.WriteQueueStateToFile(SaveFile.FileName); } - private void mnu_import_Click(object sender, EventArgs e) + /// + /// Import Queue + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuImportClick(object sender, EventArgs e) { OpenFile.FileName = string.Empty; OpenFile.ShowDialog(); if (OpenFile.FileName != String.Empty) queue.LoadQueueFromFile(OpenFile.FileName); - UpdateUIElements(); } - private void mnu_readd_Click(object sender, EventArgs e) + /// + /// Readd current job to queue + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuReaddClick(object sender, EventArgs e) { - if (!queue.LastEncode.IsEmpty) + if (queue.LastEncode != null && !queue.LastEncode.IsEmpty) { - queue.Add(queue.LastEncode.Query, queue.LastEncode.Source, queue.LastEncode.Destination, - queue.LastEncode.CustomQuery); - UpdateUIElements(); - } - } - - private void mnu_reconfigureJob_Click(object sender, EventArgs e) - { - if (list_queue.SelectedIndices != null) - { - lock (queue) - { - lock (list_queue) - { - int index = list_queue.SelectedIndices[0]; - mainWindow.RecievingJob(queue.GetJob(index)); - queue.Remove(index); - RedrawQueue(); - } - } + queue.Add( + queue.LastEncode.Query, + queue.LastEncode.Title, + queue.LastEncode.Source, + queue.LastEncode.Destination, + queue.LastEncode.CustomQuery); } } + /* Overrides */ - // Hide's the window when the user tries to "x" out of the window instead of closing it. + /// + /// Hide's the window when the user tries to "x" out of the window instead of closing it. + /// + /// + /// The e. + /// protected override void OnClosing(CancelEventArgs e) { e.Cancel = true; this.Hide(); base.OnClosing(e); } + + /// + /// Change the OnComplete option setting. + /// + /// + /// The sender. + /// + /// + /// The EventArgs. + /// + private void CompleteOptionChanged(object sender, EventArgs e) + { + Properties.Settings.Default.CompletionOption = drp_completeOption.Text; + HandBrake.ApplicationServices.Init.CompletionOption = drp_completeOption.Text; + Properties.Settings.Default.Save(); + } } } \ No newline at end of file