X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=184af65a6413f6cc138321c0230796f727955fe9;hb=01adcc9f552746e1c6b4503c78d4c27891d68f68;hp=ee7df2159646ffbc045f359811e74cc577213fd1;hpb=e1f17f5cc02e5a297ca0ece8067e7533b86c1b85;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ee7df215..184af65a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,31 +12,45 @@ namespace Handbrake
using System.Drawing;
using System.Globalization;
using System.IO;
- using System.Reflection;
+ using System.Linq;
using System.Threading;
using System.Windows.Forms;
+
+ using DevExpress.Utils.Menu;
+
using Functions;
+ using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Utilities;
+ 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 *************
- private IQueue encodeQueue = new Queue();
- private PresetsHandler presetHandler = new PresetsHandler();
+ private IQueueProcessor queueProcessor = new QueueProcessor(Program.InstanceId);
+ private PresetService presetHandler = new PresetService();
// 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,10 +58,12 @@ namespace Handbrake
private SourceType selectedSourceType;
private string dvdDrivePath;
private string dvdDriveLabel;
- private Preset CurrentlySelectedPreset;
- private DVD currentSource;
- private IScan SourceScan = new ScanService();
+ private Preset currentlySelectedPreset;
+ private Source currentSource;
+
+ private IScan SourceScan;
private List drives;
+ private QueueTask queueEdit;
// Delegates **********************************************************
private delegate void UpdateWindowHandler();
@@ -68,6 +84,24 @@ namespace Handbrake
return this.dvdDriveLabel;
}
+ if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
+ {
+ return Path.GetFileName(selectedTitle.SourceName);
+ }
+
+ // We have a drive, selected as a folder.
+ if (this.sourcePath.EndsWith("\\"))
+ {
+ drives = UtilityService.GetDrives();
+ foreach (DriveInformation item in drives)
+ {
+ if (item.RootDirectory.Contains(this.sourcePath))
+ {
+ return item.VolumeLabel;
+ }
+ }
+ }
+
if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
return Path.GetFileNameWithoutExtension(this.sourcePath);
@@ -79,75 +113,71 @@ 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();
+ this.presetsToolStrip.Renderer = new ToolStripRenderOverride();
+
+ // We can use LibHB, if the library hb.dll exists.
+ this.SourceScan = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();
// 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);
+ Thread clearLog = new Thread(() => UtilityService.ClearLogFiles(30));
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)
+ queueWindow = new frmQueue(this.queueProcessor, this); // Prepare the Queue
+ 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);
+ EncodeTask presetQuery = QueryParserUtility.Parse(query);
+ PresetLoader.LoadPreset(this, presetQuery, Settings.Default.defaultPreset);
x264Panel.StandardizeOptString();
x264Panel.SetCurrentSettingsInPanel();
@@ -159,17 +189,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(this.queueProcessor);
+
+ // 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)
@@ -178,15 +212,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();
}
}
@@ -197,34 +229,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
@@ -236,81 +240,83 @@ namespace Handbrake
RegisterPresetEventHandler();
// Handle Window Resize
- if (Properties.Settings.Default.MainWindowMinimize)
- this.Resize += new EventHandler(frmMain_Resize);
+ if (Settings.Default.MainWindowMinimize)
+ this.Resize += this.frmMain_Resize;
// Handle Encode Start / Finish / Pause
- encodeQueue.EncodeStarted += new EventHandler(encodeStarted);
- encodeQueue.EncodeEnded += new EventHandler(encodeEnded);
+ this.queueProcessor.EncodeService.EncodeStarted += this.encodeStarted;
+ this.queueProcessor.EncodeService.EncodeCompleted += encodeEnded;
+
+ // Scan Started and Completed Events
+ SourceScan.ScanStatusChanged += this.SourceScanScanStatusChanged;
+ SourceScan.ScanCompleted += this.SourceScanScanCompleted;
// Handle a file being draged onto the GUI.
- this.DragEnter += new DragEventHandler(frmMain_DragEnter);
- this.DragDrop += new DragEventHandler(frmMain_DragDrop);
+ this.DragEnter += frmMain_DragEnter;
+ this.DragDrop += this.frmMain_DragDrop;
}
// Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset
private void RegisterPresetEventHandler()
{
// Output Settings
- drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel);
- check_largeFile.CheckedChanged += new EventHandler(changePresetLabel);
- check_iPodAtom.CheckedChanged += new EventHandler(changePresetLabel);
- check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel);
+ drop_format.SelectedIndexChanged += this.changePresetLabel;
+ check_largeFile.CheckedChanged += this.changePresetLabel;
+ check_iPodAtom.CheckedChanged += this.changePresetLabel;
+ check_optimiseMP4.CheckedChanged += this.changePresetLabel;
// Picture Settings
- PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged += this.changePresetLabel;
// Filter Settings
- Filters.FilterSettingsChanged += new EventHandler(changePresetLabel);
+ Filters.FilterSettingsChanged += this.changePresetLabel;
// Video Tab
- drp_videoEncoder.SelectedIndexChanged += new EventHandler(changePresetLabel);
- check_2PassEncode.CheckedChanged += new EventHandler(changePresetLabel);
- check_turbo.CheckedChanged += new EventHandler(changePresetLabel);
- text_filesize.TextChanged += new EventHandler(changePresetLabel);
- text_bitrate.TextChanged += new EventHandler(changePresetLabel);
- slider_videoQuality.ValueChanged += new EventHandler(changePresetLabel);
+ drp_videoEncoder.SelectedIndexChanged += this.changePresetLabel;
+ check_2PassEncode.CheckedChanged += this.changePresetLabel;
+ check_turbo.CheckedChanged += this.changePresetLabel;
+ text_bitrate.TextChanged += this.changePresetLabel;
+ slider_videoQuality.ValueChanged += this.changePresetLabel;
// Audio Panel
- AudioSettings.AudioListChanged += new EventHandler(changePresetLabel);
+ AudioSettings.AudioListChanged += this.changePresetLabel;
// Advanced Tab
- x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel);
+ x264Panel.rtf_x264Query.TextChanged += this.changePresetLabel;
}
private void UnRegisterPresetEventHandler()
{
// Output Settings
- drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel);
- check_largeFile.CheckedChanged -= new EventHandler(changePresetLabel);
- check_iPodAtom.CheckedChanged -= new EventHandler(changePresetLabel);
- check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel);
+ drop_format.SelectedIndexChanged -= this.changePresetLabel;
+ check_largeFile.CheckedChanged -= this.changePresetLabel;
+ check_iPodAtom.CheckedChanged -= this.changePresetLabel;
+ check_optimiseMP4.CheckedChanged -= this.changePresetLabel;
// Picture Settings
- PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged -= this.changePresetLabel;
// Filter Settings
- Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel);
+ Filters.FilterSettingsChanged -= this.changePresetLabel;
// Video Tab
- drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel);
- check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel);
- check_turbo.CheckedChanged -= new EventHandler(changePresetLabel);
- text_filesize.TextChanged -= new EventHandler(changePresetLabel);
- text_bitrate.TextChanged -= new EventHandler(changePresetLabel);
- slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel);
+ drp_videoEncoder.SelectedIndexChanged -= this.changePresetLabel;
+ check_2PassEncode.CheckedChanged -= this.changePresetLabel;
+ check_turbo.CheckedChanged -= this.changePresetLabel;
+ text_bitrate.TextChanged -= this.changePresetLabel;
+ slider_videoQuality.ValueChanged -= this.changePresetLabel;
// Audio Panel
- AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel);
+ AudioSettings.AudioListChanged -= this.changePresetLabel;
// Advanced Tab
- x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel);
+ x264Panel.rtf_x264Query.TextChanged -= this.changePresetLabel;
}
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)
@@ -341,12 +347,12 @@ namespace Handbrake
private void encodeStarted(object sender, EventArgs e)
{
SetEncodeStarted();
- encodeQueue.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged;
+ this.queueProcessor.EncodeService.EncodeStatusChanged += EncodeQueue_EncodeStatusChanged;
}
private void encodeEnded(object sender, EventArgs e)
{
- encodeQueue.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged;
+ this.queueProcessor.EncodeService.EncodeStatusChanged -= EncodeQueue_EncodeStatusChanged;
SetEncodeFinished();
}
#endregion
@@ -412,8 +418,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);
}
///
@@ -433,147 +438,40 @@ namespace Handbrake
#endregion
- #region Presets Menu
-
- ///
- /// Reset the Built in Presets
- ///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void mnu_presetReset_Click(object sender, EventArgs e)
- {
- presetHandler.UpdateBuiltInPresets();
- LoadPresetPanel();
- if (treeView_presets.Nodes.Count == 0)
- MessageBox.Show(
- "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- else
- MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
- 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();
- }
-
- #endregion
-
- #region Help Menu
+ #region Help Menu (Toolbar)
///
- /// Menu - Display the User Guide Web Page
+ /// Menu - Display the User Guide Web Page
///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void mnu_user_guide_Click(object sender, EventArgs e)
+ /// The Sender
+ /// The EventArgs
+ private void MnuUserGuide_Click(object sender, EventArgs e)
{
Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");
}
///
- /// Menu - Check for Updates
+ /// Check for Updates
///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void mnu_UpdateCheck_Click(object sender, EventArgs e)
+ /// The Sender
+ /// The EventArgs
+ private void MnuCheckForUpdates_Click(object sender, EventArgs e)
{
lbl_updateCheck.Visible = true;
- Main.BeginCheckForUpdates(new AsyncCallback(this.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);
}
///
/// Menu - Display the About Window
///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void mnu_about_Click(object sender, EventArgs e)
+ /// The Sender
+ /// The EventArgs
+ private void MnuAboutHandBrake_Click(object sender, EventArgs e)
{
using (frmAbout About = new frmAbout())
{
@@ -643,12 +541,16 @@ namespace Handbrake
"Do you wish to include picture settings when updating the preset: " +
treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel,
MessageBoxIcon.Question);
- if (result == DialogResult.Yes)
- presetHandler.Update(treeView_presets.SelectedNode.Text,
- QueryGenerator.GenerateTabbedComponentsQuery(this), true);
- else if (result == DialogResult.No)
- presetHandler.Update(treeView_presets.SelectedNode.Text,
- QueryGenerator.GenerateTabbedComponentsQuery(this), false);
+
+ Preset preset = new Preset
+ {
+ Name = this.treeView_presets.SelectedNode.Text,
+ Query =
+ QueryGenerator.GenerateQueryForPreset(this, QueryPictureSettingsMode.SourceMaximum, true, 0, 0),
+ CropSettings = (result == DialogResult.Yes)
+ };
+
+ presetHandler.Update(preset);
}
///
@@ -664,7 +566,7 @@ namespace Handbrake
{
if (treeView_presets.SelectedNode != null)
{
- presetHandler.Remove(treeView_presets.SelectedNode.Text);
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);
treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);
}
treeView_presets.Select();
@@ -686,7 +588,7 @@ namespace Handbrake
// Now enable the save menu if the selected preset is a user preset
if (treeView_presets.SelectedNode != null)
- if (presetHandler.CheckIfUserPresetExists(treeView_presets.SelectedNode.Text))
+ if (presetHandler.CheckIfPresetExists(treeView_presets.SelectedNode.Text))
pmnu_saveChanges.Enabled = true;
treeView_presets.Select();
@@ -694,31 +596,18 @@ namespace Handbrake
// Presets Management
- ///
- /// Button - Add a preset
- ///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void btn_addPreset_Click(object sender, EventArgs e)
+ private void BtnAddPreset_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)
+ private void BtnRemovePreset_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -726,23 +615,15 @@ namespace Handbrake
{
if (treeView_presets.SelectedNode != null)
{
- presetHandler.Remove(treeView_presets.SelectedNode.Text);
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);
treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);
}
}
treeView_presets.Select();
}
- ///
- /// Button - Set the selected preset as the default
- ///
- ///
- /// The sender.
- ///
- ///
- /// The e.
- ///
- private void btn_setDefault_Click(object sender, EventArgs e)
+
+ private void MnuSetDefaultPreset_Click(object sender, EventArgs e)
{
if (treeView_presets.SelectedNode != null)
{
@@ -759,6 +640,30 @@ namespace Handbrake
MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
+ private void MnuImportPreset_Click(object sender, EventArgs e)
+ {
+ this.ImportPreset();
+ }
+
+ private void MnuExportPreset_Click(object sender, EventArgs e)
+ {
+ this.ExportPreset();
+ }
+
+ private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)
+ {
+ presetHandler.UpdateBuiltInPresets(string.Empty);
+ LoadPresetPanel();
+ if (treeView_presets.Nodes.Count == 0)
+ MessageBox.Show(
+ "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",
+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ else
+ MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
+
+ treeView_presets.ExpandAll();
+ }
+
///
/// PresetBar Mouse Down event
///
@@ -799,6 +704,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
///
///
@@ -816,7 +744,7 @@ namespace Handbrake
if (result == DialogResult.Yes)
{
if (treeView_presets.SelectedNode != null)
- presetHandler.Remove(treeView_presets.SelectedNode.Text);
+ presetHandler.Remove((Preset)treeView_presets.SelectedNode.Tag);
// Remember each nodes expanded status so we can reload it
List nodeStatus = new List();
@@ -852,7 +780,6 @@ namespace Handbrake
if (preset != null)
{
string query = presetHandler.GetPreset(presetName).Query;
- bool loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings;
if (query != null)
{
@@ -860,17 +787,17 @@ namespace Handbrake
x264Panel.Reset2Defaults();
// Send the query from the file to the Query Parser class
- QueryParser presetQuery = QueryParser.Parse(query);
+ EncodeTask presetQuery = QueryParserUtility.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.StandardizeOptString();
x264Panel.SetCurrentSettingsInPanel();
// Finally, let this window have a copy of the preset settings.
- CurrentlySelectedPreset = preset;
+ this.currentlySelectedPreset = preset;
PictureSettings.SetPresetCropWarningLabel(preset);
}
}
@@ -899,8 +826,8 @@ namespace Handbrake
{
if (openPreset.ShowDialog() == DialogResult.OK)
{
- QueryParser parsed = PlistPresetHandler.Import(openPreset.FileName);
- if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)"))
+ EncodeTask parsed = PlistPresetHandler.Import(openPreset.FileName);
+ if (presetHandler.CheckIfPresetExists(parsed.PresetName + " (Imported)"))
{
DialogResult result =
MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?",
@@ -908,18 +835,30 @@ namespace Handbrake
MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (result == DialogResult.Yes)
{
- PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);
- presetHandler.Update(parsed.PresetName + " (Imported)",
- QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
- parsed.UsesPictureSettings);
+ PresetLoader.LoadPreset(this, parsed, parsed.PresetName);
+
+ Preset preset = new Preset
+ {
+ Name = parsed.PresetName + " (Imported)",
+ Query = QueryGenerator.GenerateFullQuery(this),
+ CropSettings = parsed.UsesPictureSettings
+ };
+
+ presetHandler.Update(preset);
}
}
else
{
- PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);
- if (presetHandler.Add(parsed.PresetName + " (Imported)",
- QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
- parsed.UsesPictureSettings))
+ PresetLoader.LoadPreset(this, parsed, parsed.PresetName);
+
+ Preset preset = new Preset
+ {
+ Name = parsed.PresetName + " (Imported)",
+ Query = QueryGenerator.GenerateFullQuery(this),
+ CropSettings = parsed.UsesPictureSettings
+ };
+
+ if (presetHandler.Add(preset))
{
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)")
{
@@ -936,15 +875,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);
@@ -1002,45 +936,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();
+ this.queueProcessor.Pause();
- if (Properties.Settings.Default.enocdeStatusInGui &&
- !Properties.Settings.Default.showCliForInGuiEncodeStatus)
- {
- encodeQueue.Stop();
- }
+ if (Settings.Default.showCliForInGuiEncodeStatus)
+ this.queueProcessor.EncodeService.SafelyStop();
else
- {
- encodeQueue.SafelyClose();
- }
+ this.queueProcessor.EncodeService.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 (this.queueProcessor.QueueManager.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
@@ -1079,24 +1009,34 @@ 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, this.GetTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
+ QueueTask task = new QueueTask(query)
+ {
+ Title = this.GetTitle(),
+ Source = jobSourcePath,
+ Destination = jobDestination,
+ CustomQuery = (this.rtf_query.Text != string.Empty)
+ };
+
+ if (this.queueProcessor.QueueManager.Count == 0)
+ this.queueProcessor.QueueManager.Add(task);
queueWindow.SetQueue();
- if (encodeQueue.Count > 1)
+ if (this.queueProcessor.QueueManager.Count > 1)
queueWindow.Show(false);
SetEncodeStarted(); // Encode is running, so setup the GUI appropriately
- encodeQueue.Start(); // Start The Queue Encoding Process
+ this.queueProcessor.Start(); // Start The Queue Encoding Process
}
this.Focus();
@@ -1118,36 +1058,124 @@ 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;
+ }
+ }
}
- string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);
- if (rtf_query.Text != string.Empty)
- query = rtf_query.Text;
+ 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 (encodeQueue.CheckForDestinationDuplicate(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;
+
+ // 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 (this.queueProcessor.QueueManager.CheckForDestinationPathDuplicates(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, this.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, this.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.
+ QueueTask task = new QueueTask(query)
+ {
+ Title = this.GetTitle(),
+ Source = jobSourcePath,
+ Destination = jobDestination,
+ CustomQuery = (this.rtf_query.Text != string.Empty)
+ };
+ this.queueProcessor.QueueManager.Add(task);
- queueWindow.Show();
- }
+ lbl_encode.Text = this.queueProcessor.QueueManager.Count + " encode(s) pending in the queue";
+
+ return true;
}
///
@@ -1208,11 +1236,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(this.queueProcessor.EncodeService, SourceScan);
- ActivityWindow.Show();
- ActivityWindow.Activate();
+ this.activityWindow.Show();
+ this.activityWindow.Activate();
}
#endregion
@@ -1278,29 +1306,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)
@@ -1309,18 +1339,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;
@@ -1332,7 +1399,7 @@ namespace Handbrake
}
sourcePath = Path.GetFileName(file);
- StartScan(file, 0);
+ StartScan(file, titleSpecific);
}
private void drp_dvdtitle_Click(object sender, EventArgs e)
@@ -1357,7 +1424,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
@@ -1370,6 +1437,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;
}
@@ -1392,7 +1465,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());
@@ -1400,7 +1473,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)
@@ -1410,14 +1483,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;
}
@@ -1600,17 +1673,14 @@ namespace Handbrake
switch (DVD_Save.FilterIndex)
{
case 1:
- if (
- !Path.GetExtension(DVD_Save.FileName).Equals(".mp4",
- StringComparison.InvariantCultureIgnoreCase))
- if (Properties.Settings.Default.useM4v)
+ if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))
+ if (Properties.Settings.Default.useM4v == 2 || Properties.Settings.Default.useM4v == 0)
DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");
else
DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");
break;
case 2:
- if (
- !Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))
+ if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))
DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");
break;
default:
@@ -1640,11 +1710,7 @@ namespace Handbrake
switch (drop_format.SelectedIndex)
{
case 0:
- if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked ||
- AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())
- SetExtension(".m4v");
- else
- SetExtension(".mp4");
+ SetExtension(".mp4");
break;
case 1:
SetExtension(".mkv");
@@ -1668,9 +1734,8 @@ namespace Handbrake
public void SetExtension(string newExtension)
{
if (newExtension == ".mp4" || newExtension == ".m4v")
- if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() ||
- Subtitles.RequiresM4V())
- newExtension = ".m4v";
+ if (Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V() || Properties.Settings.Default.useM4v == 2)
+ newExtension = Properties.Settings.Default.useM4v == 1 ? ".mp4" : ".m4v";
else
newExtension = ".mp4";
@@ -1754,6 +1819,10 @@ namespace Handbrake
this.checkMaximumFramerate.Visible = false;
this.checkMaximumFramerate.CheckState = CheckState.Unchecked;
}
+ else
+ {
+ this.checkMaximumFramerate.Visible = true;
+ }
}
///
@@ -1778,7 +1847,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
@@ -1786,7 +1855,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
@@ -1805,7 +1874,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)
@@ -1820,6 +1889,7 @@ namespace Handbrake
double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
rfValue = Math.Round(rfValue, 2);
lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US"));
+ this.lbl_rfwarn.Visible = rfValue == 0;
break;
case "VP3 (Theora)":
lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;
@@ -1827,19 +1897,9 @@ namespace Handbrake
}
}
- private void radio_targetFilesize_CheckedChanged(object sender, EventArgs e)
- {
- text_bitrate.Enabled = false;
- text_filesize.Enabled = true;
- slider_videoQuality.Enabled = false;
-
- check_2PassEncode.Enabled = true;
- }
-
private void radio_avgBitrate_CheckedChanged(object sender, EventArgs e)
{
text_bitrate.Enabled = true;
- text_filesize.Enabled = false;
slider_videoQuality.Enabled = false;
check_2PassEncode.Enabled = true;
@@ -1848,7 +1908,6 @@ namespace Handbrake
private void radio_cq_CheckedChanged(object sender, EventArgs e)
{
text_bitrate.Enabled = false;
- text_filesize.Enabled = false;
slider_videoQuality.Enabled = true;
check_2PassEncode.Enabled = false;
@@ -1881,7 +1940,7 @@ namespace Handbrake
}
else
{
- if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)
+ if (drop_format.SelectedIndex != 1)
SetExtension(".mp4");
data_chpt.Enabled = false;
btn_importChapters.Enabled = false;
@@ -1915,7 +1974,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;
@@ -1925,7 +1984,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)
@@ -1959,8 +2018,6 @@ namespace Handbrake
try
{
SourceScan.Scan(sourcePath, title);
- SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
- SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
}
catch (Exception exc)
{
@@ -1977,9 +2034,15 @@ namespace Handbrake
///
/// The e.
///
- private void SourceScan_ScanStatusChanged(object sender, EventArgs e)
+ private void SourceScanScanStatusChanged(object sender, ScanProgressEventArgs e)
{
- UpdateScanStatusLabel();
+ if (this.InvokeRequired)
+ {
+ this.BeginInvoke(new ScanProgessStatus(this.SourceScanScanStatusChanged), new[] { sender, e });
+ return;
+ }
+
+ labelSource.Text = string.Format("Processing Title: {0} of {1}", e.CurrentTitle, e.Titles);
}
///
@@ -1991,32 +2054,11 @@ namespace Handbrake
///
/// The e.
///
- private void SourceScan_ScanCompleted(object sender, EventArgs e)
- {
- UpdateGuiAfterScan();
- }
-
- ///
- /// Update the Scan Status Label
- ///
- private void UpdateScanStatusLabel()
- {
- if (InvokeRequired)
- {
- BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));
- return;
- }
- lbl_encode.Text = SourceScan.ScanStatus;
- }
-
- ///
- /// Reset the GUI when the scan has completed
- ///
- private void UpdateGuiAfterScan()
+ private void SourceScanScanCompleted(object sender, EventArgs e)
{
- if (InvokeRequired)
+ if (this.InvokeRequired)
{
- BeginInvoke(new UpdateWindowHandler(UpdateGuiAfterScan));
+ this.BeginInvoke(new ScanCompletedStatus(this.SourceScanScanCompleted), new[] { sender, e });
return;
}
@@ -2042,17 +2084,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
@@ -2065,6 +2109,34 @@ namespace Handbrake
}
UpdateSourceLabel();
+ // This is a bit of a hack to fix the queue editing.
+ // If afte the scan, we find a job sitting in queueEdit, then the user has rescaned the source from the queue by clicking edit.
+ // When this occures, we want to repopulate their old settings.
+ if (queueEdit != null)
+ {
+ // Setup UI
+ if (queueEdit.Query != null)
+ {
+ // Send the query from the file to the Query Parser class
+ EncodeTask presetQuery = QueryParserUtility.Parse(queueEdit.Query);
+
+ // Now load the preset
+ PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue");
+
+ // Set the destination path
+ this.text_destination.Text = queueEdit.Destination;
+
+ // The x264 widgets will need updated, so do this now:
+ x264Panel.StandardizeOptString();
+ x264Panel.SetCurrentSettingsInPanel();
+
+ // Set the crop label
+ PictureSettings.SetPresetCropWarningLabel(null);
+ }
+
+ queueEdit = null;
+ }
+
// Enable the GUI components and enable any disabled components
EnableGUI();
}
@@ -2085,7 +2157,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;
@@ -2110,8 +2181,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;
@@ -2125,13 +2197,13 @@ namespace Handbrake
///
private void KillScan()
{
- SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
+ SourceScan.ScanCompleted -= this.SourceScanScanCompleted;
EnableGUI();
ResetGUI();
SourceScan.Stop();
- lbl_encode.Text = "Scan Cancelled!";
+ labelSource.Text = "Scan Cancelled";
}
///
@@ -2155,11 +2227,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);
}
///
@@ -2168,30 +2235,15 @@ namespace Handbrake
///
/// The job.
///
- public void RecievingJob(Job job)
+ public void RecievingJob(QueueTask job)
{
- string query = job.Query;
- StartScan(job.Source, job.Title);
-
- if (query != null)
- {
- // Ok, Reset all the H264 widgets before changing the preset
- x264Panel.Reset2Defaults();
-
- // Send the query from the file to the Query Parser class
- QueryParser presetQuery = QueryParser.Parse(query);
-
- // Now load the preset
- PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue", true);
-
- // The x264 widgets will need updated, so do this now:
- x264Panel.StandardizeOptString();
- x264Panel.SetCurrentSettingsInPanel();
+ // Reset
+ this.currentlySelectedPreset = null;
+ x264Panel.Reset2Defaults();
- // Finally, let this window have a copy of the preset settings.
- CurrentlySelectedPreset = null;
- PictureSettings.SetPresetCropWarningLabel(null);
- }
+ // Scan
+ queueEdit = job; // Nasty but will do for now. TODO
+ StartScan(job.Source, job.Title);
}
#endregion
@@ -2246,7 +2298,7 @@ namespace Handbrake
lbl_encode.Visible = true;
ProgressBarStatus.Value = 0;
ProgressBarStatus.Visible = true;
- lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending";
+ lbl_encode.Text = "Encoding with " + this.queueProcessor.QueueManager.Count + " encode(s) pending";
btn_start.Text = "Stop";
btn_start.ToolTipText = "Stop the encoding process.";
btn_start.Image = Properties.Resources.stop;
@@ -2266,21 +2318,22 @@ namespace Handbrake
///
/// The e.
///
- private void EncodeQueue_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EncodeProgressEventArgs e)
+ private void EncodeQueue_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
{
if (this.InvokeRequired)
{
- this.BeginInvoke(new Encode.EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });
+ this.BeginInvoke(new 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}",
+ "{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);
+ e.EstimatedTimeLeft,
+ this.queueProcessor.QueueManager.Count);
ProgressBarStatus.Value = (int)Math.Round(e.PercentComplete);
}
@@ -2298,7 +2351,7 @@ namespace Handbrake
return;
}
- drives = Main.GetDrives();
+ drives = UtilityService.GetDrives();
List menuItems = new List();
foreach (DriveInformation drive in drives)
@@ -2309,7 +2362,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);
}
@@ -2328,12 +2381,49 @@ 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);
- presetHandler.GetPresetPanel(ref treeView_presets);
+ // Clear the old presets
+ treeView_presets.Nodes.Clear();
+
+
+ string category = string.Empty; // The category we are currnetly processing
+ TreeNode rootNode = null;
+ foreach (Preset preset in this.presetHandler.Presets.Where(p => p.IsBuildIn))
+ {
+ // If the category of this preset doesn't match the current category we are processing
+ // Then we need to create a new root node.
+ if (preset.Category != category)
+ {
+ rootNode = new TreeNode(preset.Category) { ForeColor = Color.DarkBlue };
+ treeView_presets.Nodes.Add(rootNode);
+ category = preset.Category;
+ }
+
+ if (preset.Category == category && rootNode != null)
+ rootNode.Nodes.Add(new TreeNode(preset.Name) { ToolTipText = preset.Description, ForeColor = Color.DarkBlue });
+ }
+
+ rootNode = null;
+ category = null;
+ foreach (Preset preset in this.presetHandler.Presets.Where(p => !p.IsBuildIn)) // User Presets
+ {
+ if (preset.Category != category && preset.Category != string.Empty)
+ {
+ rootNode = new TreeNode(preset.Category) { ForeColor = Color.Black };
+ treeView_presets.Nodes.Add(rootNode);
+ category = preset.Category;
+ }
+
+ if (preset.Category == category && rootNode != null)
+ rootNode.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description });
+ else
+ treeView_presets.Nodes.Add(new TreeNode(preset.Name) { ForeColor = Color.Black, ToolTipText = preset.Description });
+ }
+
treeView_presets.Update();
}
@@ -2373,11 +2463,11 @@ namespace Handbrake
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
@@ -2413,7 +2503,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;
@@ -2427,30 +2517,44 @@ 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 (this.queueProcessor.EncodeService.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();
- }
+ this.queueProcessor.Pause();
+ this.queueProcessor.EncodeService.Stop();
+ }
+
+ if (SourceScan.IsScanning)
+ {
+ SourceScan.Stop();
+ }
- if (SourceScan.IsScanning)
+ SourceScan.ScanCompleted -= this.SourceScanScanCompleted;
+ SourceScan.ScanStatusChanged -= this.SourceScanScanStatusChanged;
+ }
+ catch (Exception exc)
+ {
+ 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());
+ }
+ finally
{
- SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
- SourceScan.Stop();
+ base.OnFormClosing(e);
}
- base.OnFormClosing(e);
}
#endregion