From: sr55 Date: Sat, 22 Sep 2007 16:16:40 +0000 (+0000) Subject: WinGui: X-Git-Tag: 0.9.1~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d33808160c6938bd9611e155bebf97ab1d617b1e;p=handbrake WinGui: - Added some new png images to the gui ( Hawkman's Image pack) - Redesigned the layout of the queue slightly. - Fixed size issue with the DVD info window. - git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@980 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 97918ad34..181293626 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -177,8 +177,11 @@ + + + + - diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs index ed9c1d186..505af031d 100644 --- a/win/C#/Properties/AssemblyInfo.cs +++ b/win/C#/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Resources; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Handbrake")] -[assembly: AssemblyDescription("DVD to MPEG-4 converter")] +[assembly: AssemblyDescription("DVD Like Source to MPEG-4 converter")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Handbrake")] [assembly: AssemblyProduct("Handbrake")] diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index 169ae4ed3..e0240113e 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -88,9 +88,9 @@ namespace Handbrake.Properties { } } - internal static System.Drawing.Bitmap General_Preferences { + internal static System.Drawing.Bitmap General_Prefences { get { - object obj = ResourceManager.GetObject("General Preferences", resourceCulture); + object obj = ResourceManager.GetObject("General_Prefences", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -123,6 +123,34 @@ namespace Handbrake.Properties { } } + internal static System.Drawing.Bitmap Output_Small { + get { + object obj = ResourceManager.GetObject("Output_Small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Pref_Small { + get { + object obj = ResourceManager.GetObject("Pref_Small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Queue { + get { + object obj = ResourceManager.GetObject("Queue", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Queue_Small { + get { + object obj = ResourceManager.GetObject("Queue_Small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Remove { get { object obj = ResourceManager.GetObject("Remove", resourceCulture); diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index a87385743..9b28b0817 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -127,28 +127,40 @@ ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Emoticon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SplashScreen.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Queue_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\History.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Movies.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SplashScreen.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Pref_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/win/C#/Resources/Output_Small.png b/win/C#/Resources/Output_Small.png new file mode 100644 index 000000000..a1017d6fb Binary files /dev/null and b/win/C#/Resources/Output_Small.png differ diff --git a/win/C#/Resources/Pref_Small.png b/win/C#/Resources/Pref_Small.png new file mode 100644 index 000000000..a28fb5b27 Binary files /dev/null and b/win/C#/Resources/Pref_Small.png differ diff --git a/win/C#/Resources/Queue.png b/win/C#/Resources/Queue.png new file mode 100644 index 000000000..51962a1b0 Binary files /dev/null and b/win/C#/Resources/Queue.png differ diff --git a/win/C#/Resources/Queue_Small.png b/win/C#/Resources/Queue_Small.png new file mode 100644 index 000000000..02c7391a9 Binary files /dev/null and b/win/C#/Resources/Queue_Small.png differ diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs index 6777d1666..d72646109 100644 --- a/win/C#/frmDvdInfo.Designer.cs +++ b/win/C#/frmDvdInfo.Designer.cs @@ -78,7 +78,7 @@ namespace Handbrake this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(547, 495); + this.ClientSize = new System.Drawing.Size(547, 481); this.Controls.Add(this.Label2); this.Controls.Add(this.rtf_dvdInfo); this.Controls.Add(this.btn_close); @@ -87,7 +87,7 @@ namespace Handbrake this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(553, 520); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(553, 520); + this.MinimumSize = new System.Drawing.Size(553, 506); this.Name = "frmDvdInfo"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Read DVD"; diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index d74482e52..16c3a6555 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -126,6 +126,7 @@ namespace Handbrake this.lbl_encode = new System.Windows.Forms.Label(); this.btn_eCancel = new System.Windows.Forms.Button(); this.TabPage6 = new System.Windows.Forms.TabPage(); + this.label23 = new System.Windows.Forms.Label(); this.Label7 = new System.Windows.Forms.Label(); this.Label39 = new System.Windows.Forms.Label(); this.btn_ClearQuery = new System.Windows.Forms.Button(); @@ -186,7 +187,7 @@ namespace Handbrake this.text_left = new System.Windows.Forms.TextBox(); this.advancedOptions = new System.Windows.Forms.TabControl(); this.groupBox_dest = new System.Windows.Forms.GroupBox(); - this.label23 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); Label38 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); this.frmMainMenu.SuspendLayout(); @@ -230,7 +231,7 @@ namespace Handbrake this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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(408, 58); + this.drop_chapterFinish.Location = new System.Drawing.Point(408, 55); this.drop_chapterFinish.Name = "drop_chapterFinish"; this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); this.drop_chapterFinish.TabIndex = 41; @@ -244,7 +245,7 @@ namespace Handbrake this.drop_chapterStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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(295, 58); + this.drop_chapterStart.Location = new System.Drawing.Point(295, 55); this.drop_chapterStart.Name = "drop_chapterStart"; this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); this.drop_chapterStart.TabIndex = 40; @@ -260,7 +261,7 @@ namespace Handbrake this.drp_dvdtitle.FormattingEnabled = true; this.drp_dvdtitle.Items.AddRange(new object[] { "Automatic"}); - this.drp_dvdtitle.Location = new System.Drawing.Point(99, 55); + this.drp_dvdtitle.Location = new System.Drawing.Point(99, 52); this.drp_dvdtitle.Name = "drp_dvdtitle"; this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); this.drp_dvdtitle.TabIndex = 39; @@ -273,7 +274,7 @@ namespace Handbrake // this.RadioISO.AutoSize = true; this.RadioISO.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.RadioISO.Location = new System.Drawing.Point(549, 25); + this.RadioISO.Location = new System.Drawing.Point(549, 22); this.RadioISO.Name = "RadioISO"; this.RadioISO.Size = new System.Drawing.Size(44, 17); this.RadioISO.TabIndex = 19; @@ -285,7 +286,7 @@ namespace Handbrake // this.text_source.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_source.Location = new System.Drawing.Point(99, 22); + this.text_source.Location = new System.Drawing.Point(99, 19); this.text_source.Name = "text_source"; this.text_source.Size = new System.Drawing.Size(294, 21); this.text_source.TabIndex = 1; @@ -308,7 +309,7 @@ namespace Handbrake this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_Browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_Browse.Location = new System.Drawing.Point(399, 22); + this.btn_Browse.Location = new System.Drawing.Point(399, 19); this.btn_Browse.Name = "btn_Browse"; this.btn_Browse.Size = new System.Drawing.Size(78, 22); this.btn_Browse.TabIndex = 2; @@ -322,7 +323,7 @@ namespace Handbrake this.text_height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_height.ForeColor = System.Drawing.SystemColors.InfoText; - this.text_height.Location = new System.Drawing.Point(196, 58); + this.text_height.Location = new System.Drawing.Point(196, 54); this.text_height.Name = "text_height"; this.text_height.Size = new System.Drawing.Size(64, 21); this.text_height.TabIndex = 8; @@ -333,7 +334,7 @@ namespace Handbrake // this.text_width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_width.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_width.Location = new System.Drawing.Point(104, 58); + this.text_width.Location = new System.Drawing.Point(104, 54); this.text_width.Name = "text_width"; this.text_width.Size = new System.Drawing.Size(64, 21); this.text_width.TabIndex = 7; @@ -366,7 +367,7 @@ namespace Handbrake "H.264", "H.264 (iPod)", "H.264 Baseline 1.3"}); - this.drp_videoEncoder.Location = new System.Drawing.Point(104, 25); + this.drp_videoEncoder.Location = new System.Drawing.Point(104, 21); this.drp_videoEncoder.Name = "drp_videoEncoder"; this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21); this.drp_videoEncoder.TabIndex = 5; @@ -384,7 +385,7 @@ namespace Handbrake "MP3", "Vorbis", "AC3"}); - this.drp_audioCodec.Location = new System.Drawing.Point(376, 24); + this.drp_audioCodec.Location = new System.Drawing.Point(376, 20); this.drp_audioCodec.Name = "drp_audioCodec"; this.drp_audioCodec.Size = new System.Drawing.Size(111, 21); this.drp_audioCodec.TabIndex = 6; @@ -410,7 +411,7 @@ namespace Handbrake this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.None; this.QueryEditorText.Location = new System.Drawing.Point(16, 88); this.QueryEditorText.Name = "QueryEditorText"; - this.QueryEditorText.Size = new System.Drawing.Size(605, 122); + this.QueryEditorText.Size = new System.Drawing.Size(605, 93); this.QueryEditorText.TabIndex = 41; this.QueryEditorText.Text = ""; this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI."); @@ -420,7 +421,7 @@ namespace Handbrake this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.None; this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79); this.rtf_h264advanced.Name = "rtf_h264advanced"; - this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96); + this.rtf_h264advanced.Size = new System.Drawing.Size(605, 76); this.rtf_h264advanced.TabIndex = 41; this.rtf_h264advanced.Text = ""; this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details."); @@ -648,6 +649,7 @@ namespace Handbrake // // mnu_encode // + this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; this.mnu_encode.Name = "mnu_encode"; this.mnu_encode.Size = new System.Drawing.Size(155, 22); this.mnu_encode.Text = "View Queue"; @@ -655,6 +657,7 @@ namespace Handbrake // // mnu_viewDVDdata // + this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Output_Small; this.mnu_viewDVDdata.Name = "mnu_viewDVDdata"; this.mnu_viewDVDdata.Size = new System.Drawing.Size(155, 22); this.mnu_viewDVDdata.Text = "View DVD data"; @@ -667,6 +670,7 @@ namespace Handbrake // // 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(155, 22); this.mnu_options.Text = "Options"; @@ -963,7 +967,7 @@ namespace Handbrake this.GroupBox1.ForeColor = System.Drawing.Color.Black; this.GroupBox1.Location = new System.Drawing.Point(14, 35); this.GroupBox1.Name = "GroupBox1"; - this.GroupBox1.Size = new System.Drawing.Size(647, 98); + this.GroupBox1.Size = new System.Drawing.Size(647, 87); this.GroupBox1.TabIndex = 408; this.GroupBox1.TabStop = false; this.GroupBox1.Text = "Source"; @@ -972,7 +976,7 @@ namespace Handbrake // 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(374, 61); + this.Label13.Location = new System.Drawing.Point(374, 58); this.Label13.Name = "Label13"; this.Label13.Size = new System.Drawing.Size(21, 13); this.Label13.TabIndex = 42; @@ -983,7 +987,7 @@ namespace Handbrake this.RadioDVD.AutoSize = true; this.RadioDVD.Checked = true; this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.RadioDVD.Location = new System.Drawing.Point(483, 25); + this.RadioDVD.Location = new System.Drawing.Point(483, 22); this.RadioDVD.Name = "RadioDVD"; this.RadioDVD.Size = new System.Drawing.Size(60, 17); this.RadioDVD.TabIndex = 20; @@ -996,7 +1000,7 @@ namespace Handbrake this.Label17.AutoSize = true; this.Label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label17.ForeColor = System.Drawing.Color.Black; - this.Label17.Location = new System.Drawing.Point(12, 25); + this.Label17.Location = new System.Drawing.Point(17, 22); this.Label17.Name = "Label17"; this.Label17.Size = new System.Drawing.Size(52, 13); this.Label17.TabIndex = 6; @@ -1007,7 +1011,7 @@ namespace Handbrake 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(224, 61); + this.Label9.Location = new System.Drawing.Point(224, 58); this.Label9.Name = "Label9"; this.Label9.Size = new System.Drawing.Size(64, 13); this.Label9.TabIndex = 12; @@ -1018,7 +1022,7 @@ namespace Handbrake 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(12, 61); + this.Label10.Location = new System.Drawing.Point(17, 55); this.Label10.Name = "Label10"; this.Label10.Size = new System.Drawing.Size(36, 13); this.Label10.TabIndex = 11; @@ -1039,9 +1043,9 @@ namespace Handbrake this.groupBox_output.Controls.Add(this.Label12); this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBox_output.ForeColor = System.Drawing.Color.Black; - this.groupBox_output.Location = new System.Drawing.Point(14, 194); + this.groupBox_output.Location = new System.Drawing.Point(14, 185); this.groupBox_output.Name = "groupBox_output"; - this.groupBox_output.Size = new System.Drawing.Size(647, 89); + this.groupBox_output.Size = new System.Drawing.Size(647, 82); this.groupBox_output.TabIndex = 409; this.groupBox_output.TabStop = false; this.groupBox_output.Text = "Output Settings (Preset: None)"; @@ -1051,7 +1055,7 @@ namespace Handbrake this.Label56.AutoSize = true; this.Label56.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label56.ForeColor = System.Drawing.Color.Black; - this.Label56.Location = new System.Drawing.Point(175, 61); + this.Label56.Location = new System.Drawing.Point(175, 57); this.Label56.Name = "Label56"; this.Label56.Size = new System.Drawing.Size(15, 13); this.Label56.TabIndex = 38; @@ -1061,7 +1065,7 @@ namespace Handbrake // this.lbl_Aspect.AutoSize = true; this.lbl_Aspect.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_Aspect.Location = new System.Drawing.Point(374, 62); + this.lbl_Aspect.Location = new System.Drawing.Point(374, 58); this.lbl_Aspect.Name = "lbl_Aspect"; this.lbl_Aspect.Size = new System.Drawing.Size(72, 12); this.lbl_Aspect.TabIndex = 41; @@ -1071,7 +1075,7 @@ namespace Handbrake // this.Label91.AutoSize = true; this.Label91.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label91.Location = new System.Drawing.Point(270, 62); + this.Label91.Location = new System.Drawing.Point(270, 58); this.Label91.Name = "Label91"; this.Label91.Size = new System.Drawing.Size(87, 13); this.Label91.TabIndex = 40; @@ -1082,7 +1086,7 @@ namespace Handbrake this.Label55.AutoSize = true; this.Label55.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label55.ForeColor = System.Drawing.Color.Black; - this.Label55.Location = new System.Drawing.Point(17, 62); + this.Label55.Location = new System.Drawing.Point(17, 58); this.Label55.Name = "Label55"; this.Label55.Size = new System.Drawing.Size(85, 13); this.Label55.TabIndex = 29; @@ -1093,7 +1097,7 @@ namespace Handbrake this.Label47.AutoSize = true; this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label47.ForeColor = System.Drawing.Color.Black; - this.Label47.Location = new System.Drawing.Point(17, 28); + this.Label47.Location = new System.Drawing.Point(17, 24); this.Label47.Name = "Label47"; this.Label47.Size = new System.Drawing.Size(62, 13); this.Label47.TabIndex = 12; @@ -1104,7 +1108,7 @@ namespace Handbrake this.Label12.AutoSize = true; this.Label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label12.ForeColor = System.Drawing.Color.Black; - this.Label12.Location = new System.Drawing.Point(270, 28); + this.Label12.Location = new System.Drawing.Point(270, 24); this.Label12.Name = "Label12"; this.Label12.Size = new System.Drawing.Size(94, 13); this.Label12.TabIndex = 20; @@ -1115,18 +1119,18 @@ namespace Handbrake 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(12, 23); + this.Label3.Location = new System.Drawing.Point(17, 21); this.Label3.Name = "Label3"; - this.Label3.Size = new System.Drawing.Size(80, 13); + this.Label3.Size = new System.Drawing.Size(31, 13); this.Label3.TabIndex = 3; - this.Label3.Text = "Destination: "; + this.Label3.Text = "File:"; // // lbl_update // this.lbl_update.AutoSize = true; this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_update.ForeColor = System.Drawing.Color.Black; - this.lbl_update.Location = new System.Drawing.Point(102, 594); + this.lbl_update.Location = new System.Drawing.Point(93, 540); this.lbl_update.Name = "lbl_update"; this.lbl_update.Size = new System.Drawing.Size(193, 13); this.lbl_update.TabIndex = 417; @@ -1140,7 +1144,7 @@ namespace Handbrake this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_queue.Location = new System.Drawing.Point(415, 589); + this.btn_queue.Location = new System.Drawing.Point(414, 535); this.btn_queue.Name = "btn_queue"; this.btn_queue.Size = new System.Drawing.Size(115, 22); this.btn_queue.TabIndex = 416; @@ -1156,7 +1160,7 @@ namespace Handbrake this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_encode.Location = new System.Drawing.Point(536, 589); + this.btn_encode.Location = new System.Drawing.Point(535, 535); this.btn_encode.Name = "btn_encode"; this.btn_encode.Size = new System.Drawing.Size(124, 22); this.btn_encode.TabIndex = 414; @@ -1169,17 +1173,17 @@ namespace Handbrake // this.Version.BackColor = System.Drawing.Color.Transparent; this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Version.Location = new System.Drawing.Point(12, 594); + this.Version.Location = new System.Drawing.Point(11, 540); this.Version.Name = "Version"; - this.Version.Size = new System.Drawing.Size(94, 20); + this.Version.Size = new System.Drawing.Size(84, 20); this.Version.TabIndex = 415; - this.Version.Text = "Version 2.4"; + this.Version.Text = "Version 2.4.1"; // // lbl_encode // this.lbl_encode.AutoSize = true; this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_encode.Location = new System.Drawing.Point(12, 571); + this.lbl_encode.Location = new System.Drawing.Point(11, 520); this.lbl_encode.Name = "lbl_encode"; this.lbl_encode.Size = new System.Drawing.Size(129, 13); this.lbl_encode.TabIndex = 418; @@ -1194,7 +1198,7 @@ namespace Handbrake this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_eCancel.Location = new System.Drawing.Point(344, 589); + this.btn_eCancel.Location = new System.Drawing.Point(343, 535); this.btn_eCancel.Name = "btn_eCancel"; this.btn_eCancel.Size = new System.Drawing.Size(65, 22); this.btn_eCancel.TabIndex = 419; @@ -1207,6 +1211,7 @@ namespace Handbrake // TabPage6 // this.TabPage6.BackColor = System.Drawing.SystemColors.ControlLight; + this.TabPage6.Controls.Add(this.button1); this.TabPage6.Controls.Add(this.label23); this.TabPage6.Controls.Add(this.Label7); this.TabPage6.Controls.Add(this.Label39); @@ -1216,10 +1221,19 @@ namespace Handbrake this.TabPage6.Location = new System.Drawing.Point(4, 22); this.TabPage6.Name = "TabPage6"; this.TabPage6.Padding = new System.Windows.Forms.Padding(3); - this.TabPage6.Size = new System.Drawing.Size(639, 242); + this.TabPage6.Size = new System.Drawing.Size(639, 211); this.TabPage6.TabIndex = 6; this.TabPage6.Text = "Query Editor"; // + // label23 + // + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(13, 186); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(403, 13); + this.label23.TabIndex = 43; + this.label23.Text = "Remember to re-generate the query each time you change a setting!"; + // // Label7 // this.Label7.AutoSize = true; @@ -1261,7 +1275,7 @@ namespace Handbrake this.GenerateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.GenerateQuery.Location = new System.Drawing.Point(16, 59); this.GenerateQuery.Name = "GenerateQuery"; - this.GenerateQuery.Size = new System.Drawing.Size(176, 23); + this.GenerateQuery.Size = new System.Drawing.Size(154, 23); this.GenerateQuery.TabIndex = 38; this.GenerateQuery.Text = "Generate Query Now"; this.GenerateQuery.UseVisualStyleBackColor = true; @@ -1280,14 +1294,14 @@ namespace Handbrake this.h264Tab.Location = new System.Drawing.Point(4, 22); this.h264Tab.Name = "h264Tab"; this.h264Tab.Padding = new System.Windows.Forms.Padding(3); - this.h264Tab.Size = new System.Drawing.Size(639, 242); + this.h264Tab.Size = new System.Drawing.Size(639, 211); this.h264Tab.TabIndex = 5; this.h264Tab.Text = "H.264"; // // Label43 // this.Label43.AutoSize = true; - this.Label43.Location = new System.Drawing.Point(78, 206); + this.Label43.Location = new System.Drawing.Point(78, 187); this.Label43.Name = "Label43"; this.Label43.Size = new System.Drawing.Size(158, 13); this.Label43.TabIndex = 48; @@ -1296,7 +1310,7 @@ namespace Handbrake // label_h264 // this.label_h264.AutoSize = true; - this.label_h264.Location = new System.Drawing.Point(13, 206); + this.label_h264.Location = new System.Drawing.Point(13, 187); this.label_h264.Name = "label_h264"; this.label_h264.Size = new System.Drawing.Size(66, 13); this.label_h264.TabIndex = 47; @@ -1307,7 +1321,7 @@ namespace Handbrake // Label95 // this.Label95.AutoSize = true; - this.Label95.Location = new System.Drawing.Point(13, 187); + this.Label95.Location = new System.Drawing.Point(13, 168); this.Label95.Name = "Label95"; this.Label95.Size = new System.Drawing.Size(387, 13); this.Label95.TabIndex = 46; @@ -1368,7 +1382,7 @@ namespace Handbrake this.TabPage2.Location = new System.Drawing.Point(4, 22); this.TabPage2.Name = "TabPage2"; this.TabPage2.Padding = new System.Windows.Forms.Padding(3); - this.TabPage2.Size = new System.Drawing.Size(639, 242); + this.TabPage2.Size = new System.Drawing.Size(639, 211); this.TabPage2.TabIndex = 3; this.TabPage2.Text = "Audio && Subtitles"; // @@ -1522,7 +1536,7 @@ namespace Handbrake this.TabPage3.Location = new System.Drawing.Point(4, 22); this.TabPage3.Name = "TabPage3"; this.TabPage3.Padding = new System.Windows.Forms.Padding(3); - this.TabPage3.Size = new System.Drawing.Size(639, 242); + this.TabPage3.Size = new System.Drawing.Size(639, 211); this.TabPage3.TabIndex = 2; this.TabPage3.Text = "Video Settings"; // @@ -1647,7 +1661,7 @@ namespace Handbrake this.TabPage1.Location = new System.Drawing.Point(4, 22); this.TabPage1.Name = "TabPage1"; this.TabPage1.Padding = new System.Windows.Forms.Padding(3); - this.TabPage1.Size = new System.Drawing.Size(639, 242); + this.TabPage1.Size = new System.Drawing.Size(639, 211); this.TabPage1.TabIndex = 0; this.TabPage1.Text = "Picture Settings"; // @@ -1803,7 +1817,7 @@ namespace Handbrake // this.Label53.AutoSize = true; this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label53.Location = new System.Drawing.Point(134, 196); + this.Label53.Location = new System.Drawing.Point(134, 187); this.Label53.Name = "Label53"; this.Label53.Size = new System.Drawing.Size(48, 13); this.Label53.TabIndex = 32; @@ -1813,7 +1827,7 @@ namespace Handbrake // this.Label52.AutoSize = true; this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label52.Location = new System.Drawing.Point(138, 105); + this.Label52.Location = new System.Drawing.Point(138, 96); this.Label52.Name = "Label52"; this.Label52.Size = new System.Drawing.Size(28, 13); this.Label52.TabIndex = 31; @@ -1843,7 +1857,7 @@ namespace Handbrake // this.Label15.AutoSize = true; this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label15.Location = new System.Drawing.Point(39, 148); + this.Label15.Location = new System.Drawing.Point(39, 139); this.Label15.Name = "Label15"; this.Label15.Size = new System.Drawing.Size(28, 13); this.Label15.TabIndex = 29; @@ -1853,7 +1867,7 @@ namespace Handbrake // this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_top.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_top.Location = new System.Drawing.Point(131, 120); + this.text_top.Location = new System.Drawing.Point(131, 111); this.text_top.Name = "text_top"; this.text_top.Size = new System.Drawing.Size(51, 21); this.text_top.TabIndex = 10; @@ -1863,7 +1877,7 @@ namespace Handbrake // this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_bottom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_bottom.Location = new System.Drawing.Point(131, 172); + this.text_bottom.Location = new System.Drawing.Point(131, 163); this.text_bottom.Name = "text_bottom"; this.text_bottom.Size = new System.Drawing.Size(51, 21); this.text_bottom.TabIndex = 12; @@ -1889,7 +1903,7 @@ namespace Handbrake // this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_right.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_right.Location = new System.Drawing.Point(190, 145); + this.text_right.Location = new System.Drawing.Point(190, 136); this.text_right.Name = "text_right"; this.text_right.Size = new System.Drawing.Size(51, 21); this.text_right.TabIndex = 13; @@ -1899,7 +1913,7 @@ namespace Handbrake // this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_left.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text_left.Location = new System.Drawing.Point(72, 145); + this.text_left.Location = new System.Drawing.Point(72, 136); this.text_left.Name = "text_left"; this.text_left.Size = new System.Drawing.Size(51, 21); this.text_left.TabIndex = 11; @@ -1913,10 +1927,10 @@ namespace Handbrake this.advancedOptions.Controls.Add(this.h264Tab); this.advancedOptions.Controls.Add(this.TabPage6); this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.advancedOptions.Location = new System.Drawing.Point(14, 295); + this.advancedOptions.Location = new System.Drawing.Point(14, 276); this.advancedOptions.Name = "advancedOptions"; this.advancedOptions.SelectedIndex = 0; - this.advancedOptions.Size = new System.Drawing.Size(647, 268); + this.advancedOptions.Size = new System.Drawing.Size(647, 237); this.advancedOptions.TabIndex = 411; this.advancedOptions.TabStop = false; // @@ -1926,28 +1940,32 @@ namespace Handbrake this.groupBox_dest.Controls.Add(this.text_destination); this.groupBox_dest.Controls.Add(this.btn_destBrowse); this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox_dest.Location = new System.Drawing.Point(14, 138); + this.groupBox_dest.Location = new System.Drawing.Point(14, 128); this.groupBox_dest.Name = "groupBox_dest"; this.groupBox_dest.Size = new System.Drawing.Size(646, 50); this.groupBox_dest.TabIndex = 420; this.groupBox_dest.TabStop = false; this.groupBox_dest.Text = "Destination"; // - // label23 + // button1 // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(13, 221); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(403, 13); - this.label23.TabIndex = 43; - this.label23.Text = "Remember to re-generate the query each time you change a setting!"; + this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.button1.Location = new System.Drawing.Point(176, 59); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(134, 23); + this.button1.TabIndex = 44; + this.button1.Text = "Copy to Clipboard"; + this.button1.UseVisualStyleBackColor = true; // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(675, 621); + this.ClientSize = new System.Drawing.Size(675, 564); this.Controls.Add(this.groupBox_dest); this.Controls.Add(this.btn_eCancel); this.Controls.Add(this.lbl_encode); @@ -1960,7 +1978,7 @@ namespace Handbrake this.Controls.Add(this.GroupBox1); this.Controls.Add(this.frmMainMenu); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(683, 648); + this.MinimumSize = new System.Drawing.Size(683, 580); this.Name = "frmMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Handbrake"; @@ -2147,6 +2165,7 @@ namespace Handbrake internal System.Windows.Forms.Label label4; internal System.Windows.Forms.ComboBox drp_deInterlace_option; private System.Windows.Forms.Label label23; + internal System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index f3bb3e6e6..dcbc30bd2 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -32,7 +32,6 @@ namespace Handbrake this.btn_down = new System.Windows.Forms.Button(); this.btn_up = new System.Windows.Forms.Button(); this.btn_delete = new System.Windows.Forms.Button(); - this.Label1 = new System.Windows.Forms.Label(); this.btn_q_encoder = new System.Windows.Forms.Button(); this.list_queue = new System.Windows.Forms.ListBox(); this.btn_Close = new System.Windows.Forms.Button(); @@ -40,6 +39,10 @@ namespace Handbrake this.label2 = new System.Windows.Forms.Label(); this.lbl_progressValue = new System.Windows.Forms.Label(); this.btn_minimise = new System.Windows.Forms.Button(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // btn_down @@ -49,9 +52,9 @@ namespace Handbrake this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_down.Location = new System.Drawing.Point(585, 9); + this.btn_down.Location = new System.Drawing.Point(650, 144); this.btn_down.Name = "btn_down"; - this.btn_down.Size = new System.Drawing.Size(55, 22); + this.btn_down.Size = new System.Drawing.Size(64, 22); this.btn_down.TabIndex = 33; this.btn_down.TabStop = false; this.btn_down.Text = "Down"; @@ -65,9 +68,9 @@ namespace Handbrake this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_up.Location = new System.Drawing.Point(539, 9); + this.btn_up.Location = new System.Drawing.Point(649, 116); this.btn_up.Name = "btn_up"; - this.btn_up.Size = new System.Drawing.Size(40, 22); + this.btn_up.Size = new System.Drawing.Size(64, 22); this.btn_up.TabIndex = 32; this.btn_up.TabStop = false; this.btn_up.Text = "Up"; @@ -81,24 +84,15 @@ namespace Handbrake this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_delete.Location = new System.Drawing.Point(140, 374); + this.btn_delete.Location = new System.Drawing.Point(650, 190); this.btn_delete.Name = "btn_delete"; - this.btn_delete.Size = new System.Drawing.Size(124, 22); + this.btn_delete.Size = new System.Drawing.Size(64, 22); this.btn_delete.TabIndex = 31; this.btn_delete.TabStop = false; - this.btn_delete.Text = "Delete Item"; + this.btn_delete.Text = "Delete"; this.btn_delete.UseVisualStyleBackColor = false; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // - // Label1 - // - this.Label1.AutoSize = true; - this.Label1.Location = new System.Drawing.Point(10, 14); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(110, 13); - this.Label1.TabIndex = 30; - this.Label1.Text = "Videos on the Queue:"; - // // btn_q_encoder // this.btn_q_encoder.BackColor = System.Drawing.SystemColors.ControlLight; @@ -106,7 +100,7 @@ namespace Handbrake this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_q_encoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_q_encoder.Location = new System.Drawing.Point(10, 374); + this.btn_q_encoder.Location = new System.Drawing.Point(13, 302); this.btn_q_encoder.Name = "btn_q_encoder"; this.btn_q_encoder.Size = new System.Drawing.Size(124, 22); this.btn_q_encoder.TabIndex = 29; @@ -120,9 +114,9 @@ namespace Handbrake this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.list_queue.FormattingEnabled = true; this.list_queue.HorizontalScrollbar = true; - this.list_queue.Location = new System.Drawing.Point(10, 37); + this.list_queue.Location = new System.Drawing.Point(13, 72); this.list_queue.Name = "list_queue"; - this.list_queue.Size = new System.Drawing.Size(630, 288); + this.list_queue.Size = new System.Drawing.Size(630, 184); this.list_queue.TabIndex = 28; // // btn_Close @@ -132,7 +126,7 @@ namespace Handbrake this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_Close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_Close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_Close.Location = new System.Drawing.Point(532, 374); + this.btn_Close.Location = new System.Drawing.Point(606, 305); this.btn_Close.Name = "btn_Close"; this.btn_Close.Size = new System.Drawing.Size(108, 22); this.btn_Close.TabIndex = 27; @@ -144,15 +138,16 @@ namespace Handbrake // progressBar // this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight; - this.progressBar.Location = new System.Drawing.Point(74, 331); + this.progressBar.Location = new System.Drawing.Point(67, 264); this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(513, 23); + this.progressBar.Size = new System.Drawing.Size(573, 23); + this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; this.progressBar.TabIndex = 34; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(7, 337); + this.label2.Location = new System.Drawing.Point(10, 270); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 13); this.label2.TabIndex = 35; @@ -161,7 +156,7 @@ namespace Handbrake // lbl_progressValue // this.lbl_progressValue.AutoSize = true; - this.lbl_progressValue.Location = new System.Drawing.Point(605, 337); + this.lbl_progressValue.Location = new System.Drawing.Point(646, 270); this.lbl_progressValue.Name = "lbl_progressValue"; this.lbl_progressValue.Size = new System.Drawing.Size(24, 13); this.lbl_progressValue.TabIndex = 36; @@ -174,22 +169,53 @@ namespace Handbrake this.btn_minimise.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_minimise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_minimise.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_minimise.Location = new System.Drawing.Point(389, 374); + this.btn_minimise.Location = new System.Drawing.Point(471, 305); this.btn_minimise.Name = "btn_minimise"; - this.btn_minimise.Size = new System.Drawing.Size(137, 22); + this.btn_minimise.Size = new System.Drawing.Size(129, 22); this.btn_minimise.TabIndex = 37; this.btn_minimise.TabStop = false; this.btn_minimise.Text = "Minimize Window"; this.btn_minimise.UseVisualStyleBackColor = false; this.btn_minimise.Click += new System.EventHandler(this.btn_minimise_Click); // + // pictureBox1 + // + this.pictureBox1.Image = global::Handbrake.Properties.Resources.Queue; + this.pictureBox1.Location = new System.Drawing.Point(13, 13); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(32, 32); + this.pictureBox1.TabIndex = 38; + this.pictureBox1.TabStop = false; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(51, 25); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(48, 13); + this.label3.TabIndex = 39; + this.label3.Text = "Queue"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(51, 43); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(166, 13); + this.label1.TabIndex = 40; + this.label1.Text = "List of items ready to be encoded:"; + // // frmQueue // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(657, 406); + this.ClientSize = new System.Drawing.Size(726, 339); this.ControlBox = false; + this.Controls.Add(this.label1); + this.Controls.Add(this.label3); + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.btn_minimise); this.Controls.Add(this.lbl_progressValue); this.Controls.Add(this.label2); @@ -197,18 +223,17 @@ namespace Handbrake this.Controls.Add(this.btn_down); this.Controls.Add(this.btn_up); this.Controls.Add(this.btn_delete); - this.Controls.Add(this.Label1); this.Controls.Add(this.btn_q_encoder); this.Controls.Add(this.list_queue); this.Controls.Add(this.btn_Close); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(663, 431); - this.MinimumSize = new System.Drawing.Size(663, 431); this.Name = "frmQueue"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Queue"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = " "; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -219,7 +244,6 @@ namespace Handbrake internal System.Windows.Forms.Button btn_down; internal System.Windows.Forms.Button btn_up; internal System.Windows.Forms.Button btn_delete; - internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.Button btn_q_encoder; internal System.Windows.Forms.ListBox list_queue; internal System.Windows.Forms.Button btn_Close; @@ -227,5 +251,8 @@ namespace Handbrake private System.Windows.Forms.Label label2; private System.Windows.Forms.Label lbl_progressValue; internal System.Windows.Forms.Button btn_minimise; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index c40ff268d..bc45d31b8 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -171,5 +171,6 @@ namespace Handbrake } #endregion + } } \ No newline at end of file diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs index 07f9488b4..479e67fee 100644 --- a/win/C#/frmQuickStart.Designer.cs +++ b/win/C#/frmQuickStart.Designer.cs @@ -223,7 +223,7 @@ namespace Handbrake // pictureBox8 // this.pictureBox8.ErrorImage = global::Handbrake.Properties.Resources.info; - this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Preferences; + this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Prefences; this.pictureBox8.Location = new System.Drawing.Point(12, 71); this.pictureBox8.Name = "pictureBox8"; this.pictureBox8.Size = new System.Drawing.Size(34, 33);