From e102ca7f6cfd706c1f153b2ea7ec6b2f58ba1720 Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 7 Jul 2008 22:05:18 +0000 Subject: WinGui: - Version information now pulled from the CLI (any problems with this breaking on Vista let me know plz!) - GUI startup optimized to counter the effect of the slightly sluggish version check from CLI (above) - Added "Format" box just like the macgui. Move the Video Codec dropdown to the correct position on the video tab. - Few other changes to mimic the macgui. - Changed Functions.CLI to Functions.Encode - Cleaned up and added icons to the source menu. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1558 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/CLI.cs | 133 ------------- win/C#/Functions/Common.cs | 81 +++++++- win/C#/Functions/Encode.cs | 115 +++++++++++ win/C#/Functions/QueryParser.cs | 2 +- win/C#/HandBrakeCS.csproj | 6 +- win/C#/Parsing/Title.cs | 2 +- win/C#/Properties/Resources.Designer.cs | 14 ++ win/C#/Properties/Resources.resx | 6 + win/C#/Properties/Settings.Designer.cs | 4 +- win/C#/Properties/Settings.settings | 4 +- win/C#/Resources/ActivityWindow_small.png | Bin 0 -> 3490 bytes win/C#/Resources/disc_small.png | Bin 0 -> 3575 bytes win/C#/app.config | 4 +- win/C#/frmMain.Designer.cs | 306 +++++++++++++++++------------- win/C#/frmMain.cs | 111 +++++++---- win/C#/frmMain.resx | 17 ++ win/C#/frmQueue.cs | 2 +- win/C#/frmReadDVD.cs | 5 +- 18 files changed, 493 insertions(+), 319 deletions(-) delete mode 100644 win/C#/Functions/CLI.cs create mode 100644 win/C#/Functions/Encode.cs create mode 100644 win/C#/Resources/ActivityWindow_small.png create mode 100644 win/C#/Resources/disc_small.png (limited to 'win/C#') diff --git a/win/C#/Functions/CLI.cs b/win/C#/Functions/CLI.cs deleted file mode 100644 index 259397af3..000000000 --- a/win/C#/Functions/CLI.cs +++ /dev/null @@ -1,133 +0,0 @@ -/* CLI.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -using System; -using System.Collections.Generic; -using System.Threading; -using System.Diagnostics; -using System.Windows.Forms; -using System.Globalization; -using System.IO; -using System.Runtime.InteropServices; - -namespace Handbrake.Functions -{ - public class CLI - { - /// - /// CLI output is based on en-US locale, - /// we use this CultureInfo as IFormatProvider to *.Parse() calls - /// - static readonly public CultureInfo Culture = new CultureInfo("en-US", false); - - Process hbProc = new Process(); - - /// - /// Execute a HandBrakeCLI process. - /// - /// - /// The CLI Query - /// Rediect standard error - /// Redirect Standard output - /// Use Shell Executable - /// Display No Window - /// Returns a process - public Process runCli(object s, string query) - { - try - { - string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); - string logPath = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat"); - - string strCmdLine = String.Format(@"cmd /c """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, query, logPath); - - ProcessStartInfo cliStart = new ProcessStartInfo("CMD.exe", strCmdLine); - - hbProc = Process.Start(cliStart); - - // Set the process Priority - switch (Properties.Settings.Default.processPriority) - { - case "Realtime": - hbProc.PriorityClass = ProcessPriorityClass.RealTime; - break; - case "High": - hbProc.PriorityClass = ProcessPriorityClass.High; - break; - case "Above Normal": - hbProc.PriorityClass = ProcessPriorityClass.AboveNormal; - break; - case "Normal": - hbProc.PriorityClass = ProcessPriorityClass.Normal; - break; - case "Low": - hbProc.PriorityClass = ProcessPriorityClass.Idle; - break; - default: - hbProc.PriorityClass = ProcessPriorityClass.BelowNormal; - break; - } - } - catch - { - MessageBox.Show("Internal Software Error. Please Restart the Program"); - } - return hbProc; - } - - [DllImport("user32.dll")] - public static extern void LockWorkStation(); - [DllImport("user32.dll")] - public static extern int ExitWindowsEx(int uFlags, int dwReason); - - public void afterEncodeAction() - { - // Do something whent he encode ends. - switch (Properties.Settings.Default.CompletionOption) - { - case "Shutdown": - System.Diagnostics.Process.Start("Shutdown", "-s -t 60"); - break; - case "Log Off": - ExitWindowsEx(0, 0); - break; - case "Suspend": - Application.SetSuspendState(PowerState.Suspend, true, true); - break; - case "Hibernate": - Application.SetSuspendState(PowerState.Hibernate, true, true); - break; - case "Lock System": - LockWorkStation(); - break; - case "Quit HandBrake": - Application.Exit(); - break; - default: - break; - } - } - - /// - /// Update the presets.dat file with the latest version of HandBrak's presets from the CLI - /// - public void grabCLIPresets() - { - string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); - string presetsPath = Path.Combine(Application.StartupPath, "presets.dat"); - - string strCmdLine = String.Format(@"cmd /c """"{0}"" --preset-list >""{1}"" 2>&1""", handbrakeCLIPath, presetsPath); - - ProcessStartInfo hbGetPresets = new ProcessStartInfo("CMD.exe", strCmdLine); - hbGetPresets.WindowStyle = ProcessWindowStyle.Hidden; - - Process hbproc = Process.Start(hbGetPresets); - hbproc.WaitForExit(); - hbproc.Dispose(); - hbproc.Close(); - } - } -} diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index fc2b3c23a..87256dc55 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -5,18 +5,19 @@ It may be used under the terms of the GNU General Public License. */ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Windows.Forms; using System.Globalization; using System.IO; using System.Drawing; +using System.Diagnostics; +using System.Text.RegularExpressions; namespace Handbrake.Functions { class Common { - /// /// Checks for updates and returns true if an update is available. /// @@ -49,6 +50,64 @@ namespace Handbrake.Functions } } + /// + /// Get's HandBrakes version data from the CLI. + /// + /// Arraylist of Version Data. 0 = hb_version 1 = hb_build + public ArrayList getCliVersionData() + { + ArrayList cliVersionData = new ArrayList(); + // 0 = SVN Build / Version + // 1 = Build Date + + Process cliProcess = new Process(); + ProcessStartInfo handBrakeCLI = new ProcessStartInfo("HandBrakeCLI.exe", " -u"); + handBrakeCLI.UseShellExecute = false; + handBrakeCLI.RedirectStandardError = true; + handBrakeCLI.RedirectStandardOutput = true; + handBrakeCLI.CreateNoWindow = true; + cliProcess.StartInfo = handBrakeCLI; + cliProcess.Start(); + + // Retrieve standard output and report back to parent thread until the process is complete + String line; + TextReader stdOutput = cliProcess.StandardError; + + while (!cliProcess.HasExited) + { + line = stdOutput.ReadLine(); + Match m = Regex.Match(line, @"HandBrake svn[0-9]*[M]* \([0-9]*\)"); + if (m.Success != false) + { + string data = line.Replace("(", "").Replace(")","").Replace("HandBrake ",""); + string[] arr = data.Split(' '); + cliVersionData.Add(arr[0]); + cliVersionData.Add(arr[1]); + return cliVersionData; + } + } + return null; + } + + /// + /// Update the presets.dat file with the latest version of HandBrak's presets from the CLI + /// + public void grabCLIPresets() + { + string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); + string presetsPath = Path.Combine(Application.StartupPath, "presets.dat"); + + string strCmdLine = String.Format(@"cmd /c """"{0}"" --preset-list >""{1}"" 2>&1""", handbrakeCLIPath, presetsPath); + + ProcessStartInfo hbGetPresets = new ProcessStartInfo("CMD.exe", strCmdLine); + hbGetPresets.WindowStyle = ProcessWindowStyle.Hidden; + + Process hbproc = Process.Start(hbGetPresets); + hbproc.WaitForExit(); + hbproc.Dispose(); + hbproc.Close(); + } + /// /// Function which generates the filename and path automatically based on /// the Source Name, DVD title and DVD Chapters @@ -166,6 +225,20 @@ namespace Handbrake.Functions mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder; + if (presetQuery.Format != null) + { + if (presetQuery.Format == "mp4") + mainWindow.drop_format.SelectedIndex = 0; + else if (presetQuery.Format == "m4v") + mainWindow.drop_format.SelectedIndex = 1; + else if (presetQuery.Format == "mkv") + mainWindow.drop_format.SelectedIndex = 2; + else if (presetQuery.Format == "avi") + mainWindow.drop_format.SelectedIndex = 3; + else if (presetQuery.Format == "ogm") + mainWindow.drop_format.SelectedIndex = 4; + } + if (presetQuery.IpodAtom == true) mainWindow.check_iPodAtom.CheckState = CheckState.Checked; else @@ -178,6 +251,8 @@ namespace Handbrake.Functions #endregion + + // Picture Settings Tab #region Picture mainWindow.drp_crop.SelectedIndex = 1; @@ -718,7 +793,7 @@ namespace Handbrake.Functions // Now set the longest title in the gui. mainWindow.drp_dvdtitle.SelectedItem = title2Select; - } + } } // Generates part of the CLI query, for the tabbed components only. diff --git a/win/C#/Functions/Encode.cs b/win/C#/Functions/Encode.cs new file mode 100644 index 000000000..eb1263585 --- /dev/null +++ b/win/C#/Functions/Encode.cs @@ -0,0 +1,115 @@ +/* CLI.cs $ + + This file is part of the HandBrake source code. + Homepage: . + It may be used under the terms of the GNU General Public License. */ + +using System; +using System.Collections.Generic; +using System.Threading; +using System.Diagnostics; +using System.Windows.Forms; +using System.Globalization; +using System.IO; +using System.Runtime.InteropServices; + +namespace Handbrake.Functions +{ + public class Encode + { + /// + /// CLI output is based on en-US locale, + /// we use this CultureInfo as IFormatProvider to *.Parse() calls + /// + static readonly public CultureInfo Culture = new CultureInfo("en-US", false); + + Process hbProc = new Process(); + + /// + /// Execute a HandBrakeCLI process. + /// + /// + /// The CLI Query + /// Rediect standard error + /// Redirect Standard output + /// Use Shell Executable + /// Display No Window + /// Returns a process + public Process runCli(object s, string query) + { + try + { + string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); + string logPath = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat"); + + string strCmdLine = String.Format(@" cmd /c """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, query, logPath); + //string arguments = String.Format(@"{0} 2>""{1}""", query, logPath); + + ProcessStartInfo cliStart = new ProcessStartInfo("CMD.exe", strCmdLine); + + hbProc = Process.Start(cliStart); + + // Set the process Priority + switch (Properties.Settings.Default.processPriority) + { + case "Realtime": + hbProc.PriorityClass = ProcessPriorityClass.RealTime; + break; + case "High": + hbProc.PriorityClass = ProcessPriorityClass.High; + break; + case "Above Normal": + hbProc.PriorityClass = ProcessPriorityClass.AboveNormal; + break; + case "Normal": + hbProc.PriorityClass = ProcessPriorityClass.Normal; + break; + case "Low": + hbProc.PriorityClass = ProcessPriorityClass.Idle; + break; + default: + hbProc.PriorityClass = ProcessPriorityClass.BelowNormal; + break; + } + } + catch (Exception exc) + { + MessageBox.Show("Internal Software Error. Please Restart the Program. Error Information: \n\n" + exc.ToString()); + } + return hbProc; + } + + [DllImport("user32.dll")] + public static extern void LockWorkStation(); + [DllImport("user32.dll")] + public static extern int ExitWindowsEx(int uFlags, int dwReason); + + public void afterEncodeAction() + { + // Do something whent he encode ends. + switch (Properties.Settings.Default.CompletionOption) + { + case "Shutdown": + System.Diagnostics.Process.Start("Shutdown", "-s -t 60"); + break; + case "Log Off": + ExitWindowsEx(0, 0); + break; + case "Suspend": + Application.SetSuspendState(PowerState.Suspend, true, true); + break; + case "Hibernate": + Application.SetSuspendState(PowerState.Hibernate, true, true); + break; + case "Lock System": + LockWorkStation(); + break; + case "Quit HandBrake": + Application.Exit(); + break; + default: + break; + } + } + } +} diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index c7998c5be..8970a562f 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -1010,7 +1010,7 @@ namespace Handbrake.Functions double qConvert = 0; if (videoQuality.Success != false) { - qConvert = double.Parse(videoQuality.ToString().Replace("-q ", ""), Functions.CLI.Culture) * 100; + qConvert = double.Parse(videoQuality.ToString().Replace("-q ", ""), Functions.Encode.Culture) * 100; qConvert = System.Math.Ceiling(qConvert); thisQuery.q_videoQuality = int.Parse(qConvert.ToString()); } diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 96ae9194c..cb4fa7295 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -19,6 +19,7 @@ 2.0 v2.0 + false publish\ true Disk @@ -31,7 +32,6 @@ true 0 1.0.0.%2a - false false true @@ -144,7 +144,7 @@ - + @@ -234,6 +234,8 @@ + + diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs index 7582daaca..5d21d89cb 100644 --- a/win/C#/Parsing/Title.cs +++ b/win/C#/Parsing/Title.cs @@ -162,7 +162,7 @@ namespace Handbrake.Parsing if (m.Success) { thisTitle.m_resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value)); - thisTitle.m_aspectRatio = float.Parse(m.Groups[3].Value, Functions.CLI.Culture); + thisTitle.m_aspectRatio = float.Parse(m.Groups[3].Value, Functions.Encode.Culture); } // Get autocrop region for this title diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index ff3fd0b26..60a12a5c2 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -67,6 +67,13 @@ namespace Handbrake.Properties { } } + internal static System.Drawing.Bitmap ActivityWindow_small { + get { + object obj = ResourceManager.GetObject("ActivityWindow_small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap AddToQueue { get { object obj = ResourceManager.GetObject("AddToQueue", resourceCulture); @@ -88,6 +95,13 @@ namespace Handbrake.Properties { } } + internal static System.Drawing.Bitmap disc_small { + get { + object obj = ResourceManager.GetObject("disc_small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Emoticon { get { object obj = ResourceManager.GetObject("Emoticon", resourceCulture); diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index 081c86c1e..7f07815fc 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -181,4 +181,10 @@ ..\Resources\AddToQueue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\disc_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\activitywindow_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 2b5849b42..0e4f389aa 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -73,7 +73,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("SVN1544")] + [global::System.Configuration.DefaultSettingValueAttribute("{hb_version}")] public string hb_version { get { return ((string)(this["hb_version"])); @@ -121,7 +121,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2008053100")] + [global::System.Configuration.DefaultSettingValueAttribute("0")] public int hb_build { get { return ((int)(this["hb_build"])); diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 21ce3ceed..ccaf53b1f 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -15,7 +15,7 @@ Checked - SVN1544 + {hb_version} Checked @@ -27,7 +27,7 @@ Checked - 2008053100 + 0 0 diff --git a/win/C#/Resources/ActivityWindow_small.png b/win/C#/Resources/ActivityWindow_small.png new file mode 100644 index 000000000..916b6ef4a Binary files /dev/null and b/win/C#/Resources/ActivityWindow_small.png differ diff --git a/win/C#/Resources/disc_small.png b/win/C#/Resources/disc_small.png new file mode 100644 index 000000000..dca0ad228 Binary files /dev/null and b/win/C#/Resources/disc_small.png differ diff --git a/win/C#/app.config b/win/C#/app.config index 44aab93a6..329066a42 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -20,7 +20,7 @@ Checked - SVN1544 + {hb_version} Checked @@ -32,7 +32,7 @@ Checked - 2008053100 + 0 0 diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 14dfb36d2..aec3f8fc9 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -90,15 +90,11 @@ namespace Handbrake this.File_Open = new System.Windows.Forms.OpenFileDialog(); this.ISO_Open = new System.Windows.Forms.OpenFileDialog(); this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_open = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem(); this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_options = new System.Windows.Forms.ToolStripMenuItem(); this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem(); @@ -239,7 +235,6 @@ namespace Handbrake this.check_mixedReferences = new System.Windows.Forms.CheckBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.btn_clear = new System.Windows.Forms.Button(); - this.btn_copy2C = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); this.btn_generate_Query = new System.Windows.Forms.Button(); this.label33 = new System.Windows.Forms.Label(); @@ -249,21 +244,29 @@ namespace Handbrake this.groupBox2 = new System.Windows.Forms.GroupBox(); this.treeView_presets = new System.Windows.Forms.TreeView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.lbl_encode = new System.Windows.Forms.ToolStripLabel(); + this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); + this.drop_format = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); this.btn_source = new System.Windows.Forms.ToolStripDropDownButton(); - this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem(); this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem(); + this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.btn_start = new System.Windows.Forms.ToolStripButton(); this.btn_add2Queue = new System.Windows.Forms.ToolStripButton(); this.btn_showQueue = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.btn_minimize = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.lbl_encode = new System.Windows.Forms.ToolStripLabel(); - this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); + this.mnu_open = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_options = new System.Windows.Forms.ToolStripMenuItem(); Label38 = new System.Windows.Forms.Label(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); @@ -297,7 +300,7 @@ namespace Handbrake Label38.AutoSize = true; Label38.BackColor = System.Drawing.Color.Transparent; Label38.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - Label38.Location = new System.Drawing.Point(304, 65); + Label38.Location = new System.Drawing.Point(334, 38); Label38.Name = "Label38"; Label38.Size = new System.Drawing.Size(108, 13); Label38.TabIndex = 11; @@ -403,9 +406,9 @@ namespace Handbrake "MPEG-4 (XviD)", "H.264 (x264)", "VP3 (Theora)"}); - this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20); + this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35); this.drp_videoEncoder.Name = "drp_videoEncoder"; - this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21); + this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21); this.drp_videoEncoder.TabIndex = 1; this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder"); this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged); @@ -455,7 +458,7 @@ namespace Handbrake this.check_largeFile.AutoSize = true; this.check_largeFile.BackColor = System.Drawing.Color.Transparent; this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_largeFile.Location = new System.Drawing.Point(261, 23); + this.check_largeFile.Location = new System.Drawing.Point(193, 22); this.check_largeFile.Name = "check_largeFile"; this.check_largeFile.Size = new System.Drawing.Size(82, 17); this.check_largeFile.TabIndex = 4; @@ -470,7 +473,7 @@ namespace Handbrake this.check_turbo.BackColor = System.Drawing.Color.Transparent; this.check_turbo.Enabled = false; this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_turbo.Location = new System.Drawing.Point(37, 151); + this.check_turbo.Location = new System.Drawing.Point(37, 184); this.check_turbo.Name = "check_turbo"; this.check_turbo.Size = new System.Drawing.Size(115, 17); this.check_turbo.TabIndex = 7; @@ -492,7 +495,7 @@ namespace Handbrake "24", "25", "29.97"}); - this.drp_videoFramerate.Location = new System.Drawing.Point(125, 35); + this.drp_videoFramerate.Location = new System.Drawing.Point(125, 68); this.drp_videoFramerate.Name = "drp_videoFramerate"; this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21); this.drp_videoFramerate.TabIndex = 2; @@ -501,7 +504,7 @@ namespace Handbrake // // slider_videoQuality // - this.slider_videoQuality.Location = new System.Drawing.Point(435, 90); + this.slider_videoQuality.Location = new System.Drawing.Point(468, 91); this.slider_videoQuality.Maximum = 100; this.slider_videoQuality.Name = "slider_videoQuality"; this.slider_videoQuality.Size = new System.Drawing.Size(167, 42); @@ -513,7 +516,7 @@ namespace Handbrake // text_filesize // this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_filesize.Location = new System.Drawing.Point(446, 63); + this.text_filesize.Location = new System.Drawing.Point(476, 36); this.text_filesize.Name = "text_filesize"; this.text_filesize.Size = new System.Drawing.Size(81, 21); this.text_filesize.TabIndex = 12; @@ -523,7 +526,7 @@ namespace Handbrake // text_bitrate // this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_bitrate.Location = new System.Drawing.Point(446, 36); + this.text_bitrate.Location = new System.Drawing.Point(476, 63); this.text_bitrate.Name = "text_bitrate"; this.text_bitrate.Size = new System.Drawing.Size(81, 21); this.text_bitrate.TabIndex = 10; @@ -607,7 +610,7 @@ namespace Handbrake this.check_optimiseMP4.AutoSize = true; this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent; this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_optimiseMP4.Location = new System.Drawing.Point(349, 23); + this.check_optimiseMP4.Location = new System.Drawing.Point(281, 22); this.check_optimiseMP4.Name = "check_optimiseMP4"; this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17); this.check_optimiseMP4.TabIndex = 25; @@ -622,7 +625,7 @@ namespace Handbrake this.check_iPodAtom.AutoSize = true; this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent; this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_iPodAtom.Location = new System.Drawing.Point(498, 23); + this.check_iPodAtom.Location = new System.Drawing.Point(430, 22); this.check_iPodAtom.Name = "check_iPodAtom"; this.check_iPodAtom.Size = new System.Drawing.Size(122, 17); this.check_iPodAtom.TabIndex = 26; @@ -1021,16 +1024,6 @@ namespace Handbrake this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20); this.FileToolStripMenuItem.Text = "&File"; // - // mnu_open - // - this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image"))); - this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_open.Name = "mnu_open"; - this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.mnu_open.Size = new System.Drawing.Size(210, 22); - this.mnu_open.Text = "&Import Preset"; - this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click); - // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; @@ -1052,6 +1045,7 @@ namespace Handbrake // this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_encode, + this.mnu_encodeLog, this.mnu_viewDVDdata, this.ToolStripSeparator5, this.mnu_options}); @@ -1059,36 +1053,10 @@ namespace Handbrake this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 20); this.ToolsToolStripMenuItem.Text = "&Tools"; // - // mnu_encode - // - this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; - this.mnu_encode.Name = "mnu_encode"; - this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.mnu_encode.Size = new System.Drawing.Size(217, 22); - this.mnu_encode.Text = "Show Queue"; - this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click); - // - // mnu_viewDVDdata - // - this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small; - this.mnu_viewDVDdata.Name = "mnu_viewDVDdata"; - this.mnu_viewDVDdata.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.mnu_viewDVDdata.Size = new System.Drawing.Size(217, 22); - this.mnu_viewDVDdata.Text = "View DVD data"; - this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click); - // // ToolStripSeparator5 // this.ToolStripSeparator5.Name = "ToolStripSeparator5"; - this.ToolStripSeparator5.Size = new System.Drawing.Size(214, 6); - // - // mnu_options - // - this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small; - this.mnu_options.Name = "mnu_options"; - this.mnu_options.Size = new System.Drawing.Size(217, 22); - this.mnu_options.Text = "Options"; - this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click); + this.ToolStripSeparator5.Size = new System.Drawing.Size(248, 6); // // PresetsToolStripMenuItem // @@ -1277,8 +1245,8 @@ namespace Handbrake // // groupBox_output // - this.groupBox_output.Controls.Add(this.drp_videoEncoder); - this.groupBox_output.Controls.Add(this.Label47); + this.groupBox_output.Controls.Add(this.drop_format); + this.groupBox_output.Controls.Add(this.label5); this.groupBox_output.Controls.Add(this.check_largeFile); this.groupBox_output.Controls.Add(this.check_iPodAtom); this.groupBox_output.Controls.Add(this.check_optimiseMP4); @@ -1296,11 +1264,11 @@ namespace Handbrake this.Label47.AutoSize = true; this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label47.ForeColor = System.Drawing.Color.Black; - this.Label47.Location = new System.Drawing.Point(17, 24); + this.Label47.Location = new System.Drawing.Point(13, 39); this.Label47.Name = "Label47"; - this.Label47.Size = new System.Drawing.Size(62, 13); + this.Label47.Size = new System.Drawing.Size(84, 13); this.Label47.TabIndex = 0; - this.Label47.Text = "Encoder: "; + this.Label47.Text = "Video Codec:"; // // Label3 // @@ -1683,6 +1651,8 @@ namespace Handbrake // TabPage3 // this.TabPage3.BackColor = System.Drawing.Color.Transparent; + this.TabPage3.Controls.Add(this.drp_videoEncoder); + this.TabPage3.Controls.Add(this.Label47); this.TabPage3.Controls.Add(this.label25); this.TabPage3.Controls.Add(this.lbl_vfr); this.TabPage3.Controls.Add(this.check_grayscale); @@ -1713,16 +1683,16 @@ namespace Handbrake this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label25.Location = new System.Drawing.Point(13, 13); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(76, 13); + this.label25.Size = new System.Drawing.Size(43, 13); this.label25.TabIndex = 0; - this.label25.Text = "Framerate"; + this.label25.Text = "Video"; // // lbl_vfr // this.lbl_vfr.AutoSize = true; this.lbl_vfr.BackColor = System.Drawing.Color.Transparent; this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_vfr.Location = new System.Drawing.Point(123, 64); + this.lbl_vfr.Location = new System.Drawing.Point(123, 97); this.lbl_vfr.Name = "lbl_vfr"; this.lbl_vfr.Size = new System.Drawing.Size(52, 12); this.lbl_vfr.TabIndex = 3; @@ -1734,7 +1704,7 @@ namespace Handbrake this.check_grayscale.AutoSize = true; this.check_grayscale.BackColor = System.Drawing.Color.Transparent; this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_grayscale.Location = new System.Drawing.Point(16, 105); + this.check_grayscale.Location = new System.Drawing.Point(16, 138); this.check_grayscale.Name = "check_grayscale"; this.check_grayscale.Size = new System.Drawing.Size(138, 17); this.check_grayscale.TabIndex = 5; @@ -1746,7 +1716,7 @@ namespace Handbrake this.Label22.AutoSize = true; this.Label22.BackColor = System.Drawing.Color.Transparent; this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label22.Location = new System.Drawing.Point(13, 85); + this.Label22.Location = new System.Drawing.Point(13, 118); this.Label22.Name = "Label22"; this.Label22.Size = new System.Drawing.Size(191, 13); this.Label22.TabIndex = 4; @@ -1757,7 +1727,7 @@ namespace Handbrake this.check_2PassEncode.AutoSize = true; this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent; this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_2PassEncode.Location = new System.Drawing.Point(16, 128); + this.check_2PassEncode.Location = new System.Drawing.Point(16, 161); this.check_2PassEncode.Name = "check_2PassEncode"; this.check_2PassEncode.Size = new System.Drawing.Size(119, 17); this.check_2PassEncode.TabIndex = 6; @@ -1770,7 +1740,7 @@ namespace Handbrake this.Label2.AutoSize = true; this.Label2.BackColor = System.Drawing.Color.Transparent; this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label2.Location = new System.Drawing.Point(304, 13); + this.Label2.Location = new System.Drawing.Point(334, 13); this.Label2.Name = "Label2"; this.Label2.Size = new System.Drawing.Size(53, 13); this.Label2.TabIndex = 8; @@ -1781,7 +1751,7 @@ namespace Handbrake this.Label42.AutoSize = true; this.Label42.BackColor = System.Drawing.Color.Transparent; this.Label42.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label42.Location = new System.Drawing.Point(304, 38); + this.Label42.Location = new System.Drawing.Point(334, 65); this.Label42.Name = "Label42"; this.Label42.Size = new System.Drawing.Size(117, 13); this.Label42.TabIndex = 9; @@ -1792,7 +1762,7 @@ namespace Handbrake this.SliderValue.AutoSize = true; this.SliderValue.BackColor = System.Drawing.Color.Transparent; this.SliderValue.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SliderValue.Location = new System.Drawing.Point(599, 96); + this.SliderValue.Location = new System.Drawing.Point(641, 100); this.SliderValue.Name = "SliderValue"; this.SliderValue.Size = new System.Drawing.Size(23, 12); this.SliderValue.TabIndex = 15; @@ -1803,7 +1773,7 @@ namespace Handbrake this.Label46.AutoSize = true; this.Label46.BackColor = System.Drawing.Color.Transparent; this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label46.Location = new System.Drawing.Point(13, 38); + this.Label46.Location = new System.Drawing.Point(13, 71); this.Label46.Name = "Label46"; this.Label46.Size = new System.Drawing.Size(106, 13); this.Label46.TabIndex = 1; @@ -1814,7 +1784,7 @@ namespace Handbrake this.Label40.AutoSize = true; this.Label40.BackColor = System.Drawing.Color.Transparent; this.Label40.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label40.Location = new System.Drawing.Point(304, 95); + this.Label40.Location = new System.Drawing.Point(334, 99); this.Label40.Name = "Label40"; this.Label40.Size = new System.Drawing.Size(107, 13); this.Label40.TabIndex = 13; @@ -2748,7 +2718,6 @@ namespace Handbrake // tabPage4 // this.tabPage4.Controls.Add(this.btn_clear); - this.tabPage4.Controls.Add(this.btn_copy2C); this.tabPage4.Controls.Add(this.label34); this.tabPage4.Controls.Add(this.btn_generate_Query); this.tabPage4.Controls.Add(this.label33); @@ -2772,19 +2741,6 @@ namespace Handbrake this.btn_clear.UseVisualStyleBackColor = true; this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click); // - // btn_copy2C - // - this.btn_copy2C.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_copy2C.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_copy2C.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_copy2C.Location = new System.Drawing.Point(148, 75); - this.btn_copy2C.Name = "btn_copy2C"; - this.btn_copy2C.Size = new System.Drawing.Size(136, 22); - this.btn_copy2C.TabIndex = 3; - this.btn_copy2C.Text = "Copy to clipboard"; - this.btn_copy2C.UseVisualStyleBackColor = true; - this.btn_copy2C.Click += new System.EventHandler(this.btn_copy2C_Click); - // // label34 // this.label34.AutoSize = true; @@ -2903,11 +2859,78 @@ namespace Handbrake this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(6, 39); + // + // lbl_encode + // + this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_encode.Name = "lbl_encode"; + this.lbl_encode.Size = new System.Drawing.Size(148, 36); + this.lbl_encode.Text = "Encoding: Not Started"; + // + // notifyIcon + // + this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info; + this.notifyIcon.BalloonTipText = "HandBrake Status Here"; + this.notifyIcon.BalloonTipTitle = "HandBrake"; + this.notifyIcon.ContextMenuStrip = notifyIconMenu; + this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); + this.notifyIcon.Text = "HandBrake"; + this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick); + // + // drop_format + // + this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.drop_format.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.drop_format.FormattingEnabled = true; + this.drop_format.Items.AddRange(new object[] { + "MP4 File", + "M4V File", + "MKV File", + "AVI File", + "OGM File"}); + this.drop_format.Location = new System.Drawing.Point(75, 19); + this.drop_format.Name = "drop_format"; + this.drop_format.Size = new System.Drawing.Size(106, 21); + this.drop_format.TabIndex = 28; + this.ToolTip.SetToolTip(this.drop_format, "Select a video encoder"); + this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.ForeColor = System.Drawing.Color.Black; + this.label5.Location = new System.Drawing.Point(17, 23); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(52, 13); + this.label5.TabIndex = 27; + this.label5.Text = "Format:"; + // // btn_source // this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btn_dvd_source, this.btn_file_source, + this.btn_dvd_source, + this.toolStripSeparator1, this.mnu_dvd_drive}); this.btn_source.Image = global::Handbrake.Properties.Resources.Movies; this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; @@ -2917,34 +2940,37 @@ namespace Handbrake this.btn_source.Text = "Source"; this.btn_source.Click += new System.EventHandler(this.btn_source_Click); // + // btn_file_source + // + this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small; + this.btn_file_source.Name = "btn_file_source"; + this.btn_file_source.Size = new System.Drawing.Size(194, 22); + this.btn_file_source.Text = "Video File"; + this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click); + // // btn_dvd_source // + this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image"))); + this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_dvd_source.Name = "btn_dvd_source"; - this.btn_dvd_source.Size = new System.Drawing.Size(197, 22); - this.btn_dvd_source.Text = "DVD / VIDEO_TS Folder"; + this.btn_dvd_source.Size = new System.Drawing.Size(194, 22); + this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder"; this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click); // - // btn_file_source + // toolStripSeparator1 // - this.btn_file_source.Name = "btn_file_source"; - this.btn_file_source.Size = new System.Drawing.Size(197, 22); - this.btn_file_source.Text = "Video File"; - this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click); + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6); // // mnu_dvd_drive // - this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.Disc; + this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small; this.mnu_dvd_drive.Name = "mnu_dvd_drive"; - this.mnu_dvd_drive.Size = new System.Drawing.Size(197, 22); + this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22); this.mnu_dvd_drive.Text = "[No DVD Drive Ready]"; this.mnu_dvd_drive.Visible = false; this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click); // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39); - // // btn_start // this.btn_start.Image = global::Handbrake.Properties.Resources.Play; @@ -2978,11 +3004,6 @@ namespace Handbrake this.btn_showQueue.Text = "Show Queue"; this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click); // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39); - // // btn_ActivityWindow // this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow; @@ -2995,11 +3016,6 @@ namespace Handbrake "ently running encode."; this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click); // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39); - // // btn_minimize // this.btn_minimize.Image = ((System.Drawing.Image)(resources.GetObject("btn_minimize.Image"))); @@ -3009,27 +3025,48 @@ namespace Handbrake this.btn_minimize.Text = "Minimize To Taskbar"; this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click); // - // toolStripSeparator9 + // mnu_open // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(6, 39); + this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image"))); + this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_open.Name = "mnu_open"; + this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.mnu_open.Size = new System.Drawing.Size(210, 22); + this.mnu_open.Text = "&Import Preset"; + this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click); // - // lbl_encode + // mnu_encode // - this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_encode.Name = "lbl_encode"; - this.lbl_encode.Size = new System.Drawing.Size(148, 36); - this.lbl_encode.Text = "Encoding: Not Started"; + this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; + this.mnu_encode.Name = "mnu_encode"; + this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); + this.mnu_encode.Size = new System.Drawing.Size(251, 22); + this.mnu_encode.Text = "Show Queue"; + this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click); // - // notifyIcon + // mnu_encodeLog // - this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info; - this.notifyIcon.BalloonTipText = "HandBrake Status Here"; - this.notifyIcon.BalloonTipTitle = "HandBrake"; - this.notifyIcon.ContextMenuStrip = notifyIconMenu; - this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); - this.notifyIcon.Text = "HandBrake"; - this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick); + this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small; + this.mnu_encodeLog.Name = "mnu_encodeLog"; + this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22); + this.mnu_encodeLog.Text = "Activity Window (Encode log)"; + this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click); + // + // mnu_viewDVDdata + // + this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small; + this.mnu_viewDVDdata.Name = "mnu_viewDVDdata"; + this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22); + this.mnu_viewDVDdata.Text = "Activity Window (Scan log)"; + this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click); + // + // mnu_options + // + this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small; + this.mnu_options.Name = "mnu_options"; + this.mnu_options.Size = new System.Drawing.Size(251, 22); + this.mnu_options.Text = "Options"; + this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click); // // frmMain // @@ -3202,7 +3239,6 @@ namespace Handbrake internal System.Windows.Forms.Button btn_generate_Query; internal System.Windows.Forms.Label label33; internal System.Windows.Forms.Button btn_clear; - internal System.Windows.Forms.Button btn_copy2C; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton btn_start; private System.Windows.Forms.ToolStripButton btn_add2Queue; @@ -3307,7 +3343,6 @@ namespace Handbrake internal System.Windows.Forms.Label lbl_duration; internal System.Windows.Forms.Label label_duration; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; - private System.Windows.Forms.ToolStripMenuItem btn_dvd_source; private System.Windows.Forms.ToolStripMenuItem btn_file_source; private System.Windows.Forms.ToolStripLabel lbl_encode; private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset; @@ -3316,6 +3351,11 @@ namespace Handbrake private System.Windows.Forms.ToolStripMenuItem mnu_user_guide; private System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive; private System.Windows.Forms.ToolStripDropDownButton btn_source; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem btn_dvd_source; + internal System.Windows.Forms.ComboBox drop_format; + internal System.Windows.Forms.Label label5; + internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 9f8041fda..70b5649bb 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -24,7 +24,7 @@ namespace Handbrake // Declarations ******************************************************* Functions.Common hb_common_func = new Functions.Common(); Functions.x264Panel x264PanelFunctions = new Functions.x264Panel(); - Functions.CLI cliObj = new Functions.CLI(); + Functions.Encode cliObj = new Functions.Encode(); Functions.Queue encodeQueue = new Functions.Queue(); Parsing.Title selectedTitle; Functions.Presets presetHandler = new Functions.Presets(); @@ -55,6 +55,20 @@ namespace Handbrake InitializeComponent(); + // Update the users config file with the CLI version data. + lblStatus.Text = "Setting Version Data ..."; + Application.DoEvents(); + ArrayList x = hb_common_func.getCliVersionData(); + if (x != null) + { + try + { + Properties.Settings.Default.hb_build = int.Parse(x[1].ToString()); + Properties.Settings.Default.hb_version = x[0].ToString(); + } + catch (Exception) { /* Do Nothing */ } + } + // show the form, but leave disabled until preloading is complete then show the main form this.Enabled = false; this.Show(); @@ -70,37 +84,22 @@ namespace Handbrake Thread.Sleep(100); } - //H264 Panel Loading - lblStatus.Text = "Loading H264 Panel ..."; - Application.DoEvents(); - setupH264Panel(); - Thread.Sleep(100); - - // Load the presets - // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load. - lblStatus.Text = "Loading Presets Bar ..."; - Application.DoEvents(); - drp_crop.SelectedIndex = 0; - loadPresetPanel(); - Thread.Sleep(200); - - // Now load the users default if required. (Will overide the above setting) - lblStatus.Text = "Loading Preset Settings ..."; + // Setup the GUI components + lblStatus.Text = "Setting up the GUI ..."; Application.DoEvents(); + setupH264Panel(); // Initalize the H.264 Panel + drp_crop.SelectedIndex = 0; // Set the default Cropping Option + loadPresetPanel(); // Load the Preset Panel + // Load the user's default settings or Normal Preset if (Properties.Settings.Default.defaultSettings == "Checked") loadUserDefaults(); else loadNormalPreset(); - Thread.Sleep(100); - - // Enable or disable tooltips + // Enabled GUI tooltip's if Required if (Properties.Settings.Default.tooltipEnable == "Checked") - { - lblStatus.Text = "Loading Tooltips ..."; - Application.DoEvents(); ToolTip.Active = true; - Thread.Sleep(100); - } + Thread.Sleep(400); + //Finished Loading lblStatus.Text = "Loading Complete!"; @@ -118,9 +117,8 @@ namespace Handbrake // Turn the interface back to the user this.Enabled = true; - // Some event Handlers. + // Some event Handlers. Used for minimize to taskbar this.Resize += new EventHandler(frmMain_Resize); - } // Startup Functions @@ -346,6 +344,11 @@ namespace Handbrake queueWindow.setQueue(encodeQueue); queueWindow.Show(); } + private void mnu_encodeLog_Click(object sender, EventArgs e) + { + frmActivityWindow dvdInfoWindow = new frmActivityWindow("hb_encode_log.dat", this, queueWindow); + dvdInfoWindow.Show(); + } private void mnu_viewDVDdata_Click(object sender, EventArgs e) { frmActivityWindow dvdInfoWindow = new frmActivityWindow("dvdinfo.dat", this, queueWindow); @@ -363,7 +366,7 @@ namespace Handbrake private void mnu_presetReset_Click(object sender, EventArgs e) { - cliObj.grabCLIPresets(); + hb_common_func.grabCLIPresets(); loadPresetPanel(); if (treeView_presets.Nodes.Count == 0) MessageBox.Show("Unable to load the presets.dat 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); @@ -709,9 +712,37 @@ namespace Handbrake { setAudioByContainer(text_destination.Text); setVideoByContainer(text_destination.Text); + string path = text_destination.Text; + if (path.EndsWith(".mp4")) + drop_format.SelectedIndex = 0; + else if (path.EndsWith(".m4v")) + drop_format.SelectedIndex = 1; + else if (path.EndsWith(".mkv")) + drop_format.SelectedIndex = 2; + else if (path.EndsWith(".avi")) + drop_format.SelectedIndex = 3; + else if (path.EndsWith(".ogm")) + drop_format.SelectedIndex = 4; + } // Output Settings + private void drop_format_SelectedIndexChanged(object sender, EventArgs e) + { + + if (drop_format.SelectedIndex == 0) + setExtension(".mp4"); + else if (drop_format.SelectedIndex == 1) + setExtension(".m4v"); + else if (drop_format.SelectedIndex == 2) + setExtension(".mkv"); + else if (drop_format.SelectedIndex == 3) + setExtension(".avi"); + else if (drop_format.SelectedIndex == 4) + setExtension(".ogm"); + } + + //Video Tab private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e) { if ((text_destination.Text.Contains(".mp4")) || (text_destination.Text.Contains(".m4v"))) @@ -758,8 +789,6 @@ namespace Handbrake } } - - //Video Tab private void text_bitrate_TextChanged(object sender, EventArgs e) { text_filesize.Text = ""; @@ -1457,11 +1486,6 @@ namespace Handbrake { rtf_query.Clear(); } - private void btn_copy2C_Click(object sender, EventArgs e) - { - if (rtf_query.Text != "") - Clipboard.SetText(rtf_query.Text, TextDataFormat.Text); - } // Presets private void btn_addPreset_Click(object sender, EventArgs e) @@ -1507,6 +1531,16 @@ namespace Handbrake #endregion #region Functions + // Replace File extenstion. + public void setExtension(string newExtension) + { + text_destination.Text = text_destination.Text.Replace(".mp4", newExtension); + text_destination.Text = text_destination.Text.Replace(".m4v", newExtension); + text_destination.Text = text_destination.Text.Replace(".mkv", newExtension); + text_destination.Text = text_destination.Text.Replace(".avi", newExtension); + text_destination.Text = text_destination.Text.Replace(".ogm", newExtension); + } + // DVD Parsing public void setStreamReader(Parsing.DVD dvd) { @@ -1917,6 +1951,7 @@ namespace Handbrake MessageBox.Show("Drive Detection Error. \n Error Information: \n\n " + exc.ToString()); } } + #endregion #region Encoding and Queue @@ -1933,7 +1968,9 @@ namespace Handbrake else { hbProc = cliObj.runCli(this, (string)state); + hbProc.WaitForExit(); + //MessageBox.Show(hbProc.ExitCode.ToString()); setEncodeLabelFinished(); hbProc = null; @@ -2006,7 +2043,9 @@ namespace Handbrake } #endregion - + + + // This is the END of the road ------------------------------------------------------------------------------ } } \ No newline at end of file diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index bf77a09c5..1da887cdb 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -188,6 +188,23 @@ Note: Do not change any of the chapter numbers! 731, 18 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I + k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC + TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p + AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 + BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr + UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG + CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 + F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS + rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt + NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp + 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W + AAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 1a50f1cc0..d239203a5 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -22,7 +22,7 @@ namespace Handbrake { private delegate void ProgressUpdateHandler(); private delegate void setEncoding(); - Functions.CLI cliObj = new Functions.CLI(); + Functions.Encode cliObj = new Functions.Encode(); Boolean cancel = false; Process hbProc = null; Functions.Queue queue; diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs index d845efc27..3eb212d4f 100644 --- a/win/C#/frmReadDVD.cs +++ b/win/C#/frmReadDVD.cs @@ -34,7 +34,6 @@ namespace Handbrake this.inputFile = inputFile; this.mainWindow = parent; startScan(); - } private void startScan() @@ -82,7 +81,7 @@ namespace Handbrake } } - Functions.CLI process = new Functions.CLI(); + Functions.Encode process = new Functions.Encode(); private void startProc(object state) { @@ -91,7 +90,7 @@ namespace Handbrake string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); string dvdInfoPath = Path.Combine(Path.GetTempPath(), "dvdinfo.dat"); - // Make we don't pick up a stale dvdinfo.dat (and that we have rights to the file) + // Make we don't pick up a stale hb_encode_log.dat (and that we have rights to the file) if (File.Exists(dvdInfoPath)) File.Delete(dvdInfoPath); -- cgit v1.2.3