X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=1a1cfae47111132a432eb258c93120890b4f05b5;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=e4f6c05be6302398ee7fd76b80b301791835fe40;hpb=c63aa009f42272821994d6d43f130da9243e6dbb;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index e4f6c05b..1a1cfae4 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1,8 +1,7 @@
/* frmMain.cs $
-
- This file is part of the HandBrake source code.
- Homepage: .
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: .
+ It may be used under the terms of the GNU General Public License. */
namespace Handbrake
{
@@ -13,12 +12,14 @@ namespace Handbrake
using System.Drawing;
using System.Globalization;
using System.IO;
+ using System.Reflection;
using System.Threading;
using System.Windows.Forms;
using Functions;
using Model;
using Parsing;
using Presets;
+ using Properties;
using Services;
public partial class frmMain : Form
@@ -27,44 +28,75 @@ namespace Handbrake
private Queue encodeQueue = new Queue();
private PresetsHandler presetHandler = new PresetsHandler();
- // Globals: Mainly used for tracking. *********************************
- public Title selectedTitle;
+ // Windows ************************************************************
private frmQueue queueWindow;
private frmPreview qtpreview;
private frmActivityWindow ActivityWindow;
- private Form splash;
+ private frmSplashScreen splash = new frmSplashScreen();
+
+ // Globals: Mainly used for tracking. *********************************
+ public Title selectedTitle;
public string sourcePath;
- private ActivityLogMode lastAction;
private SourceType selectedSourceType;
private string dvdDrivePath;
private string dvdDriveLabel;
private Preset CurrentlySelectedPreset;
private DVD currentSource;
- private Scan SourceScan = new Scan();
+ private ScanService SourceScan = new ScanService();
+ private List drives;
+ private Thread encodeMonitor;
// Delegates **********************************************************
private delegate void UpdateWindowHandler();
// Applicaiton Startup ************************************************
+ #region Properties
+
+ ///
+ /// Gets SourceName.
+ ///
+ public string SourceName
+ {
+ get
+ {
+ if (this.selectedSourceType == SourceType.DvdDrive)
+ {
+ return this.dvdDriveLabel;
+ }
+
+ if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
+ return Path.GetFileNameWithoutExtension(this.sourcePath);
+
+ return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
+ }
+ }
+
+ #endregion
+
#region Application Startup
public frmMain()
{
// Load and setup the splash screen in this thread
- splash = new frmSplashScreen();
splash.Show(this);
- Label lblStatus = new Label {Size = new Size(150, 20), Location = new Point(182, 102)};
+ Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };
splash.Controls.Add(lblStatus);
InitializeComponent();
// Update the users config file with the CLI version data.
- lblStatus.Text = "Setting Version Data ...";
- Application.DoEvents();
+ 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);
+ }
- // Show the form, but leave disabled until preloading is complete then show the main form
+ // 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
@@ -77,9 +109,7 @@ namespace Handbrake
TimeSpan elapsed = now.Subtract(lastCheck);
if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)
{
- lblStatus.Text = "Checking for updates ...";
- Application.DoEvents();
-
+ UpdateSplashStatus(lblStatus, "Checking for updates ...");
Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);
}
}
@@ -87,15 +117,13 @@ namespace Handbrake
// Clear the log files in the background
if (Properties.Settings.Default.clearOldLogs)
{
- lblStatus.Text = "Clearing Old Log Files ...";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Clearing Old Log Files ..");
Thread clearLog = new Thread(Main.ClearOldLogs);
clearLog.Start();
}
// Setup the GUI components
- lblStatus.Text = "Setting up the GUI ...";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Setting up the GUI ...");
LoadPresetPanel(); // Load the Preset Panel
treeView_presets.ExpandAll();
lbl_encode.Text = string.Empty;
@@ -103,44 +131,33 @@ namespace Handbrake
queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue
if (!Properties.Settings.Default.QueryEditorTab)
tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.
+ if (Properties.Settings.Default.tooltipEnable)
+ ToolTip.Active = true;
// Load the user's default settings or Normal Preset
- if (Properties.Settings.Default.defaultPreset != string.Empty)
+ if (Properties.Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
{
- if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
+ string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;
+ if (query != null)
{
- string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;
- bool loadPictureSettings =
- presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings;
+ x264Panel.Reset2Defaults();
- if (query != null)
- {
- x264Panel.Reset2Defaults();
+ QueryParser presetQuery = QueryParser.Parse(query);
+ PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset,
+ presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings);
- QueryParser presetQuery = QueryParser.Parse(query);
- PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset,
- loadPictureSettings);
-
- x264Panel.X264_StandardizeOptString();
- x264Panel.X264_SetCurrentSettingsInPanel();
- }
+ x264Panel.X264_StandardizeOptString();
+ x264Panel.X264_SetCurrentSettingsInPanel();
}
- else
- loadNormalPreset();
}
else
loadNormalPreset();
- // Enabled GUI tooltip's if Required
- if (Properties.Settings.Default.tooltipEnable)
- ToolTip.Active = true;
-
// Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)
GrowlCommunicator.Register();
// Finished Loading
- lblStatus.Text = "Loading Complete!";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Loading Complete.");
splash.Close();
splash.Dispose();
this.Enabled = true;
@@ -172,10 +189,8 @@ namespace Handbrake
}
catch (Exception ex)
{
- if ((bool) result.AsyncState)
- MessageBox.Show(
- "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ if ((bool)result.AsyncState)
+ Main.ShowExceptiowWindow("Unable to check for updates, Please try again later.", ex.ToString());
}
}
@@ -186,7 +201,7 @@ namespace Handbrake
{
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?",
+ "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)
@@ -201,24 +216,10 @@ namespace Handbrake
}
}
- #endregion
-
- #region Properties
-
- public string SourceName
+ private void UpdateSplashStatus(Label status, string text)
{
- get
- {
- if (this.selectedSourceType == SourceType.DvdDrive)
- {
- return this.dvdDriveLabel;
- }
-
- if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
- return Path.GetFileNameWithoutExtension(this.sourcePath);
-
- return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
- }
+ status.Text = text;
+ Application.DoEvents();
}
#endregion
@@ -236,7 +237,6 @@ namespace Handbrake
this.Resize += new EventHandler(frmMain_Resize);
// Handle Encode Start / Finish / Pause
-
encodeQueue.QueuePauseRequested += new EventHandler(encodePaused);
encodeQueue.EncodeStarted += new EventHandler(encodeStarted);
encodeQueue.EncodeEnded += new EventHandler(encodeEnded);
@@ -256,7 +256,7 @@ namespace Handbrake
check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel);
// Picture Settings
- // PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);
// Filter Settings
Filters.FilterSettingsChanged += new EventHandler(changePresetLabel);
@@ -285,7 +285,7 @@ namespace Handbrake
check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel);
// Picture Settings
- // PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);
// Filter Settings
Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel);
@@ -324,7 +324,7 @@ namespace Handbrake
if (fileList != null)
{
- if (fileList[0] != string.Empty)
+ if (!string.IsNullOrEmpty(fileList[0]))
{
this.selectedSourceType = SourceType.VideoFile;
StartScan(fileList[0], 0);
@@ -338,14 +338,13 @@ namespace Handbrake
private void encodeStarted(object sender, EventArgs e)
{
- lastAction = ActivityLogMode.Encode;
SetEncodeStarted();
// Experimental HBProc Process Monitoring.
if (Properties.Settings.Default.enocdeStatusInGui)
{
- Thread encodeMon = new Thread(EncodeMonitorThread);
- encodeMon.Start();
+ encodeMonitor = new Thread(EncodeMonitorThread);
+ encodeMonitor.Start();
}
}
@@ -365,11 +364,29 @@ namespace Handbrake
#region File Menu
+ ///
+ /// Kill The scan menu Item
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_killCLI_Click(object sender, EventArgs e)
{
KillScan();
}
+ ///
+ /// Exit the Application Menu Item
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_exit_Click(object sender, EventArgs e)
{
Application.Exit();
@@ -379,17 +396,44 @@ namespace Handbrake
#region Tools Menu
+ ///
+ /// Menu - Start Button
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_encode_Click(object sender, EventArgs e)
{
queueWindow.Show();
}
+ ///
+ /// Menu - Display the Log Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_encodeLog_Click(object sender, EventArgs e)
{
- frmActivityWindow dvdInfoWindow = new frmActivityWindow(lastAction, encodeQueue, SourceScan);
+ frmActivityWindow dvdInfoWindow = new frmActivityWindow(encodeQueue, SourceScan);
dvdInfoWindow.Show();
}
+ ///
+ /// Menu - Display the Options Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_options_Click(object sender, EventArgs e)
{
Form options = new frmOptions(this);
@@ -400,13 +444,22 @@ 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();
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!",
+ "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);
@@ -414,25 +467,75 @@ 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();
+ 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),
+ Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
presetHandler);
preset.ShowDialog();
}
@@ -441,56 +544,44 @@ namespace Handbrake
#region Help Menu
+ ///
+ /// Menu - Display the User Guide Web Page
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_user_guide_Click(object sender, EventArgs e)
{
Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");
}
- private void mnu_handbrake_home_Click(object sender, EventArgs e)
- {
- Process.Start("http://handbrake.fr");
- }
-
+ ///
+ /// Menu - Check for Updates
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_UpdateCheck_Click(object sender, EventArgs e)
{
lbl_updateCheck.Visible = true;
Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false);
}
- private void updateCheckDoneMenu(IAsyncResult result)
- {
- // Make sure it's running on the calling thread
- if (InvokeRequired)
- {
- Invoke(new MethodInvoker(() => updateCheckDoneMenu(result)));
- return;
- }
- UpdateCheckInformation info;
- try
- {
- // Get the information about the new build, if any, and close the window
- info = Main.EndCheckForUpdates(result);
-
- if (info.NewVersionAvailable && info.BuildInformation != null)
- {
- frmUpdater updateWindow = new frmUpdater(info.BuildInformation);
- updateWindow.ShowDialog();
- }
- else
- MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK,
- MessageBoxIcon.Information);
- lbl_updateCheck.Visible = false;
- return;
- }
- catch (Exception ex)
- {
- if ((bool) result.AsyncState)
- MessageBox.Show(
- "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
-
+ ///
+ /// Menu - Display the About Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void mnu_about_Click(object sender, EventArgs e)
{
using (frmAbout About = new frmAbout())
@@ -503,37 +594,81 @@ 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();
+ ImportPreset();
}
+ ///
+ /// RMenu - Save Changes to Preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void pmnu_saveChanges_Click(object sender, EventArgs e)
{
DialogResult result =
MessageBox.Show(
"Do you wish to include picture settings when updating the preset: " +
- treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel,
+ treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel,
MessageBoxIcon.Question);
if (result == DialogResult.Yes)
- presetHandler.Update(treeView_presets.SelectedNode.Text,
+ presetHandler.Update(treeView_presets.SelectedNode.Text,
QueryGenerator.GenerateTabbedComponentsQuery(this), true);
else if (result == DialogResult.No)
- presetHandler.Update(treeView_presets.SelectedNode.Text,
+ presetHandler.Update(treeView_presets.SelectedNode.Text,
QueryGenerator.GenerateTabbedComponentsQuery(this), false);
}
+ ///
+ /// RMenu - Delete Preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void pmnu_delete_click(object sender, EventArgs e)
{
if (treeView_presets.SelectedNode != null)
@@ -544,6 +679,15 @@ namespace Handbrake
treeView_presets.Select();
}
+ ///
+ /// Preset Menu Is Opening. Setup the Menu
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void presets_menu_Opening(object sender, CancelEventArgs e)
{
// Make sure that the save menu is always disabled by default
@@ -558,15 +702,34 @@ namespace Handbrake
}
// Presets Management
+
+ ///
+ /// Button - Add a preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_addPreset_Click(object sender, EventArgs e)
{
Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);
preset.ShowDialog();
}
+ ///
+ /// Button - remove a Preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_removePreset_Click(object sender, EventArgs e)
{
- DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
+ DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result == DialogResult.Yes)
{
@@ -579,11 +742,20 @@ 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)
{
- DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?",
+ DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?",
"Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result == DialogResult.Yes)
{
@@ -596,6 +768,15 @@ namespace Handbrake
MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
+ ///
+ /// PresetBar Mouse Down event
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void treeview_presets_mouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
@@ -612,16 +793,34 @@ namespace Handbrake
treeView_presets.Select();
}
+ ///
+ /// Preset Bar after selecting the preset
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)
{
selectPreset();
}
+ ///
+ /// Preset Bar - Handle the Delete Key
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void treeView_presets_deleteKey(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Delete)
{
- DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
+ DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result == DialogResult.Yes)
{
@@ -649,6 +848,9 @@ namespace Handbrake
}
}
+ ///
+ /// Select the selected preset and setup the GUI
+ ///
private void selectPreset()
{
if (treeView_presets.SelectedNode != null)
@@ -684,6 +886,9 @@ namespace Handbrake
}
}
+ ///
+ /// Load the Normal Preset
+ ///
private void loadNormalPreset()
{
foreach (TreeNode treenode in treeView_presets.Nodes)
@@ -696,7 +901,10 @@ namespace Handbrake
}
}
- private void importPreset()
+ ///
+ /// Import a plist preset
+ ///
+ private void ImportPreset()
{
if (openPreset.ShowDialog() == DialogResult.OK)
{
@@ -704,31 +912,27 @@ namespace Handbrake
if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)"))
{
DialogResult result =
- MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?",
- "Overwrite preset?",
+ MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?",
+ "Overwrite preset?",
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),
+ presetHandler.Update(parsed.PresetName + " (Imported)",
+ QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
parsed.UsesPictureSettings);
}
}
else
{
PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);
- presetHandler.Add(parsed.PresetName,
- QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
- parsed.UsesPictureSettings);
-
- if (presetHandler.Add(parsed.PresetName + " (Imported)",
- QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
+ if (presetHandler.Add(parsed.PresetName + " (Imported)",
+ QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
parsed.UsesPictureSettings))
{
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)")
{
- ForeColor = Color.Black
+ ForeColor = Color.Black
};
treeView_presets.Nodes.Add(preset_treeview);
}
@@ -736,17 +940,73 @@ namespace Handbrake
}
}
+ ///
+ /// Export a plist Preset
+ ///
+ private void ExportPreset()
+ {
+ MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ return;
+
+ SaveFileDialog savefiledialog = new SaveFileDialog();
+ savefiledialog.Filter = "plist|*.plist";
+
+ if (treeView_presets.SelectedNode != null)
+ {
+
+ if (savefiledialog.ShowDialog() == DialogResult.OK)
+ {
+ Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text);
+ PlistPresetHandler.Export(savefiledialog.FileName, preset);
+ }
+ }
+ }
+
#endregion
#region ToolStrip
+ ///
+ /// Toolbar - When the Source button is clicked, Clear any DVD drives and add any available DVD drives that can be used as a source.
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_source_Click(object sender, EventArgs e)
{
- mnu_dvd_drive.Visible = true;
+ // Remove old Drive Menu Items.
+ List itemsToRemove = new List();
+ foreach (var item in btn_source.DropDownItems)
+ {
+ if (item.GetType() == typeof(ToolStripMenuItem))
+ {
+ ToolStripMenuItem menuItem = (ToolStripMenuItem)item;
+ if (menuItem.Name.StartsWith("Drive"))
+ {
+ itemsToRemove.Add(menuItem);
+ }
+ }
+ }
+
+ foreach (ToolStripMenuItem item in itemsToRemove)
+ btn_source.DropDownItems.Remove(item);
+
Thread driveInfoThread = new Thread(SetDriveSelectionMenuItem);
driveInfoThread.Start();
}
+ ///
+ /// Toolbar - Start The Encode
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_start_Click(object sender, EventArgs e)
{
if (btn_start.Text == "Stop")
@@ -756,12 +1016,12 @@ namespace Handbrake
!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. ",
+ "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?",
+ result = MessageBox.Show("Are you sure you wish to cancel the encode?", "Cancel Encode?",
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
}
@@ -781,9 +1041,6 @@ namespace Handbrake
{
encodeQueue.SafelyClose();
}
-
- // Update the GUI
- SetEncodeFinished();
}
}
else
@@ -806,9 +1063,9 @@ namespace Handbrake
"priority over the GUI, your recently updated settings will not be taken " +
"into account when encoding this job." +
Environment.NewLine + Environment.NewLine +
- "Do you want to replace the manual query with the updated GUI-generated query?",
- "Manual Query does not Match GUI",
- MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,
+ "Do you want to replace the manual query with the updated GUI-generated query?",
+ "Manual Query does not Match GUI",
+ MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,
MessageBoxDefaultButton.Button3);
switch (result)
@@ -837,13 +1094,13 @@ namespace Handbrake
if (File.Exists(text_destination.Text))
overwrite =
MessageBox.Show(
- "The destination file already exists. Are you sure you want to overwrite it?",
+ "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, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
+ encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
queueWindow.SetQueue();
if (encodeQueue.Count > 1)
@@ -851,26 +1108,37 @@ 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();
}
else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
- MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
MessageBoxIcon.Warning);
}
}
+ ///
+ /// Toolbar - Add the current job to the Queue
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_add2Queue_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
- MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
- MessageBoxIcon.Warning);
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
{
+ if (!Directory.Exists(Path.GetDirectoryName(text_destination.Text)))
+ {
+ MessageBox.Show("Destination Path does not exist.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ return;
+ }
+
string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);
if (rtf_query.Text != string.Empty)
query = rtf_query.Text;
@@ -879,13 +1147,13 @@ namespace Handbrake
{
DialogResult 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?",
+ "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, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
+ encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
}
else
- encodeQueue.Add(query, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
+ encodeQueue.Add(query, getTitle(), sourcePath, text_destination.Text, (rtf_query.Text != string.Empty));
lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";
@@ -893,16 +1161,34 @@ namespace Handbrake
}
}
+ ///
+ /// Toolbar - Show the Queue
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_showQueue_Click(object sender, EventArgs e)
{
queueWindow.Show();
queueWindow.Activate();
}
+ ///
+ /// Toolbar - Show the Preview Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void tb_preview_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
- MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK,
MessageBoxIcon.Warning);
else
{
@@ -917,28 +1203,24 @@ namespace Handbrake
qtpreview.Show();
}
else
- MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK,
+ MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK,
MessageBoxIcon.Warning);
}
}
+ ///
+ /// Toolbar - Show the Activity log Window
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void btn_ActivityWindow_Click(object sender, EventArgs e)
{
if (ActivityWindow == null || !ActivityWindow.IsHandleCreated)
- ActivityWindow = new frmActivityWindow(lastAction, encodeQueue, SourceScan);
- else
- switch (lastAction)
- {
- case ActivityLogMode.Scan:
- ActivityWindow.SetMode(ActivityLogMode.Scan);
- break;
- case ActivityLogMode.Encode:
- ActivityWindow.SetMode(ActivityLogMode.Encode);
- break;
- default:
- ActivityWindow.SetMode(ActivityLogMode.Encode);
- break;
- }
+ ActivityWindow = new frmActivityWindow(encodeQueue, SourceScan);
ActivityWindow.Show();
ActivityWindow.Activate();
@@ -948,6 +1230,15 @@ namespace Handbrake
#region System Tray Icon
+ ///
+ /// Handle Resizing of the main window when deaing with the Notify Icon
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void frmMain_Resize(object sender, EventArgs e)
{
if (FormWindowState.Minimized == this.WindowState)
@@ -959,6 +1250,15 @@ namespace Handbrake
notifyIcon.Visible = false;
}
+ ///
+ /// Double Click the Tray Icon
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
{
this.Visible = true;
@@ -967,6 +1267,15 @@ 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;
@@ -977,7 +1286,7 @@ namespace Handbrake
#endregion
- #region Tab Control
+ #region Main Window and Tab Control
// Source
private void btn_dvd_source_Click(object sender, EventArgs e)
@@ -1004,15 +1313,27 @@ namespace Handbrake
private void mnu_dvd_drive_Click(object sender, EventArgs e)
{
- if (this.dvdDrivePath == null) return;
- this.selectedSourceType = SourceType.DvdDrive;
- SelectSource(this.dvdDrivePath);
+ ToolStripMenuItem item = sender as ToolStripMenuItem;
+ if (item != null)
+ {
+ string driveId = item.Name.Replace("Drive", string.Empty);
+ 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);
+ }
+ }
}
private void SelectSource(string file)
{
Check_ChapterMarkers.Enabled = true;
- lastAction = ActivityLogMode.Scan;
sourcePath = string.Empty;
if (file == string.Empty) // Must have a file or path
@@ -1029,7 +1350,7 @@ namespace Handbrake
{
if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Automatic"))
MessageBox.Show(
- "There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.",
+ "There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.",
"Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
}
@@ -1042,7 +1363,7 @@ namespace Handbrake
drop_chapterFinish.Items.Clear();
// If the dropdown is set to automatic nothing else needs to be done.
- // Otheriwse if its not, title data has to be loased from parsing.
+ // Otheriwse if its not, title data has to be loaded from parsing.
if (drp_dvdtitle.Text != "Automatic")
{
selectedTitle = drp_dvdtitle.SelectedItem as Title;
@@ -1079,7 +1400,7 @@ namespace Handbrake
drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();
// Populate the Audio Channels Dropdown
- AudioSettings.SetTrackList(selectedTitle);
+ AudioSettings.SetTrackList(selectedTitle, CurrentlySelectedPreset);
// Populate the Subtitles dropdown
Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());
@@ -1097,7 +1418,7 @@ 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 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);
}
@@ -1126,7 +1447,7 @@ namespace Handbrake
if (drop_mode.SelectedIndex != 0) // Function is not used if we are not in chapters mode.
return;
- Control ctl = (Control) sender;
+ Control ctl = (Control)sender;
int chapterStart, chapterEnd;
int.TryParse(drop_chapterStart.Text, out chapterStart);
int.TryParse(drop_chapterFinish.Text, out chapterEnd);
@@ -1160,8 +1481,8 @@ namespace Handbrake
int n = data_chpt.Rows.Add();
data_chpt.Rows[n].Cells[0].Value = (i + 1);
data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1);
- data_chpt.Rows[n].Cells[0].ValueType = typeof (int);
- data_chpt.Rows[n].Cells[1].ValueType = typeof (string);
+ data_chpt.Rows[n].Cells[0].ValueType = typeof(int);
+ data_chpt.Rows[n].Cells[1].ValueType = typeof(string);
i++;
}
}
@@ -1210,7 +1531,7 @@ namespace Handbrake
case 2:
if (selectedTitle != null)
{
- duration = duration/selectedTitle.Fps;
+ duration = duration / selectedTitle.Fps;
lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString();
}
else
@@ -1259,7 +1580,7 @@ namespace Handbrake
if (selectedTitle != null)
{
drop_chapterStart.Text = "0";
- drop_chapterFinish.Text = (selectedTitle.Fps*selectedTitle.Duration.TotalSeconds).ToString();
+ drop_chapterFinish.Text = (selectedTitle.Fps * selectedTitle.Duration.TotalSeconds).ToString();
}
return;
}
@@ -1288,7 +1609,7 @@ namespace Handbrake
{
case 1:
if (
- !Path.GetExtension(DVD_Save.FileName).Equals(".mp4",
+ !Path.GetExtension(DVD_Save.FileName).Equals(".mp4",
StringComparison.InvariantCultureIgnoreCase))
if (Properties.Settings.Default.useM4v)
DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");
@@ -1297,8 +1618,7 @@ namespace Handbrake
break;
case 2:
if (
- !Path.GetExtension(DVD_Save.FileName).Equals(".mkv",
- StringComparison.InvariantCultureIgnoreCase))
+ !Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))
DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");
break;
default:
@@ -1340,7 +1660,6 @@ namespace Handbrake
}
AudioSettings.SetContainer(drop_format.Text);
- Subtitles.SetContainer(drop_format.SelectedIndex);
if (drop_format.Text.Contains("MP4"))
{
@@ -1409,29 +1728,13 @@ namespace Handbrake
CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");
double cqStep = Properties.Settings.Default.x264cqstep;
- double multiplier = 1.0/cqStep;
- double value = slider_videoQuality.Value*multiplier;
+ double multiplier = 1.0 / cqStep;
+ double value = slider_videoQuality.Value * multiplier;
+
+ slider_videoQuality.Maximum = (int)(51 / Properties.Settings.Default.x264cqstep);
- switch (Properties.Settings.Default.x264cqstep.ToString(culture))
- {
- case "0.2":
- slider_videoQuality.Maximum = 255;
- break;
- case "0.25":
- slider_videoQuality.Maximum = 204;
- break;
- case "0.5":
- slider_videoQuality.Maximum = 102;
- break;
- case "1":
- slider_videoQuality.Maximum = 51;
- break;
- default:
- slider_videoQuality.Maximum = 51;
- break;
- }
if (value < slider_videoQuality.Maximum)
- slider_videoQuality.Value = slider_videoQuality.Maximum - (int) value;
+ slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value;
break;
case "VP3 (Theora)":
@@ -1474,38 +1777,21 @@ namespace Handbrake
{
// Work out the current RF value.
double cqStep = _cachedCqStep;
- double rfValue = 51.0 - slider_videoQuality.Value*cqStep;
+ double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
// Change the maximum value for the slider
- switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US")))
- {
- case "0.2":
- slider_videoQuality.Maximum = 255;
- break;
- case "0.25":
- slider_videoQuality.Maximum = 204;
- break;
- case "0.5":
- slider_videoQuality.Maximum = 102;
- break;
- case "1":
- slider_videoQuality.Maximum = 51;
- break;
- default:
- slider_videoQuality.Maximum = 51;
- break;
- }
+ slider_videoQuality.Maximum = (int)(51 / Properties.Settings.Default.x264cqstep);
// Reset the CQ slider to RF0
slider_videoQuality.Value = slider_videoQuality.Maximum;
// Reset the CQ slider back to the previous value as close as possible
double cqStepNew = Properties.Settings.Default.x264cqstep;
- double rfValueCurrent = 51.0 - slider_videoQuality.Value*cqStepNew;
+ double rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;
while (rfValueCurrent < rfValue)
{
slider_videoQuality.Value--;
- rfValueCurrent = 51.0 - slider_videoQuality.Value*cqStepNew;
+ rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;
}
// Cache the CQ step for the next calculation
@@ -1521,7 +1807,7 @@ namespace Handbrake
lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value);
break;
case "H.264 (x264)":
- double rfValue = 51.0 - slider_videoQuality.Value*cqStep;
+ double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
rfValue = Math.Round(rfValue, 2);
lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US"));
break;
@@ -1603,6 +1889,19 @@ namespace Handbrake
}
}
+ private void btn_export_Click(object sender, EventArgs e)
+ {
+ SaveFileDialog saveFileDialog = new SaveFileDialog();
+ saveFileDialog.Filter = "Csv File|*.csv";
+ saveFileDialog.DefaultExt = "csv";
+ if (saveFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ string filename = saveFileDialog.FileName;
+
+ Main.SaveChapterMarkersToCsv(this, filename);
+ }
+ }
+
private void mnu_resetChapters_Click(object sender, EventArgs e)
{
data_chpt.Rows.Clear();
@@ -1630,34 +1929,26 @@ 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.
sourcePath = filename;
- 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 ...";
- btn_source.Enabled = false;
- btn_start.Enabled = false;
- btn_showQueue.Enabled = false;
- btn_add2Queue.Enabled = false;
- tb_preview.Enabled = false;
- mnu_killCLI.Visible = true;
-
- if (ActivityWindow != null)
- ActivityWindow.SetMode(ActivityLogMode.Scan);
+ this.DisableGUI();
// Start the Scan
try
{
- isScanning = true;
- SourceScan = new Scan();
- SourceScan.ScanSource(sourcePath, title);
+ SourceScan.Scan(sourcePath, title);
SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
}
@@ -1667,16 +1958,37 @@ namespace Handbrake
}
}
+ ///
+ /// Update the Status label for the scan
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void SourceScan_ScanStatusChanged(object sender, EventArgs e)
{
UpdateScanStatusLabel();
}
+ ///
+ /// Update the UI after the scan has completed
+ ///
+ ///
+ /// The sender.
+ ///
+ ///
+ /// The e.
+ ///
private void SourceScan_ScanCompleted(object sender, EventArgs e)
{
UpdateGuiAfterScan();
}
+ ///
+ /// Update the Scan Status Label
+ ///
private void UpdateScanStatusLabel()
{
if (InvokeRequired)
@@ -1684,9 +1996,12 @@ namespace Handbrake
BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));
return;
}
- lbl_encode.Text = SourceScan.ScanStatus();
+ lbl_encode.Text = SourceScan.ScanStatus;
}
+ ///
+ /// Reset the GUI when the scan has completed
+ ///
private void UpdateGuiAfterScan()
{
if (InvokeRequired)
@@ -1697,20 +2012,31 @@ namespace Handbrake
try
{
- currentSource = SourceScan.SouceData();
+ currentSource = SourceScan.SouceData;
// Setup some GUI components
drp_dvdtitle.Items.Clear();
if (currentSource.Titles.Count != 0)
drp_dvdtitle.Items.AddRange(currentSource.Titles.ToArray());
- // Now select the longest title
- if (currentSource.Titles.Count != 0)
- drp_dvdtitle.SelectedItem = Main.SelectLongestTitle(currentSource);
+ foreach (Title title in currentSource.Titles)
+ {
+ if (title.MainTitle)
+ {
+ drp_dvdtitle.SelectedItem = title;
+ }
+ }
+
+ if (drp_dvdtitle.SelectedItem == null && drp_dvdtitle.Items.Count > 0)
+ {
+ drp_dvdtitle.SelectedIndex = 0;
+ }
// Enable the creation of chapter markers if the file is an image of a dvd.
- if (sourcePath.ToLower().Contains(".iso") || sourcePath.Contains("VIDEO_TS") ||
- Directory.Exists(Path.Combine(sourcePath, "VIDEO_TS")))
+ 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
{
@@ -1723,7 +2049,7 @@ namespace Handbrake
if (drp_dvdtitle.Items.Count == 0)
{
MessageBox.Show(
- "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or in a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).",
+ "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or in a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).",
"Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
sourcePath = string.Empty;
}
@@ -1734,12 +2060,15 @@ namespace Handbrake
}
catch (Exception exc)
{
- MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK,
+ MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK,
MessageBoxIcon.Error);
EnableGUI();
}
}
+ ///
+ /// Enable the GUI
+ ///
private void EnableGUI()
{
try
@@ -1762,27 +2091,42 @@ 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 ...";
+ btn_source.Enabled = false;
+ btn_start.Enabled = false;
+ btn_showQueue.Enabled = false;
+ btn_add2Queue.Enabled = false;
+ tb_preview.Enabled = false;
+ mnu_killCLI.Visible = true;
+ }
+
+ ///
+ /// Kill the Scan
+ ///
private void KillScan()
{
- try
- {
- SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
- EnableGUI();
- ResetGUI();
+ SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
+ EnableGUI();
+ ResetGUI();
- if (SourceScan.ScanProcess() != null)
- SourceScan.ScanProcess().Kill();
+ SourceScan.Stop();
- lbl_encode.Text = "Scan Cancelled!";
- }
- catch (Exception ex)
- {
- MessageBox.Show(
- "Unable to kill HandBrakeCLI.exe \nYou may need to manually kill HandBrakeCLI.exe using the Windows Task Manager if it does not close automatically within the next few minutes. \n\nError Information: \n" +
- ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
+ lbl_encode.Text = "Scan Cancelled!";
}
+ ///
+ /// Reset the GUI
+ ///
private void ResetGUI()
{
drp_dvdtitle.Items.Clear();
@@ -1793,9 +2137,11 @@ namespace Handbrake
sourcePath = String.Empty;
text_destination.Text = String.Empty;
selectedTitle = null;
- isScanning = false;
}
+ ///
+ /// Update the Source Label
+ ///
private void UpdateSourceLabel()
{
labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;
@@ -1806,11 +2152,16 @@ namespace Handbrake
labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
}
+ ///
+ /// Take a job from the Queue, rescan it, and reload the GUI for that job.
+ ///
+ ///
+ /// The job.
+ ///
public void RecievingJob(Job job)
{
string query = job.Query;
- StartScan(job.Source, 0);
-
+ StartScan(job.Source, job.Title);
if (query != null)
{
@@ -1851,6 +2202,7 @@ namespace Handbrake
}
lbl_encode.Text = "Encoding Finished";
+ ProgressBarStatus.Visible = false;
btn_start.Text = "Start";
btn_start.ToolTipText = "Start the encoding process";
btn_start.Image = Properties.Resources.Play;
@@ -1881,8 +2233,9 @@ namespace Handbrake
BeginInvoke(new UpdateWindowHandler(SetEncodeStarted));
return;
}
-
lbl_encode.Visible = true;
+ ProgressBarStatus.Value = 0;
+ ProgressBarStatus.Visible = true;
lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending";
btn_start.Text = "Stop";
btn_start.ToolTipText = "Stop the encoding process.";
@@ -1907,21 +2260,27 @@ namespace Handbrake
return;
}
- List drives = Main.GetDrives();
+ drives = Main.GetDrives();
- if (drives.Count == 0)
+ List menuItems = new List();
+ foreach (DriveInformation drive in drives)
{
- mnu_dvd_drive.Text = "[No DVD Drive Ready]";
- return;
+ ToolStripMenuItem menuItem = new ToolStripMenuItem
+ {
+ Name = drive.ToString(),
+ Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")",
+ Image = Resources.disc_small
+ };
+ menuItem.Click += new EventHandler(mnu_dvd_drive_Click);
+ menuItems.Add(menuItem);
}
- this.dvdDrivePath = drives[0].RootDirectory + "VIDEO_TS";
- this.dvdDriveLabel = drives[0].VolumeLabel;
- mnu_dvd_drive.Text = this.dvdDrivePath + " (" + this.dvdDriveLabel + ")";
+ foreach (ToolStripMenuItem item in menuItems)
+ btn_source.DropDownItems.Add(item);
}
- catch (Exception)
+ catch (Exception exc)
{
- mnu_dvd_drive.Text = "[No DVD Drive Ready / Found]";
+ MessageBox.Show("Error in SetDriveSelectionMenuItem" + exc);
}
}
@@ -1932,14 +2291,72 @@ namespace Handbrake
{
if (presetHandler.CheckIfPresetsAreOutOfDate())
if (!Properties.Settings.Default.presetNotification)
- MessageBox.Show(splash,
- "HandBrake has determined your built-in presets are out of date... These presets will now be updated.",
+ MessageBox.Show(splash,
+ "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);
treeView_presets.Update();
}
+ ///
+ /// Get the title from the selected item in the title dropdown.
+ ///
+ ///
+ /// The title.
+ ///
+ private int getTitle()
+ {
+ int title = 0;
+ if (drp_dvdtitle.SelectedItem != null)
+ {
+ string[] titleInfo = drp_dvdtitle.SelectedItem.ToString().Split(' ');
+ int.TryParse(titleInfo[0], out title);
+ }
+
+ return title;
+ }
+
+ ///
+ /// Handle the Update Check Finishing.
+ ///
+ ///
+ /// The result.
+ ///
+ private void updateCheckDoneMenu(IAsyncResult result)
+ {
+ // Make sure it's running on the calling thread
+ if (InvokeRequired)
+ {
+ Invoke(new MethodInvoker(() => updateCheckDoneMenu(result)));
+ return;
+ }
+ UpdateCheckInformation info;
+ try
+ {
+ // Get the information about the new build, if any, and close the window
+ info = Main.EndCheckForUpdates(result);
+
+ if (info.NewVersionAvailable && info.BuildInformation != null)
+ {
+ frmUpdater updateWindow = new frmUpdater(info.BuildInformation);
+ updateWindow.ShowDialog();
+ }
+ else
+ MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK,
+ MessageBoxIcon.Information);
+ lbl_updateCheck.Visible = false;
+ return;
+ }
+ catch (Exception ex)
+ {
+ if ((bool)result.AsyncState)
+ MessageBox.Show(
+ "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
#endregion
#region Overrides
@@ -1947,9 +2364,9 @@ namespace Handbrake
///
/// Handle GUI shortcuts
///
- ///
- ///
- ///
+ /// Message
+ /// Keys
+ /// Bool
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
if (keyData == (Keys.Control | Keys.S))
@@ -1969,25 +2386,38 @@ namespace Handbrake
///
/// If the queue is being processed, prompt the user to confirm application close.
///
- ///
+ /// FormClosingEventArgs
protected override void OnFormClosing(FormClosingEventArgs e)
{
// If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.
- if ((encodeQueue.IsEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0))
+ if (encodeQueue.IsEncoding)
{
DialogResult result =
MessageBox.Show(
- "HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?",
+ "HandBrake has queue items to process. Closing HandBrake will stop the current encoding.\n\nDo you want to close HandBrake?",
"Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
if (result == DialogResult.No)
e.Cancel = true;
+
+ // Try to safely close out if we can, or kill the cli if using in-gui status
+ if (Settings.Default.enocdeStatusInGui)
+ encodeQueue.Stop();
+ else
+ encodeQueue.SafelyClose();
+ }
+
+ if (SourceScan.IsScanning)
+ {
+ SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
+ SourceScan.Stop();
}
base.OnFormClosing(e);
}
#endregion
- #region In-GUI Encode Status (Experimental)
+ #region In-GUI Encode Status
///
/// Starts a new thread to monitor and process the CLI encode status
@@ -2000,6 +2430,8 @@ namespace Handbrake
encode.OnEncodeProgress += EncodeOnEncodeProgress;
while (!encode.EndOfStream)
encode.ReadEncodeStatus();
+
+ SetEncodeFinished();
}
catch (Exception exc)
{
@@ -2010,29 +2442,31 @@ namespace Handbrake
///
/// Displays the Encode status in the GUI
///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- private void EncodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete,
- float CurrentFps, float AverageFps, TimeSpan TimeRemaining)
+ /// The sender
+ /// The current task
+ /// Number of tasks
+ /// Percent complete
+ /// Current encode speed in fps
+ /// Avg encode speed
+ /// Time Left
+ private void EncodeOnEncodeProgress(object sender, int currentTask, int taskCount, float percentComplete, float currentFps, float av, TimeSpan timeRemaining)
{
if (this.InvokeRequired)
{
- this.BeginInvoke(new EncodeProgressEventHandler(EncodeOnEncodeProgress),
- new[]
- {
- Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps,
- TimeRemaining
- });
+ this.BeginInvoke(
+ new EncodeProgressEventHandler(EncodeOnEncodeProgress),
+ new[] { sender, currentTask, taskCount, percentComplete, currentFps, av, timeRemaining });
return;
}
lbl_encode.Text =
- string.Format("Encode Progress: {0}%, FPS: {1}, Avg FPS: {2}, Time Remaining: {3} ",
- PercentComplete, CurrentFps, AverageFps, TimeRemaining);
+ string.Format(
+ "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}",
+ percentComplete,
+ currentFps,
+ av,
+ timeRemaining);
+
+ ProgressBarStatus.Value = (int)Math.Round(percentComplete);
}
#endregion