From 35018826f82041b6ed7bd6b445f07bd64cb178fd Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 22 Jan 2012 18:40:45 +0000 Subject: git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4417 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/frmMain.Designer.cs | 158 ++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 75 deletions(-) (limited to 'win/CS/frmMain.Designer.cs') diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs index 4b23cc4c9..a53663b4d 100644 --- a/win/CS/frmMain.Designer.cs +++ b/win/CS/frmMain.Designer.cs @@ -42,6 +42,7 @@ namespace Handbrake System.Windows.Forms.ContextMenuStrip notifyIconMenu; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru allowedPassthru1 = new HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru(); 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); @@ -98,7 +99,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 +109,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(); @@ -166,6 +161,7 @@ namespace Handbrake this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar(); this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel(); this.lbl_updateCheck = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbl_libhb_warning = new System.Windows.Forms.ToolStripStatusLabel(); this.hbproc = new System.Diagnostics.Process(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -184,7 +180,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.lbl_libhb_warning = new System.Windows.Forms.ToolStripStatusLabel(); + 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(); @@ -823,15 +824,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; @@ -951,18 +943,6 @@ 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; @@ -1001,15 +981,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); @@ -1021,15 +992,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; @@ -1069,26 +1031,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); @@ -1390,8 +1332,8 @@ namespace Handbrake // mnu_AddAllTitles // this.mnu_AddAllTitles.Name = "mnu_AddAllTitles"; - this.mnu_AddAllTitles.Size = new System.Drawing.Size(152, 22); - this.mnu_AddAllTitles.Text = "Add All"; + this.mnu_AddAllTitles.Size = new System.Drawing.Size(192, 22); + this.mnu_AddAllTitles.Text = "Add All (Experimental)"; this.mnu_AddAllTitles.ToolTipText = "Add all titles to the queue.\r\nUse caution with this feature as incorrect usage ma" + "y result in a queue of failed encodes."; this.mnu_AddAllTitles.Click += new System.EventHandler(this.mnu_AddAllTitles_Click); @@ -1399,7 +1341,7 @@ namespace Handbrake // mnu_AddTittleRange // this.mnu_AddTittleRange.Name = "mnu_AddTittleRange"; - this.mnu_AddTittleRange.Size = new System.Drawing.Size(152, 22); + this.mnu_AddTittleRange.Size = new System.Drawing.Size(192, 22); this.mnu_AddTittleRange.Text = "Add Range"; this.mnu_AddTittleRange.Visible = false; this.mnu_AddTittleRange.Click += new System.EventHandler(this.mnu_AddTittleRange_Click); @@ -1553,6 +1495,14 @@ namespace Handbrake this.lbl_updateCheck.Text = "Checking for Updates ..."; this.lbl_updateCheck.Visible = false; // + // lbl_libhb_warning + // + this.lbl_libhb_warning.ForeColor = System.Drawing.Color.Red; + this.lbl_libhb_warning.Name = "lbl_libhb_warning"; + this.lbl_libhb_warning.Size = new System.Drawing.Size(198, 17); + this.lbl_libhb_warning.Text = "Warning: Experimental LibHB in use!"; + this.lbl_libhb_warning.Visible = false; + // // hbproc // this.hbproc.StartInfo.Domain = ""; @@ -1768,13 +1718,71 @@ namespace Handbrake // this.File_ChapterImport.Filter = "CSV Files|*.csv"; // - // lbl_libhb_warning + // PictureSettings // - this.lbl_libhb_warning.ForeColor = System.Drawing.Color.Red; - this.lbl_libhb_warning.Name = "lbl_libhb_warning"; - this.lbl_libhb_warning.Size = new System.Drawing.Size(198, 17); - this.lbl_libhb_warning.Text = "Warning: Experimental LibHB in use!"; - this.lbl_libhb_warning.Visible = false; + 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"; + allowedPassthru1.AudioAllowAACPass = true; + allowedPassthru1.AudioAllowAC3Pass = true; + allowedPassthru1.AudioAllowDTSHDPass = true; + allowedPassthru1.AudioAllowDTSPass = true; + allowedPassthru1.AudioAllowMP3Pass = true; + allowedPassthru1.AudioEncoderFallback = HandBrake.Interop.Model.Encoding.AudioEncoder.Ac3; + this.AudioSettings.PassthruSettings = allowedPassthru1; + 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 // -- cgit v1.2.3