X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=2f1467625931789930468ba84439032b443be03b;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=7f46139a260700c2cddb31571b414922e9f03693;hpb=46ef431ee18da11b72c337b0148d4d7c8fd8a52a;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7f46139a..2f146762 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,20 +12,30 @@ namespace Handbrake
using System.Drawing;
using System.Globalization;
using System.IO;
- using System.Reflection;
using System.Threading;
using System.Windows.Forms;
using Functions;
+ using HandBrake.Framework.Model;
+ using HandBrake.Framework.Services;
+ using HandBrake.Framework.Views;
+ using HandBrake.ApplicationServices.Functions;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Parsing;
using HandBrake.ApplicationServices.Services;
using HandBrake.ApplicationServices.Services.Interfaces;
+ using Handbrake.ToolWindows;
+
using Model;
using Presets;
using Properties;
+ using Main = Handbrake.Functions.Main;
+
+ ///
+ /// The Main Window
+ ///
public partial class frmMain : Form
{
// Objects which may be used by one or more other objects *************
@@ -36,7 +46,6 @@ namespace Handbrake
private frmQueue queueWindow;
private frmPreview qtpreview;
private frmActivityWindow activityWindow;
- private frmSplashScreen splash = new frmSplashScreen();
// Globals: Mainly used for tracking. *********************************
public Title selectedTitle;
@@ -68,6 +77,11 @@ namespace Handbrake
return this.dvdDriveLabel;
}
+ if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
+ {
+ return Path.GetFileName(selectedTitle.SourceName);
+ }
+
if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
return Path.GetFileNameWithoutExtension(this.sourcePath);
@@ -87,72 +101,59 @@ namespace Handbrake
///
public frmMain(string[] args)
{
- // Load and setup the splash screen in this thread
- splash.Show(this);
- Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };
- splash.Controls.Add(lblStatus);
-
InitializeComponent();
// Update the users config file with the CLI version data.
- UpdateSplashStatus(lblStatus, "Checking CLI Version Data ...");
Main.SetCliVersionData();
- Main.CheckForValidCliVersion();
if (Settings.Default.hb_version.Contains("svn"))
{
- Version v = Assembly.GetExecutingAssembly().GetName().Version;
- this.Text += " " + v.ToString(4);
+ this.Text += " " + Settings.Default.hb_version;
}
- // Show the form, but leave disabled until preloading is complete then show the main form)
- this.Enabled = false;
- this.Show();
- Application.DoEvents(); // Forces frmMain to draw
-
// Check for new versions, if update checking is enabled
- if (Properties.Settings.Default.updateStatus)
+ if (Settings.Default.updateStatus)
{
- DateTime now = DateTime.Now;
- DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate;
- TimeSpan elapsed = now.Subtract(lastCheck);
- if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)
+ if (DateTime.Now.Subtract(Settings.Default.lastUpdateCheckDate).TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)
{
- UpdateSplashStatus(lblStatus, "Checking for updates ...");
- Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);
+ // Set when the last update was
+ Settings.Default.lastUpdateCheckDate = DateTime.Now;
+ Settings.Default.Save();
+ string url = Settings.Default.hb_build.ToString().EndsWith("1")
+ ? Settings.Default.appcast_unstable
+ : Settings.Default.appcast;
+ UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false, url, Settings.Default.hb_build, Settings.Default.skipversion, Settings.Default.hb_version);
}
}
// Clear the log files in the background
- if (Properties.Settings.Default.clearOldLogs)
+ if (Settings.Default.clearOldLogs)
{
- UpdateSplashStatus(lblStatus, "Clearing Old Log Files ..");
Thread clearLog = new Thread(Main.ClearOldLogs);
clearLog.Start();
}
// Setup the GUI components
- UpdateSplashStatus(lblStatus, "Setting up the GUI ...");
LoadPresetPanel(); // Load the Preset Panel
treeView_presets.ExpandAll();
lbl_encode.Text = string.Empty;
drop_mode.SelectedIndex = 0;
queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue
- if (!Properties.Settings.Default.QueryEditorTab)
+ if (!Settings.Default.QueryEditorTab)
tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.
- if (Properties.Settings.Default.tooltipEnable)
+ if (Settings.Default.tooltipEnable)
ToolTip.Active = true;
// Load the user's default settings or Normal Preset
- if (Properties.Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
+ if (Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
{
- string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;
+ string query = presetHandler.GetPreset(Settings.Default.defaultPreset).Query;
if (query != null)
{
x264Panel.Reset2Defaults();
QueryParser presetQuery = QueryParser.Parse(query);
- PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset);
+ PresetLoader.LoadPreset(this, presetQuery, Settings.Default.defaultPreset);
x264Panel.StandardizeOptString();
x264Panel.SetCurrentSettingsInPanel();
@@ -164,15 +165,9 @@ namespace Handbrake
// Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)
GrowlCommunicator.Register();
- // Finished Loading
- UpdateSplashStatus(lblStatus, "Loading Complete.");
- splash.Close();
- splash.Dispose();
- this.Enabled = true;
-
// Event Handlers and Queue Recovery
events();
- queueRecovery();
+ Main.RecoverQueue(encodeQueue);
// If have a file passed in via command arguemtents, check it's a file and try scanning it.
if (args.Length >= 1 && (File.Exists(args[0]) || Directory.Exists(args[0])))
@@ -181,6 +176,10 @@ namespace Handbrake
}
}
+ ///
+ /// When the update check is done, process the results.
+ ///
+ /// IAsyncResult result
private void UpdateCheckDone(IAsyncResult result)
{
if (InvokeRequired)
@@ -189,15 +188,13 @@ namespace Handbrake
return;
}
- UpdateCheckInformation info;
-
try
{
- info = Main.EndCheckForUpdates(result);
+ UpdateCheckInformation info = UpdateService.EndCheckForUpdates(result);
if (info.NewVersionAvailable)
{
- frmUpdater updateWindow = new frmUpdater(info.BuildInformation);
+ UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
updateWindow.ShowDialog();
}
}
@@ -208,34 +205,6 @@ namespace Handbrake
}
}
- // Startup Functions
- private void queueRecovery()
- {
- if (Main.CheckQueueRecovery())
- {
- DialogResult result =
- MessageBox.Show(
- "HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?",
- "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-
- if (result == DialogResult.Yes)
- encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery
- else
- {
- // Remove the Queue recovery file if the user doesn't want to recovery the last queue.
- string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");
- if (File.Exists(queuePath))
- File.Delete(queuePath);
- }
- }
- }
-
- private void UpdateSplashStatus(Label status, string text)
- {
- status.Text = text;
- Application.DoEvents();
- }
-
#endregion
#region Events
@@ -254,6 +223,10 @@ namespace Handbrake
encodeQueue.EncodeStarted += new EventHandler(encodeStarted);
encodeQueue.EncodeEnded += new EventHandler(encodeEnded);
+ // Scan Started and Completed Events
+ SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
+ SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
+
// Handle a file being draged onto the GUI.
this.DragEnter += new DragEventHandler(frmMain_DragEnter);
this.DragDrop += new DragEventHandler(frmMain_DragDrop);
@@ -423,8 +396,7 @@ namespace Handbrake
///
private void mnu_encodeLog_Click(object sender, EventArgs e)
{
- frmActivityWindow dvdInfoWindow = new frmActivityWindow(encodeQueue, SourceScan);
- dvdInfoWindow.Show();
+ this.btn_ActivityWindow_Click(this, null);
}
///
@@ -576,7 +548,12 @@ namespace Handbrake
private void mnu_UpdateCheck_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);
}
///
@@ -820,6 +797,29 @@ namespace Handbrake
}
///
+ /// When the mouse moves, display a preset
+ ///
+ /// The Sender
+ /// the MouseEventArgs
+ private void TreeViewPresetsMouseMove(object sender, MouseEventArgs e)
+ {
+ TreeNode theNode = this.treeView_presets.GetNodeAt(e.X, e.Y);
+
+ if ((theNode != null))
+ {
+ // Change the ToolTip only if the pointer moved to a new node.
+ if (theNode.ToolTipText != this.ToolTip.GetToolTip(this.treeView_presets))
+ {
+ this.ToolTip.SetToolTip(this.treeView_presets, theNode.ToolTipText);
+ }
+ }
+ else // Pointer is not over a node so clear the ToolTip.
+ {
+ this.ToolTip.SetToolTip(this.treeView_presets, string.Empty);
+ }
+ }
+
+ ///
/// Preset Bar - Handle the Delete Key
///
///
@@ -939,7 +939,7 @@ namespace Handbrake
PresetLoader.LoadPreset(this, parsed, parsed.PresetName);
if (presetHandler.Add(parsed.PresetName + " (Imported)",
QueryGenerator.GenerateFullQuery(this),
- parsed.UsesPictureSettings))
+ parsed.UsesPictureSettings, string.Empty))
{
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)")
{
@@ -956,15 +956,10 @@ namespace Handbrake
///
private void ExportPreset()
{
- MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning);
- return;
-
- SaveFileDialog savefiledialog = new SaveFileDialog();
- savefiledialog.Filter = "plist|*.plist";
+ SaveFileDialog savefiledialog = new SaveFileDialog { Filter = "plist|*.plist" };
if (treeView_presets.SelectedNode != null)
{
-
if (savefiledialog.ShowDialog() == DialogResult.OK)
{
Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text);
@@ -1136,7 +1131,64 @@ namespace Handbrake
///
private void btn_add2Queue_Click(object sender, EventArgs e)
{
- // Get the CLI query or use the query editor if it's not empty.
+ // 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)
+ {
+ 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)
+ {
+ if (title.Duration.TotalMinutes > min && title.Duration.TotalMinutes < max)
+ {
+ // Add to Queue
+ this.drp_dvdtitle.SelectedItem = title;
+
+ if (!this.AddItemToQueue(false))
+ {
+ errors = true;
+ }
+ }
+ }
+
+ if (errors)
+ {
+ MessageBox.Show(
+ "One or more items could not be added to the queue. You should check your queue and manually add any missing jobs.",
+ "Warning",
+ MessageBoxButtons.OK,
+ MessageBoxIcon.Warning);
+ }
+ }
+ }
+
+ private bool AddItemToQueue(bool showError)
+ {
string query = QueryGenerator.GenerateFullQuery(this);
if (!string.IsNullOrEmpty(rtf_query.Text))
query = rtf_query.Text;
@@ -1148,34 +1200,48 @@ namespace Handbrake
// Make sure we have a Source and Destination.
if (string.IsNullOrEmpty(jobSourcePath) || string.IsNullOrEmpty(jobDestination))
{
- MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
- return;
+ 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)))
{
- MessageBox.Show("Destination Path does not exist.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
- return;
+ if (showError)
+ MessageBox.Show(string.Format("Destination Path does not exist.\nPath: {0}\n\nThis item was not added to the Queue.", Path.GetDirectoryName(jobDestination)), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ return false;
}
// Make sure we don't have a duplciate on the queue.
if (encodeQueue.CheckForDestinationDuplicate(jobDestination))
{
- 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?",
- "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
- if (result == DialogResult.Yes)
- encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty));
+ if (showError)
+ {
+ DialogResult result;
+ result =
+ MessageBox.Show(
+ 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
+ {
+ return false;
+ }
}
- else
- encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty));
- lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";
+ // Add the job.
+ encodeQueue.Add(query, this.GetTitle(), jobSourcePath, jobDestination, (rtf_query.Text != string.Empty));
- queueWindow.Show();
+ lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";
+ return true;
}
///
@@ -1306,29 +1372,31 @@ namespace Handbrake
#region Main Window and Tab Control
// Source
- private void btn_dvd_source_Click(object sender, EventArgs e)
+ private void BtnFolderScanClicked(object sender, EventArgs e)
{
+ this.btn_source.HideDropDown();
if (DVD_Open.ShowDialog() == DialogResult.OK)
{
this.selectedSourceType = SourceType.Folder;
- SelectSource(DVD_Open.SelectedPath);
+ SelectSource(DVD_Open.SelectedPath, 0);
}
else
UpdateSourceLabel();
}
- private void btn_file_source_Click(object sender, EventArgs e)
+ private void BtnFileScanClicked(object sender, EventArgs e)
{
+ this.btn_source.HideDropDown();
if (ISO_Open.ShowDialog() == DialogResult.OK)
{
this.selectedSourceType = SourceType.VideoFile;
- SelectSource(ISO_Open.FileName);
+ SelectSource(ISO_Open.FileName, 0);
}
else
UpdateSourceLabel();
}
- private void mnu_dvd_drive_Click(object sender, EventArgs e)
+ private void MnuDvdDriveClick(object sender, EventArgs e)
{
ToolStripMenuItem item = sender as ToolStripMenuItem;
if (item != null)
@@ -1337,18 +1405,55 @@ namespace Handbrake
int id;
if (int.TryParse(driveId, out id))
{
-
this.dvdDrivePath = drives[id].RootDirectory;
this.dvdDriveLabel = drives[id].VolumeLabel;
if (this.dvdDrivePath == null) return;
this.selectedSourceType = SourceType.DvdDrive;
- SelectSource(this.dvdDrivePath);
+ SelectSource(this.dvdDrivePath, 0);
+ }
+ }
+ }
+
+ private void 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)
+ private void SelectSource(string file, int titleSpecific)
{
Check_ChapterMarkers.Enabled = true;
sourcePath = string.Empty;
@@ -1360,7 +1465,7 @@ namespace Handbrake
}
sourcePath = Path.GetFileName(file);
- StartScan(file, 0);
+ StartScan(file, titleSpecific);
}
private void drp_dvdtitle_Click(object sender, EventArgs e)
@@ -1398,6 +1503,12 @@ namespace Handbrake
for (int i = 1; i <= selectedTitle.AngleCount; i++)
drop_angle.Items.Add(i.ToString());
+ if (drop_angle.Items.Count == 0)
+ {
+ drop_angle.Visible = false;
+ lbl_angle.Visible = false;
+ }
+
if (drop_angle.Items.Count != 0)
drop_angle.SelectedIndex = 0;
}
@@ -1420,7 +1531,7 @@ namespace Handbrake
drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();
// Populate the Audio Channels Dropdown
- AudioSettings.SetTrackList(selectedTitle, this.currentlySelectedPreset);
+ AudioSettings.SetTrackListFromPreset(selectedTitle, this.currentlySelectedPreset);
// Populate the Subtitles dropdown
Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());
@@ -1428,7 +1539,7 @@ namespace Handbrake
// Update the source label if we have multiple streams
if (selectedTitle != null)
if (!string.IsNullOrEmpty(selectedTitle.SourceName))
- labelSource.Text = labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
+ labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
// Run the AutoName & ChapterNaming functions
if (Properties.Settings.Default.autoNaming)
@@ -1438,14 +1549,14 @@ namespace Handbrake
text_destination.Text = autoPath;
else
MessageBox.Show(
- "You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')",
+ "You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a valid default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')",
"Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
data_chpt.Rows.Clear();
if (selectedTitle.Chapters.Count != 1)
{
- DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text);
+ DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);
if (chapterGridView != null)
data_chpt = chapterGridView;
}
@@ -1810,7 +1921,7 @@ namespace Handbrake
}
}
- private double _cachedCqStep = Properties.Settings.Default.x264cqstep;
+ private double cachedCqStep = Properties.Settings.Default.x264cqstep;
///
/// Update the CQ slider for x264 for a new CQ step. This is set from option
@@ -1818,7 +1929,7 @@ namespace Handbrake
public void setQualityFromSlider()
{
// Work out the current RF value.
- double cqStep = _cachedCqStep;
+ double cqStep = this.cachedCqStep;
double rfValue = 51.0 - slider_videoQuality.Value * cqStep;
// Change the maximum value for the slider
@@ -1837,7 +1948,7 @@ namespace Handbrake
}
// Cache the CQ step for the next calculation
- _cachedCqStep = Properties.Settings.Default.x264cqstep;
+ this.cachedCqStep = Properties.Settings.Default.x264cqstep;
}
private void slider_videoQuality_Scroll(object sender, EventArgs e)
@@ -1947,7 +2058,7 @@ namespace Handbrake
private void mnu_resetChapters_Click(object sender, EventArgs e)
{
data_chpt.Rows.Clear();
- DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text);
+ DataGridView chapterGridView = Main.ChapterNaming(selectedTitle, data_chpt, drop_chapterFinish.Text);
if (chapterGridView != null)
{
data_chpt = chapterGridView;
@@ -1991,8 +2102,6 @@ namespace Handbrake
try
{
SourceScan.Scan(sourcePath, title);
- SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
- SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
}
catch (Exception exc)
{
@@ -2038,7 +2147,7 @@ namespace Handbrake
BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel));
return;
}
- lbl_encode.Text = SourceScan.ScanStatus;
+ labelSource.Text = SourceScan.ScanStatus;
}
///
@@ -2119,7 +2228,6 @@ namespace Handbrake
{
if (InvokeRequired)
BeginInvoke(new UpdateWindowHandler(EnableGUI));
- lbl_encode.Text = "Scan Completed";
foreach (Control ctrl in Controls)
ctrl.Enabled = true;
btn_start.Enabled = true;
@@ -2144,8 +2252,9 @@ namespace Handbrake
if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))
ctrl.Enabled = false;
- lbl_encode.Visible = true;
- lbl_encode.Text = "Scanning ...";
+ labelSource.Enabled = true;
+ labelStaticSource.Enabled = true;
+ SourceLayoutPanel.Enabled = true;
btn_source.Enabled = false;
btn_start.Enabled = false;
btn_showQueue.Enabled = false;
@@ -2165,7 +2274,7 @@ namespace Handbrake
SourceScan.Stop();
- lbl_encode.Text = "Scan Cancelled!";
+ labelSource.Text = "Scan Cancelled";
}
///
@@ -2189,11 +2298,6 @@ namespace Handbrake
private void UpdateSourceLabel()
{
labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;
-
- if (selectedTitle != null)
- if (!string.IsNullOrEmpty(selectedTitle.SourceName))
- // If it's one of multiple source files, make sure we don't use the folder name
- labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
}
///
@@ -2310,11 +2414,12 @@ namespace Handbrake
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,
+ encodeQueue.Count);
ProgressBarStatus.Value = (int)Math.Round(e.PercentComplete);
}
@@ -2343,7 +2448,7 @@ namespace Handbrake
Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")",
Image = Resources.disc_small
};
- menuItem.Click += new EventHandler(mnu_dvd_drive_Click);
+ menuItem.Click += new EventHandler(MnuDvdDriveClick);
menuItems.Add(menuItem);
}
@@ -2362,8 +2467,8 @@ namespace Handbrake
private void LoadPresetPanel()
{
if (presetHandler.CheckIfPresetsAreOutOfDate())
- if (!Properties.Settings.Default.presetNotification)
- MessageBox.Show(splash,
+ if (!Settings.Default.presetNotification)
+ MessageBox.Show(this,
"HandBrake has determined your built-in presets are out of date... These presets will now be updated.",
"Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -2407,11 +2512,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
@@ -2447,7 +2552,7 @@ namespace Handbrake
return true;
}
- if (keyData == (Keys.Control | Keys.A))
+ if (keyData == (Keys.Control | Keys.Shift | Keys.A))
{
btn_add2Queue_Click(this, new EventArgs());
return true;
@@ -2461,33 +2566,41 @@ namespace Handbrake
/// FormClosingEventArgs
protected override void OnFormClosing(FormClosingEventArgs e)
{
- // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.
- if (encodeQueue.IsEncoding)
+ try
{
- DialogResult result =
- MessageBox.Show(
- "HandBrake has queue items to process. Closing HandBrake will stop the current encoding.\n\nDo you want to close HandBrake?",
- "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-
- if (result == DialogResult.No)
+ // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.
+ if (encodeQueue.IsEncoding)
{
- e.Cancel = true;
- return;
- }
+ 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;
+ return;
+ }
- // Try to safely close out if we can, or kill the cli if using in-gui status
- if (!Settings.Default.showCliForInGuiEncodeStatus)
encodeQueue.Stop();
- else
- encodeQueue.SafelyClose();
- }
+ }
- if (SourceScan.IsScanning)
+ if (SourceScan.IsScanning)
+ {
+ SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
+ SourceScan.Stop();
+ }
+ }
+ 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