WinGui:

- Set Default now set's the currently selected preset to default, not the current settings.
- Add Preset can now optionally add a flag to allow saving of picture size information (just like the macgui)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2052 b64f7644-9d1e-0410-96f1-a4d463321fa5

11 files changed, 163 insertions, 85 deletions

diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs
index 172125a9f..fbd36fbdb 100644
--- a/win/C#/Presets/PresetsHandler.cs
+++ b/win/C#/Presets/PresetsHandler.cs
@@ -20,13 +20,14 @@ namespace Handbrake.Presets
         /// </summary>

         /// <param name="presetName">String, The name of the new preset</param>

         /// <param name="query">String, the CLI query for the new preset</param>

-        public Boolean addPreset(string presetName, string query)

+        public Boolean addPreset(string presetName, string query, Boolean pictureSettings)

         {

             if (checkIfPresetExists(presetName) == false)

             {

                 Preset newPreset = new Preset();

                 newPreset.Name = presetName;

                 newPreset.Query = query;

+                newPreset.PictureSettings = pictureSettings;

                 user_presets.Add(newPreset);

                 updateUserPresetsFile();

                 return true;

@@ -107,20 +108,20 @@ namespace Handbrake.Presets
         /// </summary>

         /// <param name="name">String, The preset's name</param>

         /// <returns>String, the CLI query for the given preset name</returns>

-        public string getCliForPreset(string name)

+        public Preset getPreset(string name)

         {

             // Built In Presets

             foreach (Preset item in presets)

             {

                 if (item.Name == name)

-                    return item.Query;

+                    return item;

             }

 

             // User Presets

             foreach (Preset item in user_presets)

             {

                 if (item.Name == name)

-                    return item.Query;

+                    return item;

             }

 

             return null;

diff --git a/win/C#/Presets/preset.cs b/win/C#/Presets/preset.cs
index 58d3be966..ee983427a 100644
--- a/win/C#/Presets/preset.cs
+++ b/win/C#/Presets/preset.cs
@@ -15,6 +15,7 @@ namespace Handbrake.Presets
         private string category = null;

         private string name;

         private string query;

+        private Boolean pictureSettings;

 

         /// <summary>

         /// Get or Set the preset's level. This indicated if it is a root or child node

@@ -52,5 +53,14 @@ namespace Handbrake.Presets
             set { this.query = value; }

         }

 

+        /// <summary>

+        /// Get or set the usage of Picture Settings in presets.

+        /// </summary>

+        public Boolean PictureSettings

+        {

+            get { return pictureSettings; }

+            set { this.pictureSettings = value; }

+        }

+

     }

 }
\ No newline at end of file
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index c18b31dd4..a8c3c0f2f 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -110,12 +110,12 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

         [global::System.Configuration.DefaultSettingValueAttribute("")]

-        public string defaultUserSettings {

+        public string defaultPreset {

             get {

-                return ((string)(this["defaultUserSettings"]));

+                return ((string)(this["defaultPreset"]));

             }

             set {

-                this["defaultUserSettings"] = value;

+                this["defaultPreset"] = value;

             }

         }

         

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 2b8b4f2c2..ce7993310 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -23,7 +23,7 @@
     <Setting Name="CompletionOption" Type="System.String" Scope="User">

       <Value Profile="(Default)">Do Nothing</Value>

     </Setting>

-    <Setting Name="defaultUserSettings" Type="System.String" Scope="User">

+    <Setting Name="defaultPreset" Type="System.String" Scope="User">

       <Value Profile="(Default)" />

     </Setting>

     <Setting Name="hb_build" Type="System.Int32" Scope="User">

diff --git a/win/C#/app.config b/win/C#/app.config
index 433cbf14d..4ac6ad7ba 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -28,7 +28,7 @@
             <setting name="CompletionOption" serializeAs="String">

                 <value>Do Nothing</value>

             </setting>

-            <setting name="defaultUserSettings" serializeAs="String">

+            <setting name="defaultPreset" serializeAs="String">

                 <value />

             </setting>

             <setting name="hb_build" serializeAs="String">

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index 3db705c1b..c7bea2b29 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -34,11 +34,14 @@ namespace Handbrake
         /// </summary>

         private void InitializeComponent()

         {

+            this.components = new System.ComponentModel.Container();

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAddPreset));

             this.lbl_name = new System.Windows.Forms.Label();

             this.txt_preset_name = new System.Windows.Forms.TextBox();

             this.btn_add = new System.Windows.Forms.Button();

             this.btn_cancel = new System.Windows.Forms.Button();

+            this.check_pictureSettings = new System.Windows.Forms.CheckBox();

+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

             this.SuspendLayout();

             // 

             // lbl_name

@@ -53,7 +56,6 @@ namespace Handbrake
             // 

             // txt_preset_name

             // 

-            this.txt_preset_name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.txt_preset_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.txt_preset_name.Location = new System.Drawing.Point(109, 17);

             this.txt_preset_name.Name = "txt_preset_name";

@@ -66,7 +68,7 @@ namespace Handbrake
             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_add.Location = new System.Drawing.Point(284, 44);

+            this.btn_add.Location = new System.Drawing.Point(284, 67);

             this.btn_add.Name = "btn_add";

             this.btn_add.Size = new System.Drawing.Size(66, 22);

             this.btn_add.TabIndex = 0;

@@ -81,7 +83,7 @@ namespace Handbrake
             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_cancel.Location = new System.Drawing.Point(212, 44);

+            this.btn_cancel.Location = new System.Drawing.Point(212, 67);

             this.btn_cancel.Name = "btn_cancel";

             this.btn_cancel.Size = new System.Drawing.Size(66, 22);

             this.btn_cancel.TabIndex = 3;

@@ -90,11 +92,23 @@ namespace Handbrake
             this.btn_cancel.UseVisualStyleBackColor = false;

             this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);

             // 

+            // check_pictureSettings

+            // 

+            this.check_pictureSettings.AutoSize = true;

+            this.check_pictureSettings.Location = new System.Drawing.Point(109, 44);

+            this.check_pictureSettings.Name = "check_pictureSettings";

+            this.check_pictureSettings.Size = new System.Drawing.Size(118, 17);

+            this.check_pictureSettings.TabIndex = 4;

+            this.check_pictureSettings.Text = "Use Picture Size";

+            this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");

+            this.check_pictureSettings.UseVisualStyleBackColor = true;

+            // 

             // frmAddPreset

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(362, 76);

+            this.ClientSize = new System.Drawing.Size(365, 100);

+            this.Controls.Add(this.check_pictureSettings);

             this.Controls.Add(this.btn_cancel);

             this.Controls.Add(this.btn_add);

             this.Controls.Add(this.txt_preset_name);

@@ -120,5 +134,7 @@ namespace Handbrake
         private System.Windows.Forms.TextBox txt_preset_name;

         internal System.Windows.Forms.Button btn_add;

         internal System.Windows.Forms.Button btn_cancel;

+        private System.Windows.Forms.CheckBox check_pictureSettings;

+        private System.Windows.Forms.ToolTip toolTip;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index 3fa157d40..67dbfa95e 100644
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -31,7 +31,11 @@ namespace Handbrake
 

         private void btn_add_Click(object sender, EventArgs e)

         {

-            if (presetCode.addPreset(txt_preset_name.Text.Trim(), query) == true)

+            Boolean pictureSettings = false;

+            if (check_pictureSettings.Checked)

+                pictureSettings = true;

+

+            if (presetCode.addPreset(txt_preset_name.Text.Trim(), query, pictureSettings) == true)

             {

                 frmMainWindow.loadPresetPanel();

                 this.Close();

diff --git a/win/C#/frmAddPreset.resx b/win/C#/frmAddPreset.resx
index 37f92905a..341225412 100644
--- a/win/C#/frmAddPreset.resx
+++ b/win/C#/frmAddPreset.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>17, 17</value>

+  </metadata>

   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c8753d184..8c7be7a62 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -91,13 +91,30 @@ namespace Handbrake
                 tabs_panel.TabPages.RemoveAt(5); // Remove the query editor tab if the user does not want it enabled.

 

             // Load the user's default settings or Normal Preset

-            if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultUserSettings != "")

+            if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultPreset != "")

             {

-                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(Properties.Settings.Default.defaultUserSettings);

-                presetLoader.presetLoader(this, presetQuery, "User Defaults ");

-                // The x264 widgets will need updated, so do this now:

-                x264PanelFunctions.X264_StandardizeOptString(this);

-                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);

+                // Ok, so, we've selected a preset. Now we want to load it.

+                if (presetHandler.getPreset(Properties.Settings.Default.defaultPreset) != null)

+                {

+                    string query = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).Query;

+                    Boolean loadPictureSettings = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).PictureSettings;

+

+                    if (query != null)

+                    {

+                        //Ok, Reset all the H264 widgets before changing the preset

+                        x264PanelFunctions.reset2Defaults(this);

+

+                        // Send the query from the file to the Query Parser class, then load the preset

+                        Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);

+                        presetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);

+

+                        // The x264 widgets will need updated, so do this now:

+                        x264PanelFunctions.X264_StandardizeOptString(this);

+                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);

+                    }

+                }

+                else

+                    loadNormalPreset();

             }

             else

                 loadNormalPreset();

@@ -339,11 +356,14 @@ namespace Handbrake
         }

         private void btn_setDefault_Click(object sender, EventArgs e)

         {

-            String query = queryGen.GenerateTheQuery(this);

-            Properties.Settings.Default.defaultUserSettings = query;

-            // Save the new default Settings

-            Properties.Settings.Default.Save();

-            MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);

+            if (treeView_presets.SelectedNode != null)

+            {

+                Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;

+                Properties.Settings.Default.Save();

+                MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);

+            }

+            else

+                MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

         }

         private void treeview_presets_mouseUp(object sender, MouseEventArgs e)

         {

@@ -364,22 +384,26 @@ namespace Handbrake
             {

                 // Ok, so, we've selected a preset. Now we want to load it.

                 string presetName = treeView_presets.SelectedNode.Text;

-                string query = presetHandler.getCliForPreset(presetName);

-

-                if (query != null)

+                if (presetHandler.getPreset(presetName) != null)

                 {

-                    //Ok, Reset all the H264 widgets before changing the preset

-                    x264PanelFunctions.reset2Defaults(this);

+                    string query = presetHandler.getPreset(presetName).Query;

+                    Boolean loadPictureSettings = presetHandler.getPreset(presetName).PictureSettings;

 

-                    // Send the query from the file to the Query Parser class

-                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);

+                    if (query != null)

+                    {

+                        //Ok, Reset all the H264 widgets before changing the preset

+                        x264PanelFunctions.reset2Defaults(this);

 

-                    // Now load the preset

-                    presetLoader.presetLoader(this, presetQuery, presetName);

+                        // Send the query from the file to the Query Parser class

+                        Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);

 

-                    // The x264 widgets will need updated, so do this now:

-                    x264PanelFunctions.X264_StandardizeOptString(this);

-                    x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);

+                        // Now load the preset

+                        presetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);

+

+                        // The x264 widgets will need updated, so do this now:

+                        x264PanelFunctions.X264_StandardizeOptString(this);

+                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);

+                    }

                 }

             }

         }

@@ -984,6 +1008,9 @@ namespace Handbrake
         //Picture Tab

         private void text_width_TextChanged(object sender, EventArgs e)

         {

+            if (text_width.Text == "")

+                text_width.BackColor = Color.White;

+

             maxWidth = 0; maxHeight = 0;  // Reset max width so that it's not using the MaxWidth -X. Quick hack to allow -X for preset usage.

 

             int width;

@@ -1009,6 +1036,9 @@ namespace Handbrake
         }

         private void text_height_TextChanged(object sender, EventArgs e)

         {

+            if (text_height.Text == "")

+                text_height.BackColor = Color.White;

+

             maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.

 

             int height;

@@ -1143,7 +1173,7 @@ namespace Handbrake
                 setBitrateSelections384(drp_audbit_1);

             else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))

                 setBitrateSelections160(drp_audbit_1); drp_audbit_1.Text = "160";

-            

+

             // Update an item in the Audio list if required.

             if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)

             {

@@ -1238,7 +1268,7 @@ namespace Handbrake
             }

 

         }

-        

+

         private void audioList_remove_Click(object sender, EventArgs e)

         {

             removeAudioTrack();

@@ -1294,7 +1324,7 @@ namespace Handbrake
             else

                 check_forced.Enabled = true;

         }

-        

+

         // Chapter Marker Tab

         private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)

         {

@@ -1649,16 +1679,16 @@ namespace Handbrake
             else

             {

                 // Just make sure not to re-enable the following boxes if the track above is none

-               /* if (drp_track2Audio.Text != "None")

-                {

-                    audMix.Enabled = true;

-                    audbit.Enabled = true;

-                    audsr.Enabled = true;

-

-                    audMix.Text = "Automatic";

-                    audbit.Text = "160";

-                    audsr.Text = "Auto";

-                }*/

+                /* if (drp_track2Audio.Text != "None")

+                 {

+                     audMix.Enabled = true;

+                     audbit.Enabled = true;

+                     audsr.Enabled = true;

+

+                     audMix.Text = "Automatic";

+                     audbit.Text = "160";

+                     audsr.Text = "Auto";

+                 }*/

             }

         }

         #endregion

diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs
index f634909b3..b21b3556a 100644
--- a/win/C#/frmMain/PresetLoader.cs
+++ b/win/C#/frmMain/PresetLoader.cs
@@ -15,7 +15,7 @@ namespace Handbrake
         /// <param name="mainWindow"></param>

         /// <param name="presetQuery">The Parsed CLI Query</param>

         /// <param name="name">Name of the preset</param>

-        public void presetLoader(frmMain mainWindow, Functions.QueryParser presetQuery, string name)

+        public void presetLoader(frmMain mainWindow, Functions.QueryParser presetQuery, string name, Boolean pictureSettings)

         {

             // ---------------------------

             // Setup the GUI

@@ -80,7 +80,35 @@ namespace Handbrake
             if (presetQuery.CropBottom == "0" && presetQuery.CropTop == "0")

                 if (presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")

                     mainWindow.check_customCrop.Checked = true;

-            

+

+            mainWindow.text_width.Text = "";

+            mainWindow.text_height.Text = "";

+

+            if (pictureSettings == true)

+            {

+                if (presetQuery.CropTop != null)

+                {

+                    int top, bottom, left, right;

+                    int.TryParse(presetQuery.CropTop, out top);

+                    int.TryParse(presetQuery.CropBottom, out bottom);

+                    int.TryParse(presetQuery.CropLeft, out left);

+                    int.TryParse(presetQuery.CropRight, out right);

+

+                    mainWindow.check_customCrop.Checked = true;

+                    mainWindow.text_top.Value = top;

+                    mainWindow.text_bottom.Value = bottom;

+                    mainWindow.text_left.Value = left;

+                    mainWindow.text_right.Value = right;

+                    

+                }

+

+                if (presetQuery.Width != 0)

+                    mainWindow.text_width.Text = presetQuery.Width.ToString();

+

+                if (presetQuery.Height != 0)

+                    mainWindow.text_height.Text = presetQuery.Height.ToString();

+            }

+

             mainWindow.drp_deInterlace_option.Text = presetQuery.DeInterlace;

             mainWindow.drp_deNoise.Text = presetQuery.DeNoise;

 

@@ -118,20 +146,6 @@ namespace Handbrake
                     mainWindow.drp_anamorphic.SelectedIndex = 0;

             }

 

-            if (presetQuery.Width != 0)

-                mainWindow.text_width.Text = presetQuery.Width.ToString();

-            else

-            {

-                mainWindow.text_width.Text = "";

-            }

-

-            if (presetQuery.Height != 0)

-                mainWindow.text_height.Text = presetQuery.Height.ToString();

-            else

-            {

-                mainWindow.text_height.Text = "";

-            }

-

             // Set the public max width and max height varibles in frmMain

             // These are used by the query generator to determine if it should use -X or -w  / -Y or -h

             if (presetQuery.MaxWidth != 0)

@@ -145,7 +159,7 @@ namespace Handbrake
                 mainWindow.text_height.Text = presetQuery.MaxHeight.ToString();

                 mainWindow.maxHeight = presetQuery.MaxHeight;

             }

-              

+

 

             #endregion

 

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 909051189..695f2c3b2 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -74,6 +74,7 @@ namespace Handbrake
             this.drp_processors = new System.Windows.Forms.ComboBox();

             this.Label4 = new System.Windows.Forms.Label();

             this.tab_advanced = new System.Windows.Forms.TabPage();

+            this.check_queryEditorTab = new System.Windows.Forms.CheckBox();

             this.lbl_appcastUnstable = new System.Windows.Forms.Label();

             this.check_mainMinimize = new System.Windows.Forms.CheckBox();

             this.check_snapshot = new System.Windows.Forms.CheckBox();

@@ -112,7 +113,6 @@ 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.check_queryEditorTab = new System.Windows.Forms.CheckBox();

             this.tab_options.SuspendLayout();

             this.tab_general.SuspendLayout();

             this.tab_picture.SuspendLayout();

@@ -312,9 +312,9 @@ namespace Handbrake
             this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 64);

             this.check_userDefaultSettings.Name = "check_userDefaultSettings";

-            this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17);

+            this.check_userDefaultSettings.Size = new System.Drawing.Size(158, 17);

             this.check_userDefaultSettings.TabIndex = 69;

-            this.check_userDefaultSettings.Text = "Load my default settings";

+            this.check_userDefaultSettings.Text = "Load my default preset";

             this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset.");

             this.check_userDefaultSettings.UseVisualStyleBackColor = false;

             this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);

@@ -609,6 +609,21 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced / Other";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

+            // check_queryEditorTab

+            // 

+            this.check_queryEditorTab.AutoSize = true;

+            this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;

+            this.check_queryEditorTab.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.check_queryEditorTab.Location = new System.Drawing.Point(76, 64);

+            this.check_queryEditorTab.Name = "check_queryEditorTab";

+            this.check_queryEditorTab.Size = new System.Drawing.Size(175, 17);

+            this.check_queryEditorTab.TabIndex = 84;

+            this.check_queryEditorTab.Text = "Enable \"Query Editor\" Tab";

+            this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +

+                    " effect.");

+            this.check_queryEditorTab.UseVisualStyleBackColor = false;

+            this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);

+            // 

             // lbl_appcastUnstable

             // 

             this.lbl_appcastUnstable.AutoSize = true;

@@ -1029,21 +1044,6 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";

             this.openFile_vlc.Filter = "exe|*.exe";

             // 

-            // check_queryEditorTab

-            // 

-            this.check_queryEditorTab.AutoSize = true;

-            this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;

-            this.check_queryEditorTab.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_queryEditorTab.Location = new System.Drawing.Point(76, 64);

-            this.check_queryEditorTab.Name = "check_queryEditorTab";

-            this.check_queryEditorTab.Size = new System.Drawing.Size(175, 17);

-            this.check_queryEditorTab.TabIndex = 84;

-            this.check_queryEditorTab.Text = "Enable \"Query Editor\" Tab";

-            this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +

-                    " effect.");

-            this.check_queryEditorTab.UseVisualStyleBackColor = false;

-            this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);

-            // 

             // frmOptions

             // 

             this.ClientSize = new System.Drawing.Size(514, 375);