summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2007-10-26 21:38:04 +0000
committersr55 <[email protected]>2007-10-26 21:38:04 +0000
commite44b0fa6cf44948a3f20446515fe4d930eed6f77 (patch)
tree0e74e4d502992dbd2ac1a180e9fae5b5e6f9da68
parent592c7665ccf092313449860dded33b85e1735bfc (diff)
WinGui:
- Reversed the functionality of the show/hide presets button. By default presets always show now. - Re-added file open / save options and removed presets open/save buttons. Was confusing users. - Added the ability to modify items on the queue. - All Presets Updated. - Queue Threading changed in an attempt to avoid Windows loosing track of it. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1039 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat
-rw-r--r--win/C#/Properties/Settings.Designer.cs8
-rw-r--r--win/C#/Properties/Settings.settings4
-rw-r--r--win/C#/app.config4
-rw-r--r--win/C#/frmMain.Designer.cs152
-rw-r--r--win/C#/frmMain.cs379
-rw-r--r--win/C#/frmMain.resx35
-rw-r--r--win/C#/frmOptions.Designer.cs4
-rw-r--r--win/C#/frmOptions.cs4
-rw-r--r--win/C#/frmQueue.Designer.cs100
-rw-r--r--win/C#/frmQueue.cs44
10 files changed, 438 insertions, 296 deletions
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 041e88149..7238dc836 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("")]
+ [global::System.Configuration.DefaultSettingValueAttribute("Checked")]
public string defaultSettings {
get {
return ((string)(this["defaultSettings"]));
@@ -589,12 +589,12 @@ namespace Handbrake.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
- public string showPresets {
+ public string hidePresets {
get {
- return ((string)(this["showPresets"]));
+ return ((string)(this["hidePresets"]));
}
set {
- this["showPresets"] = value;
+ this["hidePresets"] = value;
}
}
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index a92bc7c73..5063e1101 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -15,7 +15,7 @@
<Value Profile="(Default)">Automatic</Value>
</Setting>
<Setting Name="defaultSettings" Type="System.String" Scope="User">
- <Value Profile="(Default)" />
+ <Value Profile="(Default)">Checked</Value>
</Setting>
<Setting Name="updateStatus" Type="System.String" Scope="User">
<Value Profile="(Default)">Checked</Value>
@@ -143,7 +143,7 @@
<Setting Name="BuiltInPresets" Type="System.Collections.Specialized.StringCollection" Scope="User">
<Value Profile="(Default)" />
</Setting>
- <Setting Name="showPresets" Type="System.String" Scope="User">
+ <Setting Name="hidePresets" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="selectedPreset" Type="System.String" Scope="User">
diff --git a/win/C#/app.config b/win/C#/app.config
index 36011680b..bfb9526ee 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -20,7 +20,7 @@
<value>Automatic</value>
</setting>
<setting name="defaultSettings" serializeAs="String">
- <value />
+ <value>Checked</value>
</setting>
<setting name="updateStatus" serializeAs="String">
<value>Checked</value>
@@ -142,7 +142,7 @@
<setting name="CompletionOption" serializeAs="String">
<value>Do Nothing</value>
</setting>
- <setting name="showPresets" serializeAs="String">
+ <setting name="hidePresets" serializeAs="String">
<value />
</setting>
<setting name="selectedPreset" serializeAs="String">
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index dba694bc7..d91d8fd36 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -61,13 +61,14 @@ namespace Handbrake
this.btn_presets = new System.Windows.Forms.Button();
this.btn_setDefault = new System.Windows.Forms.Button();
this.ListBox_Presets = new System.Windows.Forms.ListBox();
- this.btn_removePreset = new System.Windows.Forms.Button();
- this.btn_addPreset = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();
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.mnu_save = 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();
@@ -182,7 +183,6 @@ namespace Handbrake
this.label25 = new System.Windows.Forms.Label();
this.groupBox_dest = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
Label38 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
this.frmMainMenu.SuspendLayout();
@@ -197,7 +197,6 @@ namespace Handbrake
this.tabPage4.SuspendLayout();
this.groupBox_dest.SuspendLayout();
this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// Label38
@@ -212,7 +211,6 @@ namespace Handbrake
//
// DVD_Save
//
- this.DVD_Save.DefaultExt = "mp4";
this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|avi|*.avi|ogm|*.ogm|mkv|*.mkv";
//
// File_Save
@@ -571,6 +569,7 @@ namespace Handbrake
this.btn_presets.Text = "Show Presets";
this.ToolTip.SetToolTip(this.btn_presets, "Show or Hide the preset section");
this.btn_presets.UseVisualStyleBackColor = true;
+ this.btn_presets.Visible = false;
this.btn_presets.Click += new System.EventHandler(this.btn_presets_Click);
//
// btn_setDefault
@@ -580,7 +579,7 @@ namespace Handbrake
this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_setDefault.Location = new System.Drawing.Point(110, 23);
+ this.btn_setDefault.Location = new System.Drawing.Point(113, 447);
this.btn_setDefault.Name = "btn_setDefault";
this.btn_setDefault.Size = new System.Drawing.Size(72, 22);
this.btn_setDefault.TabIndex = 107;
@@ -615,45 +614,11 @@ namespace Handbrake
"Television"});
this.ListBox_Presets.Location = new System.Drawing.Point(11, 21);
this.ListBox_Presets.Name = "ListBox_Presets";
- this.ListBox_Presets.Size = new System.Drawing.Size(174, 368);
+ this.ListBox_Presets.Size = new System.Drawing.Size(174, 420);
this.ListBox_Presets.TabIndex = 104;
this.ToolTip.SetToolTip(this.ListBox_Presets, "To load a preset, simply click the preset you desire.");
this.ListBox_Presets.SelectedIndexChanged += new System.EventHandler(this.ListBox_Presets_SelectedIndexChanged);
//
- // btn_removePreset
- //
- this.btn_removePreset.BackColor = System.Drawing.SystemColors.ControlLight;
- this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_removePreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_removePreset.Location = new System.Drawing.Point(59, 23);
- this.btn_removePreset.Name = "btn_removePreset";
- this.btn_removePreset.Size = new System.Drawing.Size(45, 22);
- this.btn_removePreset.TabIndex = 106;
- this.btn_removePreset.TabStop = false;
- this.btn_removePreset.Text = "Save";
- this.ToolTip.SetToolTip(this.btn_removePreset, "Save the current settings as a preset.");
- this.btn_removePreset.UseVisualStyleBackColor = false;
- this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);
- //
- // btn_addPreset
- //
- this.btn_addPreset.BackColor = System.Drawing.SystemColors.ControlLight;
- this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_addPreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_addPreset.Location = new System.Drawing.Point(8, 23);
- this.btn_addPreset.Name = "btn_addPreset";
- this.btn_addPreset.Size = new System.Drawing.Size(45, 22);
- this.btn_addPreset.TabIndex = 105;
- this.btn_addPreset.TabStop = false;
- this.btn_addPreset.Text = "Open";
- this.ToolTip.SetToolTip(this.btn_addPreset, "Open a preset which you have saved.");
- this.btn_addPreset.UseVisualStyleBackColor = false;
- this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);
- //
// button1
//
this.button1.BackColor = System.Drawing.SystemColors.ControlLight;
@@ -664,7 +629,7 @@ namespace Handbrake
this.button1.Location = new System.Drawing.Point(16, 78);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(114, 22);
- this.button1.TabIndex = 109;
+ this.button1.TabIndex = 112;
this.button1.TabStop = false;
this.button1.Text = "Test Query Parser";
this.ToolTip.SetToolTip(this.button1, "Open a preset which you have saved.");
@@ -674,7 +639,6 @@ namespace Handbrake
// DVD_Open
//
this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";
- this.DVD_Open.ShowNewFolderButton = false;
//
// File_Open
//
@@ -685,20 +649,49 @@ namespace Handbrake
//
this.ISO_Open.DefaultExt = "ISO";
this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;";
+ this.ISO_Open.RestoreDirectory = true;
this.ISO_Open.SupportMultiDottedExtensions = true;
//
// FileToolStripMenuItem
//
this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mnu_open,
+ this.mnu_save,
+ this.toolStripSeparator2,
this.mnu_exit});
this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 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(185, 22);
+ this.mnu_open.Text = "&Open Preset";
+ this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);
+ //
+ // mnu_save
+ //
+ this.mnu_save.Image = ((System.Drawing.Image)(resources.GetObject("mnu_save.Image")));
+ this.mnu_save.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.mnu_save.Name = "mnu_save";
+ this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+ this.mnu_save.Size = new System.Drawing.Size(185, 22);
+ this.mnu_save.Text = "&Save Preset";
+ this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(182, 6);
+ //
// mnu_exit
//
this.mnu_exit.Name = "mnu_exit";
- this.mnu_exit.Size = new System.Drawing.Size(152, 22);
+ this.mnu_exit.Size = new System.Drawing.Size(185, 22);
this.mnu_exit.Text = "E&xit";
this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);
//
@@ -996,7 +989,7 @@ namespace Handbrake
this.groupBox_output.ForeColor = System.Drawing.Color.Black;
this.groupBox_output.Location = new System.Drawing.Point(14, 185);
this.groupBox_output.Name = "groupBox_output";
- this.groupBox_output.Size = new System.Drawing.Size(647, 82);
+ this.groupBox_output.Size = new System.Drawing.Size(647, 85);
this.groupBox_output.TabIndex = 16;
this.groupBox_output.TabStop = false;
this.groupBox_output.Text = "Output Settings (Preset: None)";
@@ -1081,7 +1074,7 @@ namespace Handbrake
this.lbl_update.AutoSize = true;
this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_update.ForeColor = System.Drawing.Color.Black;
- this.lbl_update.Location = new System.Drawing.Point(108, 540);
+ this.lbl_update.Location = new System.Drawing.Point(108, 543);
this.lbl_update.Name = "lbl_update";
this.lbl_update.Size = new System.Drawing.Size(193, 13);
this.lbl_update.TabIndex = 98;
@@ -1095,7 +1088,7 @@ namespace Handbrake
this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_queue.Location = new System.Drawing.Point(414, 535);
+ this.btn_queue.Location = new System.Drawing.Point(414, 538);
this.btn_queue.Name = "btn_queue";
this.btn_queue.Size = new System.Drawing.Size(115, 22);
this.btn_queue.TabIndex = 100;
@@ -1111,7 +1104,7 @@ namespace Handbrake
this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_encode.Location = new System.Drawing.Point(535, 535);
+ this.btn_encode.Location = new System.Drawing.Point(535, 538);
this.btn_encode.Name = "btn_encode";
this.btn_encode.Size = new System.Drawing.Size(124, 22);
this.btn_encode.TabIndex = 101;
@@ -1124,7 +1117,7 @@ namespace Handbrake
//
this.Version.BackColor = System.Drawing.Color.Transparent;
this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Version.Location = new System.Drawing.Point(11, 540);
+ this.Version.Location = new System.Drawing.Point(11, 543);
this.Version.Name = "Version";
this.Version.Size = new System.Drawing.Size(105, 20);
this.Version.TabIndex = 97;
@@ -1134,7 +1127,7 @@ namespace Handbrake
//
this.lbl_encode.AutoSize = true;
this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_encode.Location = new System.Drawing.Point(11, 520);
+ this.lbl_encode.Location = new System.Drawing.Point(11, 523);
this.lbl_encode.Name = "lbl_encode";
this.lbl_encode.Size = new System.Drawing.Size(129, 13);
this.lbl_encode.TabIndex = 96;
@@ -1149,7 +1142,7 @@ namespace Handbrake
this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_eCancel.Location = new System.Drawing.Point(343, 535);
+ this.btn_eCancel.Location = new System.Drawing.Point(343, 538);
this.btn_eCancel.Name = "btn_eCancel";
this.btn_eCancel.Size = new System.Drawing.Size(65, 22);
this.btn_eCancel.TabIndex = 99;
@@ -1172,9 +1165,10 @@ namespace Handbrake
this.TabPage6.Location = new System.Drawing.Point(4, 22);
this.TabPage6.Name = "TabPage6";
this.TabPage6.Padding = new System.Windows.Forms.Padding(3);
- this.TabPage6.Size = new System.Drawing.Size(639, 211);
+ this.TabPage6.Size = new System.Drawing.Size(639, 215);
this.TabPage6.TabIndex = 6;
this.TabPage6.Text = "Query Editor";
+ this.TabPage6.UseVisualStyleBackColor = true;
//
// btn_copy
//
@@ -1259,9 +1253,10 @@ namespace Handbrake
this.h264Tab.Location = new System.Drawing.Point(4, 22);
this.h264Tab.Name = "h264Tab";
this.h264Tab.Padding = new System.Windows.Forms.Padding(3);
- this.h264Tab.Size = new System.Drawing.Size(639, 211);
+ this.h264Tab.Size = new System.Drawing.Size(639, 215);
this.h264Tab.TabIndex = 5;
this.h264Tab.Text = "H.264";
+ this.h264Tab.UseVisualStyleBackColor = true;
//
// Label43
//
@@ -1347,9 +1342,10 @@ namespace Handbrake
this.TabPage2.Location = new System.Drawing.Point(4, 22);
this.TabPage2.Name = "TabPage2";
this.TabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.TabPage2.Size = new System.Drawing.Size(639, 211);
+ this.TabPage2.Size = new System.Drawing.Size(639, 215);
this.TabPage2.TabIndex = 3;
this.TabPage2.Text = "Audio && Subtitles";
+ this.TabPage2.UseVisualStyleBackColor = true;
//
// Label19
//
@@ -1502,9 +1498,10 @@ namespace Handbrake
this.TabPage3.Location = new System.Drawing.Point(4, 22);
this.TabPage3.Name = "TabPage3";
this.TabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.TabPage3.Size = new System.Drawing.Size(639, 211);
+ this.TabPage3.Size = new System.Drawing.Size(639, 215);
this.TabPage3.TabIndex = 2;
this.TabPage3.Text = "Video Settings";
+ this.TabPage3.UseVisualStyleBackColor = true;
//
// check_grayscale
//
@@ -1629,9 +1626,10 @@ namespace Handbrake
this.TabPage1.Location = new System.Drawing.Point(4, 22);
this.TabPage1.Name = "TabPage1";
this.TabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.TabPage1.Size = new System.Drawing.Size(639, 211);
+ this.TabPage1.Size = new System.Drawing.Size(639, 215);
this.TabPage1.TabIndex = 0;
this.TabPage1.Text = "Picture Settings";
+ this.TabPage1.UseVisualStyleBackColor = true;
//
// lbl_anamorphicError
//
@@ -1912,7 +1910,7 @@ namespace Handbrake
this.advancedOptions.Location = new System.Drawing.Point(14, 276);
this.advancedOptions.Name = "advancedOptions";
this.advancedOptions.SelectedIndex = 0;
- this.advancedOptions.Size = new System.Drawing.Size(647, 237);
+ this.advancedOptions.Size = new System.Drawing.Size(647, 241);
this.advancedOptions.TabIndex = 27;
this.advancedOptions.TabStop = false;
//
@@ -1924,9 +1922,10 @@ namespace Handbrake
this.tabPage4.Controls.Add(this.button1);
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
- this.tabPage4.Size = new System.Drawing.Size(639, 211);
+ this.tabPage4.Size = new System.Drawing.Size(639, 215);
this.tabPage4.TabIndex = 7;
this.tabPage4.Text = "Development";
+ this.tabPage4.UseVisualStyleBackColor = true;
//
// label26
//
@@ -1935,7 +1934,7 @@ namespace Handbrake
this.label26.Location = new System.Drawing.Point(13, 35);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(372, 26);
- this.label26.TabIndex = 130;
+ this.label26.TabIndex = 111;
this.label26.Text = "This tab is used for testing of new features. You can ignore this.\r\nIt will not b" +
"e a user visible tab on release.";
//
@@ -1965,37 +1964,23 @@ namespace Handbrake
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.btn_setDefault);
this.groupBox2.Controls.Add(this.ListBox_Presets);
this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox2.ForeColor = System.Drawing.Color.Black;
this.groupBox2.Location = new System.Drawing.Point(674, 35);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(193, 404);
+ this.groupBox2.Size = new System.Drawing.Size(193, 482);
this.groupBox2.TabIndex = 103;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Presets";
//
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.btn_removePreset);
- this.groupBox3.Controls.Add(this.btn_setDefault);
- this.groupBox3.Controls.Add(this.btn_addPreset);
- this.groupBox3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Location = new System.Drawing.Point(674, 448);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(193, 61);
- this.groupBox3.TabIndex = 108;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Preset Functions";
- //
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(873, 564);
- this.Controls.Add(this.groupBox3);
+ this.ClientSize = new System.Drawing.Size(873, 568);
this.Controls.Add(this.btn_presets);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox_dest);
@@ -2037,7 +2022,6 @@ namespace Handbrake
this.groupBox_dest.ResumeLayout(false);
this.groupBox_dest.PerformLayout();
this.groupBox2.ResumeLayout(false);
- this.groupBox3.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -2047,8 +2031,6 @@ namespace Handbrake
internal System.Windows.Forms.SaveFileDialog File_Save;
internal System.Windows.Forms.ToolTip ToolTip;
- internal System.Windows.Forms.OpenFileDialog File_Open;
- internal System.Windows.Forms.OpenFileDialog ISO_Open;
internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;
internal System.Windows.Forms.ToolStripMenuItem mnu_open3;
internal System.Windows.Forms.ToolStripMenuItem mnu_exit;
@@ -2100,7 +2082,6 @@ namespace Handbrake
internal System.Windows.Forms.Button btn_queue;
internal System.Windows.Forms.Button btn_encode;
internal System.Windows.Forms.Label Version;
- internal System.Windows.Forms.SaveFileDialog DVD_Save;
private System.Windows.Forms.Label lbl_encode;
internal System.Windows.Forms.Button btn_eCancel;
internal System.Windows.Forms.TabPage TabPage6;
@@ -2163,7 +2144,6 @@ namespace Handbrake
internal System.Windows.Forms.TextBox text_left;
internal System.Windows.Forms.TabControl advancedOptions;
internal System.Windows.Forms.Label Label46;
- internal System.Windows.Forms.FolderBrowserDialog DVD_Open;
private System.Windows.Forms.GroupBox groupBox_dest;
internal System.Windows.Forms.ComboBox drp_subtitle;
internal System.Windows.Forms.Label Label19;
@@ -2180,8 +2160,6 @@ namespace Handbrake
private System.Windows.Forms.Label label23;
internal System.Windows.Forms.Button btn_copy;
private System.Windows.Forms.GroupBox groupBox2;
- internal System.Windows.Forms.Button btn_removePreset;
- internal System.Windows.Forms.Button btn_addPreset;
private System.Windows.Forms.ListBox ListBox_Presets;
internal System.Windows.Forms.Button btn_presets;
internal System.Windows.Forms.Button btn_setDefault;
@@ -2189,7 +2167,6 @@ namespace Handbrake
private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;
private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
- private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
internal System.Windows.Forms.Button button1;
@@ -2197,6 +2174,13 @@ namespace Handbrake
private System.Windows.Forms.TabPage tabPage4;
internal System.Windows.Forms.Label label26;
internal System.Windows.Forms.Label label25;
+ private System.Windows.Forms.SaveFileDialog DVD_Save;
+ private System.Windows.Forms.OpenFileDialog File_Open;
+ private System.Windows.Forms.OpenFileDialog ISO_Open;
+ private System.Windows.Forms.FolderBrowserDialog DVD_Open;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripMenuItem mnu_open;
+ private System.Windows.Forms.ToolStripMenuItem mnu_save;
}
} \ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ecfc2680b..b7aab968a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -54,10 +54,8 @@ namespace Handbrake
// Enable or disable tooltips
tooltip();
- // Hide the presets part of the window
- this.Width = 590;
-
- showPresets();
+ // Hide the preset bar should the user have the option enabled.
+ hidePresetBar();
/*
* This code can be used for storing preset and preset name information in future versions.
@@ -226,12 +224,12 @@ namespace Handbrake
}
}
- private void showPresets()
+ private void hidePresetBar()
{
- if (Properties.Settings.Default.showPresets == "Checked")
+ if (Properties.Settings.Default.hidePresets == "Checked")
{
- btn_presets.Visible = false;
- this.Width = 881;
+ btn_presets.Visible = true;
+ this.Width = 591;
}
}
@@ -244,6 +242,169 @@ namespace Handbrake
#region File Menu
+
+
+ private void mnu_open_Click(object sender, EventArgs e)
+ {
+ string filename;
+ File_Open.ShowDialog();
+ filename = File_Open.FileName;
+ if (filename != "")
+ {
+ try
+ {
+ // Create StreamReader & open file
+ StreamReader line = new StreamReader(filename);
+ string temporyLine; // Used for reading the line into a varible before processing on the checkState items below.
+
+ // Read in the data and set the correct GUI component with the setting.
+ text_source.Text = line.ReadLine();
+ drp_dvdtitle.Text = line.ReadLine();
+ drop_chapterStart.Text = line.ReadLine();
+ drop_chapterFinish.Text = line.ReadLine();
+ text_destination.Text = line.ReadLine();
+ drp_videoEncoder.Text = line.ReadLine();
+ drp_audioCodec.Text = line.ReadLine();
+ text_width.Text = line.ReadLine();
+ text_height.Text = line.ReadLine();
+ text_top.Text = line.ReadLine();
+ text_bottom.Text = line.ReadLine();
+ text_left.Text = line.ReadLine();
+ text_right.Text = line.ReadLine();
+ drp_subtitle.Text = line.ReadLine();
+ text_bitrate.Text = line.ReadLine();
+ text_filesize.Text = line.ReadLine();
+ slider_videoQuality.Value = int.Parse(line.ReadLine());
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ check_2PassEncode.CheckState = CheckState.Checked;
+ }
+
+ drp_deInterlace_option.Text = line.ReadLine();
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ check_grayscale.CheckState = CheckState.Checked;
+ }
+
+ drp_videoFramerate.Text = line.ReadLine();
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ Check_ChapterMarkers.CheckState = CheckState.Checked;
+ }
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ CheckPixelRatio.CheckState = CheckState.Checked;
+ }
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ check_turbo.CheckState = CheckState.Checked;
+ }
+
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ check_largeFile.CheckState = CheckState.Checked;
+ }
+
+ drp_audioBitrate.Text = line.ReadLine();
+ drp_audioSampleRate.Text = line.ReadLine();
+ drp_audioChannels.Text = line.ReadLine();
+ drp_audioMixDown.Text = line.ReadLine();
+
+ // Advanced H264 Options
+ temporyLine = line.ReadLine();
+ if (temporyLine == "Checked")
+ {
+ CheckCRF.CheckState = CheckState.Checked;
+ }
+ rtf_h264advanced.Text = line.ReadLine();
+
+ // Close the stream
+ line.Close();
+
+
+ // Fix for SliderValue not appearing when Opening saved file
+ SliderValue.Text = slider_videoQuality.Value + "%";
+
+ }
+ catch (Exception)
+ {
+ MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ }
+ }
+ }
+
+ private void mnu_save_Click(object sender, EventArgs e)
+ {
+ string filename;
+ File_Save.ShowDialog();
+ filename = File_Save.FileName;
+ if (filename != "")
+ {
+ try
+ {
+ // Create a StreamWriter and open the file
+ StreamWriter line = new StreamWriter(filename);
+
+ //Source
+ line.WriteLine(text_source.Text);
+ line.WriteLine(drp_dvdtitle.Text);
+ line.WriteLine(drop_chapterStart.Text);
+ line.WriteLine(drop_chapterFinish.Text);
+ //Destination
+ line.WriteLine(text_destination.Text);
+ line.WriteLine(drp_videoEncoder.Text);
+ line.WriteLine(drp_audioCodec.Text);
+ line.WriteLine(text_width.Text);
+ line.WriteLine(text_height.Text);
+ //Picture Settings Tab
+ line.WriteLine(text_top.Text);
+ line.WriteLine(text_bottom.Text);
+ line.WriteLine(text_left.Text);
+ line.WriteLine(text_right.Text);
+ line.WriteLine(drp_subtitle.Text);
+ //Video Settings Tab
+ line.WriteLine(text_bitrate.Text);
+ line.WriteLine(text_filesize.Text);
+ line.WriteLine(slider_videoQuality.Value.ToString());
+ line.WriteLine(check_2PassEncode.CheckState.ToString());
+ line.WriteLine(drp_deInterlace_option.Text);
+ line.WriteLine(check_grayscale.CheckState.ToString());
+ line.WriteLine(drp_videoFramerate.Text);
+ line.WriteLine(Check_ChapterMarkers.CheckState.ToString());
+ line.WriteLine(CheckPixelRatio.CheckState.ToString());
+ line.WriteLine(check_turbo.CheckState.ToString());
+ line.WriteLine(check_largeFile.CheckState.ToString());
+ //Audio Settings Tab
+ line.WriteLine(drp_audioBitrate.Text);
+ line.WriteLine(drp_audioSampleRate.Text);
+ line.WriteLine(drp_audioChannels.Text);
+ line.WriteLine(drp_audioMixDown.Text);
+ //H264 Tab
+ line.WriteLine(CheckCRF.CheckState.ToString());
+ line.WriteLine(rtf_h264advanced.Text);
+ // close the stream
+ line.Close();
+ MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+ }
+ catch (Exception)
+ {
+ MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ }
+
+ }
+ }
+
private void mnu_exit_Click(object sender, EventArgs e)
{
Application.Exit();
@@ -381,7 +542,8 @@ namespace Handbrake
{
String filename = "";
text_source.Text = "";
- frmDvdInfo dvdInfoWindow = new frmDvdInfo();
+ frmDvdInfo dvdInfoWindow = new frmDvdInfo();
+
if (RadioDVD.Checked)
{
DVD_Open.ShowDialog();
@@ -456,6 +618,7 @@ namespace Handbrake
private void btn_queue_Click(object sender, EventArgs e)
{
+
if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
@@ -473,7 +636,7 @@ namespace Handbrake
queueWindow.Show();
}
}
-
+
private void btn_copy_Click(object sender, EventArgs e)
{
if (QueryEditorText.Text != "")
@@ -514,167 +677,6 @@ namespace Handbrake
}
- private void btn_addPreset_Click(object sender, EventArgs e)
- {
- string filename;
- File_Open.ShowDialog();
- filename = File_Open.FileName;
- if (filename != "")
- {
- try
- {
- // Create StreamReader & open file
- StreamReader line = new StreamReader(filename);
- string temporyLine; // Used for reading the line into a varible before processing on the checkState items below.
-
- // Read in the data and set the correct GUI component with the setting.
- text_source.Text = line.ReadLine();
- drp_dvdtitle.Text = line.ReadLine();
- drop_chapterStart.Text = line.ReadLine();
- drop_chapterFinish.Text = line.ReadLine();
- text_destination.Text = line.ReadLine();
- drp_videoEncoder.Text = line.ReadLine();
- drp_audioCodec.Text = line.ReadLine();
- text_width.Text = line.ReadLine();
- text_height.Text = line.ReadLine();
- text_top.Text = line.ReadLine();
- text_bottom.Text = line.ReadLine();
- text_left.Text = line.ReadLine();
- text_right.Text = line.ReadLine();
- drp_subtitle.Text = line.ReadLine();
- text_bitrate.Text = line.ReadLine();
- text_filesize.Text = line.ReadLine();
- slider_videoQuality.Value = int.Parse(line.ReadLine());
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- check_2PassEncode.CheckState = CheckState.Checked;
- }
-
- drp_deInterlace_option.Text = line.ReadLine();
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- check_grayscale.CheckState = CheckState.Checked;
- }
-
- drp_videoFramerate.Text = line.ReadLine();
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- Check_ChapterMarkers.CheckState = CheckState.Checked;
- }
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- CheckPixelRatio.CheckState = CheckState.Checked;
- }
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- check_turbo.CheckState = CheckState.Checked;
- }
-
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- check_largeFile.CheckState = CheckState.Checked;
- }
-
- drp_audioBitrate.Text = line.ReadLine();
- drp_audioSampleRate.Text = line.ReadLine();
- drp_audioChannels.Text = line.ReadLine();
- drp_audioMixDown.Text = line.ReadLine();
-
- // Advanced H264 Options
- temporyLine = line.ReadLine();
- if (temporyLine == "Checked")
- {
- CheckCRF.CheckState = CheckState.Checked;
- }
- rtf_h264advanced.Text = line.ReadLine();
-
- // Close the stream
- line.Close();
-
-
- // Fix for SliderValue not appearing when Opening saved file
- SliderValue.Text = slider_videoQuality.Value + "%";
-
- }
- catch (Exception)
- {
- MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
- }
- }
- }
-
- private void btn_removePreset_Click(object sender, EventArgs e)
- {
- string filename;
- File_Save.ShowDialog();
- filename = File_Save.FileName;
- if (filename != "")
- {
- try
- {
- // Create a StreamWriter and open the file
- StreamWriter line = new StreamWriter(filename);
-
- //Source
- line.WriteLine(text_source.Text);
- line.WriteLine(drp_dvdtitle.Text);
- line.WriteLine(drop_chapterStart.Text);
- line.WriteLine(drop_chapterFinish.Text);
- //Destination
- line.WriteLine(text_destination.Text);
- line.WriteLine(drp_videoEncoder.Text);
- line.WriteLine(drp_audioCodec.Text);
- line.WriteLine(text_width.Text);
- line.WriteLine(text_height.Text);
- //Picture Settings Tab
- line.WriteLine(text_top.Text);
- line.WriteLine(text_bottom.Text);
- line.WriteLine(text_left.Text);
- line.WriteLine(text_right.Text);
- line.WriteLine(drp_subtitle.Text);
- //Video Settings Tab
- line.WriteLine(text_bitrate.Text);
- line.WriteLine(text_filesize.Text);
- line.WriteLine(slider_videoQuality.Value.ToString());
- line.WriteLine(check_2PassEncode.CheckState.ToString());
- line.WriteLine(drp_deInterlace_option.Text);
- line.WriteLine(check_grayscale.CheckState.ToString());
- line.WriteLine(drp_videoFramerate.Text);
- line.WriteLine(Check_ChapterMarkers.CheckState.ToString());
- line.WriteLine(CheckPixelRatio.CheckState.ToString());
- line.WriteLine(check_turbo.CheckState.ToString());
- line.WriteLine(check_largeFile.CheckState.ToString());
- //Audio Settings Tab
- line.WriteLine(drp_audioBitrate.Text);
- line.WriteLine(drp_audioSampleRate.Text);
- line.WriteLine(drp_audioChannels.Text);
- line.WriteLine(drp_audioMixDown.Text);
- //H264 Tab
- line.WriteLine(CheckCRF.CheckState.ToString());
- line.WriteLine(rtf_h264advanced.Text);
- // close the stream
- line.Close();
- MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
- }
- catch (Exception)
- {
- MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
- }
-
- }
- }
-
private void btn_setDefault_Click(object sender, EventArgs e)
{
//Source
@@ -731,6 +733,7 @@ namespace Handbrake
// Preset Seleciton
private void ListBox_Presets_SelectedIndexChanged(object sender, EventArgs e)
{
+
string selectedPreset = null;
if (ListBox_Presets.SelectedItem != null)
{
@@ -743,59 +746,78 @@ namespace Handbrake
switch (selectedPreset)
{
+ //(anamorphic, width, height, vencoder, bitrate, filesize, quality, qpercent, audioBit, chpt, audioSample, h264, deinterlace, twopass, crop, turbo, audioCodec, preset
+
case "Animation":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Apple Animation)");
setMkv();
break;
+
case "AppleTV":
- setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Apple TV)");
+ setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2:cabac=0", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Apple TV)");
break;
+
case "Bedlam":
- setGuiSetttings(CheckState.Checked, "", "", "H.264", "1800", "", 0, "0%", "160", CheckState.Checked, "48", "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Bedlam)");
+ setGuiSetttings(CheckState.Checked, "", "", "H.264", "1800", "", 0, "0%", "160", CheckState.Checked, "48", "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Bedlam)");
setMkv();
break;
+
case "Blind":
- setGuiSetttings(CheckState.Unchecked, "512", "", "H.264", "512", "", 0, "0%", "128", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Blind)");
+ setGuiSetttings(CheckState.Unchecked, "512", "", "Mpeg 4", "512", "", 0, "0%", "128", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Blind)");
break;
+
case "Broke":
setGuiSetttings(CheckState.Unchecked, "640", "", "H.264", "", "695", 0, "0%", "128", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:b-pyramid::direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Broke)");
break;
+
case "Classic":
- setGuiSetttings(CheckState.Unchecked, "", "", "H.264", "1000", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Classic)");
+ setGuiSetttings(CheckState.Unchecked, "", "", "Mpeg 4", "1000", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Classic)");
break;
+
case "Constant Quality Rate":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "", "", 64, "64%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AC3", "Output Settings (Preset: CQR)");
setMkv();
break;
+
case "Deux Six Quatre":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1600", "", 0, "0%", "160", CheckState.Checked, "48", "ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: DSQ)");
setMkv();
break;
+
case "Film":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Film)");
setMkv();
break;
+
case "iPhone / iPod Touch":
setGuiSetttings(CheckState.Unchecked, "480", "", "H.264 (iPod)", "960", "", 0, "0%", "128", CheckState.Checked, "48", "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPhone)");
break;
+
case "iPod High-Rez":
setGuiSetttings(CheckState.Unchecked, "640", "", "H.264 (iPod)", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod High Rez)");
break;
+
case "iPod Low-Rez":
setGuiSetttings(CheckState.Unchecked, "320", "", "H.264 (iPod)", "700", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod Low Rez)");
break;
+
case "Normal":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "ref=2:bframes=2:subme=5:me=umh", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Normal)");
break;
+
case "PS3":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "level=41:subme=5:me=umh", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PS3)");
break;
+
case "PSP":
- setGuiSetttings(CheckState.Unchecked, "368", "208", "Mpeg 4", "1024", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PSP)");
+ setGuiSetttings(CheckState.Unchecked, "368", "208", "Mpeg 4", "1024", "", 0, "0%", "160", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PSP)");
break;
+
case "QuickTime":
- setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct-auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Quicktime)");
+ setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Quicktime)");
break;
+
+
case "Television":
setGuiSetttings(CheckState.Unchecked, "", "", "H.264", "1300", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Television)");
setMkv();
@@ -1815,6 +1837,9 @@ namespace Handbrake
MessageBox.Show(thisQuery.DeTelecine.ToString());
}
+
+
+
// This is the END of the road ------------------------------------------------------------------------------
}
}
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 856138691..f8feed8cd 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -138,13 +138,46 @@
<metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>432, 15</value>
</metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+</value>
+ </data>
+ <data name="mnu_save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAixJREFUOE+tk91L
+ k3EUx/cvdN9N0EW3NTWGa7EaPOUcyqphWBG9PZEv5dJlmqhYmUYtXyBb4dJJy+kknFT4BqZIjaFMJUsz
+ V7TEoabYRDD49ju/6Pm1Mi+iH5zLz+c855zvo1L9j/fsaRRUvvZltHmX8Ni9gMaGCO47ZlBb8wn22yHc
+ KJ9CackECgteIy93FBfOB6H0JrC3B6ipXsVGb2V1Dca0XhxOe8JLEXhbF7mgsuLLX3mCIwsr2G1+DrVa
+ huWQRwjcj+a5oLTk87qCn/D78CLiTD4UXJ7GAXOTEDjrZ7ngku3dH4Jf4ZHJCLZJXlhzxpGa4hSCurth
+ LsjOGo0R/A4PBsPYrHdDlgMwmRxCUF31kQvkMwFFsB7c4/+ATYkNOHL0BZKSaoXgZuU0urvATgkcP/kK
+ lmMDfNu0MJqZPps6/4D7cNDSCUmyC8HVskl0+MAyADS5vrG7f0X59Tm+VFoYzZyZEVTg5NR2GAwVQnCl
+ cByeZuChc40FJwpjek5MmU/YkH6uiHdOTmHwfg/0+jIhsOWNMRiouhPlnUnAQoI4rYSht7MYm5qDnHsN
+ e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2
+ 7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH
+ Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>94, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 460a77570..df13a4ac5 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -92,9 +92,9 @@ namespace Handbrake
this.check_showPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.check_showPreset.Location = new System.Drawing.Point(15, 94);
this.check_showPreset.Name = "check_showPreset";
- this.check_showPreset.Size = new System.Drawing.Size(362, 17);
+ this.check_showPreset.Size = new System.Drawing.Size(115, 17);
this.check_showPreset.TabIndex = 50;
- this.check_showPreset.Text = "Always Show Presets (Hide\'s the Show/Hide preset button)";
+ this.check_showPreset.Text = "Hide Preset Bar";
this.check_showPreset.UseVisualStyleBackColor = true;
this.check_showPreset.CheckedChanged += new System.EventHandler(this.check_showPreset_CheckedChanged);
//
diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index fe54d22a5..5451d6f9b 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -44,7 +44,7 @@ namespace Handbrake
check_tooltip.CheckState = CheckState.Checked;
}
- if (Properties.Settings.Default.showPresets == "Checked")
+ if (Properties.Settings.Default.hidePresets == "Checked")
{
check_showPreset.CheckState = CheckState.Checked;
}
@@ -98,7 +98,7 @@ namespace Handbrake
private void check_showPreset_CheckedChanged(object sender, EventArgs e)
{
- Properties.Settings.Default.showPresets = check_showPreset.CheckState.ToString();
+ Properties.Settings.Default.hidePresets = check_showPreset.CheckState.ToString();
}
diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 1c809e18e..7a26c8775 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -45,7 +45,12 @@ namespace Handbrake
this.btn_cancel = new System.Windows.Forms.Button();
this.lbl_status = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.text_edit = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.btn_updateQuery = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// btn_down
@@ -55,7 +60,7 @@ namespace Handbrake
this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_down.Location = new System.Drawing.Point(650, 144);
+ this.btn_down.Location = new System.Drawing.Point(656, 91);
this.btn_down.Name = "btn_down";
this.btn_down.Size = new System.Drawing.Size(64, 22);
this.btn_down.TabIndex = 33;
@@ -71,7 +76,7 @@ namespace Handbrake
this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_up.Location = new System.Drawing.Point(649, 116);
+ this.btn_up.Location = new System.Drawing.Point(655, 63);
this.btn_up.Name = "btn_up";
this.btn_up.Size = new System.Drawing.Size(64, 22);
this.btn_up.TabIndex = 32;
@@ -87,7 +92,7 @@ namespace Handbrake
this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_delete.Location = new System.Drawing.Point(650, 190);
+ this.btn_delete.Location = new System.Drawing.Point(656, 137);
this.btn_delete.Name = "btn_delete";
this.btn_delete.Size = new System.Drawing.Size(64, 22);
this.btn_delete.TabIndex = 31;
@@ -103,7 +108,7 @@ namespace Handbrake
this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_q_encoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_q_encoder.Location = new System.Drawing.Point(13, 302);
+ this.btn_q_encoder.Location = new System.Drawing.Point(10, 366);
this.btn_q_encoder.Name = "btn_q_encoder";
this.btn_q_encoder.Size = new System.Drawing.Size(124, 22);
this.btn_q_encoder.TabIndex = 29;
@@ -115,12 +120,13 @@ namespace Handbrake
// list_queue
//
this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.list_queue.FormattingEnabled = true;
+ this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.list_queue.HorizontalScrollbar = true;
- this.list_queue.Location = new System.Drawing.Point(13, 72);
+ this.list_queue.Location = new System.Drawing.Point(19, 19);
this.list_queue.Name = "list_queue";
this.list_queue.Size = new System.Drawing.Size(630, 184);
this.list_queue.TabIndex = 28;
+ this.list_queue.SelectedIndexChanged += new System.EventHandler(this.list_queue_SelectedIndexChanged);
//
// btn_Close
//
@@ -129,7 +135,7 @@ namespace Handbrake
this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(606, 305);
+ this.btn_Close.Location = new System.Drawing.Point(639, 366);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(108, 22);
this.btn_Close.TabIndex = 27;
@@ -141,16 +147,16 @@ namespace Handbrake
// progressBar
//
this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight;
- this.progressBar.Location = new System.Drawing.Point(67, 264);
+ this.progressBar.Location = new System.Drawing.Point(64, 328);
this.progressBar.Name = "progressBar";
- this.progressBar.Size = new System.Drawing.Size(576, 23);
+ this.progressBar.Size = new System.Drawing.Size(653, 23);
this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar.TabIndex = 34;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(10, 270);
+ this.label2.Location = new System.Drawing.Point(7, 334);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(51, 13);
this.label2.TabIndex = 35;
@@ -159,7 +165,7 @@ namespace Handbrake
// lbl_progressValue
//
this.lbl_progressValue.AutoSize = true;
- this.lbl_progressValue.Location = new System.Drawing.Point(646, 270);
+ this.lbl_progressValue.Location = new System.Drawing.Point(723, 332);
this.lbl_progressValue.Name = "lbl_progressValue";
this.lbl_progressValue.Size = new System.Drawing.Size(24, 13);
this.lbl_progressValue.TabIndex = 36;
@@ -200,7 +206,7 @@ namespace Handbrake
this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_cancel.Location = new System.Drawing.Point(143, 302);
+ this.btn_cancel.Location = new System.Drawing.Point(140, 366);
this.btn_cancel.Name = "btn_cancel";
this.btn_cancel.Size = new System.Drawing.Size(91, 22);
this.btn_cancel.TabIndex = 41;
@@ -216,19 +222,73 @@ namespace Handbrake
//
this.lbl_status.AutoSize = true;
this.lbl_status.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_status.Location = new System.Drawing.Point(260, 268);
+ this.lbl_status.Location = new System.Drawing.Point(314, 332);
this.lbl_status.Name = "lbl_status";
this.lbl_status.Size = new System.Drawing.Size(176, 13);
this.lbl_status.TabIndex = 42;
this.lbl_status.Text = "Encode Queue Completed!";
this.lbl_status.Visible = false;
//
+ // text_edit
+ //
+ this.text_edit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.text_edit.Location = new System.Drawing.Point(119, 209);
+ this.text_edit.Name = "text_edit";
+ this.text_edit.Size = new System.Drawing.Size(530, 21);
+ this.text_edit.TabIndex = 43;
+ this.toolTip1.SetToolTip(this.text_edit, "Avoid using this feature when the encoder is about to start a new task. You may o" +
+ "verwrite the wrong job");
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label4.Location = new System.Drawing.Point(16, 211);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(97, 13);
+ this.label4.TabIndex = 45;
+ this.label4.Text = "Modify Query:";
+ //
+ // btn_updateQuery
+ //
+ this.btn_updateQuery.BackColor = System.Drawing.SystemColors.ControlLight;
+ this.btn_updateQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;
+ this.btn_updateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btn_updateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_updateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
+ this.btn_updateQuery.Location = new System.Drawing.Point(655, 207);
+ this.btn_updateQuery.Name = "btn_updateQuery";
+ this.btn_updateQuery.Size = new System.Drawing.Size(64, 23);
+ this.btn_updateQuery.TabIndex = 46;
+ this.btn_updateQuery.TabStop = false;
+ this.btn_updateQuery.Text = "Update";
+ this.btn_updateQuery.UseVisualStyleBackColor = false;
+ this.btn_updateQuery.Click += new System.EventHandler(this.btn_updateQuery_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.list_queue);
+ this.groupBox1.Controls.Add(this.btn_updateQuery);
+ this.groupBox1.Controls.Add(this.btn_delete);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.btn_up);
+ this.groupBox1.Controls.Add(this.text_edit);
+ this.groupBox1.Controls.Add(this.btn_down);
+ this.groupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.groupBox1.Location = new System.Drawing.Point(12, 73);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(735, 249);
+ this.groupBox1.TabIndex = 47;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Queued Management";
+ //
// frmQueue
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(723, 332);
+ this.ClientSize = new System.Drawing.Size(761, 396);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.lbl_status);
this.Controls.Add(this.btn_cancel);
this.Controls.Add(this.label1);
@@ -237,11 +297,7 @@ namespace Handbrake
this.Controls.Add(this.lbl_progressValue);
this.Controls.Add(this.label2);
this.Controls.Add(this.progressBar);
- this.Controls.Add(this.btn_down);
- this.Controls.Add(this.btn_up);
- this.Controls.Add(this.btn_delete);
this.Controls.Add(this.btn_q_encoder);
- this.Controls.Add(this.list_queue);
this.Controls.Add(this.btn_Close);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
@@ -249,6 +305,8 @@ namespace Handbrake
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Encode Queue";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -260,7 +318,6 @@ namespace Handbrake
internal System.Windows.Forms.Button btn_up;
internal System.Windows.Forms.Button btn_delete;
internal System.Windows.Forms.Button btn_q_encoder;
- internal System.Windows.Forms.ListBox list_queue;
internal System.Windows.Forms.Button btn_Close;
private System.Windows.Forms.ProgressBar progressBar;
private System.Windows.Forms.Label label2;
@@ -271,5 +328,10 @@ namespace Handbrake
internal System.Windows.Forms.Button btn_cancel;
private System.Windows.Forms.Label lbl_status;
private System.Windows.Forms.ToolTip toolTip1;
+ public System.Windows.Forms.ListBox list_queue;
+ private System.Windows.Forms.TextBox text_edit;
+ private System.Windows.Forms.Label label4;
+ internal System.Windows.Forms.Button btn_updateQuery;
+ private System.Windows.Forms.GroupBox groupBox1;
}
} \ No newline at end of file
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index bec77f402..d6b502643 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -40,8 +40,11 @@ namespace Handbrake
lbl_progressValue.Text = "0 %";
progressBar.Step = 100 / list_queue.Items.Count;
progressBar.Update();
- ThreadPool.QueueUserWorkItem(startProc);
- }
+ //ThreadPool.QueueUserWorkItem(startProc);
+ // Testing a new way of launching a thread. Hopefully will fix a random freeze up of the main thread.
+ Thread test = new Thread(startProc);
+ test.Start();
+ }
}
catch (Exception exc)
{
@@ -70,7 +73,7 @@ namespace Handbrake
string query = list_queue.Items[0].ToString();
updateUIElements();
-
+
Functions.CLI process = new Functions.CLI();
Process hbProc = process.runCli(this, query, false, false, false, false);
@@ -156,11 +159,13 @@ namespace Handbrake
{
lbl_status.Visible = true;
lbl_status.Text = "Encode Queue Cancelled!";
+ text_edit.Text = "";
}
else
{
lbl_status.Visible = true;
lbl_status.Text = "Encode Queue Completed!";
+ text_edit.Text = "";
}
btn_cancel.Visible = false;
@@ -217,6 +222,34 @@ namespace Handbrake
}
#endregion
+ #region Queue Item Modification
+
+ int listCount = 0;
+
+ private void btn_updateQuery_Click(object sender, EventArgs e)
+ {
+ if (text_edit.Text != "")
+ {
+ if (list_queue.Items.Count != listCount)
+ {
+ MessageBox.Show("Unable to modify the selected item. The number of items on the list has changed. \nPlease avoid modifying an item when a new encode is about to start!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ }
+ else
+ {
+ if (list_queue.SelectedItem != null)
+ list_queue.Items[list_queue.SelectedIndex] = text_edit.Text;
+ }
+ }
+ }
+
+ private void list_queue_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (list_queue.SelectedItem != null)
+ text_edit.Text = list_queue.SelectedItem.ToString();
+
+ listCount = list_queue.Items.Count;
+ }
+ #endregion
private void btn_Close_Click(object sender, EventArgs e)
{
@@ -230,6 +263,11 @@ namespace Handbrake
base.OnClosing(e);
}
+
+
+
+
+
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 04:01:32 +0000