WinGUI:

- New development tab (hidden in release builds) for testing functions.
- Fixed: chapter markers now get saved when using "set default" option
- Fixed: crash on query editor if copy was used with an empty text box
- Fixed: a few corrupted presets
- Added: Width / height & anamorphic options get highlighted in red if someone tries to change the width/height when anamorphic is enabled. (text explanation added)




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

8 files changed, 202 insertions, 73 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index f0cafac2c..1b55daa15 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -99,6 +99,7 @@
       <DependentUpon>frmQuickStart.cs</DependentUpon>

     </Compile>

     <Compile Include="Functions\CLI.cs" />

+    <Compile Include="Functions\QueryParser.cs" />

     <Compile Include="Parsing\AudioTrack.cs" />

     <Compile Include="Parsing\Chapter.cs" />

     <Compile Include="Parsing\DVD.cs" />

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 8fe778080..041e88149 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

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

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

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

         public string GuiVersion {

             get {

                 return ((string)(this["GuiVersion"]));

@@ -516,7 +516,7 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

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

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

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

         public string CliVersion {

             get {

                 return ((string)(this["CliVersion"]));

@@ -609,5 +609,17 @@ namespace Handbrake.Properties {
                 this["selectedPreset"] = value;

             }

         }

+        

+        [global::System.Configuration.UserScopedSettingAttribute()]

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

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

+        public string chapterMarker {

+            get {

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

+            }

+            set {

+                this["chapterMarker"] = value;

+            }

+        }

     }

 }

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 96bd2d9d6..a92bc7c73 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />

   <Settings>

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

-      <Value Profile="(Default)">2.4.1</Value>

+      <Value Profile="(Default)">2.4.2</Value>

     </Setting>

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

       <Value Profile="(Default)">http://download.m0k.org/handbrake/windows/update.txt</Value>

@@ -126,7 +126,7 @@
       <Value Profile="(Default)" />

     </Setting>

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

-      <Value Profile="(Default)">0.9.1</Value>

+      <Value Profile="(Default)">0.9.2</Value>

     </Setting>

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

       <Value Profile="(Default)">Checked</Value>

@@ -149,5 +149,8 @@
     <Setting Name="selectedPreset" Type="System.String" Scope="User">

       <Value Profile="(Default)" />

     </Setting>

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

+      <Value Profile="(Default)" />

+    </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file
diff --git a/win/C#/app.config b/win/C#/app.config
index 8b3000c21..36011680b 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -8,7 +8,7 @@
     <userSettings>

         <Handbrake.Properties.Settings>

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

-                <value>2.4.1</value>

+                <value>2.4.2</value>

             </setting>

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

                 <value>http://download.m0k.org/handbrake/windows/update.txt</value>

@@ -128,7 +128,7 @@
                 <value />

             </setting>

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

-                <value>0.9.1</value>

+                <value>0.9.2</value>

             </setting>

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

                 <value>Checked</value>

@@ -148,6 +148,9 @@
             <setting name="selectedPreset" serializeAs="String">

                 <value />

             </setting>

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

+                <value />

+            </setting>

         </Handbrake.Properties.Settings>

     </userSettings>

 </configuration>
\ No newline at end of file
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index fd8777ae7..8cdaf1b39 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -63,6 +63,7 @@ namespace Handbrake
             this.ListBox_Presets = new System.Windows.Forms.ListBox();

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

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

+            this.button1 = new System.Windows.Forms.Button();

             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();

             this.File_Open = new System.Windows.Forms.OpenFileDialog();

             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();

@@ -79,6 +80,8 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();

             this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();

             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();

+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

             this.OnlineDocumentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_wiki = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_faq = new System.Windows.Forms.ToolStripMenuItem();

@@ -140,7 +143,7 @@ namespace Handbrake
             this.Label18 = new System.Windows.Forms.Label();

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

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

-            this.Label37 = new System.Windows.Forms.Label();

+            this.lbl_largeMp4Warning = new System.Windows.Forms.Label();

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

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

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

@@ -149,6 +152,7 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();

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

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

+            this.lbl_anamorphicError = new System.Windows.Forms.Label();

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

             this.drp_deNoise = new System.Windows.Forms.ComboBox();

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

@@ -176,8 +180,7 @@ namespace Handbrake
             this.groupBox_dest = new System.Windows.Forms.GroupBox();

             this.groupBox2 = new System.Windows.Forms.GroupBox();

             this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();

-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

+            this.tabPage4 = new System.Windows.Forms.TabPage();

             Label38 = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

             this.frmMainMenu.SuspendLayout();

@@ -192,6 +195,7 @@ namespace Handbrake
             this.groupBox_dest.SuspendLayout();

             this.groupBox2.SuspendLayout();

             this.groupBox3.SuspendLayout();

+            this.tabPage4.SuspendLayout();

             this.SuspendLayout();

             // 

             // Label38

@@ -207,7 +211,7 @@ namespace Handbrake
             // DVD_Save

             // 

             this.DVD_Save.DefaultExt = "mp4";

-            this.DVD_Save.Filter = "*.mp4|*.mp4|*.m4v|*.m4v|*.avi|*.avi|*.ogm|*.ogm|*.mkv|*.mkv";

+            this.DVD_Save.Filter = "mp4|.mp4|m4v|.m4v|avi|.avi|ogm|.ogm|mkv|.mkv";

             // 

             // File_Save

             // 

@@ -470,11 +474,12 @@ namespace Handbrake
             this.check_largeFile.Text = "Larger mp4 Files (> 4GB)";

             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of mp4 files greater than 4GB.");

             this.check_largeFile.UseVisualStyleBackColor = true;

-            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);

+            this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);

             // 

             // check_turbo

             // 

             this.check_turbo.AutoSize = true;

+            this.check_turbo.Enabled = false;

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

             this.check_turbo.Location = new System.Drawing.Point(37, 84);

             this.check_turbo.Name = "check_turbo";

@@ -598,7 +603,7 @@ namespace Handbrake
             "Constant Quality Rate",

             "Deux Six Quatre",

             "Film",

-            "iPhone",

+            "iPhone / iPod Touch",

             "iPod High-Rez",

             "iPod Low-Rez",

             "Normal",

@@ -647,6 +652,23 @@ namespace Handbrake
             this.btn_addPreset.UseVisualStyleBackColor = false;

             this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);

             // 

+            // button1

+            // 

+            this.button1.BackColor = System.Drawing.SystemColors.ControlLight;

+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;

+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

+            this.button1.Location = new System.Drawing.Point(8, 13);

+            this.button1.Name = "button1";

+            this.button1.Size = new System.Drawing.Size(114, 22);

+            this.button1.TabIndex = 109;

+            this.button1.TabStop = false;

+            this.button1.Text = "Test Query Parser";

+            this.ToolTip.SetToolTip(this.button1, "Open a preset which you have saved.");

+            this.button1.UseVisualStyleBackColor = false;

+            this.button1.Click += new System.EventHandler(this.button1_Click);

+            // 

             // DVD_Open

             // 

             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";

@@ -674,7 +696,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(103, 22);

             this.mnu_exit.Text = "E&xit";

             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);

             // 

@@ -772,6 +794,18 @@ namespace Handbrake
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);

             this.HelpToolStripMenuItem.Text = "&Help";

             // 

+            // mnu_quickStart

+            // 

+            this.mnu_quickStart.Name = "mnu_quickStart";

+            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);

+            this.mnu_quickStart.Text = "Quick Start Information";

+            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);

+            // 

+            // toolStripSeparator1

+            // 

+            this.toolStripSeparator1.Name = "toolStripSeparator1";

+            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);

+            // 

             // OnlineDocumentationToolStripMenuItem

             // 

             this.OnlineDocumentationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

@@ -1045,7 +1079,7 @@ namespace Handbrake
             this.lbl_update.AutoSize = true;

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

             this.lbl_update.ForeColor = System.Drawing.Color.Black;

-            this.lbl_update.Location = new System.Drawing.Point(93, 540);

+            this.lbl_update.Location = new System.Drawing.Point(108, 540);

             this.lbl_update.Name = "lbl_update";

             this.lbl_update.Size = new System.Drawing.Size(193, 13);

             this.lbl_update.TabIndex = 98;

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

             this.Version.Location = new System.Drawing.Point(11, 540);

             this.Version.Name = "Version";

-            this.Version.Size = new System.Drawing.Size(84, 20);

+            this.Version.Size = new System.Drawing.Size(105, 20);

             this.Version.TabIndex = 97;

-            this.Version.Text = "Version 0.9.1";

+            this.Version.Text = "Version {0.0.0}";

             // 

             // lbl_encode

             // 

@@ -1139,6 +1173,7 @@ namespace Handbrake
             this.TabPage6.Size = new System.Drawing.Size(639, 211);

             this.TabPage6.TabIndex = 6;

             this.TabPage6.Text = "Query Editor";

+            this.TabPage6.UseVisualStyleBackColor = true;

             // 

             // btn_copy

             // 

@@ -1226,6 +1261,7 @@ namespace Handbrake
             this.h264Tab.Size = new System.Drawing.Size(639, 211);

             this.h264Tab.TabIndex = 5;

             this.h264Tab.Text = "H.264";

+            this.h264Tab.UseVisualStyleBackColor = true;

             // 

             // Label43

             // 

@@ -1314,6 +1350,7 @@ namespace Handbrake
             this.TabPage2.Size = new System.Drawing.Size(639, 211);

             this.TabPage2.TabIndex = 3;

             this.TabPage2.Text = "Audio && Subtitles";

+            this.TabPage2.UseVisualStyleBackColor = true;

             // 

             // Label19

             // 

@@ -1447,7 +1484,7 @@ namespace Handbrake
             // 

             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;

             this.TabPage3.Controls.Add(this.check_grayscale);

-            this.TabPage3.Controls.Add(this.Label37);

+            this.TabPage3.Controls.Add(this.lbl_largeMp4Warning);

             this.TabPage3.Controls.Add(this.check_largeFile);

             this.TabPage3.Controls.Add(this.check_turbo);

             this.TabPage3.Controls.Add(this.CheckCRF);

@@ -1469,6 +1506,7 @@ namespace Handbrake
             this.TabPage3.Size = new System.Drawing.Size(639, 211);

             this.TabPage3.TabIndex = 2;

             this.TabPage3.Text = "Video Settings";

+            this.TabPage3.UseVisualStyleBackColor = true;

             // 

             // check_grayscale

             // 

@@ -1481,15 +1519,15 @@ namespace Handbrake
             this.check_grayscale.Text = "Grayscale Encoding";

             this.check_grayscale.UseVisualStyleBackColor = true;

             // 

-            // Label37

+            // lbl_largeMp4Warning

             // 

-            this.Label37.AutoSize = true;

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

-            this.Label37.Location = new System.Drawing.Point(35, 127);

-            this.Label37.Name = "Label37";

-            this.Label37.Size = new System.Drawing.Size(241, 12);

-            this.Label37.TabIndex = 57;

-            this.Label37.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";

+            this.lbl_largeMp4Warning.AutoSize = true;

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

+            this.lbl_largeMp4Warning.Location = new System.Drawing.Point(35, 127);

+            this.lbl_largeMp4Warning.Name = "lbl_largeMp4Warning";

+            this.lbl_largeMp4Warning.Size = new System.Drawing.Size(241, 12);

+            this.lbl_largeMp4Warning.TabIndex = 57;

+            this.lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";

             // 

             // Label22

             // 

@@ -1511,6 +1549,7 @@ namespace Handbrake
             this.check_2PassEncode.TabIndex = 54;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.check_2PassEncode.UseVisualStyleBackColor = true;

+            this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);

             // 

             // Label2

             // 

@@ -1565,6 +1604,7 @@ namespace Handbrake
             // TabPage1

             // 

             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;

+            this.TabPage1.Controls.Add(this.lbl_anamorphicError);

             this.TabPage1.Controls.Add(this.label24);

             this.TabPage1.Controls.Add(this.drp_deNoise);

             this.TabPage1.Controls.Add(this.label11);

@@ -1594,6 +1634,19 @@ namespace Handbrake
             this.TabPage1.Size = new System.Drawing.Size(639, 211);

             this.TabPage1.TabIndex = 0;

             this.TabPage1.Text = "Picture Settings";

+            this.TabPage1.UseVisualStyleBackColor = true;

+            // 

+            // lbl_anamorphicError

+            // 

+            this.lbl_anamorphicError.AutoSize = true;

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

+            this.lbl_anamorphicError.ForeColor = System.Drawing.Color.Red;

+            this.lbl_anamorphicError.Location = new System.Drawing.Point(436, 149);

+            this.lbl_anamorphicError.Name = "lbl_anamorphicError";

+            this.lbl_anamorphicError.Size = new System.Drawing.Size(176, 24);

+            this.lbl_anamorphicError.TabIndex = 52;

+            this.lbl_anamorphicError.Text = "Must be disabled to allow width or \r\nheight to be altered";

+            this.lbl_anamorphicError.Visible = false;

             // 

             // label24

             // 

@@ -1670,10 +1723,10 @@ namespace Handbrake
             this.drp_deInterlace_option.FormattingEnabled = true;

             this.drp_deInterlace_option.Items.AddRange(new object[] {

             "None",

-            "Origional (Fast)",

+            "Original (Fast)",

             "yadif (Slow)",

             "yadif + mcdeint (Slower)",

-            "yadif + mcdeint  (Slowest)"});

+            "yadif + mcdeint (Slowest)"});

             this.drp_deInterlace_option.Location = new System.Drawing.Point(416, 63);

             this.drp_deInterlace_option.Name = "drp_deInterlace_option";

             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);

@@ -1856,6 +1909,7 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.TabPage2);

             this.advancedOptions.Controls.Add(this.h264Tab);

             this.advancedOptions.Controls.Add(this.TabPage6);

+            this.advancedOptions.Controls.Add(this.tabPage4);

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

             this.advancedOptions.Location = new System.Drawing.Point(14, 276);

             this.advancedOptions.Name = "advancedOptions";

@@ -1901,17 +1955,15 @@ namespace Handbrake
             this.groupBox3.TabStop = false;

             this.groupBox3.Text = "Preset Functions";

             // 

-            // mnu_quickStart

-            // 

-            this.mnu_quickStart.Name = "mnu_quickStart";

-            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);

-            this.mnu_quickStart.Text = "Quick Start Information";

-            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);

-            // 

-            // toolStripSeparator1

+            // tabPage4

             // 

-            this.toolStripSeparator1.Name = "toolStripSeparator1";

-            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);

+            this.tabPage4.Controls.Add(this.button1);

+            this.tabPage4.Location = new System.Drawing.Point(4, 22);

+            this.tabPage4.Name = "tabPage4";

+            this.tabPage4.Size = new System.Drawing.Size(639, 211);

+            this.tabPage4.TabIndex = 7;

+            this.tabPage4.Text = "Development";

+            this.tabPage4.UseVisualStyleBackColor = true;

             // 

             // frmMain

             // 

@@ -1960,6 +2012,7 @@ namespace Handbrake
             this.groupBox_dest.PerformLayout();

             this.groupBox2.ResumeLayout(false);

             this.groupBox3.ResumeLayout(false);

+            this.tabPage4.ResumeLayout(false);

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -2052,7 +2105,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label18;

         internal System.Windows.Forms.ComboBox drp_audioSampleRate;

         internal System.Windows.Forms.TabPage TabPage3;

-        internal System.Windows.Forms.Label Label37;

+        internal System.Windows.Forms.Label lbl_largeMp4Warning;

         internal System.Windows.Forms.CheckBox check_largeFile;

         internal System.Windows.Forms.CheckBox check_turbo;

         internal System.Windows.Forms.CheckBox CheckCRF;

@@ -2114,6 +2167,9 @@ namespace Handbrake
         private System.Windows.Forms.GroupBox groupBox3;

         private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

+        internal System.Windows.Forms.Button button1;

+        private System.Windows.Forms.Label lbl_anamorphicError;

+        private System.Windows.Forms.TabPage tabPage4;

 

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 06bc526f4..bc8b48649 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -152,6 +152,12 @@ namespace Handbrake
                     {

                         check_largeFile.CheckState = CheckState.Checked;

                     }

+

+                    if (Properties.Settings.Default.chapterMarker == "Checked")

+                    {

+                        Check_ChapterMarkers.CheckState = CheckState.Checked;

+                    }

+                   

                     // Audio Settings Tab

                     drp_audioBitrate.Text = Properties.Settings.Default.AudioBitrate;

                     drp_audioSampleRate.Text = Properties.Settings.Default.AudioSampleRate;

@@ -463,7 +469,8 @@ namespace Handbrake
 

         private void btn_copy_Click(object sender, EventArgs e)

         {

-            Clipboard.SetText(QueryEditorText.Text, TextDataFormat.Text);

+            if (QueryEditorText.Text != "")

+                Clipboard.SetText(QueryEditorText.Text, TextDataFormat.Text);

         }

 

         private void showQueue()

@@ -695,6 +702,7 @@ namespace Handbrake
             Properties.Settings.Default.detelecine = check_detelecine.CheckState.ToString();

             Properties.Settings.Default.denoise = drp_deNoise.Text;

             Properties.Settings.Default.deblock = check_deblock.CheckState.ToString();

+            Properties.Settings.Default.chapterMarker = Check_ChapterMarkers.CheckState.ToString();

             //Audio Settings Tab

             Properties.Settings.Default.AudioBitrate = drp_audioBitrate.Text;

             Properties.Settings.Default.AudioSampleRate = drp_audioSampleRate.Text;

@@ -760,14 +768,14 @@ namespace Handbrake
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Film)");

                     setMkv();

                     break;

-                case "iPhone":

-                    setGuiSetttings(CheckState.Unchecked, "480", "", "H.264", "960", "", 0, "0%", "128", CheckState.Checked, "48", "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPhone)");

+                case "iPhone / iPod Touch":

+                    setGuiSetttings(CheckState.Unchecked, "480", "", "H.264 (iPod)", "960", "", 0, "0%", "128", CheckState.Checked, "48", "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPhone)");

                     break;

                 case "iPod High-Rez":

-                    setGuiSetttings(CheckState.Unchecked, "640", "", "H.264", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod High Rez)");

+                    setGuiSetttings(CheckState.Unchecked, "640", "", "H.264 (iPod)", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod High Rez)");

                     break;

                 case "iPod Low-Rez":

-                    setGuiSetttings(CheckState.Unchecked, "320", "", "H.264", "700", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod Low Rez)");

+                    setGuiSetttings(CheckState.Unchecked, "320", "", "H.264 (iPod)", "700", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod Low Rez)");

                     break;

                 case "Normal":

                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "ref=2:bframes=2:subme=5:me=umh", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Normal)");

@@ -1056,13 +1064,14 @@ namespace Handbrake
 

         private void text_width_TextChanged(object sender, EventArgs e)

         {

-

             try

             {

                 if (CheckPixelRatio.Checked)

                 {

                     text_width.Text = "";

-                    text_width.BackColor = Color.White;

+                    text_width.BackColor = Color.LightCoral;

+                    CheckPixelRatio.BackColor = Color.LightCoral;

+                    lbl_anamorphicError.Visible = true;

                 }

                 else

                 {

@@ -1091,7 +1100,7 @@ namespace Handbrake
                     {

                         text_height.Text = height.ToString();

                     }

-                }

+                }                   

             }

             catch (Exception)

             {

@@ -1106,25 +1115,25 @@ namespace Handbrake
         {

             try

             {

-                if (text_height.Text != "Auto")

-                {

-                    if (CheckPixelRatio.Checked)

+                if (CheckPixelRatio.Checked)

                     {

                         text_height.Text = "";

-                        text_width.BackColor = Color.White;

+                        text_height.BackColor = Color.LightCoral;

+                        CheckPixelRatio.BackColor = Color.LightCoral;

+                        lbl_anamorphicError.Visible = true;

+                }

+                else

+                {

+                    if ((int.Parse(text_height.Text) % 16) != 0)

+                    {

+                            text_height.BackColor = Color.LightCoral;

                     }

                     else

                     {

-                        if ((int.Parse(text_height.Text) % 16) != 0)

-                        {

-                            text_height.BackColor = Color.LightCoral;

-                        }

-                        else

-                        {

                             text_height.BackColor = Color.LightGreen;

-                        }

                     }

                 }

+

             } catch(Exception){

                 // No need to alert the user.

             }

@@ -1182,6 +1191,36 @@ namespace Handbrake
             text_height.Text = "";

             text_width.BackColor = Color.White;

             text_height.BackColor = Color.White;

+            CheckPixelRatio.BackColor = frmMain.DefaultBackColor;

+            lbl_anamorphicError.Visible = false;

+        }

+

+        private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)

+        {

+            if (check_2PassEncode.CheckState.ToString() == "Checked")

+            {

+                check_turbo.Enabled = true;

+            }

+            else

+            {

+                check_turbo.Enabled = false;

+                check_turbo.CheckState = CheckState.Unchecked;

+            }

+        }

+

+        private void check_largeFile_CheckedChanged(object sender, EventArgs e)

+        {

+            if (!text_destination.Text.Contains(".mp4"))

+            {

+                lbl_largeMp4Warning.Text = "Warning: Only mp4 files are supported";

+                lbl_largeMp4Warning.ForeColor = Color.Red;

+                check_largeFile.CheckState = CheckState.Unchecked;

+            }

+            else

+            {

+                lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";

+                lbl_largeMp4Warning.ForeColor = Color.Black;

+            }

         }

 

         private void drp_dvdtitle_Click(object sender, EventArgs e)

@@ -1289,14 +1328,7 @@ namespace Handbrake
             }

         }

 

-        private void check_largeFile_CheckedChanged(object sender, EventArgs e)

-        {

-            if (!text_destination.Text.Contains(".mp4"))

-            {

-                MessageBox.Show("This option is only compatible with the mp4 file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

-                check_largeFile.CheckState = CheckState.Unchecked;

-            }

-        }

+

 

         private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)

         {

@@ -1541,8 +1573,8 @@ namespace Handbrake
                 case "None":

                     deinterlace = "";

                     break;

-                case "Origional (Fast)":

-                    deinterlace = " --deinterlace=1";

+                case "Original (Fast)":

+                    deinterlace = " --deinterlace=" + '"' + "-1" + '"';

                     break;

                 case "yadif (Slow)":

                     deinterlace = " --deinterlace=" + '"' + "0" + '"';

@@ -1585,8 +1617,7 @@ namespace Handbrake
             string denoise = "";

             string CRF = CheckCRF.CheckState.ToString();

 

-

-            if ((CRF == "Checked"))

+            if (CRF == "Checked")

                 CRF = " -Q ";

             else

                 CRF = "";

@@ -1651,7 +1682,7 @@ namespace Handbrake
                     break;

             }

 

-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + videoFramerate + turboH264 + largeFile + deblock + detelecine + denoise;

+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + largeFile + deblock + detelecine + denoise;

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

 

             // Audio Settings Tab

@@ -1700,7 +1731,7 @@ namespace Handbrake
                     Mixdown = "6ch";

                     break;

                 default:

-                    Mixdown = "stero";

+                    Mixdown = "";

                     break;

             }

 

@@ -1753,6 +1784,27 @@ namespace Handbrake
 

         #endregion

 

+

+

+        private Functions.QueryParser thisQuery;

+        private void button1_Click(object sender, EventArgs e)

+        {

+            String query = "";

+            if (QueryEditorText.Text == "")

+            {

+                query = GenerateTheQuery();

+            }

+            else

+            {

+                query = QueryEditorText.Text;

+            }

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

+            MessageBox.Show(thisQuery.DeTelecine.ToString());

+        }

+

+

+

+

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index e11f7f888..8f4002955 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -211,7 +211,7 @@ namespace Handbrake
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

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

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(724, 335);

+            this.ClientSize = new System.Drawing.Size(727, 336);

             this.ControlBox = false;

             this.Controls.Add(this.label1);

             this.Controls.Add(this.label3);

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index a08591c51..07c0f4037 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -120,8 +120,8 @@ namespace Handbrake
 

         #endregion

 

-        #region Queue Management

 

+        #region Queue Management

         private void btn_up_Click(object sender, EventArgs e)

         {

             int count = list_queue.Items.Count;

@@ -162,6 +162,8 @@ namespace Handbrake
         }

         #endregion

 

+

+

         #region Window Management

 

         private void btn_Close_Click(object sender, EventArgs e)