X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=1a1cfae47111132a432eb258c93120890b4f05b5;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=50a4c8ef6ec56df59bf3c9cfe99a9a09dad1c5ca;hpb=c506c49da51975f3f78ffd0b6f40b4ab05c93e28;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 50a4c8ef..1a1cfae4 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -28,33 +28,57 @@ namespace Handbrake private Queue encodeQueue = new Queue(); private PresetsHandler presetHandler = new PresetsHandler(); - // Globals: Mainly used for tracking. ********************************* - public Title selectedTitle; + // Windows ************************************************************ private frmQueue queueWindow; private frmPreview qtpreview; private frmActivityWindow ActivityWindow; - private Form splash; + private frmSplashScreen splash = new frmSplashScreen(); + + // Globals: Mainly used for tracking. ********************************* + public Title selectedTitle; public string sourcePath; - private ActivityLogMode lastAction; private SourceType selectedSourceType; private string dvdDrivePath; private string dvdDriveLabel; private Preset CurrentlySelectedPreset; private DVD currentSource; - private Scan SourceScan = new Scan(); + private ScanService SourceScan = new ScanService(); private List drives; + private Thread encodeMonitor; // Delegates ********************************************************** private delegate void UpdateWindowHandler(); // Applicaiton Startup ************************************************ + #region Properties + + /// + /// Gets SourceName. + /// + public string SourceName + { + get + { + if (this.selectedSourceType == SourceType.DvdDrive) + { + return this.dvdDriveLabel; + } + + if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS") + return Path.GetFileNameWithoutExtension(this.sourcePath); + + return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath)); + } + } + + #endregion + #region Application Startup public frmMain() { // Load and setup the splash screen in this thread - splash = new frmSplashScreen(); splash.Show(this); Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) }; splash.Controls.Add(lblStatus); @@ -62,8 +86,7 @@ namespace Handbrake InitializeComponent(); // Update the users config file with the CLI version data. - lblStatus.Text = "Checking CLI Version Data ..."; - Application.DoEvents(); + UpdateSplashStatus(lblStatus, "Checking CLI Version Data ..."); Main.SetCliVersionData(); Main.CheckForValidCliVersion(); @@ -86,9 +109,7 @@ namespace Handbrake TimeSpan elapsed = now.Subtract(lastCheck); if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck) { - lblStatus.Text = "Checking for updates ..."; - Application.DoEvents(); - + UpdateSplashStatus(lblStatus, "Checking for updates ..."); Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false); } } @@ -96,15 +117,13 @@ namespace Handbrake // Clear the log files in the background if (Properties.Settings.Default.clearOldLogs) { - lblStatus.Text = "Clearing Old Log Files ..."; - Application.DoEvents(); + UpdateSplashStatus(lblStatus, "Clearing Old Log Files .."); Thread clearLog = new Thread(Main.ClearOldLogs); clearLog.Start(); } // Setup the GUI components - lblStatus.Text = "Setting up the GUI ..."; - Application.DoEvents(); + UpdateSplashStatus(lblStatus, "Setting up the GUI ..."); LoadPresetPanel(); // Load the Preset Panel treeView_presets.ExpandAll(); lbl_encode.Text = string.Empty; @@ -112,44 +131,33 @@ namespace Handbrake queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue if (!Properties.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) + ToolTip.Active = true; // Load the user's default settings or Normal Preset - if (Properties.Settings.Default.defaultPreset != string.Empty) + if (Properties.Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null) { - if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null) + string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query; + if (query != null) { - string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query; - bool loadPictureSettings = - presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings; + x264Panel.Reset2Defaults(); - if (query != null) - { - x264Panel.Reset2Defaults(); - - QueryParser presetQuery = QueryParser.Parse(query); - PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, - loadPictureSettings); + QueryParser presetQuery = QueryParser.Parse(query); + PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, + presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings); - x264Panel.X264_StandardizeOptString(); - x264Panel.X264_SetCurrentSettingsInPanel(); - } + x264Panel.X264_StandardizeOptString(); + x264Panel.X264_SetCurrentSettingsInPanel(); } - else - loadNormalPreset(); } else loadNormalPreset(); - // Enabled GUI tooltip's if Required - if (Properties.Settings.Default.tooltipEnable) - ToolTip.Active = true; - // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything) GrowlCommunicator.Register(); // Finished Loading - lblStatus.Text = "Loading Complete!"; - Application.DoEvents(); + UpdateSplashStatus(lblStatus, "Loading Complete."); splash.Close(); splash.Dispose(); this.Enabled = true; @@ -182,9 +190,7 @@ namespace Handbrake catch (Exception ex) { if ((bool)result.AsyncState) - MessageBox.Show( - "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, - "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + Main.ShowExceptiowWindow("Unable to check for updates, Please try again later.", ex.ToString()); } } @@ -210,24 +216,10 @@ namespace Handbrake } } - #endregion - - #region Properties - - public string SourceName + private void UpdateSplashStatus(Label status, string text) { - get - { - if (this.selectedSourceType == SourceType.DvdDrive) - { - return this.dvdDriveLabel; - } - - if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS") - return Path.GetFileNameWithoutExtension(this.sourcePath); - - return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath)); - } + status.Text = text; + Application.DoEvents(); } #endregion @@ -245,7 +237,6 @@ 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); @@ -265,7 +256,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel); // Picture Settings - // PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel); + PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel); // Filter Settings Filters.FilterSettingsChanged += new EventHandler(changePresetLabel); @@ -294,7 +285,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel); // Picture Settings - // PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel); + PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel); // Filter Settings Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel); @@ -333,7 +324,7 @@ namespace Handbrake if (fileList != null) { - if (fileList[0] != string.Empty) + if (!string.IsNullOrEmpty(fileList[0])) { this.selectedSourceType = SourceType.VideoFile; StartScan(fileList[0], 0); @@ -347,14 +338,13 @@ namespace Handbrake private void encodeStarted(object sender, EventArgs e) { - lastAction = ActivityLogMode.Encode; SetEncodeStarted(); // Experimental HBProc Process Monitoring. if (Properties.Settings.Default.enocdeStatusInGui) { - Thread encodeMon = new Thread(EncodeMonitorThread); - encodeMon.Start(); + encodeMonitor = new Thread(EncodeMonitorThread); + encodeMonitor.Start(); } } @@ -374,11 +364,29 @@ namespace Handbrake #region File Menu + /// + /// Kill The scan menu Item + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_killCLI_Click(object sender, EventArgs e) { KillScan(); } + /// + /// Exit the Application Menu Item + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_exit_Click(object sender, EventArgs e) { Application.Exit(); @@ -388,17 +396,44 @@ namespace Handbrake #region Tools Menu + /// + /// Menu - Start Button + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_encode_Click(object sender, EventArgs e) { queueWindow.Show(); } + /// + /// Menu - Display the Log Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_encodeLog_Click(object sender, EventArgs e) { - frmActivityWindow dvdInfoWindow = new frmActivityWindow(lastAction, encodeQueue, SourceScan); + frmActivityWindow dvdInfoWindow = new frmActivityWindow(encodeQueue, SourceScan); dvdInfoWindow.Show(); } + /// + /// Menu - Display the Options Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_options_Click(object sender, EventArgs e) { Form options = new frmOptions(this); @@ -409,6 +444,15 @@ namespace Handbrake #region Presets Menu + /// + /// Reset the Built in Presets + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_presetReset_Click(object sender, EventArgs e) { presetHandler.UpdateBuiltInPresets(); @@ -423,22 +467,72 @@ namespace Handbrake treeView_presets.ExpandAll(); } + /// + /// Delete the selected preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_delete_preset_Click(object sender, EventArgs e) { presetHandler.RemoveBuiltInPresets(); LoadPresetPanel(); // Reload the preset panel } + /// + /// Select the Normal preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_SelectDefault_Click(object sender, EventArgs e) { loadNormalPreset(); } + /// + /// Import a plist Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_importMacPreset_Click(object sender, EventArgs e) { ImportPreset(); } + /// + /// Export a Plist Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void mnu_exportMacPreset_Click(object sender, EventArgs e) + { + ExportPreset(); + } + + /// + /// Create a new Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_new_preset_Click(object sender, EventArgs e) { Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), @@ -450,56 +544,44 @@ namespace Handbrake #region Help Menu + /// + /// Menu - Display the User Guide Web Page + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_user_guide_Click(object sender, EventArgs e) { Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide"); } - private void mnu_handbrake_home_Click(object sender, EventArgs e) - { - Process.Start("http://handbrake.fr"); - } - + /// + /// Menu - Check for Updates + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_UpdateCheck_Click(object sender, EventArgs e) { lbl_updateCheck.Visible = true; Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false); } - private void updateCheckDoneMenu(IAsyncResult result) - { - // Make sure it's running on the calling thread - if (InvokeRequired) - { - Invoke(new MethodInvoker(() => updateCheckDoneMenu(result))); - return; - } - UpdateCheckInformation info; - try - { - // Get the information about the new build, if any, and close the window - info = Main.EndCheckForUpdates(result); - - if (info.NewVersionAvailable && info.BuildInformation != null) - { - frmUpdater updateWindow = new frmUpdater(info.BuildInformation); - updateWindow.ShowDialog(); - } - else - MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, - MessageBoxIcon.Information); - lbl_updateCheck.Visible = false; - return; - } - catch (Exception ex) - { - if ((bool)result.AsyncState) - MessageBox.Show( - "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, - "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - + /// + /// Menu - Display the About Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void mnu_about_Click(object sender, EventArgs e) { using (frmAbout About = new frmAbout()) @@ -512,22 +594,57 @@ namespace Handbrake #region Preset Bar - // Right Click Menu Code + /// + /// RMenu - Expand All + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void pmnu_expandAll_Click(object sender, EventArgs e) { treeView_presets.ExpandAll(); } + /// + /// RMenu - Collaspe All + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void pmnu_collapse_Click(object sender, EventArgs e) { treeView_presets.CollapseAll(); } + /// + /// Menu - Import Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void pmnu_import_Click(object sender, EventArgs e) { ImportPreset(); } + /// + /// RMenu - Save Changes to Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void pmnu_saveChanges_Click(object sender, EventArgs e) { DialogResult result = @@ -543,6 +660,15 @@ namespace Handbrake QueryGenerator.GenerateTabbedComponentsQuery(this), false); } + /// + /// RMenu - Delete Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void pmnu_delete_click(object sender, EventArgs e) { if (treeView_presets.SelectedNode != null) @@ -553,6 +679,15 @@ namespace Handbrake treeView_presets.Select(); } + /// + /// Preset Menu Is Opening. Setup the Menu + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void presets_menu_Opening(object sender, CancelEventArgs e) { // Make sure that the save menu is always disabled by default @@ -567,12 +702,31 @@ namespace Handbrake } // Presets Management + + /// + /// Button - Add a preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_addPreset_Click(object sender, EventArgs e) { Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler); preset.ShowDialog(); } + /// + /// Button - remove a Preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_removePreset_Click(object sender, EventArgs e) { DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", @@ -588,6 +742,15 @@ namespace Handbrake treeView_presets.Select(); } + /// + /// Button - Set the selected preset as the default + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_setDefault_Click(object sender, EventArgs e) { if (treeView_presets.SelectedNode != null) @@ -605,6 +768,15 @@ namespace Handbrake MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } + /// + /// PresetBar Mouse Down event + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void treeview_presets_mouseUp(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) @@ -621,11 +793,29 @@ namespace Handbrake treeView_presets.Select(); } + /// + /// Preset Bar after selecting the preset + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e) { selectPreset(); } + /// + /// Preset Bar - Handle the Delete Key + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void treeView_presets_deleteKey(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Delete) @@ -658,6 +848,9 @@ namespace Handbrake } } + /// + /// Select the selected preset and setup the GUI + /// private void selectPreset() { if (treeView_presets.SelectedNode != null) @@ -693,6 +886,9 @@ namespace Handbrake } } + /// + /// Load the Normal Preset + /// private void loadNormalPreset() { foreach (TreeNode treenode in treeView_presets.Nodes) @@ -705,6 +901,9 @@ namespace Handbrake } } + /// + /// Import a plist preset + /// private void ImportPreset() { if (openPreset.ShowDialog() == DialogResult.OK) @@ -741,10 +940,41 @@ namespace Handbrake } } + /// + /// Export a plist Preset + /// + 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"; + + if (treeView_presets.SelectedNode != null) + { + + if (savefiledialog.ShowDialog() == DialogResult.OK) + { + Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text); + PlistPresetHandler.Export(savefiledialog.FileName, preset); + } + } + } + #endregion #region ToolStrip + /// + /// Toolbar - When the Source button is clicked, Clear any DVD drives and add any available DVD drives that can be used as a source. + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_source_Click(object sender, EventArgs e) { // Remove old Drive Menu Items. @@ -768,6 +998,15 @@ namespace Handbrake driveInfoThread.Start(); } + /// + /// Toolbar - Start The Encode + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_start_Click(object sender, EventArgs e) { if (btn_start.Text == "Stop") @@ -802,9 +1041,6 @@ namespace Handbrake { encodeQueue.SafelyClose(); } - - // Update the GUI - SetEncodeFinished(); } } else @@ -872,10 +1108,7 @@ namespace Handbrake SetEncodeStarted(); // Encode is running, so setup the GUI appropriately encodeQueue.Start(); // Start The Queue Encoding Process - lastAction = ActivityLogMode.Encode; // Set the last action to encode - Used for activity window. } - if (ActivityWindow != null) - ActivityWindow.SetMode(ActivityLogMode.Encode); this.Focus(); } @@ -885,13 +1118,27 @@ namespace Handbrake } } + /// + /// Toolbar - Add the current job to the Queue + /// + /// + /// The sender. + /// + /// + /// The e. + /// 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); + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { + if (!Directory.Exists(Path.GetDirectoryName(text_destination.Text))) + { + MessageBox.Show("Destination Path does not exist.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); if (rtf_query.Text != string.Empty) query = rtf_query.Text; @@ -914,12 +1161,30 @@ namespace Handbrake } } + /// + /// Toolbar - Show the Queue + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_showQueue_Click(object sender, EventArgs e) { queueWindow.Show(); queueWindow.Activate(); } + /// + /// Toolbar - Show the Preview Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void tb_preview_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) @@ -943,23 +1208,19 @@ namespace Handbrake } } + /// + /// Toolbar - Show the Activity log Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_ActivityWindow_Click(object sender, EventArgs e) { if (ActivityWindow == null || !ActivityWindow.IsHandleCreated) - ActivityWindow = new frmActivityWindow(lastAction, encodeQueue, SourceScan); - else - switch (lastAction) - { - case ActivityLogMode.Scan: - ActivityWindow.SetMode(ActivityLogMode.Scan); - break; - case ActivityLogMode.Encode: - ActivityWindow.SetMode(ActivityLogMode.Encode); - break; - default: - ActivityWindow.SetMode(ActivityLogMode.Encode); - break; - } + ActivityWindow = new frmActivityWindow(encodeQueue, SourceScan); ActivityWindow.Show(); ActivityWindow.Activate(); @@ -969,6 +1230,15 @@ namespace Handbrake #region System Tray Icon + /// + /// Handle Resizing of the main window when deaing with the Notify Icon + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void frmMain_Resize(object sender, EventArgs e) { if (FormWindowState.Minimized == this.WindowState) @@ -980,6 +1250,15 @@ namespace Handbrake notifyIcon.Visible = false; } + /// + /// Double Click the Tray Icon + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e) { this.Visible = true; @@ -988,19 +1267,26 @@ namespace Handbrake notifyIcon.Visible = false; } + /// + /// Tray Icon - Restore Menu Item - Resture the Window + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void btn_restore_Click(object sender, EventArgs e) { this.Visible = true; this.Activate(); this.WindowState = FormWindowState.Normal; notifyIcon.Visible = false; - - this.StartScan(null, 2); } #endregion - #region Tab Control + #region Main Window and Tab Control // Source private void btn_dvd_source_Click(object sender, EventArgs e) @@ -1048,7 +1334,6 @@ namespace Handbrake private void SelectSource(string file) { Check_ChapterMarkers.Enabled = true; - lastAction = ActivityLogMode.Scan; sourcePath = string.Empty; if (file == string.Empty) // Must have a file or path @@ -1375,7 +1660,6 @@ namespace Handbrake } AudioSettings.SetContainer(drop_format.Text); - Subtitles.SetContainer(drop_format.SelectedIndex); if (drop_format.Text.Contains("MP4")) { @@ -1605,6 +1889,19 @@ namespace Handbrake } } + private void btn_export_Click(object sender, EventArgs e) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.Filter = "Csv File|*.csv"; + saveFileDialog.DefaultExt = "csv"; + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + string filename = saveFileDialog.FileName; + + Main.SaveChapterMarkersToCsv(this, filename); + } + } + private void mnu_resetChapters_Click(object sender, EventArgs e) { data_chpt.Rows.Clear(); @@ -1632,8 +1929,15 @@ namespace Handbrake #region Source Scan - public bool isScanning { get; set; } - + /// + /// Start the Scan Process + /// + /// + /// The filename. + /// + /// + /// The title. + /// private void StartScan(string filename, int title) { // Setup the GUI components for the scan. @@ -1641,15 +1945,10 @@ namespace Handbrake this.DisableGUI(); - if (ActivityWindow != null) - ActivityWindow.SetMode(ActivityLogMode.Scan); - // Start the Scan try { - isScanning = true; - SourceScan = new Scan(); - SourceScan.ScanSource(sourcePath, title); + SourceScan.Scan(sourcePath, title); SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged); SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted); } @@ -1659,16 +1958,37 @@ namespace Handbrake } } + /// + /// Update the Status label for the scan + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void SourceScan_ScanStatusChanged(object sender, EventArgs e) { UpdateScanStatusLabel(); } + /// + /// Update the UI after the scan has completed + /// + /// + /// The sender. + /// + /// + /// The e. + /// private void SourceScan_ScanCompleted(object sender, EventArgs e) { UpdateGuiAfterScan(); } + /// + /// Update the Scan Status Label + /// private void UpdateScanStatusLabel() { if (InvokeRequired) @@ -1676,9 +1996,12 @@ namespace Handbrake BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel)); return; } - lbl_encode.Text = SourceScan.ScanStatus(); + lbl_encode.Text = SourceScan.ScanStatus; } + /// + /// Reset the GUI when the scan has completed + /// private void UpdateGuiAfterScan() { if (InvokeRequired) @@ -1689,7 +2012,7 @@ namespace Handbrake try { - currentSource = SourceScan.SouceData(); + currentSource = SourceScan.SouceData; // Setup some GUI components drp_dvdtitle.Items.Clear(); @@ -1743,6 +2066,9 @@ namespace Handbrake } } + /// + /// Enable the GUI + /// private void EnableGUI() { try @@ -1765,6 +2091,9 @@ namespace Handbrake } } + /// + /// Disable the GUI + /// private void DisableGUI() { foreach (Control ctrl in Controls) @@ -1781,27 +2110,23 @@ namespace Handbrake mnu_killCLI.Visible = true; } + /// + /// Kill the Scan + /// private void KillScan() { - try - { - SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted); - EnableGUI(); - ResetGUI(); + SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted); + EnableGUI(); + ResetGUI(); - if (SourceScan.ScanProcess() != null) - SourceScan.ScanProcess().Kill(); + SourceScan.Stop(); - lbl_encode.Text = "Scan Cancelled!"; - } - catch (Exception ex) - { - MessageBox.Show( - "Unable to kill HandBrakeCLI.exe \nYou may need to manually kill HandBrakeCLI.exe using the Windows Task Manager if it does not close automatically within the next few minutes. \n\nError Information: \n" + - ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } + lbl_encode.Text = "Scan Cancelled!"; } + /// + /// Reset the GUI + /// private void ResetGUI() { drp_dvdtitle.Items.Clear(); @@ -1812,9 +2137,11 @@ namespace Handbrake sourcePath = String.Empty; text_destination.Text = String.Empty; selectedTitle = null; - isScanning = false; } + /// + /// Update the Source Label + /// private void UpdateSourceLabel() { labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName; @@ -1825,6 +2152,12 @@ namespace Handbrake labelSource.Text = Path.GetFileName(selectedTitle.SourceName); } + /// + /// Take a job from the Queue, rescan it, and reload the GUI for that job. + /// + /// + /// The job. + /// public void RecievingJob(Job job) { string query = job.Query; @@ -1869,6 +2202,7 @@ namespace Handbrake } lbl_encode.Text = "Encoding Finished"; + ProgressBarStatus.Visible = false; btn_start.Text = "Start"; btn_start.ToolTipText = "Start the encoding process"; btn_start.Image = Properties.Resources.Play; @@ -1899,8 +2233,9 @@ namespace Handbrake BeginInvoke(new UpdateWindowHandler(SetEncodeStarted)); return; } - lbl_encode.Visible = true; + ProgressBarStatus.Value = 0; + ProgressBarStatus.Visible = true; lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending"; btn_start.Text = "Stop"; btn_start.ToolTipText = "Stop the encoding process."; @@ -1930,10 +2265,12 @@ namespace Handbrake List menuItems = new List(); foreach (DriveInformation drive in drives) { - ToolStripMenuItem menuItem = new ToolStripMenuItem(); - menuItem.Name = drive.ToString(); - menuItem.Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")"; - menuItem.Image = Resources.disc_small; + ToolStripMenuItem menuItem = new ToolStripMenuItem + { + Name = drive.ToString(), + Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")", + Image = Resources.disc_small + }; menuItem.Click += new EventHandler(mnu_dvd_drive_Click); menuItems.Add(menuItem); } @@ -1980,6 +2317,46 @@ namespace Handbrake return title; } + /// + /// Handle the Update Check Finishing. + /// + /// + /// The result. + /// + private void updateCheckDoneMenu(IAsyncResult result) + { + // Make sure it's running on the calling thread + if (InvokeRequired) + { + Invoke(new MethodInvoker(() => updateCheckDoneMenu(result))); + return; + } + UpdateCheckInformation info; + try + { + // Get the information about the new build, if any, and close the window + info = Main.EndCheckForUpdates(result); + + if (info.NewVersionAvailable && info.BuildInformation != null) + { + frmUpdater updateWindow = new frmUpdater(info.BuildInformation); + updateWindow.ShowDialog(); + } + else + MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, + MessageBoxIcon.Information); + lbl_updateCheck.Visible = false; + return; + } + catch (Exception ex) + { + if ((bool)result.AsyncState) + MessageBox.Show( + "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, + "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + #endregion #region Overrides @@ -1987,9 +2364,9 @@ namespace Handbrake /// /// Handle GUI shortcuts /// - /// - /// - /// + /// Message + /// Keys + /// Bool protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { if (keyData == (Keys.Control | Keys.S)) @@ -2009,25 +2386,38 @@ namespace Handbrake /// /// If the queue is being processed, prompt the user to confirm application close. /// - /// + /// 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) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0)) + if (encodeQueue.IsEncoding) { DialogResult result = MessageBox.Show( - "HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?", + "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 (result == DialogResult.No) e.Cancel = true; + + // 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 (Experimental) + #region In-GUI Encode Status /// /// Starts a new thread to monitor and process the CLI encode status @@ -2040,6 +2430,8 @@ namespace Handbrake encode.OnEncodeProgress += EncodeOnEncodeProgress; while (!encode.EndOfStream) encode.ReadEncodeStatus(); + + SetEncodeFinished(); } catch (Exception exc) { @@ -2050,24 +2442,31 @@ namespace Handbrake /// /// Displays the Encode status in the GUI /// - /// - /// - /// - /// - /// - /// - /// - private void EncodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining) + /// 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) { this.BeginInvoke( new EncodeProgressEventHandler(EncodeOnEncodeProgress), - new[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining }); + new[] { sender, currentTask, taskCount, percentComplete, currentFps, av, timeRemaining }); return; } lbl_encode.Text = - string.Format("Encode Progress: {0}%, FPS: {1}, Avg FPS: {2}, Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining); + 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