From 95628b04abdae3aa6b53f7eaf2bd0fbc89a5ff4f Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 16 Aug 2010 19:28:22 +0000 Subject: [PATCH] WinGui: - Tidy the Options window, removed old debug code that isn't needed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3482 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Controls/PictureSettings.cs | 12 --- win/C#/Functions/Main.cs | 4 +- win/C#/Properties/Settings.Designer.cs | 14 +--- win/C#/Properties/Settings.settings | 3 - win/C#/app.config | 3 - win/C#/frmOptions.Designer.cs | 111 ++++++++++--------------- win/C#/frmOptions.cs | 14 ---- win/C#/frmOptions.resx | 23 ++--- 8 files changed, 54 insertions(+), 130 deletions(-) diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs index e0319a690..b6f51f515 100644 --- a/win/C#/Controls/PictureSettings.cs +++ b/win/C#/Controls/PictureSettings.cs @@ -152,9 +152,6 @@ namespace Handbrake.Controls // Picture Controls private void TextWidthValueChanged(object sender, EventArgs e) { - if (Properties.Settings.Default.disableResCalc) - return; - if (preventChangingWidth) return; @@ -214,9 +211,6 @@ namespace Handbrake.Controls private void TextHeightValueChanged(object sender, EventArgs e) { - if (Properties.Settings.Default.disableResCalc) - return; - if (preventChangingHeight) return; @@ -277,9 +271,6 @@ namespace Handbrake.Controls private void CheckKeepArCheckedChanged(object sender, EventArgs e) { - if (Properties.Settings.Default.disableResCalc) - return; - // Force TextWidth to recalc height if (check_KeepAR.Checked) TextWidthValueChanged(this, new EventArgs()); @@ -298,9 +289,6 @@ namespace Handbrake.Controls private void UpdownDisplayWidthValueChanged(object sender, EventArgs e) { - if (Properties.Settings.Default.disableResCalc) - return; - if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked) { preventChangingCustom = true; diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index ebc3f3836..e6f8e0769 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -278,8 +278,10 @@ namespace Handbrake.Functions // 1 = Build Date DateTime lastModified = File.GetLastWriteTime("HandBrakeCLI.exe"); - if (Properties.Settings.Default.cliLastModified == lastModified && Properties.Settings.Default.hb_build != 0) + if (Properties.Settings.Default.hb_build != 0 && Properties.Settings.Default.cliLastModified == lastModified ) + { return; + } Properties.Settings.Default.cliLastModified = lastModified; diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 1f49b4ecf..3ff94a01d 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4952 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -394,18 +394,6 @@ namespace Handbrake.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool disableResCalc { - get { - return ((bool)(this["disableResCalc"])); - } - set { - this["disableResCalc"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 2d8437ab2..e4a9fb5b3 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -95,9 +95,6 @@ - - False - False diff --git a/win/C#/app.config b/win/C#/app.config index bf67ae2dc..40db8364b 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -101,9 +101,6 @@ - - False - False diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 2541defc3..4de8a9c74 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -100,8 +100,6 @@ namespace Handbrake this.label30 = new System.Windows.Forms.Label(); this.check_disablePresetNotification = new System.Windows.Forms.CheckBox(); this.label28 = new System.Windows.Forms.Label(); - this.tab_debug = new System.Windows.Forms.TabPage(); - this.check_disableResCalc = new System.Windows.Forms.CheckBox(); this.label8 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pathFinder = new System.Windows.Forms.FolderBrowserDialog(); @@ -135,7 +133,8 @@ namespace Handbrake this.label26 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); this.openFile_vlc = new System.Windows.Forms.OpenFileDialog(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); this.tab_options.SuspendLayout(); this.tab_general.SuspendLayout(); this.tab_picture.SuspendLayout(); @@ -143,19 +142,20 @@ namespace Handbrake this.tab_audio_sub.SuspendLayout(); this.tab_cli.SuspendLayout(); this.tab_advanced.SuspendLayout(); - this.tab_debug.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.tableLayoutPanel5.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // btn_close // - this.btn_close.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; 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(519, 404); + this.btn_close.Location = new System.Drawing.Point(528, 440); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(72, 22); this.btn_close.TabIndex = 53; @@ -185,15 +185,15 @@ namespace Handbrake // // tab_options // - this.tableLayoutPanel5.SetColumnSpan(this.tab_options, 2); + this.tab_options.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tab_options.Controls.Add(this.tab_general); this.tab_options.Controls.Add(this.tab_picture); this.tab_options.Controls.Add(this.tab_audio_sub); this.tab_options.Controls.Add(this.tab_cli); this.tab_options.Controls.Add(this.tab_advanced); - this.tab_options.Controls.Add(this.tab_debug); - this.tab_options.Dock = System.Windows.Forms.DockStyle.Fill; - this.tab_options.Location = new System.Drawing.Point(3, 38); + this.tab_options.Location = new System.Drawing.Point(12, 74); this.tab_options.Name = "tab_options"; this.tab_options.SelectedIndex = 0; this.tab_options.Size = new System.Drawing.Size(588, 360); @@ -1049,35 +1049,11 @@ namespace Handbrake this.label28.TabIndex = 85; this.label28.Text = "x264:"; // - // tab_debug - // - this.tab_debug.Controls.Add(this.check_disableResCalc); - this.tab_debug.Location = new System.Drawing.Point(4, 22); - this.tab_debug.Name = "tab_debug"; - this.tab_debug.Padding = new System.Windows.Forms.Padding(3); - this.tab_debug.Size = new System.Drawing.Size(580, 334); - this.tab_debug.TabIndex = 7; - this.tab_debug.Text = "Debug"; - this.tab_debug.UseVisualStyleBackColor = true; - // - // check_disableResCalc - // - this.check_disableResCalc.AutoSize = true; - this.check_disableResCalc.Location = new System.Drawing.Point(13, 15); - this.check_disableResCalc.Name = "check_disableResCalc"; - this.check_disableResCalc.Size = new System.Drawing.Size(327, 17); - this.check_disableResCalc.TabIndex = 0; - this.check_disableResCalc.Text = "Disable Resolution Calculation for \"None\" and \"Custom\" modes."; - this.ToolTip.SetToolTip(this.check_disableResCalc, resources.GetString("check_disableResCalc.ToolTip")); - this.check_disableResCalc.UseVisualStyleBackColor = true; - this.check_disableResCalc.CheckedChanged += new System.EventHandler(this.check_disableResCalc_CheckedChanged); - // // label8 // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(41, 11); + this.label8.Location = new System.Drawing.Point(51, 19); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(115, 13); this.label8.TabIndex = 61; @@ -1086,7 +1062,7 @@ namespace Handbrake // pictureBox2 // this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences; - this.pictureBox2.Location = new System.Drawing.Point(3, 0); + this.pictureBox2.Location = new System.Drawing.Point(12, 9); this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(32, 32); @@ -1432,25 +1408,29 @@ namespace Handbrake this.openFile_vlc.DefaultExt = "exe"; this.openFile_vlc.Filter = "exe|*.exe"; // - // tableLayoutPanel5 - // - this.tableLayoutPanel5.AutoSize = true; - this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel5.Controls.Add(this.pictureBox2, 0, 0); - this.tableLayoutPanel5.Controls.Add(this.btn_close, 1, 2); - this.tableLayoutPanel5.Controls.Add(this.label8, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.tab_options, 0, 1); - this.tableLayoutPanel5.Location = new System.Drawing.Point(12, 12); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 3; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 429); - this.tableLayoutPanel5.TabIndex = 62; + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.panel2); + this.panel1.Controls.Add(this.label8); + this.panel1.Controls.Add(this.pictureBox2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(615, 65); + this.panel1.TabIndex = 62; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.Control; + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 55); + this.panel2.MaximumSize = new System.Drawing.Size(0, 10); + this.panel2.MinimumSize = new System.Drawing.Size(0, 10); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(615, 10); + this.panel2.TabIndex = 59; // // frmOptions // @@ -1458,15 +1438,16 @@ namespace Handbrake this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(627, 456); - this.Controls.Add(this.tableLayoutPanel5); + this.ClientSize = new System.Drawing.Size(615, 472); + this.Controls.Add(this.panel1); + this.Controls.Add(this.btn_close); + this.Controls.Add(this.tab_options); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmOptions"; - this.Padding = new System.Windows.Forms.Padding(12); this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -1484,13 +1465,10 @@ namespace Handbrake this.tab_cli.PerformLayout(); this.tab_advanced.ResumeLayout(false); this.tab_advanced.PerformLayout(); - this.tab_debug.ResumeLayout(false); - this.tab_debug.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -1576,7 +1554,6 @@ namespace Handbrake internal System.Windows.Forms.ComboBox drop_updateCheckDays; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; internal System.Windows.Forms.ComboBox drp_Priority; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries; private System.Windows.Forms.TabPage tab_audio_sub; internal System.Windows.Forms.ComboBox drop_preferredLang; @@ -1585,8 +1562,6 @@ namespace Handbrake private System.Windows.Forms.RadioButton radio_dub; private System.Windows.Forms.Label label15; internal System.Windows.Forms.Button btn_browse; - private System.Windows.Forms.TabPage tab_debug; - private System.Windows.Forms.CheckBox check_disableResCalc; internal System.Windows.Forms.CheckBox check_growlEncode; internal System.Windows.Forms.CheckBox check_GrowlQueue; internal System.Windows.Forms.ComboBox drop_previewScanCount; @@ -1597,5 +1572,7 @@ namespace Handbrake internal System.Windows.Forms.CheckBox check_removeUnderscores; internal System.Windows.Forms.CheckBox check_preventSleep; private System.Windows.Forms.Label label11; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; } } \ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 6af23b0ed..ac7e6924b 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -187,12 +187,6 @@ namespace Handbrake // Use Experimental dvdnav if (Properties.Settings.Default.noDvdNav) check_dvdnav.CheckState = CheckState.Checked; - - // ############################# - // Debug - // ############################# - if (Properties.Settings.Default.disableResCalc) - check_disableResCalc.Checked = true; } #region General @@ -454,14 +448,6 @@ namespace Handbrake #endregion - #region Debug - - private void check_disableResCalc_CheckedChanged(object sender, EventArgs e) - { - Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked; - } - - #endregion private void btn_close_Click(object sender, EventArgs e) { diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx index df466a44b..8a1811c83 100644 --- a/win/C#/frmOptions.resx +++ b/win/C#/frmOptions.resx @@ -120,19 +120,6 @@ 132, 18 - - Shows the CLI window when encoding. -You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c -meaing you'll have playable files if you choose to end the encode early. - -When disabled, Presseting "Stop" on the main winow will render the encode unplayable. - - - 132, 18 - - - 132, 18 - Use .m4v instead of .mp4 for MP4 files @@ -140,10 +127,12 @@ Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if y When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v. - - If the new Picture Settings panel is causing you problems, enable this option. -It disables some of the resolution calcuation code for None and Custom modes. -When enabled, the values in the text boxes will simply be passed through to the CLI so it is up to you to get the values correct. + + Shows the CLI window when encoding. +You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c +meaing you'll have playable files if you choose to end the encode early. + +When disabled, Presseting "Stop" on the main winow will render the encode unplayable. 17, 17 -- 2.40.0