X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=2f1467625931789930468ba84439032b443be03b;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=bfa405412dcaaa13a9f9ceddff07a07df1297b43;hpb=814e73cb615fcd97b9fcd133c98fd261f303363b;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bfa40541..2f146762 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,36 +12,50 @@ 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 Parsing;
using Presets;
using Properties;
- using Services;
+ using Main = Handbrake.Functions.Main;
+
+ ///
+ /// The Main Window
+ ///
public partial class frmMain : Form
{
// Objects which may be used by one or more other objects *************
- private Queue encodeQueue = new Queue();
+ private IQueue 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 frmActivityWindow activityWindow;
+
+ // 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 Preset currentlySelectedPreset;
private DVD currentSource;
- private Scan SourceScan = new Scan();
+ private IScan SourceScan = new ScanService();
private List drives;
// Delegates **********************************************************
@@ -49,116 +63,123 @@ namespace Handbrake
// Applicaiton Startup ************************************************
- #region Application Startup
+ #region Properties
- public frmMain()
+ ///
+ /// Gets SourceName.
+ ///
+ public string SourceName
{
- // 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);
+ get
+ {
+ if (this.selectedSourceType == SourceType.DvdDrive)
+ {
+ 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);
+
+ return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
+ }
+ }
+ #endregion
+
+ #region Application Startup
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ ///
+ /// The arguments passed in on application startup.
+ ///
+ public frmMain(string[] args)
+ {
InitializeComponent();
// Update the users config file with the CLI version data.
- lblStatus.Text = "Checking CLI Version Data ...";
- Application.DoEvents();
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)
{
- lblStatus.Text = "Checking for updates ...";
- Application.DoEvents();
-
- 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)
{
- lblStatus.Text = "Clearing Old Log Files ...";
- Application.DoEvents();
Thread clearLog = new Thread(Main.ClearOldLogs);
clearLog.Start();
}
// Setup the GUI components
- lblStatus.Text = "Setting up the GUI ...";
- Application.DoEvents();
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 (Settings.Default.tooltipEnable)
+ ToolTip.Active = true;
// Load the user's default settings or Normal Preset
- if (Properties.Settings.Default.defaultPreset != string.Empty)
+ if (Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
{
- if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
+ string query = presetHandler.GetPreset(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, Settings.Default.defaultPreset);
- x264Panel.X264_StandardizeOptString();
- x264Panel.X264_SetCurrentSettingsInPanel();
- }
+ x264Panel.StandardizeOptString();
+ x264Panel.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();
- 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)
@@ -167,66 +188,20 @@ 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();
}
}
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);
- }
- }
-
- // 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);
- }
- }
- }
-
- #endregion
-
- #region Properties
-
- 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));
+ Main.ShowExceptiowWindow("Unable to check for updates, Please try again later.", ex.ToString());
}
}
@@ -245,11 +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);
@@ -265,7 +242,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 +271,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);
@@ -317,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)
@@ -333,7 +310,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,38 +324,44 @@ 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();
- }
+ 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 *********************************
#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 +371,43 @@ 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);
- dvdInfoWindow.Show();
+ this.btn_ActivityWindow_Click(this, null);
}
+ ///
+ /// 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 +418,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,83 +441,130 @@ 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),
- 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
#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);
- }
+ 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);
}
+ ///
+ /// Menu - Display the About Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_about_Click(object sender, EventArgs e)
{
using (frmAbout About = new frmAbout())
@@ -512,24 +577,60 @@ 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)
{
+ // 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: " +
@@ -537,12 +638,21 @@ 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);
}
+ ///
+ /// RMenu - Delete Preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void pmnu_delete_click(object sender, EventArgs e)
{
if (treeView_presets.SelectedNode != null)
@@ -553,6 +663,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 +686,36 @@ 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();
+ 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;
+ }
}
+ ///
+ /// 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 +731,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 +757,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 +782,52 @@ 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();
}
+ ///
+ /// 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
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void treeView_presets_deleteKey(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Delete)
@@ -658,6 +860,9 @@ namespace Handbrake
}
}
+ ///
+ /// Select the selected preset and setup the GUI
+ ///
private void selectPreset()
{
if (treeView_presets.SelectedNode != null)
@@ -668,7 +873,6 @@ namespace Handbrake
if (preset != null)
{
string query = presetHandler.GetPreset(presetName).Query;
- bool loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings;
if (query != null)
{
@@ -679,20 +883,23 @@ 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);
}
}
}
}
+ ///
+ /// Load the Normal Preset
+ ///
private void loadNormalPreset()
{
foreach (TreeNode treenode in treeView_presets.Nodes)
@@ -705,6 +912,9 @@ namespace Handbrake
}
}
+ ///
+ /// Import a plist preset
+ ///
private void ImportPreset()
{
if (openPreset.ShowDialog() == DialogResult.OK)
@@ -718,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)")
{
@@ -741,10 +951,36 @@ namespace Handbrake
}
}
+ ///
+ /// Export a plist Preset
+ ///
+ private void ExportPreset()
+ {
+ 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);
+ 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,54 +1004,54 @@ 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")
{
- 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();
- }
-
- // Update the GUI
- SetEncodeFinished();
+ 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
@@ -854,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)
@@ -872,10 +1110,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,41 +1120,154 @@ 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);
- 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)
{
- string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);
- if (rtf_query.Text != string.Empty)
- query = rtf_query.Text;
+ MessageBox.Show("Destination Auto Naming must be enabled in preferences for this feature to work.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
- if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text))
+ 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)
{
- DialogResult result =
+ 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;
+
+ // 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;
+ }
+
+ // 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;
+ 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;
}
+ ///
+ /// 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,32 +1291,37 @@ 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;
- }
+ if (this.activityWindow == null || !this.activityWindow.IsHandleCreated)
+ this.activityWindow = new frmActivityWindow(encodeQueue, SourceScan);
- ActivityWindow.Show();
- ActivityWindow.Activate();
+ this.activityWindow.Show();
+ this.activityWindow.Activate();
}
#endregion
#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 +1333,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,44 +1350,53 @@ 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)
+ 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)
@@ -1034,21 +1405,57 @@ 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 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 SelectSource(string file)
+ 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;
- lastAction = ActivityLogMode.Scan;
sourcePath = string.Empty;
if (file == string.Empty) // Must have a file or path
@@ -1058,7 +1465,7 @@ namespace Handbrake
}
sourcePath = Path.GetFileName(file);
- StartScan(file, 0);
+ StartScan(file, titleSpecific);
}
private void drp_dvdtitle_Click(object sender, EventArgs e)
@@ -1083,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
@@ -1092,7 +1499,16 @@ namespace Handbrake
{
drop_angle.Visible = true;
lbl_angle.Visible = true;
- drop_angle.Items.AddRange(selectedTitle.Angles.ToArray());
+
+ 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;
}
@@ -1115,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());
@@ -1123,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)
@@ -1133,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;
}
@@ -1375,7 +1791,6 @@ namespace Handbrake
}
AudioSettings.SetContainer(drop_format.Text);
- Subtitles.SetContainer(drop_format.SelectedIndex);
if (drop_format.Text.Contains("MP4"))
{
@@ -1463,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()
@@ -1484,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
@@ -1492,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
@@ -1511,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)
@@ -1621,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;
@@ -1631,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)
@@ -1645,8 +2082,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.
@@ -1654,17 +2098,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.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
- SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
+ SourceScan.Scan(sourcePath, title);
}
catch (Exception exc)
{
@@ -1672,16 +2109,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)
@@ -1689,9 +2147,12 @@ namespace Handbrake
BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));
return;
}
- lbl_encode.Text = SourceScan.ScanStatus();
+ labelSource.Text = SourceScan.ScanStatus;
}
+ ///
+ /// Reset the GUI when the scan has completed
+ ///
private void UpdateGuiAfterScan()
{
if (InvokeRequired)
@@ -1702,7 +2163,7 @@ namespace Handbrake
try
{
- currentSource = SourceScan.SouceData();
+ currentSource = SourceScan.SouceData;
// Setup some GUI components
drp_dvdtitle.Items.Clear();
@@ -1722,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
@@ -1756,13 +2219,15 @@ namespace Handbrake
}
}
+ ///
+ /// Enable the GUI
+ ///
private void EnableGUI()
{
try
{
if (InvokeRequired)
BeginInvoke(new UpdateWindowHandler(EnableGUI));
- lbl_encode.Text = "Scan Completed";
foreach (Control ctrl in Controls)
ctrl.Enabled = true;
btn_start.Enabled = true;
@@ -1778,14 +2243,18 @@ namespace Handbrake
}
}
+ ///
+ /// Disable the GUI
+ ///
private void DisableGUI()
{
foreach (Control ctrl in Controls)
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;
@@ -1794,17 +2263,23 @@ namespace Handbrake
mnu_killCLI.Visible = true;
}
+ ///
+ /// Kill the Scan
+ ///
private void KillScan()
{
SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
EnableGUI();
ResetGUI();
- SourceScan.KillScan();
+ SourceScan.Stop();
- lbl_encode.Text = "Scan Cancelled!";
+ labelSource.Text = "Scan Cancelled";
}
+ ///
+ /// Reset the GUI
+ ///
private void ResetGUI()
{
drp_dvdtitle.Items.Clear();
@@ -1815,19 +2290,22 @@ 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;
-
- 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);
}
+ ///
+ /// 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;
@@ -1842,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);
}
}
@@ -1872,6 +2350,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;
@@ -1902,8 +2381,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.";
@@ -1916,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()
@@ -1933,11 +2442,13 @@ 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;
- menuItem.Click += new EventHandler(mnu_dvd_drive_Click);
+ ToolStripMenuItem menuItem = new ToolStripMenuItem
+ {
+ Name = drive.ToString(),
+ Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")",
+ Image = Resources.disc_small
+ };
+ menuItem.Click += new EventHandler(MnuDvdDriveClick);
menuItems.Add(menuItem);
}
@@ -1956,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);
@@ -1971,7 +2482,7 @@ namespace Handbrake
///
/// The title.
///
- private int getTitle()
+ private int GetTitle()
{
int title = 0;
if (drp_dvdtitle.SelectedItem != null)
@@ -1983,6 +2494,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(() => this.UpdateCheckDoneMenu(result)));
+ return;
+ }
+ UpdateCheckInformation info;
+ try
+ {
+ // Get the information about the new build, if any, and close the window
+ info = UpdateService.EndCheckForUpdates(result);
+
+ if (info.NewVersionAvailable && info.BuildInformation != null)
+ {
+ UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
+ 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
@@ -2001,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;
@@ -2015,80 +2566,45 @@ 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.KillScan();
- }
- base.OnFormClosing(e);
- }
-
- #endregion
-
- #region In-GUI Encode Status (Experimental)
+ }
- ///
- /// 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();
+ 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
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- private void EncodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)
- {
- if (this.InvokeRequired)
+ finally
{
- this.BeginInvoke(
- new EncodeProgressEventHandler(EncodeOnEncodeProgress),
- new[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining });
- return;
+ base.OnFormClosing(e);
}
- lbl_encode.Text =
- string.Format("Encode Progress: {0}%, FPS: {1}, Avg FPS: {2}, Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining);
}
#endregion
-
// This is the END of the road ****************************************
}
}
\ No newline at end of file