From: sr55 Date: Sun, 5 Jul 2009 16:38:58 +0000 (+0000) Subject: WinGui: X-Git-Tag: 0.9.4~296 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40b0985abcaea7a7d45676edfb0f472ff356694e;p=handbrake WinGui: - UI design tweaks, consistent font usage, tableLayout for frmMain - Bug Fixes related to using source label instead of source path. - thanks to darkassassin - Few small tweaks/ fixes to above patch. - Fixed: Delete all built in presets option. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2666 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs index e067aa579..ea94567c9 100644 --- a/win/C#/Controls/AudioPanel.Designer.cs +++ b/win/C#/Controls/AudioPanel.Designer.cs @@ -169,7 +169,7 @@ namespace Handbrake.Controls // btn_RemoveAudioTrack // this.btn_RemoveAudioTrack.BackColor = System.Drawing.Color.Transparent; - this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(133, 268); this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack"; @@ -182,7 +182,7 @@ namespace Handbrake.Controls // btn_addAudioTrack // this.btn_addAudioTrack.BackColor = System.Drawing.Color.Transparent; - this.btn_addAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_addAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 268); this.btn_addAudioTrack.Name = "btn_addAudioTrack"; @@ -196,10 +196,9 @@ namespace Handbrake.Controls // this.lbl_drc.AutoSize = true; this.lbl_drc.BackColor = System.Drawing.Color.Transparent; - this.lbl_drc.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_drc.Location = new System.Drawing.Point(658, 37); this.lbl_drc.Name = "lbl_drc"; - this.lbl_drc.Size = new System.Drawing.Size(14, 13); + this.lbl_drc.Size = new System.Drawing.Size(13, 13); this.lbl_drc.TabIndex = 62; this.lbl_drc.Text = "0"; // @@ -207,10 +206,9 @@ namespace Handbrake.Controls // this.label16.AutoSize = true; this.label16.BackColor = System.Drawing.Color.Transparent; - this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label16.Location = new System.Drawing.Point(607, 17); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(28, 12); + this.label16.Size = new System.Drawing.Size(28, 13); this.label16.TabIndex = 61; this.label16.Text = "DRC"; // @@ -230,10 +228,10 @@ namespace Handbrake.Controls // this.label68.AutoSize = true; this.label68.BackColor = System.Drawing.Color.Transparent; - this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label68.Location = new System.Drawing.Point(13, 13); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(92, 13); + this.label68.Size = new System.Drawing.Size(80, 13); this.label68.TabIndex = 49; this.label68.Text = "Audio Tracks"; // @@ -241,10 +239,9 @@ namespace Handbrake.Controls // this.label67.AutoSize = true; this.label67.BackColor = System.Drawing.Color.Transparent; - this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label67.Location = new System.Drawing.Point(463, 17); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(62, 12); + this.label67.Size = new System.Drawing.Size(61, 13); this.label67.TabIndex = 57; this.label67.Text = "Samplerate"; // @@ -252,10 +249,9 @@ namespace Handbrake.Controls // this.label66.AutoSize = true; this.label66.BackColor = System.Drawing.Color.Transparent; - this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label66.Location = new System.Drawing.Point(538, 17); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(39, 12); + this.label66.Size = new System.Drawing.Size(39, 13); this.label66.TabIndex = 59; this.label66.Text = "Bitrate"; // @@ -263,10 +259,9 @@ namespace Handbrake.Controls // this.label65.AutoSize = true; this.label65.BackColor = System.Drawing.Color.Transparent; - this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label65.Location = new System.Drawing.Point(234, 17); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(69, 12); + this.label65.Size = new System.Drawing.Size(67, 13); this.label65.TabIndex = 53; this.label65.Text = "Audio Codec"; // @@ -274,16 +269,14 @@ namespace Handbrake.Controls // this.label14.AutoSize = true; this.label14.BackColor = System.Drawing.Color.Transparent; - this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.Location = new System.Drawing.Point(368, 17); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(48, 12); + this.label14.Size = new System.Drawing.Size(49, 13); this.label14.TabIndex = 55; this.label14.Text = "Mixdown"; // // drp_audenc_1 // - this.drp_audenc_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audenc_1.FormattingEnabled = true; this.drp_audenc_1.Items.AddRange(new object[] { "AAC (faac)", @@ -292,7 +285,7 @@ namespace Handbrake.Controls "AC3 Passthru"}); this.drp_audenc_1.Location = new System.Drawing.Point(215, 34); this.drp_audenc_1.Name = "drp_audenc_1"; - this.drp_audenc_1.Size = new System.Drawing.Size(111, 20); + this.drp_audenc_1.Size = new System.Drawing.Size(111, 21); this.drp_audenc_1.TabIndex = 52; this.drp_audenc_1.Text = "AAC (faac)"; this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged); @@ -301,16 +294,14 @@ namespace Handbrake.Controls // this.label27.AutoSize = true; this.label27.BackColor = System.Drawing.Color.Transparent; - this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label27.Location = new System.Drawing.Point(86, 17); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(40, 12); + this.label27.Size = new System.Drawing.Size(40, 13); this.label27.TabIndex = 51; this.label27.Text = "Source"; // // drp_audmix_1 // - this.drp_audmix_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audmix_1.FormattingEnabled = true; this.drp_audmix_1.Items.AddRange(new object[] { "Automatic", @@ -321,27 +312,25 @@ namespace Handbrake.Controls "6 Channel Discrete"}); this.drp_audmix_1.Location = new System.Drawing.Point(332, 34); this.drp_audmix_1.Name = "drp_audmix_1"; - this.drp_audmix_1.Size = new System.Drawing.Size(129, 20); + this.drp_audmix_1.Size = new System.Drawing.Size(129, 21); this.drp_audmix_1.TabIndex = 54; this.drp_audmix_1.Text = "Automatic"; this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_1_SelectedIndexChanged); // // drp_track1Audio // - this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_track1Audio.FormattingEnabled = true; this.drp_track1Audio.Items.AddRange(new object[] { "Automatic"}); this.drp_track1Audio.Location = new System.Drawing.Point(15, 35); this.drp_track1Audio.Name = "drp_track1Audio"; - this.drp_track1Audio.Size = new System.Drawing.Size(194, 20); + this.drp_track1Audio.Size = new System.Drawing.Size(194, 21); this.drp_track1Audio.TabIndex = 50; this.drp_track1Audio.Text = "Automatic"; this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged); // // drp_audbit_1 // - this.drp_audbit_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audbit_1.FormattingEnabled = true; this.drp_audbit_1.Items.AddRange(new object[] { "32", @@ -356,14 +345,13 @@ namespace Handbrake.Controls "160"}); this.drp_audbit_1.Location = new System.Drawing.Point(525, 34); this.drp_audbit_1.Name = "drp_audbit_1"; - this.drp_audbit_1.Size = new System.Drawing.Size(70, 20); + this.drp_audbit_1.Size = new System.Drawing.Size(70, 21); this.drp_audbit_1.TabIndex = 58; this.drp_audbit_1.Text = "160"; this.drp_audbit_1.SelectedIndexChanged += new System.EventHandler(this.drp_audbit_1_SelectedIndexChanged); // // drp_audsr_1 // - this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audsr_1.FormattingEnabled = true; this.drp_audsr_1.Items.AddRange(new object[] { "Auto", @@ -374,7 +362,7 @@ namespace Handbrake.Controls "22.05"}); this.drp_audsr_1.Location = new System.Drawing.Point(467, 34); this.drp_audsr_1.Name = "drp_audsr_1"; - this.drp_audsr_1.Size = new System.Drawing.Size(55, 20); + this.drp_audsr_1.Size = new System.Drawing.Size(55, 21); this.drp_audsr_1.TabIndex = 56; this.drp_audsr_1.Text = "Auto"; this.drp_audsr_1.SelectedIndexChanged += new System.EventHandler(this.drp_audsr_1_SelectedIndexChanged); @@ -395,7 +383,6 @@ namespace Handbrake.Controls this.AudioTrackGroup.Controls.Add(this.label65); this.AudioTrackGroup.Controls.Add(this.label67); this.AudioTrackGroup.Controls.Add(this.label66); - this.AudioTrackGroup.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.AudioTrackGroup.ForeColor = System.Drawing.Color.Black; this.AudioTrackGroup.Location = new System.Drawing.Point(16, 32); this.AudioTrackGroup.Name = "AudioTrackGroup"; @@ -419,6 +406,7 @@ namespace Handbrake.Controls this.Controls.Add(this.btn_RemoveAudioTrack); this.Controls.Add(this.btn_addAudioTrack); this.Controls.Add(this.label68); + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "AudioPanel"; this.Size = new System.Drawing.Size(720, 310); this.audioMenu.ResumeLayout(false); diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs index a395778b8..6bdd7fbba 100644 --- a/win/C#/Controls/Filters.Designer.cs +++ b/win/C#/Controls/Filters.Designer.cs @@ -52,7 +52,7 @@ // this.text_customDT.Location = new System.Drawing.Point(288, 32); this.text_customDT.Name = "text_customDT"; - this.text_customDT.Size = new System.Drawing.Size(115, 20); + this.text_customDT.Size = new System.Drawing.Size(115, 21); this.text_customDT.TabIndex = 47; this.text_customDT.Visible = false; // @@ -60,17 +60,15 @@ // this.label18.AutoSize = true; this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label18.Location = new System.Drawing.Point(13, 35); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(72, 13); + this.label18.Size = new System.Drawing.Size(61, 13); this.label18.TabIndex = 46; this.label18.Text = "Detelecine:"; // // drop_detelecine // this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_detelecine.FormattingEnabled = true; this.drop_detelecine.Items.AddRange(new object[] { "Off", @@ -86,7 +84,7 @@ // this.text_customDC.Location = new System.Drawing.Point(288, 59); this.text_customDC.Name = "text_customDC"; - this.text_customDC.Size = new System.Drawing.Size(115, 20); + this.text_customDC.Size = new System.Drawing.Size(115, 21); this.text_customDC.TabIndex = 50; this.text_customDC.Visible = false; // @@ -94,17 +92,15 @@ // this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.Location = new System.Drawing.Point(13, 62); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(59, 13); + this.label1.Size = new System.Drawing.Size(49, 13); this.label1.TabIndex = 49; this.label1.Text = "Decomb:"; // // drop_decomb // this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_decomb.FormattingEnabled = true; this.drop_decomb.Items.AddRange(new object[] { "Off", @@ -120,7 +116,7 @@ // this.text_customDI.Location = new System.Drawing.Point(288, 86); this.text_customDI.Name = "text_customDI"; - this.text_customDI.Size = new System.Drawing.Size(115, 20); + this.text_customDI.Size = new System.Drawing.Size(115, 21); this.text_customDI.TabIndex = 53; this.text_customDI.Visible = false; // @@ -128,17 +124,15 @@ // this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(13, 89); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(77, 13); + this.label2.Size = new System.Drawing.Size(65, 13); this.label2.TabIndex = 52; this.label2.Text = "Deinterlace:"; // // drop_deinterlace // this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_deinterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_deinterlace.FormattingEnabled = true; this.drop_deinterlace.Items.AddRange(new object[] { "None", @@ -156,7 +150,7 @@ // this.text_customDN.Location = new System.Drawing.Point(288, 113); this.text_customDN.Name = "text_customDN"; - this.text_customDN.Size = new System.Drawing.Size(115, 20); + this.text_customDN.Size = new System.Drawing.Size(115, 21); this.text_customDN.TabIndex = 56; this.text_customDN.Visible = false; // @@ -164,17 +158,15 @@ // this.label3.AutoSize = true; this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(13, 116); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(58, 13); + this.label3.Size = new System.Drawing.Size(49, 13); this.label3.TabIndex = 55; this.label3.Text = "Denoise:"; // // drop_denoise // this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_denoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_denoise.FormattingEnabled = true; this.drop_denoise.Items.AddRange(new object[] { "None", @@ -203,10 +195,9 @@ // this.check_grayscale.AutoSize = true; this.check_grayscale.BackColor = System.Drawing.Color.Transparent; - this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.check_grayscale.Location = new System.Drawing.Point(121, 191); this.check_grayscale.Name = "check_grayscale"; - this.check_grayscale.Size = new System.Drawing.Size(138, 17); + this.check_grayscale.Size = new System.Drawing.Size(119, 17); this.check_grayscale.TabIndex = 57; this.check_grayscale.Text = "Grayscale Encoding"; this.check_grayscale.UseVisualStyleBackColor = false; @@ -215,10 +206,9 @@ // this.label8.AutoSize = true; this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(13, 147); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(58, 13); + this.label8.Size = new System.Drawing.Size(48, 13); this.label8.TabIndex = 60; this.label8.Text = "Deblock:"; // @@ -226,10 +216,9 @@ // this.lbl_deblockVal.AutoSize = true; this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent; - this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_deblockVal.Location = new System.Drawing.Point(301, 147); this.lbl_deblockVal.Name = "lbl_deblockVal"; - this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13); + this.lbl_deblockVal.Size = new System.Drawing.Size(23, 13); this.lbl_deblockVal.TabIndex = 59; this.lbl_deblockVal.Text = "Off"; // @@ -237,10 +226,10 @@ // this.label68.AutoSize = true; this.label68.BackColor = System.Drawing.Color.Transparent; - this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label68.Location = new System.Drawing.Point(13, 13); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(49, 13); + this.label68.Size = new System.Drawing.Size(42, 13); this.label68.TabIndex = 61; this.label68.Text = "Filters"; // @@ -265,6 +254,7 @@ this.Controls.Add(this.text_customDT); this.Controls.Add(this.label18); this.Controls.Add(this.drop_detelecine); + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "Filters"; this.Size = new System.Drawing.Size(592, 270); ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit(); diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs index 68b23031a..8f3727486 100644 --- a/win/C#/Controls/PictureSettings.Designer.cs +++ b/win/C#/Controls/PictureSettings.Designer.cs @@ -399,8 +399,8 @@ namespace Handbrake.Controls this.Controls.Add(this.lbl_Aspect); this.Controls.Add(this.Label91); this.Controls.Add(this.Label55); - this.Name = "PictureSettings"; resources.ApplyResources(this, "$this"); + this.Name = "PictureSettings"; ((System.ComponentModel.ISupportInitialize)(this.text_height)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.text_width)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).EndInit(); diff --git a/win/C#/Controls/PictureSettings.resx b/win/C#/Controls/PictureSettings.resx index f9ff3dffe..aec224f68 100644 --- a/win/C#/Controls/PictureSettings.resx +++ b/win/C#/Controls/PictureSettings.resx @@ -118,11 +118,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Tahoma, 8.25pt + 206, 59 - 64, 20 + 64, 21 @@ -140,11 +143,14 @@ 22 + + Tahoma, 8.25pt + 68, 59 - 64, 20 + 64, 21 49 @@ -165,13 +171,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 152, 63 - 48, 13 + 42, 13 48 @@ -194,11 +200,14 @@ True + + Tahoma, 8.25pt + 279, 61 - 34, 13 + 37, 13 47 @@ -222,13 +231,13 @@ True - Verdana, 6.75pt + Tahoma, 8.25pt 66, 36 - 72, 12 + 68, 13 41 @@ -251,6 +260,9 @@ True + + Tahoma, 8.25pt + 13, 35 @@ -279,13 +291,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 14, 119 - 80, 13 + 67, 13 45 @@ -306,7 +318,7 @@ 28 - Verdana, 8.25pt + Tahoma, 8.25pt None @@ -345,13 +357,13 @@ True - Verdana, 8.25pt, style=Bold + Tahoma, 8.25pt, style=Bold 13, 13 - 34, 13 + 30, 13 39 @@ -375,13 +387,13 @@ True - Verdana, 6.75pt + Tahoma, 8.25pt 241, 36 - 72, 12 + 68, 13 43 @@ -405,13 +417,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 152, 35 - 83, 13 + 72, 13 42 @@ -435,13 +447,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 13, 63 - 44, 13 + 39, 13 44 @@ -465,13 +477,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 14, 146 - 58, 13 + 50, 13 51 @@ -492,7 +504,7 @@ 20 - Verdana, 8.25pt + Tahoma, 8.25pt 16 @@ -527,11 +539,14 @@ 21 + + Tahoma, 8.25pt + 110, 170 - 100, 20 + 100, 21 53 @@ -558,13 +573,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 14, 173 - 90, 13 + 76, 13 54 @@ -588,13 +603,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 14, 199 - 71, 13 + 62, 13 56 @@ -614,11 +629,14 @@ 16 + + Tahoma, 8.25pt + 110, 196 - 100, 20 + 100, 21 55 @@ -643,13 +661,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 14, 225 - 75, 13 + 65, 13 58 @@ -669,11 +687,14 @@ 14 + + Tahoma, 8.25pt + 110, 222 - 100, 20 + 100, 21 57 @@ -697,11 +718,14 @@ True + + Tahoma, 8.25pt + 68, 85 - 115, 17 + 114, 17 59 @@ -724,11 +748,14 @@ True + + Tahoma, 8.25pt + 399, 57 - 63, 17 + 65, 17 70 @@ -751,11 +778,14 @@ True + + Tahoma, 8.25pt + 399, 33 - 72, 17 + 73, 17 69 @@ -778,11 +808,14 @@ False + + Tahoma, 8.25pt + 479, 146 - 44, 20 + 44, 21 67 @@ -802,11 +835,14 @@ False + + Tahoma, 8.25pt + 479, 100 - 44, 20 + 44, 21 64 @@ -826,11 +862,14 @@ False + + Tahoma, 8.25pt + 428, 122 - 44, 20 + 44, 21 62 @@ -850,11 +889,14 @@ False + + Tahoma, 8.25pt + 530, 122 - 44, 20 + 44, 21 65 @@ -875,13 +917,13 @@ True - Verdana, 8.25pt, style=Bold + Tahoma, 8.25pt, style=Bold 396, 13 - 37, 13 + 33, 13 60 @@ -905,13 +947,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 477, 170 - 48, 13 + 41, 13 68 @@ -935,13 +977,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 486, 85 - 28, 13 + 25, 13 63 @@ -965,13 +1007,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt - 573, 124 + 580, 124 - 36, 13 + 32, 13 66 @@ -995,13 +1037,13 @@ True - Verdana, 8.25pt + Tahoma, 8.25pt 396, 124 - 28, 13 + 26, 13 61 @@ -1025,13 +1067,13 @@ True - Verdana, 6.75pt + Tahoma, 8.25pt 108, 250 - 72, 12 + 68, 13 74 @@ -1054,11 +1096,14 @@ True + + Tahoma, 8.25pt + 14, 249 - 66, 13 + 67, 13 73 @@ -1081,6 +1126,9 @@ True + + Tahoma, 8.25pt + 666, 279 diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs index 6a3b122c7..bb04f06de 100644 --- a/win/C#/Controls/Subtitles.Designer.cs +++ b/win/C#/Controls/Subtitles.Designer.cs @@ -43,12 +43,12 @@ this.forced = new System.Windows.Forms.ColumnHeader(); this.burned = new System.Windows.Forms.ColumnHeader(); this.defaultTrack = new System.Windows.Forms.ColumnHeader(); - this.label68 = new System.Windows.Forms.Label(); this.subMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnu_moveup = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_movedown = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_remove = new System.Windows.Forms.ToolStripMenuItem(); + this.label68 = new System.Windows.Forms.Label(); this.AudioTrackGroup.SuspendLayout(); this.subMenu.SuspendLayout(); this.SuspendLayout(); @@ -56,11 +56,10 @@ // drp_subtitleTracks // this.drp_subtitleTracks.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_subtitleTracks.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_subtitleTracks.FormattingEnabled = true; this.drp_subtitleTracks.Location = new System.Drawing.Point(57, 20); this.drp_subtitleTracks.Name = "drp_subtitleTracks"; - this.drp_subtitleTracks.Size = new System.Drawing.Size(194, 20); + this.drp_subtitleTracks.Size = new System.Drawing.Size(194, 21); this.drp_subtitleTracks.TabIndex = 50; this.drp_subtitleTracks.SelectedIndexChanged += new System.EventHandler(this.drp_subtitleTracks_SelectedIndexChanged); // @@ -72,7 +71,6 @@ this.AudioTrackGroup.Controls.Add(this.check_burned); this.AudioTrackGroup.Controls.Add(this.check_forced); this.AudioTrackGroup.Controls.Add(this.drp_subtitleTracks); - this.AudioTrackGroup.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.AudioTrackGroup.ForeColor = System.Drawing.Color.Black; this.AudioTrackGroup.Location = new System.Drawing.Point(16, 32); this.AudioTrackGroup.Name = "AudioTrackGroup"; @@ -84,20 +82,18 @@ // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(6, 22); + this.label1.Location = new System.Drawing.Point(6, 23); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 13); + this.label1.Size = new System.Drawing.Size(37, 13); this.label1.TabIndex = 72; this.label1.Text = "Track:"; // // check_default // this.check_default.AutoSize = true; - this.check_default.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_default.Location = new System.Drawing.Point(446, 21); + this.check_default.Location = new System.Drawing.Point(426, 22); this.check_default.Name = "check_default"; - this.check_default.Size = new System.Drawing.Size(67, 17); + this.check_default.Size = new System.Drawing.Size(61, 17); this.check_default.TabIndex = 71; this.check_default.Text = "Default"; this.check_default.UseVisualStyleBackColor = true; @@ -106,10 +102,9 @@ // check_burned // this.check_burned.AutoSize = true; - this.check_burned.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_burned.Location = new System.Drawing.Point(357, 21); + this.check_burned.Location = new System.Drawing.Point(347, 22); this.check_burned.Name = "check_burned"; - this.check_burned.Size = new System.Drawing.Size(83, 17); + this.check_burned.Size = new System.Drawing.Size(73, 17); this.check_burned.TabIndex = 70; this.check_burned.Text = "Burned In"; this.check_burned.UseVisualStyleBackColor = true; @@ -118,10 +113,9 @@ // check_forced // this.check_forced.AutoSize = true; - this.check_forced.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_forced.Location = new System.Drawing.Point(257, 21); + this.check_forced.Location = new System.Drawing.Point(257, 22); this.check_forced.Name = "check_forced"; - this.check_forced.Size = new System.Drawing.Size(94, 17); + this.check_forced.Size = new System.Drawing.Size(84, 17); this.check_forced.TabIndex = 69; this.check_forced.Text = "Forced Only"; this.check_forced.UseVisualStyleBackColor = true; @@ -130,7 +124,7 @@ // btn_addSubTrack // this.btn_addSubTrack.BackColor = System.Drawing.Color.Transparent; - this.btn_addSubTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_addSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_addSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_addSubTrack.Location = new System.Drawing.Point(16, 274); this.btn_addSubTrack.Name = "btn_addSubTrack"; @@ -143,7 +137,7 @@ // btn_RemoveSubTrack // this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent; - this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_RemoveSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_RemoveSubTrack.Location = new System.Drawing.Point(133, 274); this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack"; @@ -200,17 +194,6 @@ this.defaultTrack.Text = "Default"; this.defaultTrack.Width = 100; // - // label68 - // - this.label68.AutoSize = true; - this.label68.BackColor = System.Drawing.Color.Transparent; - this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label68.Location = new System.Drawing.Point(13, 13); - this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(64, 13); - this.label68.TabIndex = 67; - this.label68.Text = "Subtitles"; - // // subMenu // this.subMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -248,6 +231,17 @@ this.mnu_remove.Text = "Remove"; this.mnu_remove.Click += new System.EventHandler(this.mnu_remove_Click); // + // label68 + // + this.label68.AutoSize = true; + this.label68.BackColor = System.Drawing.Color.Transparent; + this.label68.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label68.Location = new System.Drawing.Point(13, 13); + this.label68.Name = "label68"; + this.label68.Size = new System.Drawing.Size(57, 13); + this.label68.TabIndex = 67; + this.label68.Text = "Subtitles"; + // // Subtitles // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -257,6 +251,7 @@ this.Controls.Add(this.lv_subList); this.Controls.Add(this.label68); this.Controls.Add(this.btn_addSubTrack); + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "Subtitles"; this.Size = new System.Drawing.Size(719, 300); this.AudioTrackGroup.ResumeLayout(false); diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs index 2c7d6cf42..b32f5d395 100644 --- a/win/C#/Controls/x264Panel.Designer.cs +++ b/win/C#/Controls/x264Panel.Designer.cs @@ -93,20 +93,18 @@ namespace Handbrake.Controls // lbl_psytrellis // this.lbl_psytrellis.AutoSize = true; - this.lbl_psytrellis.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_psytrellis.Location = new System.Drawing.Point(319, 198); + this.lbl_psytrellis.Location = new System.Drawing.Point(328, 198); this.lbl_psytrellis.Name = "lbl_psytrellis"; - this.lbl_psytrellis.Size = new System.Drawing.Size(111, 12); + this.lbl_psytrellis.Size = new System.Drawing.Size(102, 13); this.lbl_psytrellis.TabIndex = 85; this.lbl_psytrellis.Text = "Psychovisual Trellis:"; // // lbl_psyrd // this.lbl_psyrd.AutoSize = true; - this.lbl_psyrd.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_psyrd.Location = new System.Drawing.Point(275, 164); + this.lbl_psyrd.Location = new System.Drawing.Point(283, 164); this.lbl_psyrd.Name = "lbl_psyrd"; - this.lbl_psyrd.Size = new System.Drawing.Size(155, 12); + this.lbl_psyrd.Size = new System.Drawing.Size(147, 13); this.lbl_psyrd.TabIndex = 84; this.lbl_psyrd.Text = "Psychovisual Rate Distortion:"; // @@ -122,10 +120,9 @@ namespace Handbrake.Controls // lbl_adaptBFrames // this.lbl_adaptBFrames.AutoSize = true; - this.lbl_adaptBFrames.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_adaptBFrames.Location = new System.Drawing.Point(17, 124); + this.lbl_adaptBFrames.Location = new System.Drawing.Point(21, 124); this.lbl_adaptBFrames.Name = "lbl_adaptBFrames"; - this.lbl_adaptBFrames.Size = new System.Drawing.Size(106, 12); + this.lbl_adaptBFrames.Size = new System.Drawing.Size(102, 13); this.lbl_adaptBFrames.TabIndex = 81; this.lbl_adaptBFrames.Text = "Adaptive B-Frames:"; // @@ -149,16 +146,16 @@ namespace Handbrake.Controls // this.label43.AutoSize = true; this.label43.BackColor = System.Drawing.Color.Transparent; - this.label43.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label43.Location = new System.Drawing.Point(13, 13); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(165, 13); + this.label43.Size = new System.Drawing.Size(144, 13); this.label43.TabIndex = 49; this.label43.Text = "Advanced H.264 Options"; // // btn_reset // - this.btn_reset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_reset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_reset.ForeColor = System.Drawing.Color.DarkOrange; this.btn_reset.Location = new System.Drawing.Point(13, 229); this.btn_reset.Name = "btn_reset"; @@ -184,11 +181,10 @@ namespace Handbrake.Controls this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; this.check_Cabac.Checked = true; this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked; - this.check_Cabac.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_Cabac.Location = new System.Drawing.Point(273, 128); + this.check_Cabac.Location = new System.Drawing.Point(277, 129); this.check_Cabac.Name = "check_Cabac"; this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_Cabac.Size = new System.Drawing.Size(147, 16); + this.check_Cabac.Size = new System.Drawing.Size(141, 17); this.check_Cabac.TabIndex = 78; this.check_Cabac.Text = "CABAC Entropy Coding:"; this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -200,11 +196,10 @@ namespace Handbrake.Controls // this.check_noDCTDecimate.AutoSize = true; this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_noDCTDecimate.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_noDCTDecimate.Location = new System.Drawing.Point(592, 40); + this.check_noDCTDecimate.Location = new System.Drawing.Point(597, 41); this.check_noDCTDecimate.Name = "check_noDCTDecimate"; this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_noDCTDecimate.Size = new System.Drawing.Size(121, 16); + this.check_noDCTDecimate.Size = new System.Drawing.Size(114, 17); this.check_noDCTDecimate.TabIndex = 77; this.check_noDCTDecimate.Text = "No DCT-Decimate:"; this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -216,11 +211,10 @@ namespace Handbrake.Controls // this.check_noFastPSkip.AutoSize = true; this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_noFastPSkip.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_noFastPSkip.Location = new System.Drawing.Point(608, 19); + this.check_noFastPSkip.Location = new System.Drawing.Point(611, 18); this.check_noFastPSkip.Name = "check_noFastPSkip"; this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_noFastPSkip.Size = new System.Drawing.Size(106, 16); + this.check_noFastPSkip.Size = new System.Drawing.Size(100, 17); this.check_noFastPSkip.TabIndex = 76; this.check_noFastPSkip.Text = "No Fast-P-Skip:"; this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -232,10 +226,9 @@ namespace Handbrake.Controls // lbl_trellis // this.lbl_trellis.AutoSize = true; - this.lbl_trellis.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_trellis.Location = new System.Drawing.Point(421, 130); this.lbl_trellis.Name = "lbl_trellis"; - this.lbl_trellis.Size = new System.Drawing.Size(41, 12); + this.lbl_trellis.Size = new System.Drawing.Size(38, 13); this.lbl_trellis.TabIndex = 67; this.lbl_trellis.Text = "Trellis:"; // @@ -274,9 +267,9 @@ namespace Handbrake.Controls "4", "5", "6"}); - this.drop_deblockBeta.Location = new System.Drawing.Point(642, 95); + this.drop_deblockBeta.Location = new System.Drawing.Point(643, 95); this.drop_deblockBeta.Name = "drop_deblockBeta"; - this.drop_deblockBeta.Size = new System.Drawing.Size(69, 21); + this.drop_deblockBeta.Size = new System.Drawing.Size(68, 21); this.drop_deblockBeta.TabIndex = 74; this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip")); this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.drop_deblockBeta_SelectedIndexChanged); @@ -284,10 +277,9 @@ namespace Handbrake.Controls // label41 // this.label41.AutoSize = true; - this.label41.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label41.Location = new System.Drawing.Point(575, 72); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(65, 12); + this.label41.Size = new System.Drawing.Size(62, 13); this.label41.TabIndex = 66; this.label41.Text = "Deblocking:"; // @@ -348,11 +340,10 @@ namespace Handbrake.Controls // this.check_8x8DCT.AutoSize = true; this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_8x8DCT.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_8x8DCT.Location = new System.Drawing.Point(492, 100); + this.check_8x8DCT.Location = new System.Drawing.Point(492, 101); this.check_8x8DCT.Name = "check_8x8DCT"; this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_8x8DCT.Size = new System.Drawing.Size(74, 16); + this.check_8x8DCT.Size = new System.Drawing.Size(71, 17); this.check_8x8DCT.TabIndex = 72; this.check_8x8DCT.Text = "8x8 DCT:"; this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -363,10 +354,9 @@ namespace Handbrake.Controls // label45 // this.label45.AutoSize = true; - this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label45.Location = new System.Drawing.Point(364, 102); + this.label45.Location = new System.Drawing.Point(367, 102); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(53, 12); + this.label45.Size = new System.Drawing.Size(50, 13); this.label45.TabIndex = 64; this.label45.Text = "Analysis:"; // @@ -388,10 +378,9 @@ namespace Handbrake.Controls // label48 // this.label48.AutoSize = true; - this.label48.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label48.Location = new System.Drawing.Point(271, 45); + this.label48.Location = new System.Drawing.Point(279, 45); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(146, 12); + this.label48.Size = new System.Drawing.Size(138, 13); this.label48.TabIndex = 62; this.label48.Text = "Subpixel Motion Estimation:"; // @@ -421,10 +410,9 @@ namespace Handbrake.Controls // lbl_merange // this.lbl_merange.AutoSize = true; - this.lbl_merange.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_merange.Location = new System.Drawing.Point(283, 71); + this.lbl_merange.Location = new System.Drawing.Point(288, 71); this.lbl_merange.Name = "lbl_merange"; - this.lbl_merange.Size = new System.Drawing.Size(134, 12); + this.lbl_merange.Size = new System.Drawing.Size(129, 13); this.lbl_merange.TabIndex = 61; this.lbl_merange.Text = "Motion Estimation Range:"; // @@ -505,10 +493,9 @@ namespace Handbrake.Controls // label54 // this.label54.AutoSize = true; - this.label54.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label54.Location = new System.Drawing.Point(277, 19); + this.label54.Location = new System.Drawing.Point(283, 19); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(140, 12); + this.label54.Size = new System.Drawing.Size(134, 13); this.label54.TabIndex = 60; this.label54.Text = "Motion Estimation Method:"; // @@ -535,11 +522,10 @@ namespace Handbrake.Controls // this.check_pyrmidalBFrames.AutoSize = true; this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_pyrmidalBFrames.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_pyrmidalBFrames.Location = new System.Drawing.Point(12, 194); + this.check_pyrmidalBFrames.Location = new System.Drawing.Point(17, 194); this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames"; this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_pyrmidalBFrames.Size = new System.Drawing.Size(130, 16); + this.check_pyrmidalBFrames.Size = new System.Drawing.Size(124, 17); this.check_pyrmidalBFrames.TabIndex = 59; this.check_pyrmidalBFrames.Text = "Pyramidal B-Frames:"; this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip")); @@ -550,11 +536,10 @@ namespace Handbrake.Controls // this.check_weightedBFrames.AutoSize = true; this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_weightedBFrames.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_weightedBFrames.Location = new System.Drawing.Point(16, 173); + this.check_weightedBFrames.Location = new System.Drawing.Point(17, 173); this.check_weightedBFrames.Name = "check_weightedBFrames"; this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_weightedBFrames.Size = new System.Drawing.Size(126, 16); + this.check_weightedBFrames.Size = new System.Drawing.Size(124, 17); this.check_weightedBFrames.TabIndex = 58; this.check_weightedBFrames.Text = "Weighted B-Frames:"; this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip")); @@ -564,10 +549,9 @@ namespace Handbrake.Controls // lbl_direct_prediction // this.lbl_direct_prediction.AutoSize = true; - this.lbl_direct_prediction.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_direct_prediction.Location = new System.Drawing.Point(29, 150); + this.lbl_direct_prediction.Location = new System.Drawing.Point(34, 150); this.lbl_direct_prediction.Name = "lbl_direct_prediction"; - this.lbl_direct_prediction.Size = new System.Drawing.Size(94, 12); + this.lbl_direct_prediction.Size = new System.Drawing.Size(89, 13); this.lbl_direct_prediction.TabIndex = 53; this.lbl_direct_prediction.Text = "Direct Prediction:"; // @@ -591,10 +575,9 @@ namespace Handbrake.Controls // label62 // this.label62.AutoSize = true; - this.label62.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label62.Location = new System.Drawing.Point(65, 98); + this.label62.Location = new System.Drawing.Point(67, 98); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(58, 12); + this.label62.Size = new System.Drawing.Size(56, 13); this.label62.TabIndex = 52; this.label62.Text = "B-Frames:"; // @@ -633,10 +616,9 @@ namespace Handbrake.Controls // label64 // this.label64.AutoSize = true; - this.label64.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label64.Location = new System.Drawing.Point(24, 45); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(99, 12); + this.label64.Size = new System.Drawing.Size(99, 13); this.label64.TabIndex = 50; this.label64.Text = "Reference Frames:"; // @@ -676,11 +658,10 @@ namespace Handbrake.Controls // this.check_mixedReferences.AutoSize = true; this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.check_mixedReferences.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.check_mixedReferences.Location = new System.Drawing.Point(25, 68); this.check_mixedReferences.Name = "check_mixedReferences"; this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.check_mixedReferences.Size = new System.Drawing.Size(117, 16); + this.check_mixedReferences.Size = new System.Drawing.Size(116, 17); this.check_mixedReferences.TabIndex = 55; this.check_mixedReferences.Text = "Mixed References:"; this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -737,6 +718,7 @@ namespace Handbrake.Controls this.Controls.Add(this.label64); this.Controls.Add(this.drop_refFrames); this.Controls.Add(this.check_mixedReferences); + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "x264Panel"; this.Size = new System.Drawing.Size(720, 306); ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).EndInit(); diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 912d6e519..030eca6cc 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -235,7 +235,7 @@ namespace Handbrake.Functions mainWindow.x264Panel.x264Query = presetQuery.H264Query; // Set the preset name - mainWindow.groupBox_output.Text = "Output Settings (Preset: " + name + ")"; + mainWindow.labelPreset.Text = "Output Settings (Preset: " + name + ")"; #endregion } } diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index 85e76f57b..b5e9cc048 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -24,8 +24,9 @@ namespace Handbrake.Functions // Source tab string query = ""; - if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue")) - query = " -i " + '"' + mainWindow.sourcePath + '"'; + if (!string.IsNullOrEmpty(mainWindow.sourcePath)) + if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue") + query = " -i " + '"' + mainWindow.sourcePath + '"'; if (mainWindow.drp_dvdtitle.Text != "Automatic") { @@ -68,8 +69,9 @@ namespace Handbrake.Functions // Source tab string query = ""; - if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue")) - query = " -i " + '"' + mainWindow.sourcePath + '"'; + if (!string.IsNullOrEmpty(mainWindow.sourcePath)) + if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue") + query = " -i " + '"' + mainWindow.sourcePath + '"'; if (mainWindow.drp_dvdtitle.Text != "Automatic") { diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs index bd756c08d..616154534 100644 --- a/win/C#/Presets/PresetsHandler.cs +++ b/win/C#/Presets/PresetsHandler.cs @@ -75,6 +75,15 @@ namespace Handbrake.Presets updatePresetsFile(); } + /// + /// Remove all built in presets; + /// + public void removeBuiltInPresets() + { + presets.Clear(); + updatePresetsFile(); + } + /// /// Save changes to a given preset in the user preset list. /// diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 720f13b04..4c19ff411 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -44,9 +44,6 @@ namespace Handbrake this.btn_restore = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); - this.drop_chapterFinish = new System.Windows.Forms.ComboBox(); - this.drop_chapterStart = new System.Windows.Forms.ComboBox(); - this.drp_dvdtitle = new System.Windows.Forms.ComboBox(); this.text_destination = new System.Windows.Forms.TextBox(); this.drp_videoEncoder = new System.Windows.Forms.ComboBox(); this.check_largeFile = new System.Windows.Forms.CheckBox(); @@ -64,9 +61,10 @@ namespace Handbrake this.btn_addPreset = new System.Windows.Forms.Button(); this.btn_removePreset = new System.Windows.Forms.Button(); this.drop_format = new System.Windows.Forms.ComboBox(); + this.drop_chapterFinish = new System.Windows.Forms.ComboBox(); + this.drop_chapterStart = new System.Windows.Forms.ComboBox(); this.drop_angle = new System.Windows.Forms.ComboBox(); - this.lbl_duration = new System.Windows.Forms.Label(); - this.label_duration = new System.Windows.Forms.Label(); + this.drp_dvdtitle = new System.Windows.Forms.ComboBox(); this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog(); this.File_Open = new System.Windows.Forms.OpenFileDialog(); this.ISO_Open = new System.Windows.Forms.OpenFileDialog(); @@ -94,15 +92,10 @@ namespace Handbrake this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_about = new System.Windows.Forms.ToolStripMenuItem(); this.frmMainMenu = new System.Windows.Forms.MenuStrip(); - this.lbl_angle = new System.Windows.Forms.Label(); - this.Label13 = new System.Windows.Forms.Label(); - this.Label9 = new System.Windows.Forms.Label(); - this.Label10 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.Label47 = new System.Windows.Forms.Label(); this.Label3 = new System.Windows.Forms.Label(); this.tab_audio = new System.Windows.Forms.TabPage(); - this.AudioSettings = new Handbrake.Controls.AudioPanel(); this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components); this.tab_video = new System.Windows.Forms.TabPage(); this.radio_cq = new System.Windows.Forms.RadioButton(); @@ -114,24 +107,19 @@ namespace Handbrake this.SliderValue = new System.Windows.Forms.Label(); this.Label46 = new System.Windows.Forms.Label(); this.tab_picture = new System.Windows.Forms.TabPage(); - this.PictureSettings = new Handbrake.Controls.PictureSettings(); this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox(); this.tabs_panel = new System.Windows.Forms.TabControl(); this.tab_filters = new System.Windows.Forms.TabPage(); - this.Filters = new Handbrake.Controls.Filters(); this.tab_subtitles = new System.Windows.Forms.TabPage(); - this.Subtitles = new Handbrake.Controls.Subtitles(); this.tab_chapters = new System.Windows.Forms.TabPage(); this.label31 = new System.Windows.Forms.Label(); this.tab_advanced = new System.Windows.Forms.TabPage(); - this.x264Panel = new Handbrake.Controls.x264Panel(); this.tab_query = new System.Windows.Forms.TabPage(); this.btn_clear = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); this.btn_generate_Query = new System.Windows.Forms.Button(); this.label33 = new System.Windows.Forms.Label(); this.rtf_query = new System.Windows.Forms.RichTextBox(); - this.btn_destBrowse = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.treeView_presets = new System.Windows.Forms.TreeView(); @@ -159,11 +147,26 @@ namespace Handbrake this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel(); this.lbl_updateCheck = new System.Windows.Forms.ToolStripStatusLabel(); this.hbproc = new System.Diagnostics.Process(); - this.label1 = new System.Windows.Forms.Label(); - this.lbl_source = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox_output = new System.Windows.Forms.Label(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.btn_destBrowse = new System.Windows.Forms.Button(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.Label10 = new System.Windows.Forms.Label(); + this.lbl_angle = new System.Windows.Forms.Label(); + this.Label9 = new System.Windows.Forms.Label(); + this.Label13 = new System.Windows.Forms.Label(); + this.label_duration = new System.Windows.Forms.Label(); + this.lbl_duration = new System.Windows.Forms.Label(); + this.labelStaticSource = new System.Windows.Forms.Label(); + this.labelSource = new System.Windows.Forms.Label(); + this.labelStaticDestination = new System.Windows.Forms.Label(); + this.labelPreset = new System.Windows.Forms.Label(); + 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(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); @@ -185,6 +188,9 @@ namespace Handbrake this.presets_menu.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.StatusStrip.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // notifyIconMenu @@ -214,52 +220,13 @@ namespace Handbrake this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; this.ToolTip.ToolTipTitle = "Tooltip"; // - // drop_chapterFinish - // - this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.drop_chapterFinish.FormattingEnabled = true; - this.drop_chapterFinish.Location = new System.Drawing.Point(506, 96); - this.drop_chapterFinish.Name = "drop_chapterFinish"; - this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); - this.drop_chapterFinish.TabIndex = 10; - this.drop_chapterFinish.Text = "Auto"; - this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)"); - this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged); - // - // drop_chapterStart - // - this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.drop_chapterStart.FormattingEnabled = true; - this.drop_chapterStart.Location = new System.Drawing.Point(374, 96); - this.drop_chapterStart.Name = "drop_chapterStart"; - this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); - this.drop_chapterStart.TabIndex = 9; - this.drop_chapterStart.Text = "Auto"; - this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)"); - this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged); - // - // drp_dvdtitle - // - this.drp_dvdtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.drp_dvdtitle.FormattingEnabled = true; - this.drp_dvdtitle.Items.AddRange(new object[] { - "Automatic"}); - this.drp_dvdtitle.Location = new System.Drawing.Point(78, 96); - this.drp_dvdtitle.Name = "drp_dvdtitle"; - this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); - this.drp_dvdtitle.TabIndex = 7; - this.drp_dvdtitle.Text = "Automatic"; - this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" + - "ter you have scanned a source."); - this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged); - this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click); - // // text_destination // - this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_destination.Location = new System.Drawing.Point(78, 153); + this.text_destination.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.text_destination.Location = new System.Drawing.Point(36, 3); this.text_destination.Name = "text_destination"; - this.text_destination.Size = new System.Drawing.Size(549, 21); + this.text_destination.Size = new System.Drawing.Size(603, 21); this.text_destination.TabIndex = 1; this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved."); this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged); @@ -267,7 +234,6 @@ namespace Handbrake // drp_videoEncoder // this.drp_videoEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_videoEncoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_videoEncoder.FormattingEnabled = true; this.drp_videoEncoder.Items.AddRange(new object[] { "MPEG-4 (FFmpeg)", @@ -282,12 +248,12 @@ namespace Handbrake // // check_largeFile // + this.check_largeFile.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_largeFile.AutoSize = true; this.check_largeFile.BackColor = System.Drawing.Color.Transparent; - this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_largeFile.Location = new System.Drawing.Point(196, 218); + this.check_largeFile.Location = new System.Drawing.Point(166, 5); this.check_largeFile.Name = "check_largeFile"; - this.check_largeFile.Size = new System.Drawing.Size(105, 17); + this.check_largeFile.Size = new System.Drawing.Size(91, 17); this.check_largeFile.TabIndex = 4; this.check_largeFile.Text = "Large file size"; this.ToolTip.SetToolTip(this.check_largeFile, "Caution: This option will likely break device compatibility with all but the Appl" + @@ -299,10 +265,9 @@ namespace Handbrake this.check_turbo.AutoSize = true; this.check_turbo.BackColor = System.Drawing.Color.Transparent; this.check_turbo.Enabled = false; - this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.check_turbo.Location = new System.Drawing.Point(146, 123); this.check_turbo.Name = "check_turbo"; - this.check_turbo.Size = new System.Drawing.Size(115, 17); + this.check_turbo.Size = new System.Drawing.Size(101, 17); this.check_turbo.TabIndex = 7; this.check_turbo.Text = "Turbo first Pass"; this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster."); @@ -310,7 +275,6 @@ namespace Handbrake // // drp_videoFramerate // - this.drp_videoFramerate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_videoFramerate.FormattingEnabled = true; this.drp_videoFramerate.Items.AddRange(new object[] { "Same as source", @@ -346,7 +310,6 @@ namespace Handbrake // text_filesize // this.text_filesize.Enabled = false; - this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_filesize.Location = new System.Drawing.Point(482, 36); this.text_filesize.Name = "text_filesize"; this.text_filesize.Size = new System.Drawing.Size(81, 21); @@ -355,7 +318,6 @@ namespace Handbrake // // text_bitrate // - this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_bitrate.Location = new System.Drawing.Point(482, 63); this.text_bitrate.Name = "text_bitrate"; this.text_bitrate.Size = new System.Drawing.Size(81, 21); @@ -365,7 +327,7 @@ namespace Handbrake // btn_setDefault // this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, 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(135, 8); this.btn_setDefault.Name = "btn_setDefault"; @@ -380,12 +342,12 @@ namespace Handbrake // // check_optimiseMP4 // + this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_optimiseMP4.AutoSize = true; this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent; - this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_optimiseMP4.Location = new System.Drawing.Point(307, 218); + this.check_optimiseMP4.Location = new System.Drawing.Point(263, 5); this.check_optimiseMP4.Name = "check_optimiseMP4"; - this.check_optimiseMP4.Size = new System.Drawing.Size(110, 17); + this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17); this.check_optimiseMP4.TabIndex = 25; this.check_optimiseMP4.Text = "Web optimized"; this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" + @@ -395,12 +357,12 @@ namespace Handbrake // // check_iPodAtom // + this.check_iPodAtom.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_iPodAtom.AutoSize = true; this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent; - this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_iPodAtom.Location = new System.Drawing.Point(423, 218); + this.check_iPodAtom.Location = new System.Drawing.Point(365, 5); this.check_iPodAtom.Name = "check_iPodAtom"; - this.check_iPodAtom.Size = new System.Drawing.Size(117, 17); + this.check_iPodAtom.Size = new System.Drawing.Size(102, 17); this.check_iPodAtom.TabIndex = 26; this.check_iPodAtom.Text = "iPod 5G support"; this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" + @@ -445,7 +407,7 @@ namespace Handbrake // btn_addPreset // this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_addPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, 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(3, 8); this.btn_addPreset.Name = "btn_addPreset"; @@ -460,7 +422,7 @@ namespace Handbrake // btn_removePreset // this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, 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(58, 8); this.btn_removePreset.Name = "btn_removePreset"; @@ -475,50 +437,63 @@ namespace Handbrake // drop_format // this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_format.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_format.FormattingEnabled = true; this.drop_format.Items.AddRange(new object[] { "MP4 File", "MKV File"}); - this.drop_format.Location = new System.Drawing.Point(78, 215); + this.drop_format.Location = new System.Drawing.Point(54, 3); this.drop_format.Name = "drop_format"; this.drop_format.Size = new System.Drawing.Size(106, 21); this.drop_format.TabIndex = 28; this.ToolTip.SetToolTip(this.drop_format, "Select the file container format."); this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged); // + // drop_chapterFinish + // + this.drop_chapterFinish.FormattingEnabled = true; + this.drop_chapterFinish.Location = new System.Drawing.Point(447, 3); + this.drop_chapterFinish.Name = "drop_chapterFinish"; + this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); + this.drop_chapterFinish.TabIndex = 10; + this.drop_chapterFinish.Text = "Auto"; + this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)"); + this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged); + // + // drop_chapterStart + // + this.drop_chapterStart.FormattingEnabled = true; + this.drop_chapterStart.Location = new System.Drawing.Point(321, 3); + this.drop_chapterStart.Name = "drop_chapterStart"; + this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); + this.drop_chapterStart.TabIndex = 9; + this.drop_chapterStart.Text = "Auto"; + this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)"); + this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged); + // // drop_angle // this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drop_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_angle.FormattingEnabled = true; - this.drop_angle.Location = new System.Drawing.Point(253, 96); + this.drop_angle.Location = new System.Drawing.Point(209, 3); this.drop_angle.Name = "drop_angle"; this.drop_angle.Size = new System.Drawing.Size(45, 21); this.drop_angle.TabIndex = 45; this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)"); // - // lbl_duration - // - this.lbl_duration.AutoSize = true; - this.lbl_duration.BackColor = System.Drawing.Color.Transparent; - this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_duration.Location = new System.Drawing.Point(648, 100); - this.lbl_duration.Name = "lbl_duration"; - this.lbl_duration.Size = new System.Drawing.Size(72, 12); - this.lbl_duration.TabIndex = 43; - this.lbl_duration.Text = "Select a Title"; - // - // label_duration + // drp_dvdtitle // - this.label_duration.AutoSize = true; - this.label_duration.BackColor = System.Drawing.Color.Transparent; - this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label_duration.Location = new System.Drawing.Point(581, 99); - this.label_duration.Name = "label_duration"; - this.label_duration.Size = new System.Drawing.Size(61, 13); - this.label_duration.TabIndex = 42; - this.label_duration.Text = "Duration:"; + this.drp_dvdtitle.FormattingEnabled = true; + this.drp_dvdtitle.Items.AddRange(new object[] { + "Automatic"}); + this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3); + this.drp_dvdtitle.Name = "drp_dvdtitle"; + this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); + this.drp_dvdtitle.TabIndex = 7; + this.drp_dvdtitle.Text = "Automatic"; + this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" + + "ter you have scanned a source."); + this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged); + this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click); // // DVD_Open // @@ -542,13 +517,13 @@ namespace Handbrake this.mnu_killCLI, this.mnu_exit}); this.FileToolStripMenuItem.Name = "FileToolStripMenuItem"; - this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20); + this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); this.FileToolStripMenuItem.Text = "&File"; // // mnu_killCLI // this.mnu_killCLI.Name = "mnu_killCLI"; - this.mnu_killCLI.Size = new System.Drawing.Size(156, 22); + this.mnu_killCLI.Size = new System.Drawing.Size(143, 22); this.mnu_killCLI.Text = "Cancel Scan"; this.mnu_killCLI.Visible = false; this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click); @@ -556,7 +531,7 @@ namespace Handbrake // mnu_exit // this.mnu_exit.Name = "mnu_exit"; - this.mnu_exit.Size = new System.Drawing.Size(156, 22); + this.mnu_exit.Size = new System.Drawing.Size(143, 22); this.mnu_exit.Text = "E&xit"; this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click); // @@ -573,7 +548,7 @@ namespace Handbrake this.ToolStripSeparator5, this.mnu_options}); this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"; - this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 20); + this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.ToolsToolStripMenuItem.Text = "&Tools"; // // mnu_encode @@ -581,7 +556,7 @@ namespace Handbrake this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; this.mnu_encode.Name = "mnu_encode"; this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.mnu_encode.Size = new System.Drawing.Size(203, 22); + this.mnu_encode.Size = new System.Drawing.Size(186, 22); this.mnu_encode.Text = "Show Queue"; this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click); // @@ -589,20 +564,20 @@ namespace Handbrake // this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small; this.mnu_encodeLog.Name = "mnu_encodeLog"; - this.mnu_encodeLog.Size = new System.Drawing.Size(203, 22); + this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22); this.mnu_encodeLog.Text = "Activity Window"; this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click); // // ToolStripSeparator5 // this.ToolStripSeparator5.Name = "ToolStripSeparator5"; - this.ToolStripSeparator5.Size = new System.Drawing.Size(200, 6); + this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6); // // mnu_options // this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small; this.mnu_options.Name = "mnu_options"; - this.mnu_options.Size = new System.Drawing.Size(203, 22); + this.mnu_options.Size = new System.Drawing.Size(186, 22); this.mnu_options.Text = "Options"; this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click); // @@ -615,13 +590,13 @@ namespace Handbrake this.btn_new_preset, this.mnu_SelectDefault}); this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"; - this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.PresetsToolStripMenuItem.Text = "&Presets"; // // mnu_presetReset // this.mnu_presetReset.Name = "mnu_presetReset"; - this.mnu_presetReset.Size = new System.Drawing.Size(215, 22); + this.mnu_presetReset.Size = new System.Drawing.Size(194, 22); this.mnu_presetReset.Text = "Update Built-in Presets"; this.mnu_presetReset.ToolTipText = "Resets all presets."; this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click); @@ -629,26 +604,26 @@ namespace Handbrake // mnu_delete_preset // this.mnu_delete_preset.Name = "mnu_delete_preset"; - this.mnu_delete_preset.Size = new System.Drawing.Size(215, 22); + this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22); this.mnu_delete_preset.Text = "Delete Built-in Presets"; this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(212, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6); // // btn_new_preset // this.btn_new_preset.Name = "btn_new_preset"; - this.btn_new_preset.Size = new System.Drawing.Size(215, 22); + this.btn_new_preset.Size = new System.Drawing.Size(194, 22); this.btn_new_preset.Text = "New Preset"; this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click); // // mnu_SelectDefault // this.mnu_SelectDefault.Name = "mnu_SelectDefault"; - this.mnu_SelectDefault.Size = new System.Drawing.Size(215, 22); + this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22); this.mnu_SelectDefault.Text = "Select Default Preset"; this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset"; this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click); @@ -664,14 +639,14 @@ namespace Handbrake this.toolStripSeparator6, this.mnu_about}); this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); this.HelpToolStripMenuItem.Text = "&Help"; // // mnu_user_guide // this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16; this.mnu_user_guide.Name = "mnu_user_guide"; - this.mnu_user_guide.Size = new System.Drawing.Size(215, 22); + this.mnu_user_guide.Size = new System.Drawing.Size(192, 22); this.mnu_user_guide.Text = "HandBrake User Guide"; this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click); // @@ -679,46 +654,44 @@ namespace Handbrake // this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16; this.mnu_handbrake_home.Name = "mnu_handbrake_home"; - this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22); + this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22); this.mnu_handbrake_home.Text = "HandBrake Homepage"; this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click); // // mnu_handbrake_forums // this.mnu_handbrake_forums.Name = "mnu_handbrake_forums"; - this.mnu_handbrake_forums.Size = new System.Drawing.Size(215, 22); + this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22); this.mnu_handbrake_forums.Text = "HandBrake Forums"; this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click); // // ToolStripSeparator3 // this.ToolStripSeparator3.Name = "ToolStripSeparator3"; - this.ToolStripSeparator3.Size = new System.Drawing.Size(212, 6); + this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6); // // mnu_UpdateCheck // this.mnu_UpdateCheck.Name = "mnu_UpdateCheck"; - this.mnu_UpdateCheck.Size = new System.Drawing.Size(215, 22); + this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22); this.mnu_UpdateCheck.Text = "Check for Updates"; this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(212, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6); // // mnu_about // this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16; this.mnu_about.Name = "mnu_about"; - this.mnu_about.Size = new System.Drawing.Size(215, 22); + this.mnu_about.Size = new System.Drawing.Size(192, 22); this.mnu_about.Text = "About..."; this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click); // // frmMainMenu // - this.frmMainMenu.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.frmMainMenu.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible; this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileToolStripMenuItem, this.ToolsToolStripMenuItem, @@ -731,57 +704,14 @@ namespace Handbrake this.frmMainMenu.TabIndex = 0; this.frmMainMenu.Text = "MenuStrip"; // - // lbl_angle - // - this.lbl_angle.AutoSize = true; - this.lbl_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_angle.ForeColor = System.Drawing.Color.Black; - this.lbl_angle.Location = new System.Drawing.Point(203, 99); - this.lbl_angle.Name = "lbl_angle"; - this.lbl_angle.Size = new System.Drawing.Size(44, 13); - this.lbl_angle.TabIndex = 44; - this.lbl_angle.Text = "Angle:"; - // - // Label13 - // - this.Label13.AutoSize = true; - this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label13.Location = new System.Drawing.Point(449, 99); - this.Label13.Name = "Label13"; - this.Label13.Size = new System.Drawing.Size(51, 13); - this.Label13.TabIndex = 10; - this.Label13.Text = "through"; - // - // Label9 - // - this.Label9.AutoSize = true; - this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label9.ForeColor = System.Drawing.Color.Black; - this.Label9.Location = new System.Drawing.Point(304, 99); - this.Label9.Name = "Label9"; - this.Label9.Size = new System.Drawing.Size(64, 13); - this.Label9.TabIndex = 8; - this.Label9.Text = "Chapters:"; - // - // Label10 - // - this.Label10.AutoSize = true; - this.Label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label10.ForeColor = System.Drawing.Color.Black; - this.Label10.Location = new System.Drawing.Point(20, 99); - this.Label10.Name = "Label10"; - this.Label10.Size = new System.Drawing.Size(36, 13); - this.Label10.TabIndex = 6; - this.Label10.Text = "Title:"; - // // label5 // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.ForeColor = System.Drawing.Color.Black; - this.label5.Location = new System.Drawing.Point(20, 219); + this.label5.Location = new System.Drawing.Point(3, 7); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(52, 13); + this.label5.Size = new System.Drawing.Size(45, 13); this.label5.TabIndex = 27; this.label5.Text = "Format:"; // @@ -789,22 +719,21 @@ namespace Handbrake // this.Label47.AutoSize = true; this.Label47.BackColor = System.Drawing.Color.Transparent; - this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label47.ForeColor = System.Drawing.Color.Black; this.Label47.Location = new System.Drawing.Point(13, 39); this.Label47.Name = "Label47"; - this.Label47.Size = new System.Drawing.Size(84, 13); + this.Label47.Size = new System.Drawing.Size(70, 13); this.Label47.TabIndex = 0; this.Label47.Text = "Video Codec:"; // // Label3 // + this.Label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.Label3.AutoSize = true; - this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label3.ForeColor = System.Drawing.Color.Black; - this.Label3.Location = new System.Drawing.Point(20, 155); + this.Label3.Location = new System.Drawing.Point(3, 8); this.Label3.Name = "Label3"; - this.Label3.Size = new System.Drawing.Size(31, 13); + this.Label3.Size = new System.Drawing.Size(27, 13); this.Label3.TabIndex = 0; this.Label3.Text = "File:"; // @@ -820,14 +749,6 @@ namespace Handbrake this.tab_audio.Text = "Audio"; this.tab_audio.UseVisualStyleBackColor = true; // - // AudioSettings - // - this.AudioSettings.BackColor = System.Drawing.Color.Transparent; - this.AudioSettings.Location = new System.Drawing.Point(0, 0); - this.AudioSettings.Name = "AudioSettings"; - this.AudioSettings.Size = new System.Drawing.Size(715, 310); - this.AudioSettings.TabIndex = 0; - // // AudioMenuRowHeightHack // this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -866,7 +787,7 @@ namespace Handbrake this.radio_cq.BackColor = System.Drawing.Color.Transparent; this.radio_cq.Location = new System.Drawing.Point(336, 97); this.radio_cq.Name = "radio_cq"; - this.radio_cq.Size = new System.Drawing.Size(125, 17); + this.radio_cq.Size = new System.Drawing.Size(110, 17); this.radio_cq.TabIndex = 18; this.radio_cq.Text = "Constant Quality:"; this.radio_cq.UseVisualStyleBackColor = false; @@ -879,7 +800,7 @@ namespace Handbrake this.radio_avgBitrate.Checked = true; this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64); this.radio_avgBitrate.Name = "radio_avgBitrate"; - this.radio_avgBitrate.Size = new System.Drawing.Size(135, 17); + this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17); this.radio_avgBitrate.TabIndex = 17; this.radio_avgBitrate.TabStop = true; this.radio_avgBitrate.Text = "Avg Bitrate (kbps):"; @@ -892,7 +813,7 @@ namespace Handbrake this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent; this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37); this.radio_targetFilesize.Name = "radio_targetFilesize"; - this.radio_targetFilesize.Size = new System.Drawing.Size(126, 17); + this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17); this.radio_targetFilesize.TabIndex = 16; this.radio_targetFilesize.Text = "Target Size (MB):"; this.radio_targetFilesize.UseVisualStyleBackColor = false; @@ -902,10 +823,10 @@ namespace Handbrake // this.label25.AutoSize = true; this.label25.BackColor = System.Drawing.Color.Transparent; - this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label25.Location = new System.Drawing.Point(13, 13); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(43, 13); + this.label25.Size = new System.Drawing.Size(38, 13); this.label25.TabIndex = 0; this.label25.Text = "Video"; // @@ -913,10 +834,9 @@ namespace Handbrake // this.check_2PassEncode.AutoSize = true; this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent; - this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.check_2PassEncode.Location = new System.Drawing.Point(125, 100); this.check_2PassEncode.Name = "check_2PassEncode"; - this.check_2PassEncode.Size = new System.Drawing.Size(119, 17); + this.check_2PassEncode.Size = new System.Drawing.Size(104, 17); this.check_2PassEncode.TabIndex = 6; this.check_2PassEncode.Text = "2-Pass Encoding"; this.check_2PassEncode.UseVisualStyleBackColor = false; @@ -926,10 +846,10 @@ namespace Handbrake // this.Label2.AutoSize = true; this.Label2.BackColor = System.Drawing.Color.Transparent; - this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label2.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(334, 13); this.Label2.Name = "Label2"; - this.Label2.Size = new System.Drawing.Size(53, 13); + this.Label2.Size = new System.Drawing.Size(47, 13); this.Label2.TabIndex = 8; this.Label2.Text = "Quality"; // @@ -937,10 +857,9 @@ namespace Handbrake // this.SliderValue.AutoSize = true; this.SliderValue.BackColor = System.Drawing.Color.Transparent; - this.SliderValue.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.SliderValue.Location = new System.Drawing.Point(480, 100); this.SliderValue.Name = "SliderValue"; - this.SliderValue.Size = new System.Drawing.Size(23, 12); + this.SliderValue.Size = new System.Drawing.Size(24, 13); this.SliderValue.TabIndex = 15; this.SliderValue.Text = "0%"; // @@ -948,10 +867,9 @@ namespace Handbrake // this.Label46.AutoSize = true; this.Label46.BackColor = System.Drawing.Color.Transparent; - this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label46.Location = new System.Drawing.Point(13, 71); this.Label46.Name = "Label46"; - this.Label46.Size = new System.Drawing.Size(106, 13); + this.Label46.Size = new System.Drawing.Size(90, 13); this.Label46.TabIndex = 1; this.Label46.Text = "Framerate (FPS):"; // @@ -967,22 +885,13 @@ namespace Handbrake this.tab_picture.Text = "Picture Settings"; this.tab_picture.UseVisualStyleBackColor = true; // - // PictureSettings - // - this.PictureSettings.BackColor = System.Drawing.Color.Transparent; - this.PictureSettings.Location = new System.Drawing.Point(0, 0); - this.PictureSettings.Name = "PictureSettings"; - this.PictureSettings.Size = new System.Drawing.Size(713, 310); - this.PictureSettings.TabIndex = 0; - // // Check_ChapterMarkers // this.Check_ChapterMarkers.AutoSize = true; this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent; - this.Check_ChapterMarkers.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32); this.Check_ChapterMarkers.Name = "Check_ChapterMarkers"; - this.Check_ChapterMarkers.Size = new System.Drawing.Size(164, 17); + this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17); this.Check_ChapterMarkers.TabIndex = 1; this.Check_ChapterMarkers.Text = "Create chapter markers"; this.Check_ChapterMarkers.UseVisualStyleBackColor = false; @@ -998,8 +907,7 @@ namespace Handbrake this.tabs_panel.Controls.Add(this.tab_chapters); this.tabs_panel.Controls.Add(this.tab_advanced); this.tabs_panel.Controls.Add(this.tab_query); - this.tabs_panel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabs_panel.Location = new System.Drawing.Point(9, 251); + this.tabs_panel.Location = new System.Drawing.Point(12, 218); this.tabs_panel.Name = "tabs_panel"; this.tabs_panel.SelectedIndex = 0; this.tabs_panel.Size = new System.Drawing.Size(732, 334); @@ -1016,14 +924,6 @@ namespace Handbrake this.tab_filters.Text = "Video Filters"; this.tab_filters.UseVisualStyleBackColor = true; // - // Filters - // - this.Filters.BackColor = System.Drawing.Color.Transparent; - this.Filters.Location = new System.Drawing.Point(0, 0); - this.Filters.Name = "Filters"; - this.Filters.Size = new System.Drawing.Size(713, 310); - this.Filters.TabIndex = 0; - // // tab_subtitles // this.tab_subtitles.Controls.Add(this.Subtitles); @@ -1035,14 +935,6 @@ namespace Handbrake this.tab_subtitles.Text = "Subtitles"; this.tab_subtitles.UseVisualStyleBackColor = true; // - // Subtitles - // - this.Subtitles.BackColor = System.Drawing.Color.Transparent; - this.Subtitles.Location = new System.Drawing.Point(0, 0); - this.Subtitles.Name = "Subtitles"; - this.Subtitles.Size = new System.Drawing.Size(722, 310); - this.Subtitles.TabIndex = 0; - // // tab_chapters // this.tab_chapters.BackColor = System.Drawing.Color.Transparent; @@ -1060,10 +952,10 @@ namespace Handbrake // this.label31.AutoSize = true; this.label31.BackColor = System.Drawing.Color.Transparent; - this.label31.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label31.Location = new System.Drawing.Point(13, 13); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(115, 13); + this.label31.Size = new System.Drawing.Size(102, 13); this.label31.TabIndex = 0; this.label31.Text = "Chapter Markers"; // @@ -1071,7 +963,6 @@ namespace Handbrake // this.tab_advanced.BackColor = System.Drawing.Color.Transparent; this.tab_advanced.Controls.Add(this.x264Panel); - this.tab_advanced.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 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(3); @@ -1080,15 +971,6 @@ namespace Handbrake this.tab_advanced.Text = "Advanced"; this.tab_advanced.UseVisualStyleBackColor = true; // - // x264Panel - // - this.x264Panel.BackColor = System.Drawing.Color.Transparent; - this.x264Panel.Location = new System.Drawing.Point(0, 0); - this.x264Panel.Name = "x264Panel"; - this.x264Panel.Size = new System.Drawing.Size(720, 306); - this.x264Panel.TabIndex = 0; - this.x264Panel.x264Query = ""; - // // tab_query // this.tab_query.Controls.Add(this.btn_clear); @@ -1106,7 +988,7 @@ namespace Handbrake // btn_clear // this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_clear.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_clear.Location = new System.Drawing.Point(634, 75); this.btn_clear.Name = "btn_clear"; @@ -1121,7 +1003,7 @@ namespace Handbrake this.label34.AutoSize = true; this.label34.Location = new System.Drawing.Point(13, 36); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(434, 26); + this.label34.Size = new System.Drawing.Size(367, 26); this.label34.TabIndex = 1; this.label34.Text = "Here you can alter the query generated by this program.\r\nDon\'t forget to re-gener" + "ate this query should you change any GUI options."; @@ -1129,7 +1011,7 @@ namespace Handbrake // btn_generate_Query // this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_generate_Query.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_generate_Query.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_generate_Query.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_generate_Query.Location = new System.Drawing.Point(16, 75); this.btn_generate_Query.Name = "btn_generate_Query"; @@ -1143,10 +1025,10 @@ namespace Handbrake // this.label33.AutoSize = true; this.label33.BackColor = System.Drawing.Color.Transparent; - this.label33.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label33.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label33.Location = new System.Drawing.Point(13, 13); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(89, 13); + this.label33.Size = new System.Drawing.Size(77, 13); this.label33.TabIndex = 0; this.label33.Text = "Query Editor"; // @@ -1159,26 +1041,13 @@ namespace Handbrake this.rtf_query.TabIndex = 5; this.rtf_query.Text = ""; // - // btn_destBrowse - // - this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_destBrowse.Location = new System.Drawing.Point(645, 152); - this.btn_destBrowse.Name = "btn_destBrowse"; - this.btn_destBrowse.Size = new System.Drawing.Size(75, 23); - this.btn_destBrowse.TabIndex = 13; - this.btn_destBrowse.Text = "Browse"; - this.btn_destBrowse.UseVisualStyleBackColor = true; - this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click); - // // groupBox2 // this.groupBox2.Controls.Add(this.splitContainer1); - 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(751, 70); + this.groupBox2.Location = new System.Drawing.Point(750, 70); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(245, 515); + this.groupBox2.Size = new System.Drawing.Size(246, 482); this.groupBox2.TabIndex = 6; this.groupBox2.TabStop = false; this.groupBox2.Text = "Presets"; @@ -1199,14 +1068,15 @@ namespace Handbrake this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset); this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset); this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault); - this.splitContainer1.Size = new System.Drawing.Size(239, 495); - this.splitContainer1.SplitterDistance = 456; + this.splitContainer1.Size = new System.Drawing.Size(240, 462); + this.splitContainer1.SplitterDistance = 424; this.splitContainer1.TabIndex = 1; // // treeView_presets // this.treeView_presets.ContextMenuStrip = this.presets_menu; this.treeView_presets.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue; this.treeView_presets.FullRowSelect = true; this.treeView_presets.HideSelection = false; @@ -1214,7 +1084,7 @@ namespace Handbrake this.treeView_presets.Location = new System.Drawing.Point(0, 0); this.treeView_presets.Name = "treeView_presets"; this.treeView_presets.ShowLines = false; - this.treeView_presets.Size = new System.Drawing.Size(239, 456); + this.treeView_presets.Size = new System.Drawing.Size(240, 424); this.treeView_presets.TabIndex = 0; this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp); this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect); @@ -1412,7 +1282,7 @@ namespace Handbrake this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lbl_encode, this.lbl_updateCheck}); - this.StatusStrip.Location = new System.Drawing.Point(0, 599); + this.StatusStrip.Location = new System.Drawing.Point(0, 560); this.StatusStrip.Name = "StatusStrip"; this.StatusStrip.Size = new System.Drawing.Size(1000, 22); this.StatusStrip.SizingGrip = false; @@ -1421,18 +1291,16 @@ namespace Handbrake // // lbl_encode // - this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_encode.Name = "lbl_encode"; - this.lbl_encode.Size = new System.Drawing.Size(31, 17); + this.lbl_encode.Size = new System.Drawing.Size(23, 17); this.lbl_encode.Text = "{0}"; // // lbl_updateCheck // this.lbl_updateCheck.BackColor = System.Drawing.Color.Transparent; this.lbl_updateCheck.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.lbl_updateCheck.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_updateCheck.Name = "lbl_updateCheck"; - this.lbl_updateCheck.Size = new System.Drawing.Size(139, 17); + this.lbl_updateCheck.Size = new System.Drawing.Size(125, 17); this.lbl_updateCheck.Text = "Checking for Updates ..."; this.lbl_updateCheck.Visible = false; // @@ -1446,86 +1314,264 @@ namespace Handbrake this.hbproc.StartInfo.UserName = ""; this.hbproc.SynchronizingObject = this; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(13, 74); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(56, 13); - this.label1.TabIndex = 8; - this.label1.Text = "Source:"; - // - // lbl_source - // - this.lbl_source.AutoSize = true; - this.lbl_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_source.Location = new System.Drawing.Point(75, 74); - this.lbl_source.Name = "lbl_source"; - this.lbl_source.Size = new System.Drawing.Size(152, 13); - this.lbl_source.TabIndex = 9; - this.lbl_source.Text = "Click \'Source\' to continue"; - // - // 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(13, 130); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(81, 13); - this.label4.TabIndex = 46; - this.label4.Text = "Destination"; - // - // groupBox_output - // - this.groupBox_output.AutoSize = true; - this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox_output.Location = new System.Drawing.Point(13, 189); - this.groupBox_output.Name = "groupBox_output"; - this.groupBox_output.Size = new System.Drawing.Size(210, 13); - this.groupBox_output.TabIndex = 47; - this.groupBox_output.Text = "Output Settings: (Preset: None)"; - // // File_Save // this.File_Save.DefaultExt = "hb"; this.File_Save.Filter = "hb|*.hb"; // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.AutoSize = true; + this.tableLayoutPanel2.ColumnCount = 3; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.Label3, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.text_destination, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.btn_destBrowse, 2, 0); + this.tableLayoutPanel2.Location = new System.Drawing.Point(21, 132); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(723, 29); + this.tableLayoutPanel2.TabIndex = 50; + // + // btn_destBrowse + // + this.btn_destBrowse.AutoSize = true; + this.btn_destBrowse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.btn_destBrowse.Location = new System.Drawing.Point(645, 3); + this.btn_destBrowse.Name = "btn_destBrowse"; + this.btn_destBrowse.Size = new System.Drawing.Size(75, 23); + this.btn_destBrowse.TabIndex = 13; + this.btn_destBrowse.Text = "Browse"; + this.btn_destBrowse.UseVisualStyleBackColor = true; + this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click); + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.AutoSize = true; + this.tableLayoutPanel3.ColumnCount = 5; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.Controls.Add(this.label5, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.drop_format, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.check_largeFile, 2, 0); + this.tableLayoutPanel3.Controls.Add(this.check_optimiseMP4, 3, 0); + this.tableLayoutPanel3.Controls.Add(this.check_iPodAtom, 4, 0); + this.tableLayoutPanel3.Location = new System.Drawing.Point(21, 180); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(723, 27); + this.tableLayoutPanel3.TabIndex = 51; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.AutoSize = true; + this.tableLayoutPanel1.ColumnCount = 10; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.Label10, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.drp_dvdtitle, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.lbl_angle, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.drop_angle, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.Label9, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.drop_chapterStart, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.Label13, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.drop_chapterFinish, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.label_duration, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.lbl_duration, 9, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(21, 86); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27); + this.tableLayoutPanel1.TabIndex = 49; + // + // Label10 + // + this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.Label10.AutoSize = true; + this.Label10.ForeColor = System.Drawing.Color.Black; + this.Label10.Location = new System.Drawing.Point(3, 7); + this.Label10.Name = "Label10"; + this.Label10.Size = new System.Drawing.Size(31, 13); + this.Label10.TabIndex = 6; + this.Label10.Text = "Title:"; + // + // lbl_angle + // + this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.lbl_angle.AutoSize = true; + this.lbl_angle.ForeColor = System.Drawing.Color.Black; + this.lbl_angle.Location = new System.Drawing.Point(165, 7); + this.lbl_angle.Name = "lbl_angle"; + this.lbl_angle.Size = new System.Drawing.Size(38, 13); + this.lbl_angle.TabIndex = 44; + this.lbl_angle.Text = "Angle:"; + // + // Label9 + // + this.Label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.Label9.AutoSize = true; + this.Label9.ForeColor = System.Drawing.Color.Black; + this.Label9.Location = new System.Drawing.Point(260, 7); + this.Label9.Name = "Label9"; + this.Label9.Size = new System.Drawing.Size(55, 13); + this.Label9.TabIndex = 8; + this.Label9.Text = "Chapters:"; + // + // Label13 + // + this.Label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.Label13.AutoSize = true; + this.Label13.Location = new System.Drawing.Point(396, 7); + this.Label13.Name = "Label13"; + this.Label13.Size = new System.Drawing.Size(45, 13); + this.Label13.TabIndex = 10; + this.Label13.Text = "through"; + // + // label_duration + // + this.label_duration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label_duration.AutoSize = true; + this.label_duration.BackColor = System.Drawing.Color.Transparent; + this.label_duration.Location = new System.Drawing.Point(522, 7); + this.label_duration.Name = "label_duration"; + this.label_duration.Size = new System.Drawing.Size(52, 13); + this.label_duration.TabIndex = 42; + this.label_duration.Text = "Duration:"; + // + // lbl_duration + // + this.lbl_duration.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lbl_duration.AutoSize = true; + this.lbl_duration.BackColor = System.Drawing.Color.Transparent; + this.lbl_duration.Location = new System.Drawing.Point(580, 7); + this.lbl_duration.Name = "lbl_duration"; + this.lbl_duration.Size = new System.Drawing.Size(39, 13); + this.lbl_duration.TabIndex = 43; + this.lbl_duration.Text = "--:--:--"; + // + // labelStaticSource + // + this.labelStaticSource.AutoSize = true; + this.labelStaticSource.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelStaticSource.Location = new System.Drawing.Point(12, 70); + this.labelStaticSource.Name = "labelStaticSource"; + this.labelStaticSource.Size = new System.Drawing.Size(49, 13); + this.labelStaticSource.TabIndex = 51; + this.labelStaticSource.Text = "Source:"; + // + // labelSource + // + this.labelSource.AutoSize = true; + this.labelSource.Location = new System.Drawing.Point(67, 70); + this.labelSource.Name = "labelSource"; + this.labelSource.Size = new System.Drawing.Size(137, 13); + this.labelSource.TabIndex = 52; + this.labelSource.Text = "Select \"Source\" to continue"; + // + // labelStaticDestination + // + this.labelStaticDestination.AutoSize = true; + this.labelStaticDestination.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelStaticDestination.Location = new System.Drawing.Point(12, 116); + this.labelStaticDestination.Name = "labelStaticDestination"; + this.labelStaticDestination.Size = new System.Drawing.Size(75, 13); + this.labelStaticDestination.TabIndex = 53; + this.labelStaticDestination.Text = "Destination:"; + // + // labelPreset + // + this.labelPreset.AutoSize = true; + this.labelPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelPreset.Location = new System.Drawing.Point(13, 164); + this.labelPreset.Name = "labelPreset"; + this.labelPreset.Size = new System.Drawing.Size(180, 13); + this.labelPreset.TabIndex = 54; + this.labelPreset.Text = "Output Settings (Preset: None)"; + // + // PictureSettings + // + this.PictureSettings.BackColor = System.Drawing.Color.Transparent; + this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F); + this.PictureSettings.Location = new System.Drawing.Point(0, 0); + this.PictureSettings.Name = "PictureSettings"; + this.PictureSettings.Size = new System.Drawing.Size(713, 310); + this.PictureSettings.TabIndex = 0; + // + // Filters + // + this.Filters.BackColor = System.Drawing.Color.Transparent; + this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Filters.Location = new System.Drawing.Point(0, 0); + this.Filters.Name = "Filters"; + this.Filters.Size = new System.Drawing.Size(713, 310); + this.Filters.TabIndex = 0; + // + // AudioSettings + // + this.AudioSettings.BackColor = System.Drawing.Color.Transparent; + this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.AudioSettings.Location = new System.Drawing.Point(0, 0); + this.AudioSettings.Name = "AudioSettings"; + this.AudioSettings.Size = new System.Drawing.Size(715, 310); + this.AudioSettings.TabIndex = 0; + // + // Subtitles + // + this.Subtitles.BackColor = System.Drawing.Color.Transparent; + this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Subtitles.Location = new System.Drawing.Point(0, 0); + this.Subtitles.Name = "Subtitles"; + this.Subtitles.Size = new System.Drawing.Size(722, 310); + this.Subtitles.TabIndex = 0; + // + // x264Panel + // + this.x264Panel.BackColor = System.Drawing.Color.Transparent; + this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.x264Panel.Location = new System.Drawing.Point(0, 0); + this.x264Panel.Name = "x264Panel"; + this.x264Panel.Size = new System.Drawing.Size(720, 306); + this.x264Panel.TabIndex = 0; + this.x264Panel.x264Query = ""; + // // frmMain // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1000, 621); - this.Controls.Add(this.groupBox_output); - this.Controls.Add(this.drop_format); - this.Controls.Add(this.label5); - this.Controls.Add(this.btn_destBrowse); - this.Controls.Add(this.check_largeFile); - this.Controls.Add(this.label4); - this.Controls.Add(this.check_iPodAtom); - this.Controls.Add(this.Label3); - this.Controls.Add(this.check_optimiseMP4); - this.Controls.Add(this.drop_angle); - this.Controls.Add(this.text_destination); - this.Controls.Add(this.lbl_source); - this.Controls.Add(this.lbl_angle); - this.Controls.Add(this.lbl_duration); - this.Controls.Add(this.label_duration); - this.Controls.Add(this.label1); - this.Controls.Add(this.Label13); - this.Controls.Add(this.drop_chapterFinish); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.drop_chapterStart); + this.ClientSize = new System.Drawing.Size(1000, 582); + this.Controls.Add(this.labelStaticSource); + this.Controls.Add(this.labelSource); + this.Controls.Add(this.tableLayoutPanel3); + this.Controls.Add(this.labelStaticDestination); this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.drp_dvdtitle); - this.Controls.Add(this.Label9); - this.Controls.Add(this.tabs_panel); - this.Controls.Add(this.Label10); + this.Controls.Add(this.labelPreset); this.Controls.Add(this.frmMainMenu); + this.Controls.Add(this.tableLayoutPanel2); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.groupBox2); this.Controls.Add(this.StatusStrip); + this.Controls.Add(this.tabs_panel); this.DoubleBuffered = true; + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "frmMain"; @@ -1557,6 +1603,12 @@ namespace Handbrake this.toolStrip1.PerformLayout(); this.StatusStrip.ResumeLayout(false); this.StatusStrip.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1578,12 +1630,6 @@ namespace Handbrake internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3; internal System.Windows.Forms.ToolStripMenuItem mnu_about; internal System.Windows.Forms.MenuStrip frmMainMenu; - internal System.Windows.Forms.Label Label13; - internal System.Windows.Forms.ComboBox drop_chapterFinish; - internal System.Windows.Forms.ComboBox drop_chapterStart; - internal System.Windows.Forms.ComboBox drp_dvdtitle; - internal System.Windows.Forms.Label Label9; - internal System.Windows.Forms.Label Label10; internal System.Windows.Forms.Label Label3; internal System.Windows.Forms.ComboBox drp_videoEncoder; internal System.Windows.Forms.Label Label47; @@ -1632,13 +1678,10 @@ namespace Handbrake internal System.Windows.Forms.Button btn_addPreset; internal System.Windows.Forms.Label label25; internal System.Windows.Forms.TabPage tab_advanced; - private System.Windows.Forms.Button btn_destBrowse; internal System.Windows.Forms.TreeView treeView_presets; internal System.Windows.Forms.RichTextBox rtf_query; private System.Windows.Forms.NotifyIcon notifyIcon; private System.Windows.Forms.ToolStripMenuItem btn_restore; - internal System.Windows.Forms.Label lbl_duration; - internal System.Windows.Forms.Label label_duration; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripMenuItem btn_file_source; private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset; @@ -1674,19 +1717,31 @@ namespace Handbrake private System.Windows.Forms.DataGridViewTextBoxColumn number; private System.Windows.Forms.DataGridViewTextBoxColumn name; private System.Diagnostics.Process hbproc; - internal ComboBox drop_angle; - internal Label lbl_angle; private TabPage tab_subtitles; internal Handbrake.Controls.AudioPanel AudioSettings; internal Handbrake.Controls.PictureSettings PictureSettings; internal Handbrake.Controls.Subtitles Subtitles; internal Handbrake.Controls.Filters Filters; - private Label label1; - internal Label lbl_source; - private Label label4; - internal Label groupBox_output; private ToolStripStatusLabel lbl_updateCheck; internal SaveFileDialog File_Save; + private TableLayoutPanel tableLayoutPanel2; + private Button btn_destBrowse; + private TableLayoutPanel tableLayoutPanel3; + private TableLayoutPanel tableLayoutPanel1; + internal Label Label10; + internal ComboBox drp_dvdtitle; + internal Label lbl_angle; + internal ComboBox drop_angle; + internal Label Label9; + internal ComboBox drop_chapterStart; + internal Label Label13; + internal ComboBox drop_chapterFinish; + internal Label label_duration; + internal Label lbl_duration; + private Label labelStaticDestination; + private Label labelSource; + private Label labelStaticSource; + internal Label labelPreset; } diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index d51f9aa41..69e850a3a 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -44,7 +44,7 @@ namespace Handbrake { // Load and setup the splash screen in this thread splash = new frmSplashScreen(); - splash.Show(); + splash.Show(this); Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) }; splash.Controls.Add(lblStatus); @@ -241,22 +241,22 @@ namespace Handbrake Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel); // Video Tab - drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel); - check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel); - check_turbo.CheckedChanged -= new EventHandler(changePresetLabel); - text_filesize.TextChanged -= new EventHandler(changePresetLabel); - text_bitrate.TextChanged -= new EventHandler(changePresetLabel); - slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel); + drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel); + check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel); + check_turbo.CheckedChanged -= new EventHandler(changePresetLabel); + text_filesize.TextChanged -= new EventHandler(changePresetLabel); + text_bitrate.TextChanged -= new EventHandler(changePresetLabel); + slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel); // Audio Panel - AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel); + AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel); // Advanced Tab - x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel); + x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel); } private void changePresetLabel(object sender, EventArgs e) { - groupBox_output.Text = "Output Settings (Preset: Custom)"; + labelPreset.Text = "Output Settings (Preset: Custom)"; } private static void frmMain_DragEnter(object sender, DragEventArgs e) @@ -267,10 +267,17 @@ namespace Handbrake private void frmMain_DragDrop(object sender, DragEventArgs e) { string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[]; + sourcePath = string.Empty; + if (fileList != null) { if (fileList[0].StartsWith("\\")) - MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + { + MessageBox.Show( + "Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", + "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + UpdateSourceLabel(); + } else { if (fileList[0] != "") @@ -279,9 +286,11 @@ namespace Handbrake startScan(fileList[0]); } else - lbl_source.Text = "Click 'Source' to continue"; + UpdateSourceLabel(); } } + else + UpdateSourceLabel(); } private void encodeStarted(object sender, EventArgs e) { @@ -343,7 +352,7 @@ namespace Handbrake presetHandler.updateBuiltInPresets(); loadPresetPanel(); if (treeView_presets.Nodes.Count == 0) - MessageBox.Show("Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); else MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -351,24 +360,8 @@ namespace Handbrake } private void mnu_delete_preset_Click(object sender, EventArgs e) { - // Empty the preset file - string presetsFile = Application.StartupPath + "\\presets.xml"; - if (File.Exists(presetsFile)) - File.Delete(presetsFile); - - try - { - FileStream strm = new FileStream(presetsFile, FileMode.Create, FileAccess.Write); - strm.Close(); - strm.Dispose(); - } - catch (Exception exc) - { - MessageBox.Show("An error has occured during the preset removal process.\n If you are using Windows Vista, you may need to run under Administrator Mode to complete this task. \n" + exc); - } - - // Reload the preset panel - loadPresetPanel(); + presetHandler.removeBuiltInPresets(); + loadPresetPanel(); // Reload the preset panel } private void mnu_SelectDefault_Click(object sender, EventArgs e) { @@ -462,7 +455,7 @@ namespace Handbrake if (treeView_presets.SelectedNode != null) { presetHandler.remove(treeView_presets.SelectedNode.Text); - treeView_presets.Nodes.Remove(treeView_presets.SelectedNode); + treeView_presets.Nodes.Remove(treeView_presets.SelectedNode); } treeView_presets.Select(); } @@ -521,7 +514,7 @@ namespace Handbrake { if (treeView_presets.GetNodeAt(e.Location) != null) { - if (groupBox_output.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text)) + if (labelPreset.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text)) selectPreset(); } } @@ -590,7 +583,7 @@ namespace Handbrake } } } - } + } private void loadNormalPreset() { foreach (TreeNode treenode in treeView_presets.Nodes) @@ -637,7 +630,7 @@ namespace Handbrake } else { - if (encodeQueue.count() != 0 || (lbl_source.Text != string.Empty && lbl_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty)) + if (encodeQueue.count() != 0 || (!string.IsNullOrEmpty(sourcePath) && string.IsNullOrEmpty(text_destination.Text))) { String query = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this); @@ -649,7 +642,7 @@ namespace Handbrake if (overwrite == DialogResult.Yes) { if (encodeQueue.count() == 0) - encodeQueue.add(query, lbl_source.Text, text_destination.Text); + encodeQueue.add(query, sourcePath, text_destination.Text); queueWindow.setQueue(); if (encodeQueue.count() > 1) @@ -661,15 +654,14 @@ namespace Handbrake } this.Focus(); } - else if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty) - MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } } private void btn_add2Queue_Click(object sender, EventArgs e) { - - if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty) - MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { String query = queryGen.generateTheQuery(this); @@ -681,11 +673,11 @@ namespace Handbrake DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?", "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (result == DialogResult.Yes) - encodeQueue.add(query, lbl_source.Text, text_destination.Text); + encodeQueue.add(query, sourcePath, text_destination.Text); } else - encodeQueue.add(query, lbl_source.Text, text_destination.Text); + encodeQueue.add(query, sourcePath, text_destination.Text); queueWindow.Show(); } @@ -696,8 +688,8 @@ namespace Handbrake } private void tb_preview_Click(object sender, EventArgs e) { - if (lbl_source.Text == "" || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == "") - MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { if (qtpreview == null) @@ -761,35 +753,39 @@ namespace Handbrake // Set the last action to scan. // This is used for tracking which file to load in the activity window lastAction = "scan"; - lbl_source.Text = ""; + sourcePath = string.Empty; if (DVD_Open.ShowDialog() == DialogResult.OK) { String filename = DVD_Open.SelectedPath; if (filename.StartsWith("\\")) - MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + { + MessageBox.Show( + "Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", + "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + UpdateSourceLabel(); + } else { if (filename != "") { - lbl_source.Text = Path.GetFullPath(filename); + sourcePath = Path.GetFullPath(filename); setupGUIforScan(filename); startScan(filename); - } - else - lbl_source.Text = "Click 'Source' to continue"; + } else + UpdateSourceLabel(); } } else - lbl_source.Text = "Click 'Source' to continue"; + UpdateSourceLabel(); } private void btn_file_source_Click(object sender, EventArgs e) { // Set the last action to scan. // This is used for tracking which file to load in the activity window lastAction = "scan"; - lbl_source.Text = ""; + sourcePath = string.Empty; if (ISO_Open.ShowDialog() == DialogResult.OK) { @@ -802,17 +798,14 @@ namespace Handbrake { if (filename != "") { - lbl_source.Text = Path.GetFileName(filename); + sourcePath = Path.GetFileName(filename); setupGUIforScan(filename); startScan(filename); - } - else - lbl_source.Text = "Click 'Source' to continue"; + } else + UpdateSourceLabel(); } } - else - lbl_source.Text = "Click 'Source' to continue"; - + UpdateSourceLabel(); } private void mnu_dvd_drive_Click(object sender, EventArgs e) { @@ -822,12 +815,13 @@ namespace Handbrake // Set the last action to scan. // This is used for tracking which file to load in the activity window lastAction = "scan"; + sourcePath = string.Empty; if (mnu_dvd_drive.Text.Contains("VIDEO_TS")) { string[] path = mnu_dvd_drive.Text.Split(' '); String filename = path[0]; - lbl_source.Text = Path.GetFullPath(filename); + sourcePath = Path.GetFullPath(filename); setupGUIforScan(filename); startScan(filename); } @@ -836,6 +830,8 @@ namespace Handbrake if (drp_dvdtitle.Items.Count == 0) MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); + UpdateSourceLabel(); + lbl_encode.Text = ""; } private void drp_dvdtitle_Click(object sender, EventArgs e) @@ -901,7 +897,7 @@ namespace Handbrake // Run the autoName & chapterNaming functions if (Properties.Settings.Default.autoNaming) { - string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex); + string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); if (autoPath != null) text_destination.Text = autoPath; else @@ -947,7 +943,7 @@ namespace Handbrake // Run the Autonaming function if (Properties.Settings.Default.autoNaming) - text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex); + text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); // Disable chapter markers if only 1 chapter is selected. if (c_start == c_end) @@ -978,7 +974,7 @@ namespace Handbrake // Run the Autonaming function if (Properties.Settings.Default.autoNaming) - text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex); + text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); // Add more rows to the Chapter menu if needed. if (Check_ChapterMarkers.Checked) @@ -1145,7 +1141,7 @@ namespace Handbrake CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US"); double multiplier = 1.0 / Properties.Settings.Default.x264cqstep; - double value = slider_videoQuality.Value*multiplier; + double value = slider_videoQuality.Value * multiplier; switch (Properties.Settings.Default.x264cqstep.ToString(culture)) { @@ -1268,7 +1264,7 @@ namespace Handbrake { if (Check_ChapterMarkers.Checked) { - if (drop_format.SelectedIndex != 1) + if (drop_format.SelectedIndex != 1) setExtension(".m4v"); data_chpt.Rows.Clear(); data_chpt.Enabled = true; @@ -1357,7 +1353,7 @@ namespace Handbrake using (hbproc = Process.Start(hbParseDvd)) { Process[] before = Process.GetProcesses(); // Get a list of running processes before starting. - scanProcessID = Main.getCliProcess(before); + scanProcessID = Main.getCliProcess(before); hbproc.WaitForExit(); if (hbproc.ExitCode != 0) cleanExit = false; @@ -1411,7 +1407,7 @@ namespace Handbrake drp_dvdtitle.SelectedItem = Main.selectLongestTitle(drp_dvdtitle); // Enable the creation of chapter markers if the file is an image of a dvd. - if (lbl_source.Text.ToLower().Contains(".iso") || lbl_source.Text.ToLower().Contains("VIDEO_TS")) + if (sourcePath.ToLower().Contains(".iso") || sourcePath.ToLower().Contains("VIDEO_TS")) Check_ChapterMarkers.Enabled = true; else { @@ -1422,7 +1418,13 @@ namespace Handbrake // If no titles were found, Display an error message if (drp_dvdtitle.Items.Count == 0) - MessageBox.Show("No Title(s) found. \n\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); + { + MessageBox.Show( + "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", + "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); + sourcePath = string.Empty; + } + UpdateSourceLabel(); // Enable the GUI components and enable any disabled components enableGUI(); @@ -1489,12 +1491,18 @@ namespace Handbrake lbl_duration.Text = "Select a Title"; PictureSettings.lbl_src_res.Text = "Select a Title"; PictureSettings.lbl_Aspect.Text = "Select a Title"; - lbl_source.Text = "Click 'Source' to continue"; + sourcePath = "Source"; text_destination.Text = ""; thisDVD = null; selectedTitle = null; isScanning = false; } + + private void UpdateSourceLabel() + { + labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : Path.GetFileName(sourcePath); + } + #endregion #region GUI @@ -1635,7 +1643,7 @@ namespace Handbrake #endregion #region In-GUI Encode Status (Experimental) - + private void encodeMonitorThread() { try @@ -1664,6 +1672,7 @@ namespace Handbrake } #endregion + // This is the END of the road **************************************** } } \ No newline at end of file diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs index 350cfab47..b447c382c 100644 --- a/win/C#/frmSplashScreen.Designer.cs +++ b/win/C#/frmSplashScreen.Designer.cs @@ -49,10 +49,13 @@ namespace Handbrake this.Font = new System.Drawing.Font("Corbel", 8.25F); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "frmSplashScreen"; + this.ShowIcon = false; + this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SplashScreen"; - this.TopMost = true; this.ResumeLayout(false); }