From 5109aee64b3f78e6a22d794f9b0e33d8bbb19b90 Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 2 Sep 2011 20:10:24 +0000 Subject: [PATCH] WinGui: Fix a display issue with the Title Dropdown. The dropdown area width was too small. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4198 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/frmMain.Designer.cs | 148 +++++++++++++++++++------------------ win/CS/frmMain.resx | 27 +++++++ 2 files changed, 102 insertions(+), 73 deletions(-) diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs index d0b141748..07f337c0d 100644 --- a/win/CS/frmMain.Designer.cs +++ b/win/CS/frmMain.Designer.cs @@ -98,7 +98,6 @@ namespace Handbrake 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.panel1 = new System.Windows.Forms.Panel(); @@ -109,18 +108,13 @@ namespace Handbrake this.lbl_SliderValue = new System.Windows.Forms.Label(); this.lbl_framerate = 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.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts(); - 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(); @@ -182,6 +176,12 @@ namespace Handbrake this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); this.openPreset = new System.Windows.Forms.OpenFileDialog(); this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog(); + 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.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts(); + this.x264Panel = new Handbrake.Controls.x264Panel(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); @@ -289,7 +289,7 @@ namespace Handbrake this.check_turbo.Enabled = false; this.check_turbo.Location = new System.Drawing.Point(495, 134); this.check_turbo.Name = "check_turbo"; - this.check_turbo.Size = new System.Drawing.Size(99, 17); + this.check_turbo.Size = new System.Drawing.Size(101, 17); this.check_turbo.TabIndex = 9; this.check_turbo.Text = "Turbo first Pass"; this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster."); @@ -481,6 +481,7 @@ namespace Handbrake // drp_dvdtitle // this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.drp_dvdtitle.DropDownWidth = 180; this.drp_dvdtitle.FormattingEnabled = true; this.drp_dvdtitle.Items.AddRange(new object[] { "Automatic"}); @@ -559,7 +560,7 @@ namespace Handbrake this.radio_cq.BackColor = System.Drawing.Color.Transparent; this.radio_cq.Location = new System.Drawing.Point(366, 37); this.radio_cq.Name = "radio_cq"; - this.radio_cq.Size = new System.Drawing.Size(105, 17); + this.radio_cq.Size = new System.Drawing.Size(110, 17); this.radio_cq.TabIndex = 3; this.radio_cq.Text = "Constant Quality:"; this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip")); @@ -573,7 +574,7 @@ namespace Handbrake this.radio_avgBitrate.Checked = true; this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108); this.radio_avgBitrate.Name = "radio_avgBitrate"; - this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17); + this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17); this.radio_avgBitrate.TabIndex = 4; this.radio_avgBitrate.TabStop = true; this.radio_avgBitrate.Text = "Avg Bitrate (kbps):"; @@ -587,7 +588,7 @@ namespace Handbrake this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent; this.check_2PassEncode.Location = new System.Drawing.Point(385, 134); this.check_2PassEncode.Name = "check_2PassEncode"; - this.check_2PassEncode.Size = new System.Drawing.Size(106, 17); + this.check_2PassEncode.Size = new System.Drawing.Size(104, 17); this.check_2PassEncode.TabIndex = 10; this.check_2PassEncode.Text = "2-Pass Encoding"; this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip")); @@ -819,15 +820,6 @@ namespace Handbrake this.tab_audio.Text = "Audio"; this.tab_audio.UseVisualStyleBackColor = true; // - // 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(720, 310); - this.AudioSettings.TabIndex = 0; - // // AudioMenuRowHeightHack // this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -875,7 +867,7 @@ namespace Handbrake this.radio_constantFramerate.Checked = true; this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0); this.radio_constantFramerate.Name = "radio_constantFramerate"; - this.radio_constantFramerate.Size = new System.Drawing.Size(117, 17); + this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17); this.radio_constantFramerate.TabIndex = 17; this.radio_constantFramerate.TabStop = true; this.radio_constantFramerate.Text = "Constant Framerate"; @@ -887,7 +879,7 @@ namespace Handbrake this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent; this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23); this.radio_peakAndVariable.Name = "radio_peakAndVariable"; - this.radio_peakAndVariable.Size = new System.Drawing.Size(113, 17); + this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17); this.radio_peakAndVariable.TabIndex = 19; this.radio_peakAndVariable.Text = "Variable Framerate"; this.radio_peakAndVariable.UseVisualStyleBackColor = false; @@ -947,25 +939,13 @@ namespace Handbrake this.tab_picture.Text = "Picture"; this.tab_picture.UseVisualStyleBackColor = true; // - // PictureSettings - // - this.PictureSettings.BackColor = System.Drawing.Color.Transparent; - this.PictureSettings.CurrentlySelectedPreset = null; - this.PictureSettings.Enabled = false; - this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.PictureSettings.Location = new System.Drawing.Point(0, 0); - this.PictureSettings.Name = "PictureSettings"; - this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0); - this.PictureSettings.Size = new System.Drawing.Size(666, 279); - this.PictureSettings.TabIndex = 0; - // // Check_ChapterMarkers // this.Check_ChapterMarkers.AutoSize = true; this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent; this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32); this.Check_ChapterMarkers.Name = "Check_ChapterMarkers"; - this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17); + this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17); this.Check_ChapterMarkers.TabIndex = 4; this.Check_ChapterMarkers.Text = "Create chapter markers"; this.Check_ChapterMarkers.UseVisualStyleBackColor = false; @@ -997,15 +977,6 @@ namespace Handbrake this.tab_filters.Text = "Video Filters"; this.tab_filters.UseVisualStyleBackColor = true; // - // 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; - // // tab_subtitles // this.tab_subtitles.Controls.Add(this.Subtitles); @@ -1017,15 +988,6 @@ namespace Handbrake this.tab_subtitles.Text = "Subtitles"; this.tab_subtitles.UseVisualStyleBackColor = true; // - // 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; - // // tab_chapters // this.tab_chapters.BackColor = System.Drawing.Color.Transparent; @@ -1065,26 +1027,6 @@ namespace Handbrake this.tab_advanced.Text = "Advanced"; this.tab_advanced.UseVisualStyleBackColor = true; // - // advancedEncoderOpts - // - this.advancedEncoderOpts.AdavancedQuery = ""; - this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent; - this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0); - this.advancedEncoderOpts.Name = "advancedEncoderOpts"; - this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209); - this.advancedEncoderOpts.TabIndex = 1; - // - // 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 = ""; - // // tab_query // this.tab_query.Controls.Add(this.btn_clear); @@ -1624,7 +1566,7 @@ namespace Handbrake 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.Size = new System.Drawing.Size(723, 28); this.tableLayoutPanel1.TabIndex = 2; // // Label10 @@ -1742,6 +1684,66 @@ namespace Handbrake // this.File_ChapterImport.Filter = "CSV Files|*.csv"; // + // PictureSettings + // + this.PictureSettings.BackColor = System.Drawing.Color.Transparent; + this.PictureSettings.CurrentlySelectedPreset = null; + this.PictureSettings.Enabled = false; + this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.PictureSettings.Location = new System.Drawing.Point(0, 0); + this.PictureSettings.Name = "PictureSettings"; + this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0); + this.PictureSettings.Size = new System.Drawing.Size(666, 279); + 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.ScannedTracks = ((System.ComponentModel.BindingList)(resources.GetObject("AudioSettings.ScannedTracks"))); + this.AudioSettings.Size = new System.Drawing.Size(720, 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; + // + // advancedEncoderOpts + // + this.advancedEncoderOpts.AdavancedQuery = ""; + this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent; + this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0); + this.advancedEncoderOpts.Name = "advancedEncoderOpts"; + this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209); + this.advancedEncoderOpts.TabIndex = 1; + // + // 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; diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx index a737bb095..402df9c5d 100644 --- a/win/CS/frmMain.resx +++ b/win/CS/frmMain.resx @@ -233,6 +233,33 @@ to make bitrate allocation decisions. 106, 15 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAElTeXN0ZW0sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0 + cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAACrAVN5c3RlbS5Db21wb25lbnRN + b2RlbC5CaW5kaW5nTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1 + ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTk0LCBDdWx0 + dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo + YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS + ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz + dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl + cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku + NS40MTk0LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA + CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTk0 + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp + b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1 + ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MTk0LCBDdWx0 + dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9u + BAAALUhhbmRCcmFrZS5BcHBsaWNhdGlvblNlcnZpY2VzLlBhcnNpbmcuQXVkaW9bXQQAAAAICAkFAAAA + AQAAAAEAAAAHBQAAAAABAAAABAAAAAQrSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu + Zy5BdWRpbwQAAAAJBgAAAA0DBQYAAAArSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu + Zy5BdWRpbwcAAAAcPFRyYWNrTnVtYmVyPmtfX0JhY2tpbmdGaWVsZBk8TGFuZ3VhZ2U+a19fQmFja2lu + Z0ZpZWxkHTxMYW5ndWFnZUNvZGU+a19fQmFja2luZ0ZpZWxkHDxEZXNjcmlwdGlvbj5rX19CYWNraW5n + RmllbGQXPEZvcm1hdD5rX19CYWNraW5nRmllbGQbPFNhbXBsZVJhdGU+a19fQmFja2luZ0ZpZWxkGDxC + aXRyYXRlPmtfX0JhY2tpbmdGaWVsZAABAQEBAAAICAgEAAAAAAAAAAoKBgcAAAAKTm9uZSBGb3VuZAoA + AAAAAAAAAAs= + + 17, 54 -- 2.40.0