From c971f5957209b6be5816b73c9fa65b322440d3d1 Mon Sep 17 00:00:00 2001 From: sr55 Date: Tue, 23 Sep 2008 15:48:56 +0000 Subject: WinGui: - Deblock Slider now displays "Off" and scales from 5 to 15 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1749 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/Common.cs | 6 +++--- win/C#/frmMain.Designer.cs | 16 +++++++++------- win/C#/frmMain.cs | 5 ++++- win/C#/frmMain.resx | 6 ------ 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index b954a02b7..eb6f8500d 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -129,8 +129,8 @@ namespace Handbrake.Functions } else { - mainWindow.slider_deblock.Value = 0; - mainWindow.lbl_deblockVal.Text = "0"; + mainWindow.slider_deblock.Value = 4; + mainWindow.lbl_deblockVal.Text = "Off"; } @@ -559,7 +559,7 @@ namespace Handbrake.Functions else if (mainWindow.drp_anamorphic.SelectedIndex == 2) query += " -P "; - if (mainWindow.slider_deblock.Value != 0) + if (mainWindow.slider_deblock.Value != 4) query += " --deblock=" + mainWindow.slider_deblock.Value; if (mainWindow.check_detelecine.Checked) diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index da4d0da94..9c32cda67 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -38,7 +38,7 @@ namespace Handbrake System.Windows.Forms.Label Label38; 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(); @@ -644,9 +644,9 @@ 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.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; this.number.Name = "number"; @@ -1029,7 +1029,7 @@ namespace Handbrake // mnu_exit // this.mnu_exit.Name = "mnu_exit"; - this.mnu_exit.Size = new System.Drawing.Size(152, 22); + this.mnu_exit.Size = new System.Drawing.Size(106, 22); this.mnu_exit.Text = "E&xit"; this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click); // @@ -1872,9 +1872,11 @@ namespace Handbrake // this.slider_deblock.Location = new System.Drawing.Point(407, 264); this.slider_deblock.Maximum = 15; + this.slider_deblock.Minimum = 4; this.slider_deblock.Name = "slider_deblock"; this.slider_deblock.Size = new System.Drawing.Size(174, 42); this.slider_deblock.TabIndex = 35; + this.slider_deblock.Value = 4; this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll); // // label8 @@ -1895,9 +1897,9 @@ namespace Handbrake 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(585, 269); this.lbl_deblockVal.Name = "lbl_deblockVal"; - this.lbl_deblockVal.Size = new System.Drawing.Size(14, 13); + this.lbl_deblockVal.Size = new System.Drawing.Size(24, 13); this.lbl_deblockVal.TabIndex = 36; - this.lbl_deblockVal.Text = "0"; + this.lbl_deblockVal.Text = "Off"; // // check_customCrop // diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 005ac9b6c..3e50e0cd1 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -798,7 +798,10 @@ namespace Handbrake } private void slider_deblock_Scroll(object sender, EventArgs e) { - lbl_deblockVal.Text = slider_deblock.Value.ToString(); + if (slider_deblock.Value == 4) + lbl_deblockVal.Text = "Off"; + else + lbl_deblockVal.Text = slider_deblock.Value.ToString(); } // Audio Tab diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 5bc2f65cb..a016a1825 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -155,12 +155,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 - 223, 15 -- cgit v1.2.3