diff options
| author | sr55 <[email protected]> | 2010-05-23 15:35:57 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-05-23 15:35:57 +0000 |
| commit | a28717d0b3d41674934d6e0e24ee70344576fb1e (patch) | |
| tree | f82bcc5c983d0de0bf83a4fc65800926a83cbe76 | |
| parent | f89416ee188a36566bd420d36488d1110a7ca1d5 (diff) | |
WinGui:
- Added some new events to the Queue for future refactoring.
- Refactor / Cleanup / Remove more stylecop warnings.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3315 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Controls/Filters.cs | 4 | ||||
| -rw-r--r-- | win/C#/Controls/Subtitles.cs | 11 | ||||
| -rw-r--r-- | win/C#/Controls/x264Panel.cs | 35 | ||||
| -rw-r--r-- | win/C#/Functions/Main.cs | 16 | ||||
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 2 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 1 | ||||
| -rw-r--r-- | win/C#/Functions/System.cs | 2 | ||||
| -rw-r--r-- | win/C#/Functions/Win32.cs | 14 | ||||
| -rw-r--r-- | win/C#/Presets/PlistPresetHandler.cs | 1 | ||||
| -rw-r--r-- | win/C#/Program.cs | 15 | ||||
| -rw-r--r-- | win/C#/Services/Queue.cs | 123 | ||||
| -rw-r--r-- | win/C#/frmAbout.cs | 18 | ||||
| -rw-r--r-- | win/C#/frmDownload.cs | 6 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 622 | ||||
| -rw-r--r-- | win/C#/frmPreview.cs | 1 | ||||
| -rw-r--r-- | win/C#/frmQueue.Designer.cs | 12 | ||||
| -rw-r--r-- | win/C#/frmQueue.cs | 5 |
17 files changed, 657 insertions, 231 deletions
diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs index c8427bb98..9f75f69d3 100644 --- a/win/C#/Controls/Filters.cs +++ b/win/C#/Controls/Filters.cs @@ -1,5 +1,4 @@ /* Filters.cs $
-
This file is part of the HandBrake source code.
Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
@@ -30,7 +29,7 @@ namespace Handbrake.Controls }
/// <summary>
- /// Returns the CLI query for the query generator.
+ /// Gets the CLI query for the query generator.
/// </summary>
public string GetCliQuery
{
@@ -54,7 +53,6 @@ namespace Handbrake.Controls break;
}
-
switch (drop_decomb.Text) // Decomb
{
case "Off":
diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs index 3326ee74e..fc9315757 100644 --- a/win/C#/Controls/Subtitles.cs +++ b/win/C#/Controls/Subtitles.cs @@ -84,7 +84,6 @@ namespace Handbrake.Controls ? srtLangVal + " (" + srtFile + ")"
: drp_subtitleTracks.SelectedItem.ToString();
-
SubtitleInfo track = new SubtitleInfo
{
Track = trackName,
@@ -433,7 +432,7 @@ namespace Handbrake.Controls /// Automatically setup the subtitle tracks.
/// This handles the automatic setup of subitles which the user can control from the program options
/// </summary>
- /// <param name="subs"></param>
+ /// <param name="subs">List of Subtitles</param>
public void SetSubtitleTrackAuto(object[] subs)
{
drp_subtitleTracks.Items.Clear();
@@ -464,7 +463,7 @@ namespace Handbrake.Controls /// <summary>
/// Set the file container which is currently in use.
/// </summary>
- /// <param name="value"></param>
+ /// <param name="value">The File Container</param>
public void SetContainer(int value)
{
fileContainer = value;
@@ -484,16 +483,16 @@ namespace Handbrake.Controls /// <summary>
/// Get the list of subtitles.
/// </summary>
- /// <returns></returns>
+ /// <returns>A List of SubtitleInfo Object</returns>
public List<SubtitleInfo> GetSubtitleInfoList()
{
return subList;
}
/// <summary>
- /// Get the CLI Query for this panel
+ /// Gets the CLI Query for this panel
/// </summary>
- /// <returns></returns>
+ /// <returns>A CliQuery string</returns>
public string GetCliQuery
{
get
diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs index 4b943e32f..a3bfd7a56 100644 --- a/win/C#/Controls/x264Panel.cs +++ b/win/C#/Controls/x264Panel.cs @@ -353,6 +353,9 @@ namespace Handbrake.Controls /// <summary>
/// This function will update the X264 Query when one of the GUI widgets changes.
/// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
private void OnX264WidgetChange(string sender)
{
Animate(sender);
@@ -376,8 +379,8 @@ namespace Handbrake.Controls /// Called when the current x264 option string contains multiple (or a single) item(s) in it seperated by :
/// it updates the current option that the widget corrosponds to, if it is already in thes string.
/// </summary>
- /// <param name="currentOptString"></param>
- /// <param name="optNameToChange"></param>
+ /// <param name="currentOptString">The Current Option String</param>
+ /// <param name="optNameToChange">Name of the option to change</param>
private void HasOptions(string currentOptString, string optNameToChange)
{
string thisOpt; // The separated option such as "bframes=3"
@@ -440,8 +443,8 @@ namespace Handbrake.Controls thisOpt = string.Empty;
else
{
- double psyrd = slider_psyrd.Value*0.1;
- double psytre = slider_psytrellis.Value*0.1;
+ double psyrd = slider_psyrd.Value * 0.1;
+ double psytre = slider_psytrellis.Value * 0.1;
string rd = psyrd.ToString("f1");
string rt = psytre.ToString("f1");
@@ -592,7 +595,7 @@ namespace Handbrake.Controls /// Handles 2 cases. 1 Where rtf_x264Query.Text is empty, and one where there is an option with no value,
/// e.g no-fast-pskip
/// </summary>
- /// <param name="optNameToChange"></param>
+ /// <param name="optNameToChange">The Option Name to Change</param>
private void HasNoOptions(IEquatable<string> optNameToChange)
{
string colon = string.Empty;
@@ -705,8 +708,8 @@ namespace Handbrake.Controls query += string.Empty;
else
{
- double psyrd = slider_psyrd.Value*0.1;
- double psytre = slider_psytrellis.Value*0.1;
+ double psyrd = slider_psyrd.Value * 0.1;
+ double psytre = slider_psytrellis.Value * 0.1;
string rd = psyrd.ToString("f1");
string rt = psytre.ToString("f1");
@@ -780,17 +783,17 @@ namespace Handbrake.Controls /// <summary>
/// Shows and hides controls based on the values of other controls.
/// </summary>
- /// <param name="sender"></param>
+ /// <param name="sender">The Sender</param>
private void Animate(string sender)
{
/* Lots of situations to cover.
- - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)
- - CABAC (when 0 turn off trellis)
- - analysis (if none, turn off 8x8dct)
- - refs (under 2, disable mixed-refs)
- - subme (if under 6, turn off psy-rd and psy-trel)
- - trellis (if 0, turn off psy-trel)
- */
+ - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)
+ - CABAC (when 0 turn off trellis)
+ - analysis (if none, turn off 8x8dct)
+ - refs (under 2, disable mixed-refs)
+ - subme (if under 6, turn off psy-rd and psy-trel)
+ - trellis (if 0, turn off psy-trel)
+ */
switch (sender)
{
@@ -893,7 +896,6 @@ namespace Handbrake.Controls slider_psyrd.Value = 10;
lbl_psyrd.Visible = false;
-
slider_psytrellis.Visible = false;
slider_psytrellis.Value = 0;
lbl_psytrellis.Visible = false;
@@ -931,7 +933,6 @@ namespace Handbrake.Controls }
}
-
private void widgetControlChanged(object sender, EventArgs e)
{
Control changedControlName = (Control) sender;
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index 6d960efcf..d7380b2b1 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -815,5 +815,21 @@ namespace Handbrake.Functions return sb.ToString().Trim();
}
+
+ /// <summary>
+ /// Show the Exception Window
+ /// </summary>
+ /// <param name="shortError">
+ /// The short error.
+ /// </param>
+ /// <param name="longError">
+ /// The long error.
+ /// </param>
+ public static void ShowExceptiowWindow(string shortError, string longError)
+ {
+ frmExceptionWindow exceptionWindow = new frmExceptionWindow();
+ exceptionWindow.Setup(shortError, longError);
+ exceptionWindow.Show();
+ }
}
}
\ No newline at end of file diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index e2762af12..f10bd0073 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -232,7 +232,7 @@ namespace Handbrake.Functions break;
case "H.264 (x264)":
double cqStep = Properties.Settings.Default.x264cqstep;
- sliderValue = (int)((51.0 / cqStep) - (value/cqStep));
+ sliderValue = (int)((51.0 / cqStep) - (value / cqStep));
break;
case "VP3 (Theora)":
sliderValue = (int)value;
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index 2edfc9e30..e4557df6f 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -442,7 +442,6 @@ namespace Handbrake.Functions if (Properties.Settings.Default.noDvdNav)
query += " --no-dvdnav";
-
return query;
}
diff --git a/win/C#/Functions/System.cs b/win/C#/Functions/System.cs index 212579ebc..fb830fb8d 100644 --- a/win/C#/Functions/System.cs +++ b/win/C#/Functions/System.cs @@ -25,7 +25,7 @@ namespace Handbrake.Functions Win32.GlobalMemoryStatus(ref memStatus);
uint memoryInfo = memStatus.dwTotalPhys;
- memoryInfo = memoryInfo/1024/1024;
+ memoryInfo = memoryInfo / 1024 / 1024;
return memoryInfo;
}
diff --git a/win/C#/Functions/Win32.cs b/win/C#/Functions/Win32.cs index e7da9d5b6..89a0c29bb 100644 --- a/win/C#/Functions/Win32.cs +++ b/win/C#/Functions/Win32.cs @@ -3,7 +3,6 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-
namespace Handbrake.Functions
{
using System;
@@ -63,6 +62,7 @@ namespace Handbrake.Functions public UInt32 dwMemoryLoad;
/// <summary>
+ /// Total Physical Memory
/// </summary>
public UInt32 dwTotalPhys; // Used
@@ -104,6 +104,18 @@ namespace Handbrake.Functions ref MEMORYSTATUS lpBuffer
);
+ /// <summary>
+ /// Generate a Console Ctrl Event
+ /// </summary>
+ /// <param name="sigevent">
+ /// The sigevent.
+ /// </param>
+ /// <param name="dwProcessGroupId">
+ /// The dw process group id.
+ /// </param>
+ /// <returns>
+ /// Bool true is sucess
+ /// </returns>
[DllImport("kernel32.dll", SetLastError = true)]
public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);
diff --git a/win/C#/Presets/PlistPresetHandler.cs b/win/C#/Presets/PlistPresetHandler.cs index 601065c53..a030cfd44 100644 --- a/win/C#/Presets/PlistPresetHandler.cs +++ b/win/C#/Presets/PlistPresetHandler.cs @@ -31,7 +31,6 @@ namespace Handbrake.Presets QueryParser queryParsed = new QueryParser();
string qualityMode = string.Empty;
-
#region Get a List of Audio Track Objects
XmlNode audioListDict = root.ChildNodes[2].ChildNodes[0].FirstChild.ChildNodes[1];
ArrayList audioTracks = new ArrayList();
diff --git a/win/C#/Program.cs b/win/C#/Program.cs index 3ce379ea4..fa186744d 100644 --- a/win/C#/Program.cs +++ b/win/C#/Program.cs @@ -24,21 +24,24 @@ namespace Handbrake [STAThread]
public static void Main()
{
+ // Handle any unhandled exceptions
+ AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
+ // Attempt to upgrade / keep the users settings between versions
if (Settings.Default.UpdateRequired)
{
Settings.Default.Upgrade();
Settings.Default.UpdateRequired = false;
}
- AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
-
- const string failedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";
- const string nightlyCLIMissing =
+ // Make sure we have any pre-requesits before trying to launch
+ const string FailedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";
+ const string NightlyCLIMissing =
"If you have downloaded the \"HandBrakeGUI\" nightly, " +
"please make sure you have also downloaded the \"HandBrakeCLI\" nightly and extracted it's contents to the same folder. ";
string missingFiles = string.Empty;
- // Verify HandBrakeCLI.exe and ilibgcc_s_sjlj-1.dll exists
+ // Verify HandBrakeCLI.exe exists
if (!File.Exists(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe")))
{
missingFiles += "\"HandBrakeCLI.exe\" was not found.";
@@ -47,7 +50,7 @@ namespace Handbrake if (missingFiles != string.Empty)
{
MessageBox.Show(
- failedInstall + missingFiles + "\n\n" + nightlyCLIMissing,
+ FailedInstall + missingFiles + "\n\n" + NightlyCLIMissing,
"Error",
MessageBoxButtons.OK,
MessageBoxIcon.Error);
diff --git a/win/C#/Services/Queue.cs b/win/C#/Services/Queue.cs index 695b585d6..d3d943024 100644 --- a/win/C#/Services/Queue.cs +++ b/win/C#/Services/Queue.cs @@ -9,6 +9,7 @@ namespace Handbrake.Services using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
+ using System.Linq;
using System.Threading;
using System.Windows.Forms;
using System.Xml.Serialization;
@@ -36,6 +37,17 @@ namespace Handbrake.Services private int nextJobId;
/// <summary>
+ /// Fires when the Queue has started
+ /// </summary>
+ public event EventHandler QueueStarted;
+
+ /// <summary>
+ /// Fires when a job is Added, Removed or Re-Ordered.
+ /// Should be used for triggering an update of the Queue Window.
+ /// </summary>
+ public event EventHandler QueueListChanged;
+
+ /// <summary>
/// Fires when a pause to the encode queue has been requested.
/// </summary>
public event EventHandler QueuePauseRequested;
@@ -45,22 +57,17 @@ namespace Handbrake.Services /// </summary>
public event EventHandler QueueCompleted;
- #region Queue
-
+ #region Properties
/// <summary>
- /// Gets and removes the next job in the queue.
+ /// Gets or sets the last encode that was processed.
/// </summary>
- /// <returns>The job that was removed from the queue.</returns>
- private Job GetNextJob()
- {
- Job job = this.queue[0];
- this.LastEncode = job;
- this.Remove(0); // Remove the item which we are about to pass out.
-
- this.WriteQueueStateToFile("hb_queue_recovery.xml");
+ /// <returns></returns>
+ public Job LastEncode { get; set; }
- return job;
- }
+ /// <summary>
+ /// Gets a value indicating whether Request Pause
+ /// </summary>
+ public bool Paused { get; private set; }
/// <summary>
/// Gets the current state of the encode queue.
@@ -77,6 +84,24 @@ namespace Handbrake.Services {
get { return this.queue.Count; }
}
+ #endregion
+
+ #region Queue
+
+ /// <summary>
+ /// Gets and removes the next job in the queue.
+ /// </summary>
+ /// <returns>The job that was removed from the queue.</returns>
+ private Job GetNextJob()
+ {
+ Job job = this.queue[0];
+ this.LastEncode = job;
+ this.Remove(0); // Remove the item which we are about to pass out.
+
+ this.WriteQueueStateToFile("hb_queue_recovery.xml");
+
+ return job;
+ }
/// <summary>
/// Adds an item to the queue.
@@ -102,14 +127,17 @@ namespace Handbrake.Services {
Id = this.nextJobId++,
Title = title,
- Query = query,
- Source = source,
- Destination = destination,
+ Query = query,
+ Source = source,
+ Destination = destination,
CustomQuery = customJob
};
this.queue.Add(newJob);
this.WriteQueueStateToFile("hb_queue_recovery.xml");
+
+ if (this.QueueListChanged != null)
+ this.QueueListChanged(this, new EventArgs());
}
/// <summary>
@@ -120,6 +148,9 @@ namespace Handbrake.Services {
this.queue.RemoveAt(index);
this.WriteQueueStateToFile("hb_queue_recovery.xml");
+
+ if (this.QueueListChanged != null)
+ this.QueueListChanged(this, new EventArgs());
}
/// <summary>
@@ -150,6 +181,9 @@ namespace Handbrake.Services }
WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file
+
+ if (this.QueueListChanged != null)
+ this.QueueListChanged(this, new EventArgs());
}
/// <summary>
@@ -167,6 +201,9 @@ namespace Handbrake.Services }
this.WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file
+
+ if (this.QueueListChanged != null)
+ this.QueueListChanged(this, new EventArgs());
}
/// <summary>
@@ -175,7 +212,7 @@ namespace Handbrake.Services /// <param name="file">The location of the file to write the queue to.</param>
public void WriteQueueStateToFile(string file)
{
- string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
@"HandBrake\hb_queue_recovery.xml");
string tempPath = file == "hb_queue_recovery.xml" ? appDataPath : file;
@@ -184,7 +221,7 @@ namespace Handbrake.Services using (FileStream strm = new FileStream(tempPath, FileMode.Create, FileAccess.Write))
{
if (serializer == null)
- serializer = new XmlSerializer(typeof (List<Job>));
+ serializer = new XmlSerializer(typeof(List<Job>));
serializer.Serialize(strm, queue);
strm.Close();
strm.Dispose();
@@ -226,14 +263,12 @@ namespace Handbrake.Services line.WriteLine(strCmdLine);
}
- MessageBox.Show("Your batch script has been sucessfully saved.", "Status", MessageBoxButtons.OK,
+ MessageBox.Show("Your batch script has been sucessfully saved.", "Status", MessageBoxButtons.OK,
MessageBoxIcon.Asterisk);
}
- catch (Exception)
+ catch (Exception exc)
{
- MessageBox.Show(
- "Unable to write to the file. Please make sure that the location has the correct permissions for file writing.",
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ Main.ShowExceptiowWindow("Unable to write to the file. Please make sure that the location has the correct permissions for file writing.", exc.ToString());
}
}
}
@@ -244,7 +279,7 @@ namespace Handbrake.Services /// <param name="file">The location of the file to read the queue from.</param>
public void LoadQueueFromFile(string file)
{
- string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
@"HandBrake\hb_queue_recovery.xml");
string tempPath = file == "hb_queue_recovery.xml" ? appDataPath : file;
@@ -255,7 +290,7 @@ namespace Handbrake.Services if (strm.Length != 0)
{
if (serializer == null)
- serializer = new XmlSerializer(typeof (List<Job>));
+ serializer = new XmlSerializer(typeof(List<Job>));
List<Job> list = serializer.Deserialize(strm) as List<Job>;
@@ -277,13 +312,7 @@ namespace Handbrake.Services /// <returns>Whether or not the supplied destination is already in the queue.</returns>
public bool CheckForDestinationDuplicate(string destination)
{
- foreach (Job checkItem in this.queue)
- {
- if (checkItem.Destination.Contains(destination.Replace("\\\\", "\\")))
- return true;
- }
-
- return false;
+ return this.queue.Any(checkItem => checkItem.Destination.Contains(destination.Replace("\\\\", "\\")));
}
#endregion
@@ -291,17 +320,6 @@ namespace Handbrake.Services #region Encoding
/// <summary>
- /// Gets or sets the last encode that was processed.
- /// </summary>
- /// <returns></returns>
- public Job LastEncode { get; set; }
-
- /// <summary>
- /// Gets a value indicating whether Request Pause
- /// </summary>
- public bool PauseRequested { get; private set; }
-
- /// <summary>
/// Starts encoding the first job in the queue and continues encoding until all jobs
/// have been encoded.
/// </summary>
@@ -309,19 +327,22 @@ namespace Handbrake.Services {
if (this.Count != 0)
{
- if (this.PauseRequested)
- this.PauseRequested = false;
+ if (this.Paused)
+ this.Paused = false;
else
{
- this.PauseRequested = false;
+ this.Paused = false;
try
{
- Thread theQueue = new Thread(this.StartQueue) {IsBackground = true};
+ Thread theQueue = new Thread(this.StartQueue) { IsBackground = true };
theQueue.Start();
+
+ if (this.QueueStarted != null)
+ this.QueueStarted(this, new EventArgs());
}
catch (Exception exc)
{
- MessageBox.Show(exc.ToString());
+ Main.ShowExceptiowWindow("Unable to Start Queue", exc.ToString());
}
}
}
@@ -332,7 +353,7 @@ namespace Handbrake.Services /// </summary>
public void Pause()
{
- this.PauseRequested = true;
+ this.Paused = true;
if (this.QueuePauseRequested != null)
this.QueuePauseRequested(this, new EventArgs());
@@ -366,10 +387,10 @@ namespace Handbrake.Services // Growl
if (Properties.Settings.Default.growlEncode)
- GrowlCommunicator.Notify("Encode Completed",
+ GrowlCommunicator.Notify("Encode Completed",
"Put down that cocktail...\nyour Handbrake encode is done.");
- while (this.PauseRequested) // Need to find a better way of doing this.
+ while (this.Paused) // Need to find a better way of doing this.
{
Thread.Sleep(2000);
}
diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs index d5576210d..6531cf13b 100644 --- a/win/C#/frmAbout.cs +++ b/win/C#/frmAbout.cs @@ -1,6 +1,5 @@ /* frmAbout.cs $
-
- This file is part of the HandBrake source code.
+ This file is part of the HandBrake source code.
Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
@@ -9,8 +8,14 @@ namespace Handbrake using System;
using System.Windows.Forms;
+ /// <summary>
+ /// The About Window
+ /// </summary>
public partial class frmAbout : Form
{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="frmAbout"/> class.
+ /// </summary>
public frmAbout()
{
InitializeComponent();
@@ -18,6 +23,15 @@ namespace Handbrake ") - " + Properties.Settings.Default.hb_platform;
}
+ /// <summary>
+ /// Button - Close the window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_close_Click(object sender, EventArgs e)
{
this.Close();
diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs index fb2b8ab06..a3067e17d 100644 --- a/win/C#/frmDownload.cs +++ b/win/C#/frmDownload.cs @@ -1,5 +1,4 @@ /* frmDownload.cs $
-
This file is part of the HandBrake source code.
Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
@@ -29,7 +28,6 @@ namespace Handbrake private delegate void DownloadFailedCallback();
-
public frmDownload(string filename)
{
InitializeComponent();
@@ -86,10 +84,10 @@ namespace Handbrake private void UpdateProgress(long bytesRead, long totalBytes)
{
- long p = (bytesRead*100)/totalBytes;
+ long p = (bytesRead * 100) / totalBytes;
int.TryParse(p.ToString(), out _progress);
progress_download.Value = _progress;
- lblProgress.Text = (bytesRead/1024) + "k of " + (totalBytes/1024) + "k ";
+ lblProgress.Text = (bytesRead / 1024) + "k of " + (totalBytes / 1024) + "k ";
}
private void DownloadComplete()
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 043b67e48..958e1794d 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -28,12 +28,14 @@ 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 SourceType selectedSourceType;
private string dvdDrivePath;
@@ -49,12 +51,34 @@ namespace Handbrake // Applicaiton Startup ************************************************
+ #region Properties
+
+ /// <summary>
+ /// Gets SourceName.
+ /// </summary>
+ public string SourceName
+ {
+ get
+ {
+ if (this.selectedSourceType == SourceType.DvdDrive)
+ {
+ return this.dvdDriveLabel;
+ }
+
+ if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
+ return Path.GetFileNameWithoutExtension(this.sourcePath);
+
+ return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
+ }
+ }
+
+ #endregion
+
#region Application Startup
public frmMain()
{
// Load and setup the splash screen in this thread
- splash = new frmSplashScreen();
splash.Show(this);
Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };
splash.Controls.Add(lblStatus);
@@ -62,8 +86,7 @@ namespace Handbrake InitializeComponent();
// Update the users config file with the CLI version data.
- lblStatus.Text = "Checking CLI Version Data ...";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Checking CLI Version Data ...");
Main.SetCliVersionData();
Main.CheckForValidCliVersion();
@@ -86,9 +109,7 @@ namespace Handbrake TimeSpan elapsed = now.Subtract(lastCheck);
if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)
{
- lblStatus.Text = "Checking for updates ...";
- Application.DoEvents();
-
+ UpdateSplashStatus(lblStatus, "Checking for updates ...");
Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);
}
}
@@ -96,15 +117,13 @@ namespace Handbrake // Clear the log files in the background
if (Properties.Settings.Default.clearOldLogs)
{
- lblStatus.Text = "Clearing Old Log Files ...";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Clearing Old Log Files ..");
Thread clearLog = new Thread(Main.ClearOldLogs);
clearLog.Start();
}
// Setup the GUI components
- lblStatus.Text = "Setting up the GUI ...";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Setting up the GUI ...");
LoadPresetPanel(); // Load the Preset Panel
treeView_presets.ExpandAll();
lbl_encode.Text = string.Empty;
@@ -112,44 +131,33 @@ namespace Handbrake queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue
if (!Properties.Settings.Default.QueryEditorTab)
tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.
+ if (Properties.Settings.Default.tooltipEnable)
+ ToolTip.Active = true;
// Load the user's default settings or Normal Preset
- if (Properties.Settings.Default.defaultPreset != string.Empty)
+ if (Properties.Settings.Default.defaultPreset != string.Empty && presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
{
- if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)
+ string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;
+ if (query != null)
{
- string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;
- bool loadPictureSettings =
- presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings;
-
- if (query != null)
- {
- x264Panel.Reset2Defaults();
+ x264Panel.Reset2Defaults();
- QueryParser presetQuery = QueryParser.Parse(query);
- PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset,
- loadPictureSettings);
+ QueryParser presetQuery = QueryParser.Parse(query);
+ PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset,
+ presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings);
- x264Panel.X264_StandardizeOptString();
- x264Panel.X264_SetCurrentSettingsInPanel();
- }
+ x264Panel.X264_StandardizeOptString();
+ x264Panel.X264_SetCurrentSettingsInPanel();
}
- else
- loadNormalPreset();
}
else
loadNormalPreset();
- // Enabled GUI tooltip's if Required
- if (Properties.Settings.Default.tooltipEnable)
- ToolTip.Active = true;
-
// Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)
GrowlCommunicator.Register();
// Finished Loading
- lblStatus.Text = "Loading Complete!";
- Application.DoEvents();
+ UpdateSplashStatus(lblStatus, "Loading Complete.");
splash.Close();
splash.Dispose();
this.Enabled = true;
@@ -182,9 +190,7 @@ namespace Handbrake catch (Exception ex)
{
if ((bool)result.AsyncState)
- MessageBox.Show(
- "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex,
- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ Main.ShowExceptiowWindow("Unable to check for updates, Please try again later.", ex.ToString());
}
}
@@ -210,24 +216,10 @@ namespace Handbrake }
}
- #endregion
-
- #region Properties
-
- public string SourceName
+ private void UpdateSplashStatus(Label status, string text)
{
- get
- {
- if (this.selectedSourceType == SourceType.DvdDrive)
- {
- return this.dvdDriveLabel;
- }
-
- if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS")
- return Path.GetFileNameWithoutExtension(this.sourcePath);
-
- return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath));
- }
+ status.Text = text;
+ Application.DoEvents();
}
#endregion
@@ -245,7 +237,6 @@ namespace Handbrake this.Resize += new EventHandler(frmMain_Resize);
// Handle Encode Start / Finish / Pause
-
encodeQueue.QueuePauseRequested += new EventHandler(encodePaused);
encodeQueue.EncodeStarted += new EventHandler(encodeStarted);
encodeQueue.EncodeEnded += new EventHandler(encodeEnded);
@@ -265,7 +256,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel);
// Picture Settings
- // PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);
// Filter Settings
Filters.FilterSettingsChanged += new EventHandler(changePresetLabel);
@@ -294,7 +285,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel);
// Picture Settings
- // PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);
+ PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);
// Filter Settings
Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel);
@@ -333,7 +324,7 @@ namespace Handbrake if (fileList != null)
{
- if (fileList[0] != string.Empty)
+ if (!string.IsNullOrEmpty(fileList[0]))
{
this.selectedSourceType = SourceType.VideoFile;
StartScan(fileList[0], 0);
@@ -373,11 +364,29 @@ namespace Handbrake #region File Menu
+ /// <summary>
+ /// Kill The scan menu Item
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_killCLI_Click(object sender, EventArgs e)
{
KillScan();
}
+ /// <summary>
+ /// Exit the Application Menu Item
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_exit_Click(object sender, EventArgs e)
{
Application.Exit();
@@ -387,17 +396,44 @@ namespace Handbrake #region Tools Menu
+ /// <summary>
+ /// Menu - Start Button
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_encode_Click(object sender, EventArgs e)
{
queueWindow.Show();
}
+ /// <summary>
+ /// Menu - Display the Log Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_encodeLog_Click(object sender, EventArgs e)
{
frmActivityWindow dvdInfoWindow = new frmActivityWindow(encodeQueue, SourceScan);
dvdInfoWindow.Show();
}
+ /// <summary>
+ /// Menu - Display the Options Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_options_Click(object sender, EventArgs e)
{
Form options = new frmOptions(this);
@@ -408,6 +444,15 @@ namespace Handbrake #region Presets Menu
+ /// <summary>
+ /// Reset the Built in Presets
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_presetReset_Click(object sender, EventArgs e)
{
presetHandler.UpdateBuiltInPresets();
@@ -422,28 +467,72 @@ namespace Handbrake treeView_presets.ExpandAll();
}
+ /// <summary>
+ /// Delete the selected preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_delete_preset_Click(object sender, EventArgs e)
{
presetHandler.RemoveBuiltInPresets();
LoadPresetPanel(); // Reload the preset panel
}
+ /// <summary>
+ /// Select the Normal preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_SelectDefault_Click(object sender, EventArgs e)
{
loadNormalPreset();
}
+ /// <summary>
+ /// Import a plist Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_importMacPreset_Click(object sender, EventArgs e)
{
ImportPreset();
}
+ /// <summary>
+ /// Export a Plist Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_exportMacPreset_Click(object sender, EventArgs e)
{
ExportPreset();
}
-
+ /// <summary>
+ /// Create a new Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_new_preset_Click(object sender, EventArgs e)
{
Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),
@@ -455,56 +544,44 @@ namespace Handbrake #region Help Menu
+ /// <summary>
+ /// Menu - Display the User Guide Web Page
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
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");
- }
-
+ /// <summary>
+ /// Menu - Check for Updates
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
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);
- }
- }
-
+ /// <summary>
+ /// Menu - Display the About Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void mnu_about_Click(object sender, EventArgs e)
{
using (frmAbout About = new frmAbout())
@@ -517,22 +594,57 @@ namespace Handbrake #region Preset Bar
- // Right Click Menu Code
+ /// <summary>
+ /// RMenu - Expand All
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void pmnu_expandAll_Click(object sender, EventArgs e)
{
treeView_presets.ExpandAll();
}
+ /// <summary>
+ /// RMenu - Collaspe All
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void pmnu_collapse_Click(object sender, EventArgs e)
{
treeView_presets.CollapseAll();
}
+ /// <summary>
+ /// Menu - Import Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void pmnu_import_Click(object sender, EventArgs e)
{
ImportPreset();
}
+ /// <summary>
+ /// RMenu - Save Changes to Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void pmnu_saveChanges_Click(object sender, EventArgs e)
{
DialogResult result =
@@ -548,6 +660,15 @@ namespace Handbrake QueryGenerator.GenerateTabbedComponentsQuery(this), false);
}
+ /// <summary>
+ /// RMenu - Delete Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void pmnu_delete_click(object sender, EventArgs e)
{
if (treeView_presets.SelectedNode != null)
@@ -558,6 +679,15 @@ namespace Handbrake treeView_presets.Select();
}
+ /// <summary>
+ /// Preset Menu Is Opening. Setup the Menu
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void presets_menu_Opening(object sender, CancelEventArgs e)
{
// Make sure that the save menu is always disabled by default
@@ -572,12 +702,31 @@ namespace Handbrake }
// Presets Management
+
+ /// <summary>
+ /// Button - Add a preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_addPreset_Click(object sender, EventArgs e)
{
Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);
preset.ShowDialog();
}
+ /// <summary>
+ /// Button - remove a Preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_removePreset_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
@@ -593,6 +742,15 @@ namespace Handbrake treeView_presets.Select();
}
+ /// <summary>
+ /// Button - Set the selected preset as the default
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_setDefault_Click(object sender, EventArgs e)
{
if (treeView_presets.SelectedNode != null)
@@ -610,6 +768,15 @@ namespace Handbrake MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
+ /// <summary>
+ /// PresetBar Mouse Down event
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void treeview_presets_mouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
@@ -626,11 +793,29 @@ namespace Handbrake treeView_presets.Select();
}
+ /// <summary>
+ /// Preset Bar after selecting the preset
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)
{
selectPreset();
}
+ /// <summary>
+ /// Preset Bar - Handle the Delete Key
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void treeView_presets_deleteKey(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Delete)
@@ -663,6 +848,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Select the selected preset and setup the GUI
+ /// </summary>
private void selectPreset()
{
if (treeView_presets.SelectedNode != null)
@@ -698,6 +886,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Load the Normal Preset
+ /// </summary>
private void loadNormalPreset()
{
foreach (TreeNode treenode in treeView_presets.Nodes)
@@ -710,6 +901,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Import a plist preset
+ /// </summary>
private void ImportPreset()
{
if (openPreset.ShowDialog() == DialogResult.OK)
@@ -746,6 +940,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Export a plist Preset
+ /// </summary>
private void ExportPreset()
{
MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -769,6 +966,15 @@ namespace Handbrake #region ToolStrip
+ /// <summary>
+ /// Toolbar - When the Source button is clicked, Clear any DVD drives and add any available DVD drives that can be used as a source.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_source_Click(object sender, EventArgs e)
{
// Remove old Drive Menu Items.
@@ -792,6 +998,15 @@ namespace Handbrake driveInfoThread.Start();
}
+ /// <summary>
+ /// Toolbar - Start The Encode
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_start_Click(object sender, EventArgs e)
{
if (btn_start.Text == "Stop")
@@ -903,6 +1118,15 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Toolbar - Add the current job to the Queue
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_add2Queue_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
@@ -932,12 +1156,30 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Toolbar - Show the Queue
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_showQueue_Click(object sender, EventArgs e)
{
queueWindow.Show();
queueWindow.Activate();
}
+ /// <summary>
+ /// Toolbar - Show the Preview Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void tb_preview_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))
@@ -961,6 +1203,15 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Toolbar - Show the Activity log Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_ActivityWindow_Click(object sender, EventArgs e)
{
if (ActivityWindow == null || !ActivityWindow.IsHandleCreated)
@@ -974,6 +1225,15 @@ namespace Handbrake #region System Tray Icon
+ /// <summary>
+ /// Handle Resizing of the main window when deaing with the Notify Icon
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void frmMain_Resize(object sender, EventArgs e)
{
if (FormWindowState.Minimized == this.WindowState)
@@ -985,6 +1245,15 @@ namespace Handbrake notifyIcon.Visible = false;
}
+ /// <summary>
+ /// Double Click the Tray Icon
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
{
this.Visible = true;
@@ -993,6 +1262,15 @@ namespace Handbrake notifyIcon.Visible = false;
}
+ /// <summary>
+ /// Tray Icon - Restore Menu Item - Resture the Window
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void btn_restore_Click(object sender, EventArgs e)
{
this.Visible = true;
@@ -1003,7 +1281,7 @@ namespace Handbrake #endregion
- #region Tab Control
+ #region Main Window and Tab Control
// Source
private void btn_dvd_source_Click(object sender, EventArgs e)
@@ -1647,8 +1925,15 @@ namespace Handbrake #region Source Scan
- public bool isScanning { get; set; }
-
+ /// <summary>
+ /// Start the Scan Process
+ /// </summary>
+ /// <param name="filename">
+ /// The filename.
+ /// </param>
+ /// <param name="title">
+ /// The title.
+ /// </param>
private void StartScan(string filename, int title)
{
// Setup the GUI components for the scan.
@@ -1659,7 +1944,6 @@ namespace Handbrake // Start the Scan
try
{
- isScanning = true;
SourceScan.Scan(sourcePath, title);
SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged);
SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted);
@@ -1670,16 +1954,37 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Update the Status label for the scan
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void SourceScan_ScanStatusChanged(object sender, EventArgs e)
{
UpdateScanStatusLabel();
}
+ /// <summary>
+ /// Update the UI after the scan has completed
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
private void SourceScan_ScanCompleted(object sender, EventArgs e)
{
UpdateGuiAfterScan();
}
+ /// <summary>
+ /// Update the Scan Status Label
+ /// </summary>
private void UpdateScanStatusLabel()
{
if (InvokeRequired)
@@ -1690,6 +1995,9 @@ namespace Handbrake lbl_encode.Text = SourceScan.ScanStatus;
}
+ /// <summary>
+ /// Reset the GUI when the scan has completed
+ /// </summary>
private void UpdateGuiAfterScan()
{
if (InvokeRequired)
@@ -1754,6 +2062,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Enable the GUI
+ /// </summary>
private void EnableGUI()
{
try
@@ -1776,6 +2087,9 @@ namespace Handbrake }
}
+ /// <summary>
+ /// Disable the GUI
+ /// </summary>
private void DisableGUI()
{
foreach (Control ctrl in Controls)
@@ -1792,6 +2106,9 @@ namespace Handbrake mnu_killCLI.Visible = true;
}
+ /// <summary>
+ /// Kill the Scan
+ /// </summary>
private void KillScan()
{
SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted);
@@ -1803,6 +2120,9 @@ namespace Handbrake lbl_encode.Text = "Scan Cancelled!";
}
+ /// <summary>
+ /// Reset the GUI
+ /// </summary>
private void ResetGUI()
{
drp_dvdtitle.Items.Clear();
@@ -1813,9 +2133,11 @@ namespace Handbrake sourcePath = String.Empty;
text_destination.Text = String.Empty;
selectedTitle = null;
- isScanning = false;
}
+ /// <summary>
+ /// Update the Source Label
+ /// </summary>
private void UpdateSourceLabel()
{
labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;
@@ -1826,6 +2148,12 @@ namespace Handbrake labelSource.Text = Path.GetFileName(selectedTitle.SourceName);
}
+ /// <summary>
+ /// Take a job from the Queue, rescan it, and reload the GUI for that job.
+ /// </summary>
+ /// <param name="job">
+ /// The job.
+ /// </param>
public void RecievingJob(Job job)
{
string query = job.Query;
@@ -1933,10 +2261,12 @@ namespace Handbrake List<ToolStripMenuItem> menuItems = new List<ToolStripMenuItem>();
foreach (DriveInformation drive in drives)
{
- ToolStripMenuItem menuItem = new ToolStripMenuItem();
- menuItem.Name = drive.ToString();
- menuItem.Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")";
- menuItem.Image = Resources.disc_small;
+ ToolStripMenuItem menuItem = new ToolStripMenuItem
+ {
+ Name = drive.ToString(),
+ Text = drive.RootDirectory + " (" + drive.VolumeLabel + ")",
+ Image = Resources.disc_small
+ };
menuItem.Click += new EventHandler(mnu_dvd_drive_Click);
menuItems.Add(menuItem);
}
@@ -1983,6 +2313,46 @@ namespace Handbrake return title;
}
+ /// <summary>
+ /// Handle the Update Check Finishing.
+ /// </summary>
+ /// <param name="result">
+ /// The result.
+ /// </param>
+ 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
@@ -2043,7 +2413,7 @@ namespace Handbrake #endregion
- #region In-GUI Encode Status (Experimental)
+ #region In-GUI Encode Status
/// <summary>
/// Starts a new thread to monitor and process the CLI encode status
@@ -2068,31 +2438,31 @@ namespace Handbrake /// <summary>
/// Displays the Encode status in the GUI
/// </summary>
- /// <param name="Sender"></param>
- /// <param name="CurrentTask"></param>
- /// <param name="TaskCount"></param>
- /// <param name="PercentComplete"></param>
- /// <param name="CurrentFps"></param>
- /// <param name="AverageFps"></param>
- /// <param name="TimeRemaining"></param>
- private void EncodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)
+ /// <param name="sender">The sender</param>
+ /// <param name="currentTask">The current task</param>
+ /// <param name="taskCount">Number of tasks</param>
+ /// <param name="percentComplete">Percent complete</param>
+ /// <param name="currentFps">Current encode speed in fps</param>
+ /// <param name="av">Avg encode speed</param>
+ /// <param name="timeRemaining">Time Left</param>
+ private void EncodeOnEncodeProgress(object sender, int currentTask, int taskCount, float percentComplete, float currentFps, float av, TimeSpan timeRemaining)
{
if (this.InvokeRequired)
{
this.BeginInvoke(
new EncodeProgressEventHandler(EncodeOnEncodeProgress),
- new[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining });
+ new[] { sender, currentTask, taskCount, percentComplete, currentFps, av, timeRemaining });
return;
}
lbl_encode.Text =
string.Format(
- "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}",
- PercentComplete,
- CurrentFps,
- AverageFps,
- TimeRemaining);
+ "{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);
+ ProgressBarStatus.Value = (int)Math.Round(percentComplete);
}
#endregion
diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index 0be644f9f..14080bd48 100644 --- a/win/C#/frmPreview.cs +++ b/win/C#/frmPreview.cs @@ -178,7 +178,6 @@ namespace Handbrake ProgressBarStatus.Value = (int)Math.Round(PercentComplete);
}
-
private void EncodeCompleted()
{
try
diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index 12a5bccfa..e6f0a2e50 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -60,12 +60,12 @@ namespace Handbrake this.mnu_readd = new System.Windows.Forms.ToolStripMenuItem();
this.SaveFile = new System.Windows.Forms.SaveFileDialog();
this.list_queue = new System.Windows.Forms.ListView();
- this.Title = new System.Windows.Forms.ColumnHeader();
- this.Chapters = new System.Windows.Forms.ColumnHeader();
- this.Source = new System.Windows.Forms.ColumnHeader();
- this.Destination = new System.Windows.Forms.ColumnHeader();
- this.EncoderVideo = new System.Windows.Forms.ColumnHeader();
- this.Audio = new System.Windows.Forms.ColumnHeader();
+ this.Title = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.Chapters = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.Source = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.Destination = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.EncoderVideo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.Audio = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 049cf40dc..93587dba8 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -125,8 +125,6 @@ namespace Handbrake {
if (doSetQueue) SetQueue();
base.Show();
-
- // Activate();
}
/// <summary>
@@ -136,10 +134,9 @@ namespace Handbrake /// <param name="e">the EventArgs</param>
private void BtnEncodeClick(object sender, EventArgs e)
{
- if (queue.PauseRequested)
+ if (queue.Paused)
{
SetUiEncodeStarted();
- MessageBox.Show("Encoding restarted", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
if (!queue.IsEncoding)
|