X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=2f1467625931789930468ba84439032b443be03b;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=3a4358bf7f7c9be82bbbd1f4ec04bd7dcf807977;hpb=0a0babb1f6eb52e697a5745f416dcc7023c5261c;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 3a4358bf..2f146762 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -12,20 +12,30 @@ namespace Handbrake using System.Drawing; using System.Globalization; using System.IO; - using System.Reflection; using System.Threading; using System.Windows.Forms; using Functions; + using HandBrake.Framework.Model; + using HandBrake.Framework.Services; + using HandBrake.Framework.Views; + using HandBrake.ApplicationServices.Functions; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Parsing; using HandBrake.ApplicationServices.Services; using HandBrake.ApplicationServices.Services.Interfaces; + using Handbrake.ToolWindows; + using Model; using Presets; using Properties; + using Main = Handbrake.Functions.Main; + + /// + /// The Main Window + /// public partial class frmMain : Form { // Objects which may be used by one or more other objects ************* @@ -35,8 +45,7 @@ namespace Handbrake // Windows ************************************************************ private frmQueue queueWindow; private frmPreview qtpreview; - private frmActivityWindow ActivityWindow; - private frmSplashScreen splash = new frmSplashScreen(); + private frmActivityWindow activityWindow; // Globals: Mainly used for tracking. ********************************* public Title selectedTitle; @@ -44,11 +53,10 @@ namespace Handbrake private SourceType selectedSourceType; private string dvdDrivePath; private string dvdDriveLabel; - private Preset CurrentlySelectedPreset; + private Preset currentlySelectedPreset; private DVD currentSource; private IScan SourceScan = new ScanService(); private List drives; - private Thread encodeMonitor; // Delegates ********************************************************** private delegate void UpdateWindowHandler(); @@ -69,6 +77,11 @@ namespace Handbrake return this.dvdDriveLabel; } + if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName)) + { + return Path.GetFileName(selectedTitle.SourceName); + } + if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS") return Path.GetFileNameWithoutExtension(this.sourcePath); @@ -80,78 +93,70 @@ namespace Handbrake #region Application Startup - public frmMain() + /// + /// Initializes a new instance of the class. + /// + /// + /// The arguments passed in on application startup. + /// + public frmMain(string[] args) { - // Load and setup the splash screen in this thread - splash.Show(this); - Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) }; - splash.Controls.Add(lblStatus); - InitializeComponent(); // Update the users config file with the CLI version data. - UpdateSplashStatus(lblStatus, "Checking CLI Version Data ..."); Main.SetCliVersionData(); - Main.CheckForValidCliVersion(); if (Settings.Default.hb_version.Contains("svn")) { - Version v = Assembly.GetExecutingAssembly().GetName().Version; - this.Text += " " + v.ToString(4); + this.Text += " " + Settings.Default.hb_version; } - // Show the form, but leave disabled until preloading is complete then show the main form) - this.Enabled = false; - this.Show(); - Application.DoEvents(); // Forces frmMain to draw - // Check for new versions, if update checking is enabled - if (Properties.Settings.Default.updateStatus) + if (Settings.Default.updateStatus) { - DateTime now = DateTime.Now; - DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate; - TimeSpan elapsed = now.Subtract(lastCheck); - if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck) + if (DateTime.Now.Subtract(Settings.Default.lastUpdateCheckDate).TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck) { - UpdateSplashStatus(lblStatus, "Checking for updates ..."); - Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false); + // Set when the last update was + Settings.Default.lastUpdateCheckDate = DateTime.Now; + Settings.Default.Save(); + string url = Settings.Default.hb_build.ToString().EndsWith("1") + ? Settings.Default.appcast_unstable + : Settings.Default.appcast; + UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version); } } // Clear the log files in the background - if (Properties.Settings.Default.clearOldLogs) + if (Settings.Default.clearOldLogs) { - UpdateSplashStatus(lblStatus, "Clearing Old Log Files .."); Thread clearLog = new Thread(Main.ClearOldLogs); clearLog.Start(); } // Setup the GUI components - UpdateSplashStatus(lblStatus, "Setting up the GUI ..."); LoadPresetPanel(); // Load the Preset Panel treeView_presets.ExpandAll(); lbl_encode.Text = string.Empty; drop_mode.SelectedIndex = 0; queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue - if (!Properties.Settings.Default.QueryEditorTab) + if (!Settings.Default.QueryEditorTab) tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled. - if (Properties.Settings.Default.tooltipEnable) + if (Settings.Default.tooltipEnable) ToolTip.Active = true; // Load the user's default settings or Normal Preset - if (Properties.Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null) + if (Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null) { - string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query; + string query = presetHandler.GetPreset(Settings.Default.defaultPreset).Query; if (query != null) { x264Panel.Reset2Defaults(); QueryParser presetQuery = QueryParser.Parse(query); - PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, - presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings); + PresetLoader.LoadPreset(this, presetQuery, Settings.Default.defaultPreset); - x264Panel.X264_StandardizeOptString(); - x264Panel.X264_SetCurrentSettingsInPanel(); + x264Panel.StandardizeOptString(); + x264Panel.SetCurrentSettingsInPanel(); } } else @@ -160,17 +165,21 @@ namespace Handbrake // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything) GrowlCommunicator.Register(); - // Finished Loading - UpdateSplashStatus(lblStatus, "Loading Complete."); - splash.Close(); - splash.Dispose(); - this.Enabled = true; - // Event Handlers and Queue Recovery events(); - queueRecovery(); + Main.RecoverQueue(encodeQueue); + + // If have a file passed in via command arguemtents, check it's a file and try scanning it. + if (args.Length >= 1 && (File.Exists(args[0]) || Directory.Exists(args[0]))) + { + this.StartScan(args[0], 0); + } } + /// + /// When the update check is done, process the results. + /// + /// IAsyncResult result private void UpdateCheckDone(IAsyncResult result) { if (InvokeRequired) @@ -179,15 +188,13 @@ namespace Handbrake return; } - UpdateCheckInformation info; - try { - info = Main.EndCheckForUpdates(result); + UpdateCheckInformation info = UpdateService.EndCheckForUpdates(result); if (info.NewVersionAvailable) { - frmUpdater updateWindow = new frmUpdater(info.BuildInformation); + UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString()); updateWindow.ShowDialog(); } } @@ -198,34 +205,6 @@ namespace Handbrake } } - // Startup Functions - private void queueRecovery() - { - if (Main.CheckQueueRecovery()) - { - DialogResult result = - MessageBox.Show( - "HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?", - "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - - if (result == DialogResult.Yes) - encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery - else - { - // Remove the Queue recovery file if the user doesn't want to recovery the last queue. - string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml"); - if (File.Exists(queuePath)) - File.Delete(queuePath); - } - } - } - - private void UpdateSplashStatus(Label status, string text) - { - status.Text = text; - Application.DoEvents(); - } - #endregion #region Events @@ -241,10 +220,13 @@ namespace Handbrake this.Resize += new EventHandler(frmMain_Resize); // Handle Encode Start / Finish / Pause - encodeQueue.QueuePauseRequested += new EventHandler(encodePaused); encodeQueue.EncodeStarted += new EventHandler(encodeStarted); encodeQueue.EncodeEnded += new EventHandler(encodeEnded); + // Scan Started and Completed Events + SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged); + SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted); + // Handle a file being draged onto the GUI. this.DragEnter += new DragEventHandler(frmMain_DragEnter); this.DragDrop += new DragEventHandler(frmMain_DragDrop); @@ -312,7 +294,7 @@ namespace Handbrake private void changePresetLabel(object sender, EventArgs e) { labelPreset.Text = "Output Settings (Preset: Custom)"; - CurrentlySelectedPreset = null; + this.currentlySelectedPreset = null; } private static void frmMain_DragEnter(object sender, DragEventArgs e) @@ -343,25 +325,14 @@ namespace Handbrake private void encodeStarted(object sender, EventArgs e) { SetEncodeStarted(); - - // Experimental HBProc Process Monitoring. - if (Properties.Settings.Default.enocdeStatusInGui) - { - encodeMonitor = new Thread(EncodeMonitorThread); - encodeMonitor.Start(); - } + encodeQueue.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged; } private void encodeEnded(object sender, EventArgs e) { + encodeQueue.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged; SetEncodeFinished(); } - - private void encodePaused(object sender, EventArgs e) - { - SetEncodeFinished(); - } - #endregion // User Interface Menus / Tool Strips ********************************* @@ -425,8 +396,7 @@ namespace Handbrake /// private void mnu_encodeLog_Click(object sender, EventArgs e) { - frmActivityWindow dvdInfoWindow = new frmActivityWindow(encodeQueue, SourceScan); - dvdInfoWindow.Show(); + this.btn_ActivityWindow_Click(this, null); } /// @@ -539,9 +509,13 @@ namespace Handbrake /// private void btn_new_preset_Click(object sender, EventArgs e) { - Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), - presetHandler); - preset.ShowDialog(); + Form preset = new frmAddPreset(this, presetHandler); + if (preset.ShowDialog() == DialogResult.OK) + { + TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black }; + treeView_presets.Nodes.Add(presetTreeview); + presetHandler.LastPresetAdded = null; + } } #endregion @@ -574,7 +548,12 @@ namespace Handbrake private void mnu_UpdateCheck_Click(object sender, EventArgs e) { lbl_updateCheck.Visible = true; - Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false); + Settings.Default.lastUpdateCheckDate = DateTime.Now; + Settings.Default.Save(); + string url = Settings.Default.hb_build.ToString().EndsWith("1") + ? Settings.Default.appcast_unstable + : Settings.Default.appcast; + UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDoneMenu), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version); } /// @@ -651,6 +630,7 @@ namespace Handbrake /// private void pmnu_saveChanges_Click(object sender, EventArgs e) { + // TODO this requires a re-think since the Query Editor has changed. DialogResult result = MessageBox.Show( "Do you wish to include picture settings when updating the preset: " + @@ -658,10 +638,10 @@ namespace Handbrake MessageBoxIcon.Question); if (result == DialogResult.Yes) presetHandler.Update(treeView_presets.SelectedNode.Text, - QueryGenerator.GenerateTabbedComponentsQuery(this), true); + QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0), true); else if (result == DialogResult.No) presetHandler.Update(treeView_presets.SelectedNode.Text, - QueryGenerator.GenerateTabbedComponentsQuery(this), false); + QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0), false); } /// @@ -718,8 +698,13 @@ namespace Handbrake /// private void btn_addPreset_Click(object sender, EventArgs e) { - Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler); - preset.ShowDialog(); + Form preset = new frmAddPreset(this, presetHandler); + if (preset.ShowDialog() == DialogResult.OK) + { + TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black }; + treeView_presets.Nodes.Add(presetTreeview); + presetHandler.LastPresetAdded = null; + } } /// @@ -812,6 +797,29 @@ namespace Handbrake } /// + /// When the mouse moves, display a preset + /// + /// The Sender + /// the MouseEventArgs + private void TreeViewPresetsMouseMove(object sender, MouseEventArgs e) + { + TreeNode theNode = this.treeView_presets.GetNodeAt(e.X, e.Y); + + if ((theNode != null)) + { + // Change the ToolTip only if the pointer moved to a new node. + if (theNode.ToolTipText != this.ToolTip.GetToolTip(this.treeView_presets)) + { + this.ToolTip.SetToolTip(this.treeView_presets, theNode.ToolTipText); + } + } + else // Pointer is not over a node so clear the ToolTip. + { + this.ToolTip.SetToolTip(this.treeView_presets, string.Empty); + } + } + + /// /// Preset Bar - Handle the Delete Key /// /// @@ -865,7 +873,6 @@ namespace Handbrake if (preset != null) { string query = presetHandler.GetPreset(presetName).Query; - bool loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings; if (query != null) { @@ -876,14 +883,14 @@ namespace Handbrake QueryParser presetQuery = QueryParser.Parse(query); // Now load the preset - PresetLoader.LoadPreset(this, presetQuery, presetName, loadPictureSettings); + PresetLoader.LoadPreset(this, presetQuery, presetName); // The x264 widgets will need updated, so do this now: - x264Panel.X264_StandardizeOptString(); - x264Panel.X264_SetCurrentSettingsInPanel(); + x264Panel.StandardizeOptString(); + x264Panel.SetCurrentSettingsInPanel(); // Finally, let this window have a copy of the preset settings. - CurrentlySelectedPreset = preset; + this.currentlySelectedPreset = preset; PictureSettings.SetPresetCropWarningLabel(preset); } } @@ -921,18 +928,18 @@ namespace Handbrake MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (result == DialogResult.Yes) { - PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); + PresetLoader.LoadPreset(this, parsed, parsed.PresetName); presetHandler.Update(parsed.PresetName + " (Imported)", - QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), + QueryGenerator.GenerateFullQuery(this), parsed.UsesPictureSettings); } } else { - PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); + PresetLoader.LoadPreset(this, parsed, parsed.PresetName); if (presetHandler.Add(parsed.PresetName + " (Imported)", - QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), - parsed.UsesPictureSettings)) + QueryGenerator.GenerateFullQuery(this), + parsed.UsesPictureSettings, string.Empty)) { TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { @@ -949,15 +956,10 @@ namespace Handbrake /// private void ExportPreset() { - MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; - - SaveFileDialog savefiledialog = new SaveFileDialog(); - savefiledialog.Filter = "plist|*.plist"; + SaveFileDialog savefiledialog = new SaveFileDialog { Filter = "plist|*.plist" }; if (treeView_presets.SelectedNode != null) { - if (savefiledialog.ShowDialog() == DialogResult.OK) { Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text); @@ -1015,47 +1017,41 @@ namespace Handbrake { if (btn_start.Text == "Stop") { - DialogResult result; - if (Properties.Settings.Default.enocdeStatusInGui && - !Properties.Settings.Default.showCliForInGuiEncodeStatus) - { - result = MessageBox.Show( - "Are you sure you wish to cancel the encode?\n\nPlease note, when 'Enable in-GUI encode status' is enabled, stopping this encode will render the file unplayable. ", - "Cancel Encode?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - } - else - { - result = MessageBox.Show("Are you sure you wish to cancel the encode?", "Cancel Encode?", - MessageBoxButtons.YesNo, MessageBoxIcon.Question); - } + DialogResult result = !Properties.Settings.Default.showCliForInGuiEncodeStatus + ? MessageBox.Show( + "Are you sure you wish to cancel the encode?\n\nPlease note: Stopping this encode will render the file unplayable. ", + "Cancel Encode?", + MessageBoxButtons.YesNo, + MessageBoxIcon.Question) + : MessageBox.Show( + "Are you sure you wish to cancel the encode?", + "Cancel Encode?", + MessageBoxButtons.YesNo, + MessageBoxIcon.Question); if (result == DialogResult.Yes) { // Pause The Queue encodeQueue.Pause(); - if (Properties.Settings.Default.enocdeStatusInGui && - !Properties.Settings.Default.showCliForInGuiEncodeStatus) - { - encodeQueue.Stop(); - if (encodeQueue.HbProcess != null) - encodeQueue.HbProcess.WaitForExit(); - } - else - { + if (Settings.Default.showCliForInGuiEncodeStatus) encodeQueue.SafelyClose(); - } + else + encodeQueue.Stop(); } } else { - if (encodeQueue.Count != 0 || - (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text))) + // If we have a custom query, then we'll want to figure out what the new source and destination is, otherwise we'll just use the gui components. + string jobSourcePath = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetSourceFromQuery(rtf_query.Text) : sourcePath; + string jobDestination = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetDestinationFromQuery(rtf_query.Text) : text_destination.Text; + + if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(jobSourcePath) && !string.IsNullOrEmpty(jobDestination))) { - string generatedQuery = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); + string generatedQuery = QueryGenerator.GenerateFullQuery(this); string specifiedQuery = rtf_query.Text != string.Empty ? rtf_query.Text - : QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); + : QueryGenerator.GenerateFullQuery(this); string query = string.Empty; // Check to make sure the generated query matches the GUI settings @@ -1094,17 +1090,19 @@ namespace Handbrake } DialogResult overwrite = DialogResult.Yes; - if (text_destination.Text != string.Empty) - if (File.Exists(text_destination.Text)) - overwrite = - MessageBox.Show( - "The destination file already exists. Are you sure you want to overwrite it?", - "Overwrite File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (!string.IsNullOrEmpty(jobDestination) && File.Exists(jobDestination)) + { + overwrite = MessageBox.Show( + "The destination file already exists. Are you sure you want to overwrite it?", + "Overwrite File?", + MessageBoxButtons.YesNo, + MessageBoxIcon.Question); + } if (overwrite == DialogResult.Yes) { if (encodeQueue.Count == 0) - encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); + encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty)); queueWindow.SetQueue(); if (encodeQueue.Count > 1) @@ -1133,36 +1131,117 @@ namespace Handbrake /// private void btn_add2Queue_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - else + // Add the item to the queue. + AddItemToQueue(true); + queueWindow.Show(); + } + + /// + /// Add Multiple Items to the Queue at once. + /// + /// The Sender + /// The EventArgs + private void MnuAddMultiToQueueClick(object sender, EventArgs e) + { + if (!Settings.Default.autoNaming) { - if (!Directory.Exists(Path.GetDirectoryName(text_destination.Text))) + MessageBox.Show("Destination Auto Naming must be enabled in preferences for this feature to work.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (this.SourceScan.SouceData == null) + { + MessageBox.Show("You must first scan a source or collection of source to use this feature.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + BatchAdd batchAdd = new BatchAdd(); + if (batchAdd.ShowDialog() == DialogResult.OK) + { + int min = batchAdd.Min; + int max = batchAdd.Max; + bool errors = false; + + foreach (Title title in this.SourceScan.SouceData.Titles) { - MessageBox.Show("Destination Path does not exist.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; + if (title.Duration.TotalMinutes > min && title.Duration.TotalMinutes < max) + { + // Add to Queue + this.drp_dvdtitle.SelectedItem = title; + + if (!this.AddItemToQueue(false)) + { + errors = true; + } + } + } + + if (errors) + { + MessageBox.Show( + "One or more items could not be added to the queue. You should check your queue and manually add any missing jobs.", + "Warning", + MessageBoxButtons.OK, + MessageBoxIcon.Warning); } + } + } + + private bool AddItemToQueue(bool showError) + { + string query = QueryGenerator.GenerateFullQuery(this); + if (!string.IsNullOrEmpty(rtf_query.Text)) + query = rtf_query.Text; + + // If we have a custom query, then we'll want to figure out what the new source and destination is, otherwise we'll just use the gui components. + string jobSourcePath = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetSourceFromQuery(rtf_query.Text) : sourcePath; + string jobDestination = !string.IsNullOrEmpty(rtf_query.Text) ? Main.GetDestinationFromQuery(rtf_query.Text) : text_destination.Text; - string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); - if (rtf_query.Text != string.Empty) - query = rtf_query.Text; + // Make sure we have a Source and Destination. + if (string.IsNullOrEmpty(jobSourcePath) || string.IsNullOrEmpty(jobDestination)) + { + if (showError) + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return false; + } - if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text)) + // Make sure the destination path exists. + if (!Directory.Exists(Path.GetDirectoryName(jobDestination))) + { + if (showError) + MessageBox.Show(string.Format("Destination Path does not exist.\nPath: {0}\n\nThis item was not added to the Queue.", Path.GetDirectoryName(jobDestination)), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return false; + } + + // Make sure we don't have a duplciate on the queue. + if (encodeQueue.CheckForDestinationDuplicate(jobDestination)) + { + if (showError) { - DialogResult result = + DialogResult result; + result = MessageBox.Show( - "There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?", - "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (result == DialogResult.Yes) - encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); + string.Format( + "There is already a queue item for this destination path.\nDestination Path: {0} \n\nIf you continue, the encode will be overwritten. Do you wish to continue?", + jobDestination), + "Warning", + MessageBoxButtons.YesNo, + MessageBoxIcon.Warning); + + if (result != DialogResult.Yes) return false; } else - encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); + { + return false; + } + } - lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue"; + // Add the job. + encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty)); - queueWindow.Show(); - } + lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue"; + + return true; } /// @@ -1223,11 +1302,11 @@ namespace Handbrake /// private void btn_ActivityWindow_Click(object sender, EventArgs e) { - if (ActivityWindow == null || !ActivityWindow.IsHandleCreated) - ActivityWindow = new frmActivityWindow(encodeQueue, SourceScan); + if (this.activityWindow == null || !this.activityWindow.IsHandleCreated) + this.activityWindow = new frmActivityWindow(encodeQueue, SourceScan); - ActivityWindow.Show(); - ActivityWindow.Activate(); + this.activityWindow.Show(); + this.activityWindow.Activate(); } #endregion @@ -1293,29 +1372,31 @@ namespace Handbrake #region Main Window and Tab Control // Source - private void btn_dvd_source_Click(object sender, EventArgs e) + private void BtnFolderScanClicked(object sender, EventArgs e) { + this.btn_source.HideDropDown(); if (DVD_Open.ShowDialog() == DialogResult.OK) { this.selectedSourceType = SourceType.Folder; - SelectSource(DVD_Open.SelectedPath); + SelectSource(DVD_Open.SelectedPath, 0); } else UpdateSourceLabel(); } - private void btn_file_source_Click(object sender, EventArgs e) + private void BtnFileScanClicked(object sender, EventArgs e) { + this.btn_source.HideDropDown(); if (ISO_Open.ShowDialog() == DialogResult.OK) { this.selectedSourceType = SourceType.VideoFile; - SelectSource(ISO_Open.FileName); + SelectSource(ISO_Open.FileName, 0); } else UpdateSourceLabel(); } - private void mnu_dvd_drive_Click(object sender, EventArgs e) + private void MnuDvdDriveClick(object sender, EventArgs e) { ToolStripMenuItem item = sender as ToolStripMenuItem; if (item != null) @@ -1324,18 +1405,55 @@ namespace Handbrake int id; if (int.TryParse(driveId, out id)) { - this.dvdDrivePath = drives[id].RootDirectory; this.dvdDriveLabel = drives[id].VolumeLabel; if (this.dvdDrivePath == null) return; this.selectedSourceType = SourceType.DvdDrive; - SelectSource(this.dvdDrivePath); + SelectSource(this.dvdDrivePath, 0); } } } - private void SelectSource(string file) + private void VideoTitleSpecificScanClick(object sender, EventArgs e) + { + this.btn_source.HideDropDown(); + if (ISO_Open.ShowDialog() == DialogResult.OK) + { + this.selectedSourceType = SourceType.VideoFile; + + int sourceTitle = 0; + TitleSpecificScan title = new TitleSpecificScan(); + if (title.ShowDialog() == DialogResult.OK) + { + sourceTitle = title.Title; + SelectSource(ISO_Open.FileName, sourceTitle); + } + } + else + UpdateSourceLabel(); + } + + private void FolderTitleSpecificScanClick(object sender, EventArgs e) + { + this.btn_source.HideDropDown(); + if (DVD_Open.ShowDialog() == DialogResult.OK) + { + this.selectedSourceType = SourceType.Folder; + + int sourceTitle = 0; + TitleSpecificScan title = new TitleSpecificScan(); + if (title.ShowDialog() == DialogResult.OK) + { + sourceTitle = title.Title; + SelectSource(DVD_Open.SelectedPath, sourceTitle); + } + } + else + UpdateSourceLabel(); + } + + private void SelectSource(string file, int titleSpecific) { Check_ChapterMarkers.Enabled = true; sourcePath = string.Empty; @@ -1347,7 +1465,7 @@ namespace Handbrake } sourcePath = Path.GetFileName(file); - StartScan(file, 0); + StartScan(file, titleSpecific); } private void drp_dvdtitle_Click(object sender, EventArgs e) @@ -1372,7 +1490,7 @@ namespace Handbrake { selectedTitle = drp_dvdtitle.SelectedItem as Title; lbl_duration.Text = selectedTitle.Duration.ToString(); - PictureSettings.CurrentlySelectedPreset = CurrentlySelectedPreset; + PictureSettings.CurrentlySelectedPreset = this.currentlySelectedPreset; PictureSettings.Source = selectedTitle; // Setup Picture Settings Tab Control // Populate the Angles dropdown @@ -1385,6 +1503,12 @@ namespace Handbrake for (int i = 1; i <= selectedTitle.AngleCount; i++) drop_angle.Items.Add(i.ToString()); + if (drop_angle.Items.Count == 0) + { + drop_angle.Visible = false; + lbl_angle.Visible = false; + } + if (drop_angle.Items.Count != 0) drop_angle.SelectedIndex = 0; } @@ -1407,7 +1531,7 @@ namespace Handbrake drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString(); // Populate the Audio Channels Dropdown - AudioSettings.SetTrackList(selectedTitle, CurrentlySelectedPreset); + AudioSettings.SetTrackListFromPreset(selectedTitle, this.currentlySelectedPreset); // Populate the Subtitles dropdown Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray()); @@ -1415,7 +1539,7 @@ namespace Handbrake // Update the source label if we have multiple streams if (selectedTitle != null) if (!string.IsNullOrEmpty(selectedTitle.SourceName)) - labelSource.Text = labelSource.Text = Path.GetFileName(selectedTitle.SourceName); + labelSource.Text = Path.GetFileName(selectedTitle.SourceName); // Run the AutoName & ChapterNaming functions if (Properties.Settings.Default.autoNaming) @@ -1425,14 +1549,14 @@ namespace Handbrake text_destination.Text = autoPath; else MessageBox.Show( - "You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')", + "You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a valid default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } data_chpt.Rows.Clear(); if (selectedTitle.Chapters.Count != 1) { - DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text); + DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text); if (chapterGridView != null) data_chpt = chapterGridView; } @@ -1754,6 +1878,28 @@ namespace Handbrake } /// + /// When the FrameRate is not Same As Source, show the Max/Constant Mode dropdown + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void drp_videoFramerate_SelectedIndexChanged(object sender, EventArgs e) + { + if (this.drp_videoFramerate.SelectedIndex == 0) + { + this.checkMaximumFramerate.Visible = false; + this.checkMaximumFramerate.CheckState = CheckState.Unchecked; + } + else + { + this.checkMaximumFramerate.Visible = true; + } + } + + /// /// Set the container format options /// public void setContainerOpts() @@ -1775,7 +1921,7 @@ namespace Handbrake } } - private double _cachedCqStep = Properties.Settings.Default.x264cqstep; + private double cachedCqStep = Properties.Settings.Default.x264cqstep; /// /// Update the CQ slider for x264 for a new CQ step. This is set from option @@ -1783,7 +1929,7 @@ namespace Handbrake public void setQualityFromSlider() { // Work out the current RF value. - double cqStep = _cachedCqStep; + double cqStep = this.cachedCqStep; double rfValue = 51.0 - slider_videoQuality.Value * cqStep; // Change the maximum value for the slider @@ -1802,7 +1948,7 @@ namespace Handbrake } // Cache the CQ step for the next calculation - _cachedCqStep = Properties.Settings.Default.x264cqstep; + this.cachedCqStep = Properties.Settings.Default.x264cqstep; } private void slider_videoQuality_Scroll(object sender, EventArgs e) @@ -1912,7 +2058,7 @@ namespace Handbrake private void mnu_resetChapters_Click(object sender, EventArgs e) { data_chpt.Rows.Clear(); - DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text); + DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text); if (chapterGridView != null) { data_chpt = chapterGridView; @@ -1922,7 +2068,7 @@ namespace Handbrake // Query Editor Tab private void btn_generate_Query_Click(object sender, EventArgs e) { - rtf_query.Text = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); + rtf_query.Text = QueryGenerator.GenerateFullQuery(this); } private void btn_clear_Click(object sender, EventArgs e) @@ -1956,8 +2102,6 @@ namespace Handbrake try { SourceScan.Scan(sourcePath, title); - SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged); - SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted); } catch (Exception exc) { @@ -2003,7 +2147,7 @@ namespace Handbrake BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel)); return; } - lbl_encode.Text = SourceScan.ScanStatus; + labelSource.Text = SourceScan.ScanStatus; } /// @@ -2039,17 +2183,19 @@ namespace Handbrake drp_dvdtitle.SelectedIndex = 0; } - // Enable the creation of chapter markers if the file is an image of a dvd. - int start, end; - int.TryParse(drop_chapterStart.Items[0].ToString(), out start); - int.TryParse(drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString(), out end); - if (end > start) - Check_ChapterMarkers.Enabled = true; - else + // Enable the creation of chapter markers if the file is an image of a dvd + if (drop_chapterStart.Items.Count > 0) { - Check_ChapterMarkers.Enabled = false; - Check_ChapterMarkers.Checked = false; - data_chpt.Rows.Clear(); + int start, end; + int.TryParse(drop_chapterStart.Items[0].ToString(), out start); + int.TryParse(drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString(), out end); + if (end > start) Check_ChapterMarkers.Enabled = true; + else + { + Check_ChapterMarkers.Enabled = false; + Check_ChapterMarkers.Checked = false; + data_chpt.Rows.Clear(); + } } // If no titles were found, Display an error message @@ -2082,7 +2228,6 @@ namespace Handbrake { if (InvokeRequired) BeginInvoke(new UpdateWindowHandler(EnableGUI)); - lbl_encode.Text = "Scan Completed"; foreach (Control ctrl in Controls) ctrl.Enabled = true; btn_start.Enabled = true; @@ -2107,8 +2252,9 @@ namespace Handbrake if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip)) ctrl.Enabled = false; - lbl_encode.Visible = true; - lbl_encode.Text = "Scanning ..."; + labelSource.Enabled = true; + labelStaticSource.Enabled = true; + SourceLayoutPanel.Enabled = true; btn_source.Enabled = false; btn_start.Enabled = false; btn_showQueue.Enabled = false; @@ -2128,7 +2274,7 @@ namespace Handbrake SourceScan.Stop(); - lbl_encode.Text = "Scan Cancelled!"; + labelSource.Text = "Scan Cancelled"; } /// @@ -2152,11 +2298,6 @@ namespace Handbrake private void UpdateSourceLabel() { labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName; - - if (selectedTitle != null) - if (!string.IsNullOrEmpty(selectedTitle.SourceName)) - // If it's one of multiple source files, make sure we don't use the folder name - labelSource.Text = Path.GetFileName(selectedTitle.SourceName); } /// @@ -2179,14 +2320,14 @@ namespace Handbrake QueryParser presetQuery = QueryParser.Parse(query); // Now load the preset - PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue", true); + PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue"); // The x264 widgets will need updated, so do this now: - x264Panel.X264_StandardizeOptString(); - x264Panel.X264_SetCurrentSettingsInPanel(); + x264Panel.StandardizeOptString(); + x264Panel.SetCurrentSettingsInPanel(); // Finally, let this window have a copy of the preset settings. - CurrentlySelectedPreset = null; + this.currentlySelectedPreset = null; PictureSettings.SetPresetCropWarningLabel(null); } } @@ -2255,6 +2396,35 @@ namespace Handbrake } /// + /// 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_encode.Text = + string.Format( + "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Encode(s) Pending {4}", + e.PercentComplete, + e.CurrentFrameRate, + e.AverageFrameRate, + e.EstimatedTimeLeft, + encodeQueue.Count); + + ProgressBarStatus.Value = (int)Math.Round(e.PercentComplete); + } + + /// /// Set the DVD Drive selection in the "Source" Menu /// private void SetDriveSelectionMenuItem() @@ -2278,7 +2448,7 @@ namespace Handbrake Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")", Image = Resources.disc_small }; - menuItem.Click += new EventHandler(mnu_dvd_drive_Click); + menuItem.Click += new EventHandler(MnuDvdDriveClick); menuItems.Add(menuItem); } @@ -2297,8 +2467,8 @@ namespace Handbrake private void LoadPresetPanel() { if (presetHandler.CheckIfPresetsAreOutOfDate()) - if (!Properties.Settings.Default.presetNotification) - MessageBox.Show(splash, + if (!Settings.Default.presetNotification) + MessageBox.Show(this, "HandBrake has determined your built-in presets are out of date... These presets will now be updated.", "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -2312,7 +2482,7 @@ namespace Handbrake /// /// The title. /// - private int getTitle() + private int GetTitle() { int title = 0; if (drp_dvdtitle.SelectedItem != null) @@ -2330,23 +2500,23 @@ namespace Handbrake /// /// The result. /// - private void updateCheckDoneMenu(IAsyncResult result) + private void UpdateCheckDoneMenu(IAsyncResult result) { // Make sure it's running on the calling thread if (InvokeRequired) { - Invoke(new MethodInvoker(() => updateCheckDoneMenu(result))); + Invoke(new MethodInvoker(() => this.UpdateCheckDoneMenu(result))); return; } UpdateCheckInformation info; try { // Get the information about the new build, if any, and close the window - info = Main.EndCheckForUpdates(result); + info = UpdateService.EndCheckForUpdates(result); if (info.NewVersionAvailable && info.BuildInformation != null) { - frmUpdater updateWindow = new frmUpdater(info.BuildInformation); + UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString()); updateWindow.ShowDialog(); } else @@ -2382,7 +2552,7 @@ namespace Handbrake return true; } - if (keyData == (Keys.Control | Keys.A)) + if (keyData == (Keys.Control | Keys.Shift | Keys.A)) { btn_add2Queue_Click(this, new EventArgs()); return true; @@ -2396,84 +2566,41 @@ namespace Handbrake /// FormClosingEventArgs protected override void OnFormClosing(FormClosingEventArgs e) { - // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close. - if (encodeQueue.IsEncoding) + try { - DialogResult result = - MessageBox.Show( - "HandBrake has queue items to process. Closing HandBrake will stop the current encoding.\n\nDo you want to close HandBrake?", - "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close. + if (encodeQueue.IsEncoding) + { + DialogResult result = + MessageBox.Show( + "HandBrake is currently encoding. Closing HandBrake will stop the current encode and will result in an unplayable file.\n\nDo you want to close HandBrake?", + "Close HandBrake?", + MessageBoxButtons.YesNo, + MessageBoxIcon.Question); - if (result == DialogResult.No) - e.Cancel = true; + if (result == DialogResult.No) + { + e.Cancel = true; + return; + } - // Try to safely close out if we can, or kill the cli if using in-gui status - if (Settings.Default.enocdeStatusInGui) encodeQueue.Stop(); - else - encodeQueue.SafelyClose(); - } - - if (SourceScan.IsScanning) - { - SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted); - SourceScan.Stop(); - } - base.OnFormClosing(e); - } - - #endregion - - #region In-GUI Encode Status - - /// - /// Starts a new thread to monitor and process the CLI encode status - /// - private void EncodeMonitorThread() - { - try - { - Parser encode = new Parser(encodeQueue.HbProcess.StandardOutput.BaseStream); - encode.OnEncodeProgress += EncodeOnEncodeProgress; - while (!encode.EndOfStream) - encode.ReadEncodeStatus(); + } - SetEncodeFinished(); + if (SourceScan.IsScanning) + { + SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted); + SourceScan.Stop(); + } } catch (Exception exc) { - MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + Main.ShowExceptiowWindow("HandBrake was not able to shutdown properly. You may need to forcefully quit HandBrake CLI from TaskManager if it's still running.", exc.ToString()); } - } - - /// - /// Displays the Encode status in the GUI - /// - /// The sender - /// The current task - /// Number of tasks - /// Percent complete - /// Current encode speed in fps - /// Avg encode speed - /// Time Left - private void EncodeOnEncodeProgress(object sender, int currentTask, int taskCount, float percentComplete, float currentFps, float av, TimeSpan timeRemaining) - { - if (this.InvokeRequired) + finally { - this.BeginInvoke( - new EncodeProgressEventHandler(EncodeOnEncodeProgress), - new[] { sender, currentTask, taskCount, percentComplete, currentFps, av, timeRemaining }); - return; + base.OnFormClosing(e); } - lbl_encode.Text = - string.Format( - "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}", - percentComplete, - currentFps, - av, - timeRemaining); - - ProgressBarStatus.Value = (int)Math.Round(percentComplete); } #endregion