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

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index e0319a6908c849bb3ce40c00e7b0a8aaba70e0d6..b6f51f515796d1446ae61e2596058fcd082e6ec2 100644 (file)
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -152,9 +152,6 @@ namespace Handbrake.Controls
         // Picture Controls\r
         private void TextWidthValueChanged(object sender, EventArgs e)\r
         {\r
-            if (Properties.Settings.Default.disableResCalc)\r
-                return;\r
-\r
             if (preventChangingWidth)\r
                 return;\r
 \r
@@ -214,9 +211,6 @@ namespace Handbrake.Controls
 \r
         private void TextHeightValueChanged(object sender, EventArgs e)\r
         {\r
-            if (Properties.Settings.Default.disableResCalc)\r
-                return;\r
-\r
             if (preventChangingHeight)\r
                 return;\r
 \r
@@ -277,9 +271,6 @@ namespace Handbrake.Controls
 \r
         private void CheckKeepArCheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (Properties.Settings.Default.disableResCalc)\r
-                return;\r
-\r
             // Force TextWidth to recalc height\r
             if (check_KeepAR.Checked)\r
                 TextWidthValueChanged(this, new EventArgs());\r
@@ -298,9 +289,6 @@ namespace Handbrake.Controls
 \r
         private void UpdownDisplayWidthValueChanged(object sender, EventArgs e)\r
         {\r
-            if (Properties.Settings.Default.disableResCalc)\r
-                return;\r
-\r
             if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)\r
             {\r
                 preventChangingCustom = true;\r

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index ebc3f38364227f9b544d3abdc47a6def1c63ae75..e6f8e07691044d682d23bca42cfbe72f3e787704 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -278,8 +278,10 @@ namespace Handbrake.Functions
             // 1 = Build Date\r
             DateTime lastModified = File.GetLastWriteTime("HandBrakeCLI.exe");\r
 \r
-            if (Properties.Settings.Default.cliLastModified == lastModified && Properties.Settings.Default.hb_build != 0)\r
+            if (Properties.Settings.Default.hb_build != 0 && Properties.Settings.Default.cliLastModified == lastModified )\r
+            {\r
                 return;\r
+            }   \r
 \r
             Properties.Settings.Default.cliLastModified = lastModified;\r
 \r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 1f49b4ecf0664385953fcb5b1de5297e83f05bc6..3ff94a01d1012d4a003c6b96730fbb2a28c82294 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.4927\r
+//     Runtime Version:2.0.50727.4952\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -394,18 +394,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]\r
-        public bool disableResCalc {\r
-            get {\r
-                return ((bool)(this["disableResCalc"]));\r
-            }\r
-            set {\r
-                this["disableResCalc"] = value;\r
-            }\r
-        }\r
-        \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("False")]\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 2d8437ab2015e340ac91ca0c5f5b625e4b408000..e4a9fb5b3c84e4df2c0630927a0daaa8e0d83adf 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -95,9 +95,6 @@
     <Setting Name="hb_platform" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
-    <Setting Name="disableResCalc" Type="System.Boolean" Scope="User">\r
-      <Value Profile="(Default)">False</Value>\r
-    </Setting>\r
     <Setting Name="growlQueue" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">False</Value>\r
     </Setting>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index bf67ae2dc8693075b8b883e91f37adb74163dfba..40db8364bd688ade9accda8159fef8a3f190f55a 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -101,9 +101,6 @@
       <setting name="hb_platform" serializeAs="String">\r
         <value />\r
       </setting>\r
-      <setting name="disableResCalc" serializeAs="String">\r
-        <value>False</value>\r
-      </setting>\r
       <setting name="growlQueue" serializeAs="String">\r
         <value>False</value>\r
       </setting>\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 2541defc33de84e43c34efa217d6829f9aba7135..4de8a9c74813b0dbf790a41aedb08c5be2731246 100644 (file)
--- 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();\r
             this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();\r
             this.label28 = new System.Windows.Forms.Label();\r
-            this.tab_debug = new System.Windows.Forms.TabPage();\r
-            this.check_disableResCalc = new System.Windows.Forms.CheckBox();\r
             this.label8 = new System.Windows.Forms.Label();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
             this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();\r
@@ -135,7 +133,8 @@ namespace Handbrake
             this.label26 = new System.Windows.Forms.Label();\r
             this.label27 = new System.Windows.Forms.Label();\r
             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();\r
-            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.panel1 = new System.Windows.Forms.Panel();\r
+            this.panel2 = new System.Windows.Forms.Panel();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -143,19 +142,20 @@ namespace Handbrake
             this.tab_audio_sub.SuspendLayout();\r
             this.tab_cli.SuspendLayout();\r
             this.tab_advanced.SuspendLayout();\r
-            this.tab_debug.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
-            this.tableLayoutPanel5.SuspendLayout();\r
+            this.panel1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // btn_close\r
             // \r
-            this.btn_close.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
+                        | System.Windows.Forms.AnchorStyles.Left)\r
+                        | System.Windows.Forms.AnchorStyles.Right)));\r
             this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(519, 404);\r
+            this.btn_close.Location = new System.Drawing.Point(528, 440);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(72, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -185,15 +185,15 @@ namespace Handbrake
             // \r
             // tab_options\r
             // \r
-            this.tableLayoutPanel5.SetColumnSpan(this.tab_options, 2);\r
+            this.tab_options.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
+                        | System.Windows.Forms.AnchorStyles.Left)\r
+                        | System.Windows.Forms.AnchorStyles.Right)));\r
             this.tab_options.Controls.Add(this.tab_general);\r
             this.tab_options.Controls.Add(this.tab_picture);\r
             this.tab_options.Controls.Add(this.tab_audio_sub);\r
             this.tab_options.Controls.Add(this.tab_cli);\r
             this.tab_options.Controls.Add(this.tab_advanced);\r
-            this.tab_options.Controls.Add(this.tab_debug);\r
-            this.tab_options.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.tab_options.Location = new System.Drawing.Point(3, 38);\r
+            this.tab_options.Location = new System.Drawing.Point(12, 74);\r
             this.tab_options.Name = "tab_options";\r
             this.tab_options.SelectedIndex = 0;\r
             this.tab_options.Size = new System.Drawing.Size(588, 360);\r
@@ -1049,35 +1049,11 @@ namespace Handbrake
             this.label28.TabIndex = 85;\r
             this.label28.Text = "x264:";\r
             // \r
-            // tab_debug\r
-            // \r
-            this.tab_debug.Controls.Add(this.check_disableResCalc);\r
-            this.tab_debug.Location = new System.Drawing.Point(4, 22);\r
-            this.tab_debug.Name = "tab_debug";\r
-            this.tab_debug.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_debug.Size = new System.Drawing.Size(580, 334);\r
-            this.tab_debug.TabIndex = 7;\r
-            this.tab_debug.Text = "Debug";\r
-            this.tab_debug.UseVisualStyleBackColor = true;\r
-            // \r
-            // check_disableResCalc\r
-            // \r
-            this.check_disableResCalc.AutoSize = true;\r
-            this.check_disableResCalc.Location = new System.Drawing.Point(13, 15);\r
-            this.check_disableResCalc.Name = "check_disableResCalc";\r
-            this.check_disableResCalc.Size = new System.Drawing.Size(327, 17);\r
-            this.check_disableResCalc.TabIndex = 0;\r
-            this.check_disableResCalc.Text = "Disable Resolution Calculation for \"None\" and \"Custom\" modes.";\r
-            this.ToolTip.SetToolTip(this.check_disableResCalc, resources.GetString("check_disableResCalc.ToolTip"));\r
-            this.check_disableResCalc.UseVisualStyleBackColor = true;\r
-            this.check_disableResCalc.CheckedChanged += new System.EventHandler(this.check_disableResCalc_CheckedChanged);\r
-            // \r
             // label8\r
             // \r
-            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label8.AutoSize = true;\r
             this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(41, 11);\r
+            this.label8.Location = new System.Drawing.Point(51, 19);\r
             this.label8.Name = "label8";\r
             this.label8.Size = new System.Drawing.Size(115, 13);\r
             this.label8.TabIndex = 61;\r
@@ -1086,7 +1062,7 @@ namespace Handbrake
             // pictureBox2\r
             // \r
             this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
-            this.pictureBox2.Location = new System.Drawing.Point(3, 0);\r
+            this.pictureBox2.Location = new System.Drawing.Point(12, 9);\r
             this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);\r
             this.pictureBox2.Name = "pictureBox2";\r
             this.pictureBox2.Size = new System.Drawing.Size(32, 32);\r
@@ -1432,25 +1408,29 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";\r
             this.openFile_vlc.Filter = "exe|*.exe";\r
             // \r
-            // tableLayoutPanel5\r
-            // \r
-            this.tableLayoutPanel5.AutoSize = true;\r
-            this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.tableLayoutPanel5.ColumnCount = 2;\r
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel5.Controls.Add(this.pictureBox2, 0, 0);\r
-            this.tableLayoutPanel5.Controls.Add(this.btn_close, 1, 2);\r
-            this.tableLayoutPanel5.Controls.Add(this.label8, 1, 0);\r
-            this.tableLayoutPanel5.Controls.Add(this.tab_options, 0, 1);\r
-            this.tableLayoutPanel5.Location = new System.Drawing.Point(12, 12);\r
-            this.tableLayoutPanel5.Name = "tableLayoutPanel5";\r
-            this.tableLayoutPanel5.RowCount = 3;\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 429);\r
-            this.tableLayoutPanel5.TabIndex = 62;\r
+            // panel1\r
+            // \r
+            this.panel1.BackColor = System.Drawing.Color.White;\r
+            this.panel1.Controls.Add(this.panel2);\r
+            this.panel1.Controls.Add(this.label8);\r
+            this.panel1.Controls.Add(this.pictureBox2);\r
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.panel1.Location = new System.Drawing.Point(0, 0);\r
+            this.panel1.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(615, 65);\r
+            this.panel1.TabIndex = 62;\r
+            // \r
+            // panel2\r
+            // \r
+            this.panel2.BackColor = System.Drawing.SystemColors.Control;\r
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+            this.panel2.Location = new System.Drawing.Point(0, 55);\r
+            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.Name = "panel2";\r
+            this.panel2.Size = new System.Drawing.Size(615, 10);\r
+            this.panel2.TabIndex = 59;\r
             // \r
             // frmOptions\r
             // \r
@@ -1458,15 +1438,16 @@ namespace Handbrake
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.AutoSize = true;\r
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.ClientSize = new System.Drawing.Size(627, 456);\r
-            this.Controls.Add(this.tableLayoutPanel5);\r
+            this.ClientSize = new System.Drawing.Size(615, 472);\r
+            this.Controls.Add(this.panel1);\r
+            this.Controls.Add(this.btn_close);\r
+            this.Controls.Add(this.tab_options);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MinimizeBox = false;\r
             this.Name = "frmOptions";\r
-            this.Padding = new System.Windows.Forms.Padding(12);\r
             this.ShowIcon = false;\r
             this.ShowInTaskbar = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
@@ -1484,13 +1465,10 @@ namespace Handbrake
             this.tab_cli.PerformLayout();\r
             this.tab_advanced.ResumeLayout(false);\r
             this.tab_advanced.PerformLayout();\r
-            this.tab_debug.ResumeLayout(false);\r
-            this.tab_debug.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
-            this.tableLayoutPanel5.ResumeLayout(false);\r
-            this.tableLayoutPanel5.PerformLayout();\r
+            this.panel1.ResumeLayout(false);\r
+            this.panel1.PerformLayout();\r
             this.ResumeLayout(false);\r
-            this.PerformLayout();\r
 \r
         }\r
 \r
@@ -1576,7 +1554,6 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_updateCheckDays;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
         internal System.Windows.Forms.ComboBox drp_Priority;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;\r
         private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;\r
         private System.Windows.Forms.TabPage tab_audio_sub;\r
         internal System.Windows.Forms.ComboBox drop_preferredLang;\r
@@ -1585,8 +1562,6 @@ namespace Handbrake
         private System.Windows.Forms.RadioButton radio_dub;\r
         private System.Windows.Forms.Label label15;\r
         internal System.Windows.Forms.Button btn_browse;\r
-        private System.Windows.Forms.TabPage tab_debug;\r
-        private System.Windows.Forms.CheckBox check_disableResCalc;\r
         internal System.Windows.Forms.CheckBox check_growlEncode;\r
         internal System.Windows.Forms.CheckBox check_GrowlQueue;\r
         internal System.Windows.Forms.ComboBox drop_previewScanCount;\r
@@ -1597,5 +1572,7 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_removeUnderscores;\r
         internal System.Windows.Forms.CheckBox check_preventSleep;\r
         private System.Windows.Forms.Label label11;\r
+        private System.Windows.Forms.Panel panel1;\r
+        private System.Windows.Forms.Panel panel2;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 6af23b0ed0506e95a84cb5603987a35088097c34..ac7e6924b4a314ee34b6e633bb07073662b1a5b0 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -187,12 +187,6 @@ namespace Handbrake
             // Use Experimental dvdnav\r
             if (Properties.Settings.Default.noDvdNav)\r
                 check_dvdnav.CheckState = CheckState.Checked;\r
-\r
-            // #############################\r
-            // Debug\r
-            // #############################\r
-            if (Properties.Settings.Default.disableResCalc)\r
-                check_disableResCalc.Checked = true;\r
         }\r
 \r
         #region General\r
@@ -454,14 +448,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        #region Debug\r
-\r
-        private void check_disableResCalc_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked;\r
-        }\r
-\r
-        #endregion\r
 \r
         private void btn_close_Click(object sender, EventArgs e)\r
         {\r

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index df466a44b9eb0595cc82ecbba9fc9ae198f84324..8a1811c837b47337faa8b0217c40b19fff2a067d 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,19 +120,6 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
-  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">\r
-    <value>Shows the CLI window when encoding.\r
-You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c\r
-meaing you'll have playable files if you choose to end the encode early. \r
-\r
-When disabled, Presseting "Stop" on the main winow will render the encode unplayable.</value>\r
-  </data>\r
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>132, 18</value>\r
-  </metadata>\r
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>132, 18</value>\r
-  </metadata>\r
   <data name="check_m4v.ToolTip" xml:space="preserve">\r
     <value>Use .m4v instead of .mp4 for MP4 files\r
 \r
@@ -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.\r
 </value>\r
   </data>\r
-  <data name="check_disableResCalc.ToolTip" xml:space="preserve">\r
-    <value>If the new Picture Settings panel is causing you problems, enable this option.\r
-It disables some of the resolution calcuation code for None and Custom modes.\r
-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.</value>\r
+  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">\r
+    <value>Shows the CLI window when encoding.\r
+You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c\r
+meaing you'll have playable files if you choose to end the encode early. \r
+\r
+When disabled, Presseting "Stop" on the main winow will render the encode unplayable.</value>\r
   </data>\r
   <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r