diff options
| -rw-r--r-- | win/C#/Changelog.html | 10 | ||||
| -rw-r--r-- | win/C#/Controls/Filters.Designer.cs | 20 | ||||
| -rw-r--r-- | win/C#/Controls/Filters.cs | 28 | ||||
| -rw-r--r-- | win/C#/Controls/PictureSettings.cs | 12 | ||||
| -rw-r--r-- | win/C#/EncodeQueue/EncodeAndQueueHandler.cs | 35 | ||||
| -rw-r--r-- | win/C#/Functions/GrowlCommunicator.cs | 15 | ||||
| -rw-r--r-- | win/C#/Presets/Import.cs | 14 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.Designer.cs | 36 | ||||
| -rw-r--r-- | win/C#/Properties/Settings.settings | 9 | ||||
| -rw-r--r-- | win/C#/app.config | 9 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 70 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 16 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 216 | ||||
| -rw-r--r-- | win/C#/frmOptions.cs | 31 | ||||
| -rw-r--r-- | win/C#/frmOptions.resx | 5 | ||||
| -rw-r--r-- | win/C#/frmPreview.cs | 2 | ||||
| -rw-r--r-- | win/C#/libraries/Growl.Connector.dll | bin | 61440 -> 61440 bytes | |||
| -rw-r--r-- | win/C#/libraries/Growl.CoreLibrary.dll | bin | 24576 -> 24576 bytes |
18 files changed, 321 insertions, 207 deletions
diff --git a/win/C#/Changelog.html b/win/C#/Changelog.html index ae6d6c3ef..1b94d87c1 100644 --- a/win/C#/Changelog.html +++ b/win/C#/Changelog.html @@ -11,13 +11,21 @@ Windows Platform Specific Changlog.<br /> <h2>Changes Since Snapshot 2 - SVN2773</h2> <!-- Snapshot 3 (upcoming) -->
<h4>New Features</h4>
+ None <br />
<h4>Minor Improvements / Changes</h4>
+ - Updated Growl to 2.0.0.20 from 2.0.0.19
+ - Added 2 new options. "Growl when queue completes" and "Growl when encode completes"
+ - Added 1 new option. "Disable Resolution Calculation for "None" and "Custom" modes."
<h4>Fixed</h4>
- Fix several issues with Picture Settings panel related to aspect ration and resolution calculation. <br />
- Fix issue where file extension could be mp4 when chapters is enabled. Problem in the autoname function.<br />
- - Fix a regex error in the appcast reader and make it more robust to errors.<br /><br />
+ - Fix a regex error in the appcast reader and make it more robust to errors.<br />
+ - Fix issue with the destination File box double appending the file extension<br />
+
+ <h4>Backend / Not important changes</h4>
+ - Filters dropdowns re-arranged and updated for consistancy (Off, Custom ...)
<h2>Changes since Snapshot 1 - SVN2592</h2> <!-- Snapshot 2 -->
diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs index 216a12d30..d6bd830c7 100644 --- a/win/C#/Controls/Filters.Designer.cs +++ b/win/C#/Controls/Filters.Designer.cs @@ -80,8 +80,8 @@ this.drop_detelecine.FormattingEnabled = true;
this.drop_detelecine.Items.AddRange(new object[] {
"Off",
- "Default",
- "Custom"});
+ "Custom",
+ "Default"});
this.drop_detelecine.Location = new System.Drawing.Point(71, 3);
this.drop_detelecine.Name = "drop_detelecine";
this.drop_detelecine.Size = new System.Drawing.Size(174, 21);
@@ -118,8 +118,8 @@ this.drop_decomb.FormattingEnabled = true;
this.drop_decomb.Items.AddRange(new object[] {
"Off",
- "Default",
- "Custom"});
+ "Custom",
+ "Default"});
this.drop_decomb.Location = new System.Drawing.Point(71, 30);
this.drop_decomb.Name = "drop_decomb";
this.drop_decomb.Size = new System.Drawing.Size(174, 21);
@@ -155,11 +155,11 @@ this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.drop_deinterlace.FormattingEnabled = true;
this.drop_deinterlace.Items.AddRange(new object[] {
- "None",
+ "Off",
+ "Custom",
"Fast",
"Slow",
- "Slower",
- "Custom"});
+ "Slower"});
this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);
this.drop_deinterlace.Name = "drop_deinterlace";
this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);
@@ -195,11 +195,11 @@ this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.drop_denoise.FormattingEnabled = true;
this.drop_denoise.Items.AddRange(new object[] {
- "None",
+ "Off",
+ "Custom",
"Weak",
"Medium",
- "Strong",
- "Custom"});
+ "Strong"});
this.drop_denoise.Location = new System.Drawing.Point(71, 84);
this.drop_denoise.Name = "drop_denoise";
this.drop_denoise.Size = new System.Drawing.Size(174, 21);
diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs index bfbc5e5ad..c5c56fcaf 100644 --- a/win/C#/Controls/Filters.cs +++ b/win/C#/Controls/Filters.cs @@ -166,10 +166,10 @@ namespace Handbrake.Controls drop_detelecine.SelectedIndex = 0;
break;
case "Default":
- drop_detelecine.SelectedIndex = 1;
+ drop_detelecine.SelectedIndex = 2;
break;
default:
- drop_detelecine.SelectedIndex = 2;
+ drop_detelecine.SelectedIndex = 1;
text_customDT.Text = value;
text_customDT.Visible = true;
break;
@@ -181,20 +181,20 @@ namespace Handbrake.Controls text_customDN.Visible = false;
switch (value)
{
- case "None":
+ case "Off":
drop_denoise.SelectedIndex = 0;
break;
case "Weak":
- drop_denoise.SelectedIndex = 1;
+ drop_denoise.SelectedIndex = 2;
break;
case "Medium":
- drop_denoise.SelectedIndex = 2;
+ drop_denoise.SelectedIndex = 3;
break;
case "Strong":
- drop_denoise.SelectedIndex = 3;
+ drop_denoise.SelectedIndex = 4;
break;
default:
- drop_denoise.SelectedIndex = 4;
+ drop_denoise.SelectedIndex = 1;
text_customDN.Text = value;
text_customDN.Visible = true;
break;
@@ -207,21 +207,21 @@ namespace Handbrake.Controls switch (value)
{
- case "None":
+ case "Off":
drop_deinterlace.SelectedIndex = 0;
break;
case "Fast":
- drop_deinterlace.SelectedIndex = 1;
+ drop_deinterlace.SelectedIndex = 2;
break;
case "Slow":
- drop_deinterlace.SelectedIndex = 2;
+ drop_deinterlace.SelectedIndex = 3;
break;
case "Slower":
- drop_deinterlace.SelectedIndex = 3;
+ drop_deinterlace.SelectedIndex = 4;
break;
default:
- drop_deinterlace.SelectedIndex = 4;
+ drop_deinterlace.SelectedIndex = 1;
text_customDI.Text = value;
text_customDI.Visible = true;
break;
@@ -237,10 +237,10 @@ namespace Handbrake.Controls drop_decomb.SelectedIndex = 0;
break;
case "Default":
- drop_decomb.SelectedIndex = 1;
+ drop_decomb.SelectedIndex = 2;
break;
default:
- drop_decomb.SelectedIndex = 2;
+ drop_decomb.SelectedIndex = 1;
text_customDC.Text = value;
text_customDC.Visible = true;
break;
diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs index f9d322ba9..1d54c9867 100644 --- a/win/C#/Controls/PictureSettings.cs +++ b/win/C#/Controls/PictureSettings.cs @@ -102,6 +102,9 @@ namespace Handbrake.Controls // Picture Controls
private void text_width_ValueChanged(object sender, EventArgs e)
{
+ if (Properties.Settings.Default.disableResCalc)
+ return;
+
if (_preventChangingWidth)
return;
@@ -160,6 +163,9 @@ namespace Handbrake.Controls }
private void text_height_ValueChanged(object sender, EventArgs e)
{
+ if (Properties.Settings.Default.disableResCalc)
+ return;
+
if (_preventChangingHeight)
return;
@@ -218,6 +224,9 @@ namespace Handbrake.Controls }
private void check_KeepAR_CheckedChanged(object sender, EventArgs e)
{
+ if (Properties.Settings.Default.disableResCalc)
+ return;
+
//Force TextWidth to recalc height
if (check_KeepAR.Checked)
text_width_ValueChanged(this, new EventArgs());
@@ -235,6 +244,9 @@ namespace Handbrake.Controls }
private void updownDisplayWidth_ValueChanged(object sender, EventArgs e)
{
+ if (Properties.Settings.Default.disableResCalc)
+ return;
+
if (_preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)
{
_preventChangingCustom = true;
diff --git a/win/C#/EncodeQueue/EncodeAndQueueHandler.cs b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs index a3f8ca6c0..6d8a2ce2f 100644 --- a/win/C#/EncodeQueue/EncodeAndQueueHandler.cs +++ b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs @@ -76,7 +76,6 @@ namespace Handbrake.EncodeQueue get { return queue.Count; }
}
-
/// <summary>
/// Adds an item to the queue.
/// </summary>
@@ -299,7 +298,7 @@ namespace Handbrake.EncodeQueue /// </summary>
public void EndEncodeJob()
{
- closeCLI();
+ CloseCLI();
}
private void startProcess(object state)
@@ -310,21 +309,25 @@ namespace Handbrake.EncodeQueue string query = GetNextJob().Query;
WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file
- runCli(query);
+ RunCli(query);
if (NewJobStarted != null)
NewJobStarted(this, new EventArgs());
hbProcess.WaitForExit();
- addCLIQueryToLog(query);
- copyLog(LastEncode.Destination);
+ AddCLIQueryToLog(query);
+ CopyLog(LastEncode.Destination);
hbProcess.Close();
hbProcess.Dispose();
-
+
isEncoding = false;
+ //Growl
+ if (Properties.Settings.Default.growlEncode)
+ GrowlCommunicator.Notify("Encode Completed", "Put down that cocktail...\nyour Handbrake encode is done.");
+
if (CurrentJobCompleted != null)
CurrentJobCompleted(this, new EventArgs());
@@ -338,7 +341,7 @@ namespace Handbrake.EncodeQueue QueueCompleted(this, new EventArgs());
// After the encode is done, we may want to shutdown, suspend etc.
- afterEncodeAction();
+ AfterEncodeAction();
}
#endregion
@@ -354,7 +357,7 @@ namespace Handbrake.EncodeQueue /// Execute a HandBrakeCLI process.
/// </summary>
/// <param name="query">The CLI Query</param>
- public void runCli(string query)
+ public void RunCli(string query)
{
try
{
@@ -417,7 +420,7 @@ namespace Handbrake.EncodeQueue /// <summary>
/// Kill the CLI process
/// </summary>
- public void closeCLI()
+ private void CloseCLI()
{
hbProcess.Kill();
isEncoding = false;
@@ -426,10 +429,15 @@ namespace Handbrake.EncodeQueue /// <summary>
/// Perform an action after an encode. e.g a shutdown, standby, restart etc.
/// </summary>
- public void afterEncodeAction()
+ private void AfterEncodeAction()
{
isEncoding = false;
currentQuery = String.Empty;
+
+ //Growl
+ if (Properties.Settings.Default.growlQueue)
+ GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
+
// Do something whent he encode ends.
switch (Properties.Settings.Default.CompletionOption)
{
@@ -448,9 +456,6 @@ namespace Handbrake.EncodeQueue case "Lock System":
Win32.LockWorkStation();
break;
- case "Growl Notification":
- GrowlCommunicator.Notify();
- break;
case "Quit HandBrake":
Application.Exit();
break;
@@ -463,7 +468,7 @@ namespace Handbrake.EncodeQueue /// Append the CLI query to the start of the log file.
/// </summary>
/// <param name="query"></param>
- public void addCLIQueryToLog(string query)
+ private static void AddCLIQueryToLog(string query)
{
string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
string logPath = Path.Combine(logDir, "last_encode_log.txt");
@@ -486,7 +491,7 @@ namespace Handbrake.EncodeQueue /// if this feature is enabled in options.
/// </summary>
/// <param name="destination"></param>
- public void copyLog(string destination)
+ private static void CopyLog(string destination)
{
try
{
diff --git a/win/C#/Functions/GrowlCommunicator.cs b/win/C#/Functions/GrowlCommunicator.cs index 7403a80a2..507ebd5ac 100644 --- a/win/C#/Functions/GrowlCommunicator.cs +++ b/win/C#/Functions/GrowlCommunicator.cs @@ -36,8 +36,7 @@ namespace Handbrake.Functions /// <summary>
/// Notification shown upon completion of encoding
/// </summary>
- public static NotificationType EncodingComplete;
-
+ public static NotificationType EncodeOrQueueCompleted = new NotificationType("EncodeOrQueue", "HandBrake Status");
/// <summary>
/// Checks to see if Growl is currently running on the local machine.
@@ -62,20 +61,16 @@ namespace Handbrake.Functions public static void Register()
{
Initialize();
-
- growl.Register(application, new NotificationType[] { EncodingComplete });
+ growl.Register(application, new NotificationType[] { EncodeOrQueueCompleted });
}
/// <summary>
/// Sends a notification to Growl. (Since Handbrake currently only supports one type of notification with
/// static text, this is a shortcut method).
/// </summary>
- public static void Notify()
+ public static void Notify(string title, string text)
{
- string title = "Encoding Complete";
- string text = "Put down that cocktail...\nyour Handbrake encode is done.";
- Notification notification = new Notification(application.Name, EncodingComplete.Name, String.Empty, title, text);
-
+ Notification notification = new Notification(application.Name, EncodeOrQueueCompleted.Name, String.Empty, title, text);
growl.Notify(notification);
}
@@ -107,8 +102,6 @@ namespace Handbrake.Functions application = new Application("Handbrake");
application.Icon = global::Handbrake.Properties.Resources.logo64;
-
- EncodingComplete = new NotificationType("Encoding Complete");
}
}
}
diff --git a/win/C#/Presets/Import.cs b/win/C#/Presets/Import.cs index ac5e15d6b..22e3e788e 100644 --- a/win/C#/Presets/Import.cs +++ b/win/C#/Presets/Import.cs @@ -133,7 +133,7 @@ namespace Handbrake.Presets break;
case "PictureDecomb":
queryParsed.Decomb = "Off";
- if (value == "1") queryParsed.Decomb = "Default";
+ if (value == "2") queryParsed.Decomb = "Default";
break;
case "PictureDecombCustom":
if (value != "")
@@ -148,13 +148,13 @@ namespace Handbrake.Presets case "0":
queryParsed.DeInterlace = "None";
break;
- case "1":
+ case "2":
queryParsed.DeInterlace = "Fast";
break;
- case "2":
+ case "3":
queryParsed.DeInterlace = "Slow";
break;
- case "3":
+ case "4":
queryParsed.DeInterlace = "Slowest";
break;
}
@@ -169,13 +169,13 @@ namespace Handbrake.Presets case "0":
queryParsed.DeNoise = "None";
break;
- case "1":
+ case "2":
queryParsed.DeNoise = "Weak";
break;
- case "2":
+ case "3":
queryParsed.DeNoise = "Medium";
break;
- case "3":
+ case "4":
queryParsed.DeNoise = "Strong";
break;
}
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index b20cb37a9..c60c8da1b 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -453,5 +453,41 @@ namespace Handbrake.Properties { this["hb_platform"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool disableResCalc {
+ get {
+ return ((bool)(this["disableResCalc"]));
+ }
+ set {
+ this["disableResCalc"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool growlQueue {
+ get {
+ return ((bool)(this["growlQueue"]));
+ }
+ set {
+ this["growlQueue"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool growlEncode {
+ get {
+ return ((bool)(this["growlEncode"]));
+ }
+ set {
+ this["growlEncode"] = value;
+ }
+ }
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 7bb901bc9..5c3d4d3b3 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -110,5 +110,14 @@ <Setting Name="hb_platform" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="disableResCalc" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">False</Value>
+ </Setting>
+ <Setting Name="growlQueue" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">False</Value>
+ </Setting>
+ <Setting Name="growlEncode" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">False</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file diff --git a/win/C#/app.config b/win/C#/app.config index 5a00d0c97..e87b03240 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -115,6 +115,15 @@ <setting name="hb_platform" serializeAs="String">
<value />
</setting>
+ <setting name="disableResCalc" serializeAs="String">
+ <value>False</value>
+ </setting>
+ <setting name="growlQueue" serializeAs="String">
+ <value>False</value>
+ </setting>
+ <setting name="growlEncode" serializeAs="String">
+ <value>False</value>
+ </setting>
</Handbrake.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 63d7c0035..8e73a3fbb 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -58,6 +58,8 @@ namespace Handbrake this.data_chpt = new System.Windows.Forms.DataGridView();
this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();
this.btn_addPreset = new System.Windows.Forms.Button();
this.btn_removePreset = new System.Windows.Forms.Button();
this.drop_format = new System.Windows.Forms.ComboBox();
@@ -129,6 +131,8 @@ namespace Handbrake this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem();
this.pmnu_collapse = new System.Windows.Forms.ToolStripMenuItem();
this.sep1 = new System.Windows.Forms.ToolStripSeparator();
+ this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem();
this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -167,19 +171,16 @@ namespace Handbrake this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.openPreset = new System.Windows.Forms.OpenFileDialog();
this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
- this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();
this.PictureSettings = new Handbrake.Controls.PictureSettings();
this.Filters = new Handbrake.Controls.Filters();
this.AudioSettings = new Handbrake.Controls.AudioPanel();
this.Subtitles = new Handbrake.Controls.Subtitles();
this.x264Panel = new Handbrake.Controls.x264Panel();
- this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();
+ this.ChaptersMenu.SuspendLayout();
this.frmMainMenu.SuspendLayout();
this.tab_audio.SuspendLayout();
this.tab_video.SuspendLayout();
@@ -201,7 +202,6 @@ namespace Handbrake this.tableLayoutPanel3.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
- this.ChaptersMenu.SuspendLayout();
this.SuspendLayout();
//
// notifyIconMenu
@@ -221,7 +221,7 @@ namespace Handbrake //
// DVD_Save
//
- this.DVD_Save.Filter = "mp4|*.mp4|mkv|*.mkv";
+ this.DVD_Save.Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv";
this.DVD_Save.SupportMultiDottedExtensions = true;
//
// ToolTip
@@ -416,6 +416,21 @@ namespace Handbrake this.name.Name = "name";
this.name.Width = 480;
//
+ // ChaptersMenu
+ //
+ this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mnu_resetChapters});
+ this.ChaptersMenu.Name = "presets_menu";
+ this.ChaptersMenu.Size = new System.Drawing.Size(191, 26);
+ this.ChaptersMenu.Text = ";";
+ //
+ // mnu_resetChapters
+ //
+ this.mnu_resetChapters.Name = "mnu_resetChapters";
+ this.mnu_resetChapters.Size = new System.Drawing.Size(190, 22);
+ this.mnu_resetChapters.Text = "Reset Chapter Names";
+ this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);
+ //
// btn_addPreset
//
this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
@@ -1135,7 +1150,7 @@ namespace Handbrake this.pmnu_saveChanges,
this.pmnu_delete});
this.presets_menu.Name = "presets_menu";
- this.presets_menu.Size = new System.Drawing.Size(155, 148);
+ this.presets_menu.Size = new System.Drawing.Size(155, 126);
this.presets_menu.Text = ";";
this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);
//
@@ -1158,6 +1173,18 @@ namespace Handbrake this.sep1.Name = "sep1";
this.sep1.Size = new System.Drawing.Size(151, 6);
//
+ // pmnu_import
+ //
+ this.pmnu_import.Name = "pmnu_import";
+ this.pmnu_import.Size = new System.Drawing.Size(154, 22);
+ this.pmnu_import.Text = "Import";
+ this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(151, 6);
+ //
// pmnu_saveChanges
//
this.pmnu_saveChanges.Name = "pmnu_saveChanges";
@@ -1566,21 +1593,6 @@ namespace Handbrake //
this.File_ChapterImport.Filter = "CSV Files|*.csv";
//
- // ChaptersMenu
- //
- this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.mnu_resetChapters});
- this.ChaptersMenu.Name = "presets_menu";
- this.ChaptersMenu.Size = new System.Drawing.Size(191, 26);
- this.ChaptersMenu.Text = ";";
- //
- // mnu_resetChapters
- //
- this.mnu_resetChapters.Name = "mnu_resetChapters";
- this.mnu_resetChapters.Size = new System.Drawing.Size(190, 22);
- this.mnu_resetChapters.Text = "Reset Chapter Names";
- this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);
- //
// PictureSettings
//
this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
@@ -1628,18 +1640,6 @@ namespace Handbrake this.x264Panel.TabIndex = 0;
this.x264Panel.x264Query = "";
//
- // pmnu_import
- //
- this.pmnu_import.Name = "pmnu_import";
- this.pmnu_import.Size = new System.Drawing.Size(154, 22);
- this.pmnu_import.Text = "Import";
- this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click);
- //
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(151, 6);
- //
// frmMain
//
this.AllowDrop = true;
@@ -1666,6 +1666,7 @@ namespace Handbrake notifyIconMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();
+ this.ChaptersMenu.ResumeLayout(false);
this.frmMainMenu.ResumeLayout(false);
this.frmMainMenu.PerformLayout();
this.tab_audio.ResumeLayout(false);
@@ -1697,7 +1698,6 @@ namespace Handbrake this.tableLayoutPanel1.PerformLayout();
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
- this.ChaptersMenu.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index fb63ed229..f50c544d0 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -186,7 +186,7 @@ namespace Handbrake private void events()
{
// Handle Widget changes when preset is selected.
- registerPresetEventHandler();
+ RegisterPresetEventHandler();
// Handle Window Resize
if (Properties.Settings.Default.MainWindowMinimize)
@@ -203,7 +203,7 @@ namespace Handbrake }
// Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset
- public void registerPresetEventHandler()
+ private void RegisterPresetEventHandler()
{
// Output Settings
drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel);
@@ -231,7 +231,7 @@ namespace Handbrake // Advanced Tab
x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel);
}
- public void unRegisterPresetEventHandler()
+ private void UnRegisterPresetEventHandler()
{
// Output Settings
drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel);
@@ -883,7 +883,7 @@ namespace Handbrake }
private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)
{
- unRegisterPresetEventHandler();
+ UnRegisterPresetEventHandler();
PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form
drop_chapterStart.Items.Clear();
@@ -963,7 +963,7 @@ namespace Handbrake data_chpt.Columns[0].Width = 166;
data_chpt.Columns[0].Width = 165;
- registerPresetEventHandler();
+ RegisterPresetEventHandler();
}
private void chapersChanged(object sender, EventArgs e)
{
@@ -1062,13 +1062,13 @@ namespace Handbrake case 1:
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))
if (Properties.Settings.Default.useM4v)
- DVD_Save.FileName += ".m4v";
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv",".m4v");
else
- DVD_Save.FileName += ".mp4";
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");
break;
case 2:
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))
- DVD_Save.FileName += ".mkv";
+ DVD_Save.FileName = DVD_Save.FileName .Replace(".mp4", ".mkv").Replace(".m4v",".mkv");
break;
default:
//do nothing
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 92c9cff63..450bad6ee 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -40,7 +40,6 @@ namespace Handbrake this.drp_completeOption = new System.Windows.Forms.ComboBox();
this.tab_options = new System.Windows.Forms.TabControl();
this.tab_general = new System.Windows.Forms.TabPage();
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label1 = new System.Windows.Forms.Label();
this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();
this.label7 = new System.Windows.Forms.Label();
@@ -100,6 +99,8 @@ namespace Handbrake this.check_queryEditorTab = new System.Windows.Forms.CheckBox();
this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();
this.check_inGuiStatus = new System.Windows.Forms.CheckBox();
+ this.tab_debug = new System.Windows.Forms.TabPage();
+ this.check_disableResCalc = new System.Windows.Forms.CheckBox();
this.label8 = new System.Windows.Forms.Label();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();
@@ -134,9 +135,10 @@ namespace Handbrake this.label27 = new System.Windows.Forms.Label();
this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();
this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
+ this.check_GrowlQueue = new System.Windows.Forms.CheckBox();
+ this.check_growlEncode = new System.Windows.Forms.CheckBox();
this.tab_options.SuspendLayout();
this.tab_general.SuspendLayout();
- this.tableLayoutPanel1.SuspendLayout();
this.tab_picture.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.tab_audio_sub.SuspendLayout();
@@ -144,6 +146,7 @@ namespace Handbrake this.tableLayoutPanel3.SuspendLayout();
this.tab_advanced.SuspendLayout();
this.tableLayoutPanel4.SuspendLayout();
+ this.tab_debug.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.tableLayoutPanel5.SuspendLayout();
this.SuspendLayout();
@@ -155,7 +158,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(519, 378);
+ this.btn_close.Location = new System.Drawing.Point(519, 404);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(72, 22);
this.btn_close.TabIndex = 53;
@@ -166,7 +169,6 @@ namespace Handbrake // drp_completeOption
//
this.drp_completeOption.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.tableLayoutPanel1.SetColumnSpan(this.drp_completeOption, 4);
this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.drp_completeOption.FormattingEnabled = true;
this.drp_completeOption.Items.AddRange(new object[] {
@@ -176,9 +178,8 @@ namespace Handbrake "Hibernate",
"Lock system",
"Log off",
- "Growl Notification",
"Quit HandBrake"});
- this.drp_completeOption.Location = new System.Drawing.Point(106, 119);
+ this.drp_completeOption.Location = new System.Drawing.Point(108, 119);
this.drp_completeOption.Name = "drp_completeOption";
this.drp_completeOption.Size = new System.Drawing.Size(166, 21);
this.drp_completeOption.TabIndex = 43;
@@ -193,83 +194,51 @@ namespace Handbrake this.tab_options.Controls.Add(this.tab_audio_sub);
this.tab_options.Controls.Add(this.tab_cli);
this.tab_options.Controls.Add(this.tab_advanced);
+ this.tab_options.Controls.Add(this.tab_debug);
this.tab_options.Dock = System.Windows.Forms.DockStyle.Fill;
this.tab_options.Location = new System.Drawing.Point(3, 38);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(588, 332);
+ this.tab_options.Size = new System.Drawing.Size(588, 360);
this.tab_options.TabIndex = 58;
//
// tab_general
//
- this.tab_general.Controls.Add(this.tableLayoutPanel1);
+ this.tab_general.Controls.Add(this.check_growlEncode);
+ this.tab_general.Controls.Add(this.check_GrowlQueue);
+ this.tab_general.Controls.Add(this.check_m4v);
+ this.tab_general.Controls.Add(this.label1);
+ this.tab_general.Controls.Add(this.label7);
+ this.tab_general.Controls.Add(this.drp_completeOption);
+ this.tab_general.Controls.Add(this.drop_updateCheckDays);
+ this.tab_general.Controls.Add(this.check_autoNaming);
+ this.tab_general.Controls.Add(this.txt_autoNameFormat);
+ this.tab_general.Controls.Add(this.check_userDefaultSettings);
+ this.tab_general.Controls.Add(this.check_tooltip);
+ this.tab_general.Controls.Add(this.label5);
+ this.tab_general.Controls.Add(this.check_updateCheck);
+ this.tab_general.Controls.Add(this.label10);
+ this.tab_general.Controls.Add(this.btn_browse);
+ this.tab_general.Controls.Add(this.label2);
+ this.tab_general.Controls.Add(this.label13);
+ this.tab_general.Controls.Add(this.text_an_path);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
this.tab_general.Padding = new System.Windows.Forms.Padding(10);
- this.tab_general.Size = new System.Drawing.Size(580, 306);
+ this.tab_general.Size = new System.Drawing.Size(580, 334);
this.tab_general.TabIndex = 3;
this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
//
- // tableLayoutPanel1
- //
- this.tableLayoutPanel1.AutoSize = true;
- this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.tableLayoutPanel1.ColumnCount = 6;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.drop_updateCheckDays, 3, 1);
- this.tableLayoutPanel1.Controls.Add(this.label7, 4, 12);
- this.tableLayoutPanel1.Controls.Add(this.check_updateCheck, 2, 0);
- this.tableLayoutPanel1.Controls.Add(this.txt_autoNameFormat, 4, 11);
- this.tableLayoutPanel1.Controls.Add(this.label5, 2, 11);
- this.tableLayoutPanel1.Controls.Add(this.label2, 0, 6);
- this.tableLayoutPanel1.Controls.Add(this.label13, 0, 9);
- this.tableLayoutPanel1.Controls.Add(this.btn_browse, 5, 10);
- this.tableLayoutPanel1.Controls.Add(this.check_tooltip, 2, 2);
- this.tableLayoutPanel1.Controls.Add(this.text_an_path, 4, 10);
- this.tableLayoutPanel1.Controls.Add(this.label10, 2, 10);
- this.tableLayoutPanel1.Controls.Add(this.check_userDefaultSettings, 2, 3);
- this.tableLayoutPanel1.Controls.Add(this.drp_completeOption, 2, 6);
- this.tableLayoutPanel1.Controls.Add(this.check_autoNaming, 2, 9);
- this.tableLayoutPanel1.Controls.Add(this.check_m4v, 2, 13);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 10);
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 15;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.Size = new System.Drawing.Size(560, 286);
- this.tableLayoutPanel1.TabIndex = 98;
- //
// label1
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(14, 5);
+ this.label1.Location = new System.Drawing.Point(15, 15);
this.label1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
this.label1.Name = "label1";
- this.tableLayoutPanel1.SetRowSpan(this.label1, 2);
this.label1.Size = new System.Drawing.Size(66, 13);
this.label1.TabIndex = 67;
this.label1.Text = "At Launch:";
@@ -277,14 +246,13 @@ namespace Handbrake // drop_updateCheckDays
//
this.drop_updateCheckDays.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.tableLayoutPanel1.SetColumnSpan(this.drop_updateCheckDays, 3);
this.drop_updateCheckDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.drop_updateCheckDays.FormattingEnabled = true;
this.drop_updateCheckDays.Items.AddRange(new object[] {
"Daily",
"Weekly",
"Monthly"});
- this.drop_updateCheckDays.Location = new System.Drawing.Point(126, 26);
+ this.drop_updateCheckDays.Location = new System.Drawing.Point(127, 35);
this.drop_updateCheckDays.Name = "drop_updateCheckDays";
this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21);
this.drop_updateCheckDays.TabIndex = 97;
@@ -296,8 +264,7 @@ namespace Handbrake //
this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label7.AutoSize = true;
- this.tableLayoutPanel1.SetColumnSpan(this.label7, 2);
- this.label7.Location = new System.Drawing.Point(183, 245);
+ this.label7.Location = new System.Drawing.Point(179, 284);
this.label7.Margin = new System.Windows.Forms.Padding(3);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(225, 13);
@@ -309,8 +276,7 @@ namespace Handbrake this.check_updateCheck.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_updateCheck.AutoSize = true;
this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;
- this.tableLayoutPanel1.SetColumnSpan(this.check_updateCheck, 4);
- this.check_updateCheck.Location = new System.Drawing.Point(106, 3);
+ this.check_updateCheck.Location = new System.Drawing.Point(108, 14);
this.check_updateCheck.Name = "check_updateCheck";
this.check_updateCheck.Size = new System.Drawing.Size(114, 17);
this.check_updateCheck.TabIndex = 68;
@@ -323,10 +289,9 @@ namespace Handbrake // txt_autoNameFormat
//
this.txt_autoNameFormat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.tableLayoutPanel1.SetColumnSpan(this.txt_autoNameFormat, 2);
- this.txt_autoNameFormat.Location = new System.Drawing.Point(183, 218);
+ this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 257);
this.txt_autoNameFormat.Name = "txt_autoNameFormat";
- this.txt_autoNameFormat.Size = new System.Drawing.Size(374, 21);
+ this.txt_autoNameFormat.Size = new System.Drawing.Size(349, 21);
this.txt_autoNameFormat.TabIndex = 79;
this.ToolTip.SetToolTip(this.txt_autoNameFormat, "Define the format of the automatically named file.\r\ne.g {source}_{title}_some-te" +
"xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +
@@ -337,8 +302,7 @@ namespace Handbrake //
this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label5.AutoSize = true;
- this.tableLayoutPanel1.SetColumnSpan(this.label5, 2);
- this.label5.Location = new System.Drawing.Point(106, 222);
+ this.label5.Location = new System.Drawing.Point(105, 260);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(45, 13);
this.label5.TabIndex = 80;
@@ -349,7 +313,7 @@ namespace Handbrake this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(6, 123);
+ this.label2.Location = new System.Drawing.Point(7, 122);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(74, 13);
this.label2.TabIndex = 54;
@@ -360,10 +324,9 @@ namespace Handbrake this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label13.Location = new System.Drawing.Point(3, 168);
+ this.label13.Location = new System.Drawing.Point(4, 188);
this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
this.label13.Name = "label13";
- this.tableLayoutPanel1.SetRowSpan(this.label13, 2);
this.label13.Size = new System.Drawing.Size(77, 13);
this.label13.TabIndex = 71;
this.label13.Text = "Output Files:";
@@ -374,7 +337,7 @@ namespace Handbrake this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_browse.Location = new System.Drawing.Point(482, 189);
+ this.btn_browse.Location = new System.Drawing.Point(456, 228);
this.btn_browse.Name = "btn_browse";
this.btn_browse.Size = new System.Drawing.Size(75, 23);
this.btn_browse.TabIndex = 78;
@@ -387,8 +350,7 @@ namespace Handbrake this.check_tooltip.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_tooltip.AutoSize = true;
this.check_tooltip.BackColor = System.Drawing.Color.Transparent;
- this.tableLayoutPanel1.SetColumnSpan(this.check_tooltip, 4);
- this.check_tooltip.Location = new System.Drawing.Point(106, 53);
+ this.check_tooltip.Location = new System.Drawing.Point(108, 62);
this.check_tooltip.Name = "check_tooltip";
this.check_tooltip.Size = new System.Drawing.Size(117, 17);
this.check_tooltip.TabIndex = 70;
@@ -400,9 +362,9 @@ namespace Handbrake // text_an_path
//
this.text_an_path.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.text_an_path.Location = new System.Drawing.Point(183, 190);
+ this.text_an_path.Location = new System.Drawing.Point(182, 230);
this.text_an_path.Name = "text_an_path";
- this.text_an_path.Size = new System.Drawing.Size(293, 21);
+ this.text_an_path.Size = new System.Drawing.Size(253, 21);
this.text_an_path.TabIndex = 76;
this.ToolTip.SetToolTip(this.text_an_path, "This is the default location where your encoded files will be stored if \"Automati" +
"cally name output files\" is enabled.");
@@ -412,8 +374,7 @@ namespace Handbrake //
this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label10.AutoSize = true;
- this.tableLayoutPanel1.SetColumnSpan(this.label10, 2);
- this.label10.Location = new System.Drawing.Point(106, 194);
+ this.label10.Location = new System.Drawing.Point(105, 233);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(71, 13);
this.label10.TabIndex = 77;
@@ -424,8 +385,7 @@ namespace Handbrake this.check_userDefaultSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_userDefaultSettings.AutoSize = true;
this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;
- this.tableLayoutPanel1.SetColumnSpan(this.check_userDefaultSettings, 4);
- this.check_userDefaultSettings.Location = new System.Drawing.Point(106, 76);
+ this.check_userDefaultSettings.Location = new System.Drawing.Point(108, 85);
this.check_userDefaultSettings.Name = "check_userDefaultSettings";
this.check_userDefaultSettings.Size = new System.Drawing.Size(137, 17);
this.check_userDefaultSettings.TabIndex = 69;
@@ -438,8 +398,7 @@ namespace Handbrake //
this.check_autoNaming.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_autoNaming.AutoSize = true;
- this.tableLayoutPanel1.SetColumnSpan(this.check_autoNaming, 4);
- this.check_autoNaming.Location = new System.Drawing.Point(106, 166);
+ this.check_autoNaming.Location = new System.Drawing.Point(108, 198);
this.check_autoNaming.Name = "check_autoNaming";
this.check_autoNaming.Size = new System.Drawing.Size(176, 17);
this.check_autoNaming.TabIndex = 72;
@@ -452,8 +411,7 @@ namespace Handbrake //
this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_m4v.AutoSize = true;
- this.tableLayoutPanel1.SetColumnSpan(this.check_m4v, 4);
- this.check_m4v.Location = new System.Drawing.Point(106, 264);
+ this.check_m4v.Location = new System.Drawing.Point(108, 303);
this.check_m4v.Name = "check_m4v";
this.check_m4v.Size = new System.Drawing.Size(283, 17);
this.check_m4v.TabIndex = 82;
@@ -468,7 +426,7 @@ namespace Handbrake this.tab_picture.Location = new System.Drawing.Point(4, 22);
this.tab_picture.Name = "tab_picture";
this.tab_picture.Padding = new System.Windows.Forms.Padding(10);
- this.tab_picture.Size = new System.Drawing.Size(580, 306);
+ this.tab_picture.Size = new System.Drawing.Size(580, 334);
this.tab_picture.TabIndex = 5;
this.tab_picture.Text = "Picture";
this.tab_picture.UseVisualStyleBackColor = true;
@@ -485,13 +443,12 @@ namespace Handbrake this.tableLayoutPanel2.Controls.Add(this.label29, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.btn_vlcPath, 3, 0);
this.tableLayoutPanel2.Controls.Add(this.txt_vlcPath, 2, 0);
- this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 10);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(560, 286);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(560, 28);
this.tableLayoutPanel2.TabIndex = 84;
//
// label29
@@ -542,7 +499,7 @@ namespace Handbrake this.tab_audio_sub.Location = new System.Drawing.Point(4, 22);
this.tab_audio_sub.Name = "tab_audio_sub";
this.tab_audio_sub.Padding = new System.Windows.Forms.Padding(3);
- this.tab_audio_sub.Size = new System.Drawing.Size(580, 306);
+ this.tab_audio_sub.Size = new System.Drawing.Size(580, 334);
this.tab_audio_sub.TabIndex = 6;
this.tab_audio_sub.Text = "Audio / Subtitles";
this.tab_audio_sub.UseVisualStyleBackColor = true;
@@ -613,7 +570,7 @@ namespace Handbrake this.tab_cli.Location = new System.Drawing.Point(4, 22);
this.tab_cli.Name = "tab_cli";
this.tab_cli.Padding = new System.Windows.Forms.Padding(10);
- this.tab_cli.Size = new System.Drawing.Size(580, 306);
+ this.tab_cli.Size = new System.Drawing.Size(580, 334);
this.tab_cli.TabIndex = 2;
this.tab_cli.Text = "CLI";
this.tab_cli.UseVisualStyleBackColor = true;
@@ -646,7 +603,6 @@ namespace Handbrake this.tableLayoutPanel3.Controls.Add(this.drp_processors, 3, 1);
this.tableLayoutPanel3.Controls.Add(this.btn_viewLogs, 2, 8);
this.tableLayoutPanel3.Controls.Add(this.btn_clearLogs, 4, 8);
- this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 10);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 10;
@@ -660,7 +616,7 @@ namespace Handbrake this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel3.Size = new System.Drawing.Size(560, 286);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(560, 227);
this.tableLayoutPanel3.TabIndex = 62;
//
// label12
@@ -894,7 +850,7 @@ namespace Handbrake this.tab_advanced.Location = new System.Drawing.Point(4, 22);
this.tab_advanced.Name = "tab_advanced";
this.tab_advanced.Padding = new System.Windows.Forms.Padding(10);
- this.tab_advanced.Size = new System.Drawing.Size(580, 306);
+ this.tab_advanced.Size = new System.Drawing.Size(580, 334);
this.tab_advanced.TabIndex = 4;
this.tab_advanced.Text = "Advanced / Other";
this.tab_advanced.UseVisualStyleBackColor = true;
@@ -923,7 +879,6 @@ namespace Handbrake this.tableLayoutPanel4.Controls.Add(this.check_queryEditorTab, 2, 3);
this.tableLayoutPanel4.Controls.Add(this.check_disablePresetNotification, 2, 5);
this.tableLayoutPanel4.Controls.Add(this.check_inGuiStatus, 2, 6);
- this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(10, 10);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 12;
@@ -939,7 +894,7 @@ namespace Handbrake this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel4.Size = new System.Drawing.Size(560, 286);
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(396, 251);
this.tableLayoutPanel4.TabIndex = 62;
//
// check_promptOnUnmatchingQueries
@@ -1128,6 +1083,29 @@ namespace Handbrake this.check_inGuiStatus.UseVisualStyleBackColor = false;
this.check_inGuiStatus.CheckedChanged += new System.EventHandler(this.check_inGuiStatus_CheckedChanged);
//
+ // tab_debug
+ //
+ this.tab_debug.Controls.Add(this.check_disableResCalc);
+ this.tab_debug.Location = new System.Drawing.Point(4, 22);
+ this.tab_debug.Name = "tab_debug";
+ this.tab_debug.Padding = new System.Windows.Forms.Padding(3);
+ this.tab_debug.Size = new System.Drawing.Size(580, 334);
+ this.tab_debug.TabIndex = 7;
+ this.tab_debug.Text = "Debug";
+ this.tab_debug.UseVisualStyleBackColor = true;
+ //
+ // check_disableResCalc
+ //
+ this.check_disableResCalc.AutoSize = true;
+ this.check_disableResCalc.Location = new System.Drawing.Point(13, 15);
+ this.check_disableResCalc.Name = "check_disableResCalc";
+ this.check_disableResCalc.Size = new System.Drawing.Size(327, 17);
+ this.check_disableResCalc.TabIndex = 0;
+ this.check_disableResCalc.Text = "Disable Resolution Calculation for \"None\" and \"Custom\" modes.";
+ this.ToolTip.SetToolTip(this.check_disableResCalc, resources.GetString("check_disableResCalc.ToolTip"));
+ this.check_disableResCalc.UseVisualStyleBackColor = true;
+ this.check_disableResCalc.CheckedChanged += new System.EventHandler(this.check_disableResCalc_CheckedChanged);
+ //
// label8
//
this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -1496,23 +1474,50 @@ namespace Handbrake this.tableLayoutPanel5.Controls.Add(this.btn_close, 1, 2);
this.tableLayoutPanel5.Controls.Add(this.label8, 1, 0);
this.tableLayoutPanel5.Controls.Add(this.tab_options, 0, 1);
- this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel5.Location = new System.Drawing.Point(12, 12);
this.tableLayoutPanel5.Name = "tableLayoutPanel5";
this.tableLayoutPanel5.RowCount = 3;
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 405);
+ this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 429);
this.tableLayoutPanel5.TabIndex = 62;
//
+ // check_GrowlQueue
+ //
+ this.check_GrowlQueue.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.check_GrowlQueue.AutoSize = true;
+ this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;
+ this.check_GrowlQueue.Location = new System.Drawing.Point(108, 146);
+ this.check_GrowlQueue.Name = "check_GrowlQueue";
+ this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);
+ this.check_GrowlQueue.TabIndex = 98;
+ this.check_GrowlQueue.Text = "Growl after Queue Completes";
+ this.ToolTip.SetToolTip(this.check_GrowlQueue, "Growl for Windows");
+ this.check_GrowlQueue.UseVisualStyleBackColor = false;
+ this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);
+ //
+ // check_growlEncode
+ //
+ this.check_growlEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.check_growlEncode.AutoSize = true;
+ this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;
+ this.check_growlEncode.Location = new System.Drawing.Point(282, 146);
+ this.check_growlEncode.Name = "check_growlEncode";
+ this.check_growlEncode.Size = new System.Drawing.Size(171, 17);
+ this.check_growlEncode.TabIndex = 99;
+ this.check_growlEncode.Text = "Growl after Encode Completes";
+ this.ToolTip.SetToolTip(this.check_growlEncode, "Growl for Windows");
+ this.check_growlEncode.UseVisualStyleBackColor = false;
+ this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);
+ //
// frmOptions
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.ClientSize = new System.Drawing.Size(618, 429);
+ this.ClientSize = new System.Drawing.Size(627, 488);
this.Controls.Add(this.tableLayoutPanel5);
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -1528,8 +1533,6 @@ namespace Handbrake this.tab_options.ResumeLayout(false);
this.tab_general.ResumeLayout(false);
this.tab_general.PerformLayout();
- this.tableLayoutPanel1.ResumeLayout(false);
- this.tableLayoutPanel1.PerformLayout();
this.tab_picture.ResumeLayout(false);
this.tab_picture.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
@@ -1544,6 +1547,8 @@ namespace Handbrake this.tab_advanced.PerformLayout();
this.tableLayoutPanel4.ResumeLayout(false);
this.tableLayoutPanel4.PerformLayout();
+ this.tab_debug.ResumeLayout(false);
+ this.tab_debug.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.tableLayoutPanel5.ResumeLayout(false);
this.tableLayoutPanel5.PerformLayout();
@@ -1573,7 +1578,6 @@ namespace Handbrake internal System.Windows.Forms.CheckBox btn_drive_detect;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label13;
- internal System.Windows.Forms.Button btn_browse;
internal System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox text_an_path;
internal System.Windows.Forms.CheckBox check_autoNaming;
@@ -1638,7 +1642,6 @@ namespace Handbrake private System.Windows.Forms.Button btn_clearLogs;
internal System.Windows.Forms.CheckBox check_m4v;
internal System.Windows.Forms.ComboBox drop_updateCheckDays;
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
internal System.Windows.Forms.ComboBox drp_processors;
@@ -1652,5 +1655,10 @@ namespace Handbrake private System.Windows.Forms.RadioButton radio_foreignAndSubs;
private System.Windows.Forms.RadioButton radio_dub;
private System.Windows.Forms.Label label15;
+ internal System.Windows.Forms.Button btn_browse;
+ private System.Windows.Forms.TabPage tab_debug;
+ private System.Windows.Forms.CheckBox check_disableResCalc;
+ internal System.Windows.Forms.CheckBox check_growlEncode;
+ internal System.Windows.Forms.CheckBox check_GrowlQueue;
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 0206d1ca3..462bdb8c4 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -47,6 +47,13 @@ namespace Handbrake // On Encode Completeion Action
drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
+ // Growl.
+ if (Properties.Settings.Default.growlEncode)
+ check_growlEncode.CheckState = CheckState.Checked;
+
+ if (Properties.Settings.Default.growlQueue)
+ check_GrowlQueue.CheckState = CheckState.Checked;
+
// Enable auto naming feature.
if (Properties.Settings.Default.autoNaming)
check_autoNaming.CheckState = CheckState.Checked;
@@ -165,6 +172,12 @@ namespace Handbrake // Use Experimental dvdnav
if (Properties.Settings.Default.dvdnav)
check_dvdnav.CheckState = CheckState.Checked;
+
+ // #############################
+ // Debug
+ // #############################
+ if (Properties.Settings.Default.disableResCalc)
+ check_disableResCalc.Checked = true;
}
#region General
@@ -187,6 +200,16 @@ namespace Handbrake Properties.Settings.Default.CompletionOption = drp_completeOption.Text;
}
+ private void check_GrowlQueue_CheckedChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.growlQueue = check_GrowlQueue.Checked;
+ }
+
+ private void check_growlEncode_CheckedChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.growlEncode = check_growlEncode.Checked;
+ }
+
private void check_autoNaming_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.autoNaming = check_autoNaming.Checked;
@@ -396,11 +419,17 @@ namespace Handbrake }
#endregion
+ #region Debug
+ private void check_disableResCalc_CheckedChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked;
+ }
+ #endregion
+
private void btn_close_Click(object sender, EventArgs e)
{
Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this
this.Close();
}
-
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx index 139d8245b..502bece8e 100644 --- a/win/C#/frmOptions.resx +++ b/win/C#/frmOptions.resx @@ -120,6 +120,11 @@ <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>132, 18</value>
</metadata>
+ <data name="check_disableResCalc.ToolTip" xml:space="preserve">
+ <value>If the new Picture Settings panel is causing you problems, enable this option.
+It disables some of the resolution calcuation code for None and Custom modes.
+When enabled, the values in the text boxes will simply be passed through to the CLI so it is up to you to get the values correct.</value>
+ </data>
<metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index 6d68dda6d..fbd695f5e 100644 --- a/win/C#/frmPreview.cs +++ b/win/C#/frmPreview.cs @@ -101,7 +101,7 @@ namespace Handbrake MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
{
- process.runCli((string)state);
+ process.RunCli((string)state);
if (process.hbProcess != null)
{
process.hbProcess.WaitForExit();
diff --git a/win/C#/libraries/Growl.Connector.dll b/win/C#/libraries/Growl.Connector.dll Binary files differindex 29e33d610..22ddf6c5e 100644 --- a/win/C#/libraries/Growl.Connector.dll +++ b/win/C#/libraries/Growl.Connector.dll diff --git a/win/C#/libraries/Growl.CoreLibrary.dll b/win/C#/libraries/Growl.CoreLibrary.dll Binary files differindex 0cfe12d33..6a05d90b2 100644 --- a/win/C#/libraries/Growl.CoreLibrary.dll +++ b/win/C#/libraries/Growl.CoreLibrary.dll |