From: sr55 Date: Sun, 22 Feb 2009 17:49:11 +0000 (+0000) Subject: git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2173 b64f7644-9d1e-0410-96f1-a4d46... X-Git-Tag: 0.9.4~784 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51ed8553568294793d0e50e11dc6c80b1f161f02;p=handbrake git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2173 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index ff8b71a70..455cf4880 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -37,7 +37,7 @@ namespace Handbrake this.components = new System.ComponentModel.Container(); System.Windows.Forms.ContextMenuStrip notifyIconMenu; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.btn_restore = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); @@ -156,6 +156,7 @@ namespace Handbrake this.Label46 = new System.Windows.Forms.Label(); this.check_grayscale = new System.Windows.Forms.CheckBox(); this.TabPage1 = new System.Windows.Forms.TabPage(); + this.lbl_max = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.drp_anamorphic = new System.Windows.Forms.ComboBox(); this.text_bottom = new System.Windows.Forms.NumericUpDown(); @@ -179,9 +180,14 @@ namespace Handbrake 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.ctl_deinterlace = new Handbrake.Deinterlace(); + this.ctl_denoise = new Handbrake.Denoise(); + this.ctl_decomb = new Handbrake.Decomb(); + this.ctl_detelecine = new Handbrake.Detelecine(); this.tab_chapters = new System.Windows.Forms.TabPage(); this.label31 = new System.Windows.Forms.Label(); this.h264Tab = 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(); @@ -215,12 +221,6 @@ namespace Handbrake this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.StatusStrip = new System.Windows.Forms.StatusStrip(); this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel(); - this.lbl_max = new System.Windows.Forms.Label(); - this.ctl_deinterlace = new Handbrake.Deinterlace(); - this.ctl_denoise = new Handbrake.Denoise(); - this.ctl_decomb = new Handbrake.Decomb(); - this.ctl_detelecine = new Handbrake.Detelecine(); - this.x264Panel = new Handbrake.Controls.x264Panel(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); @@ -458,6 +458,7 @@ namespace Handbrake // this.slider_videoQuality.Enabled = false; this.slider_videoQuality.Location = new System.Drawing.Point(347, 120); + this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0); this.slider_videoQuality.Maximum = 100; this.slider_videoQuality.Name = "slider_videoQuality"; this.slider_videoQuality.Size = new System.Drawing.Size(322, 42); @@ -605,19 +606,21 @@ namespace Handbrake // // number // - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Format = "N0"; + dataGridViewCellStyle1.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle1; + this.number.Frozen = true; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; this.number.Name = "number"; + this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.number.Width = 165; // // name // this.name.HeaderText = "Chapter Name"; this.name.Name = "name"; - this.name.Width = 460; + this.name.Width = 480; // // btn_addPreset // @@ -1576,6 +1579,15 @@ namespace Handbrake this.TabPage1.Text = "Picture Settings"; this.TabPage1.UseVisualStyleBackColor = true; // + // lbl_max + // + this.lbl_max.AutoSize = true; + this.lbl_max.Location = new System.Drawing.Point(568, 86); + this.lbl_max.Name = "lbl_max"; + this.lbl_max.Size = new System.Drawing.Size(46, 13); + this.lbl_max.TabIndex = 35; + this.lbl_max.Text = "{max}"; + // // label6 // this.label6.AutoSize = true; @@ -1858,6 +1870,48 @@ namespace Handbrake this.tab_Filters.Text = "Video Filters"; this.tab_Filters.UseVisualStyleBackColor = true; // + // ctl_deinterlace + // + this.ctl_deinterlace.AutoSize = true; + this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95); + this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0); + this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30); + this.ctl_deinterlace.Name = "ctl_deinterlace"; + this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28); + this.ctl_deinterlace.TabIndex = 41; + this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed); + // + // ctl_denoise + // + this.ctl_denoise.AutoSize = true; + this.ctl_denoise.Location = new System.Drawing.Point(19, 123); + this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0); + this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30); + this.ctl_denoise.Name = "ctl_denoise"; + this.ctl_denoise.Size = new System.Drawing.Size(275, 28); + this.ctl_denoise.TabIndex = 40; + // + // ctl_decomb + // + this.ctl_decomb.AutoSize = true; + this.ctl_decomb.Location = new System.Drawing.Point(19, 66); + this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0); + this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30); + this.ctl_decomb.Name = "ctl_decomb"; + this.ctl_decomb.Size = new System.Drawing.Size(275, 28); + this.ctl_decomb.TabIndex = 39; + this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed); + // + // ctl_detelecine + // + this.ctl_detelecine.AutoSize = true; + this.ctl_detelecine.Location = new System.Drawing.Point(19, 38); + this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0); + this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30); + this.ctl_detelecine.Name = "ctl_detelecine"; + this.ctl_detelecine.Size = new System.Drawing.Size(275, 28); + this.ctl_detelecine.TabIndex = 38; + // // tab_chapters // this.tab_chapters.BackColor = System.Drawing.Color.Transparent; @@ -1895,6 +1949,14 @@ namespace Handbrake this.h264Tab.Text = "Advanced"; this.h264Tab.UseVisualStyleBackColor = true; // + // x264Panel + // + 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); @@ -2243,65 +2305,6 @@ namespace Handbrake this.lbl_encode.Size = new System.Drawing.Size(31, 17); this.lbl_encode.Text = "{0}"; // - // lbl_max - // - this.lbl_max.AutoSize = true; - this.lbl_max.Location = new System.Drawing.Point(568, 86); - this.lbl_max.Name = "lbl_max"; - this.lbl_max.Size = new System.Drawing.Size(46, 13); - this.lbl_max.TabIndex = 35; - this.lbl_max.Text = "{max}"; - // - // ctl_deinterlace - // - this.ctl_deinterlace.AutoSize = true; - this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95); - this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0); - this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30); - this.ctl_deinterlace.Name = "ctl_deinterlace"; - this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28); - this.ctl_deinterlace.TabIndex = 41; - this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed); - // - // ctl_denoise - // - this.ctl_denoise.AutoSize = true; - this.ctl_denoise.Location = new System.Drawing.Point(19, 123); - this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0); - this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30); - this.ctl_denoise.Name = "ctl_denoise"; - this.ctl_denoise.Size = new System.Drawing.Size(275, 28); - this.ctl_denoise.TabIndex = 40; - // - // ctl_decomb - // - this.ctl_decomb.AutoSize = true; - this.ctl_decomb.Location = new System.Drawing.Point(19, 66); - this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0); - this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30); - this.ctl_decomb.Name = "ctl_decomb"; - this.ctl_decomb.Size = new System.Drawing.Size(275, 28); - this.ctl_decomb.TabIndex = 39; - this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed); - // - // ctl_detelecine - // - this.ctl_detelecine.AutoSize = true; - this.ctl_detelecine.Location = new System.Drawing.Point(19, 38); - this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0); - this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30); - this.ctl_detelecine.Name = "ctl_detelecine"; - this.ctl_detelecine.Size = new System.Drawing.Size(275, 28); - this.ctl_detelecine.TabIndex = 38; - // - // x264Panel - // - 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2537,8 +2540,6 @@ namespace Handbrake private System.Windows.Forms.ImageList AudioMenuRowHeightHack; private System.Windows.Forms.ToolStripMenuItem pmnu_saveChanges; private System.Windows.Forms.ToolStripMenuItem mnu_killCLI; - private System.Windows.Forms.DataGridViewTextBoxColumn number; - private System.Windows.Forms.DataGridViewTextBoxColumn name; private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mnu_qptest; private System.Windows.Forms.TabPage tab_Filters; @@ -2552,6 +2553,8 @@ namespace Handbrake internal Handbrake.Controls.x264Panel x264Panel; private System.Windows.Forms.ToolStripButton tb_preview; private System.Windows.Forms.Label lbl_max; + private System.Windows.Forms.DataGridViewTextBoxColumn number; + private System.Windows.Forms.DataGridViewTextBoxColumn name; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 1fbe83b3f..b1065436c 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1116,7 +1116,11 @@ namespace Handbrake break; case "H.264 (x264)": double divided; - double.TryParse(Properties.Settings.Default.x264cqstep, out divided); + System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US"); + double.TryParse(Properties.Settings.Default.x264cqstep, + System.Globalization.NumberStyles.Number, + culture, + out divided); rfValue = 51.0 - slider_videoQuality.Value * divided; max = slider_videoQuality.Maximum * divided; min = slider_videoQuality.Minimum; @@ -2095,6 +2099,7 @@ namespace Handbrake #endregion + // This is the END of the road ------------------------------------------------------------------------------ } } \ No newline at end of file diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 9b96457b9..77037cb54 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -152,12 +152,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise the list will not be populated with the correct amount of chapters. Note: Do not change any of the chapter numbers! - - True - - - True - 232, 15