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://localhost/HandBrake/trunk@1024 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index f0cafac..1b55daa 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -99,6 +99,7 @@
       <DependentUpon>frmQuickStart.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Functions\CLI.cs" />\r
+    <Compile Include="Functions\QueryParser.cs" />\r
     <Compile Include="Parsing\AudioTrack.cs" />\r
     <Compile Include="Parsing\Chapter.cs" />\r
     <Compile Include="Parsing\DVD.cs" />\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 8fe7780..041e881 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("2.4.1")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("2.4.2")]\r
         public string GuiVersion {\r
             get {\r
                 return ((string)(this["GuiVersion"]));\r
@@ -516,7 +516,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("0.9.1")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("0.9.2")]\r
         public string CliVersion {\r
             get {\r
                 return ((string)(this["CliVersion"]));\r
@@ -609,5 +609,17 @@ namespace Handbrake.Properties {
                 this["selectedPreset"] = value;\r
             }\r
         }\r
+        \r
+        [global::System.Configuration.UserScopedSettingAttribute()]\r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        public string chapterMarker {\r
+            get {\r
+                return ((string)(this["chapterMarker"]));\r
+            }\r
+            set {\r
+                this["chapterMarker"] = value;\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 96bd2d9..a92bc7c 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />\r
   <Settings>\r
     <Setting Name="GuiVersion" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">2.4.1</Value>\r
+      <Value Profile="(Default)">2.4.2</Value>\r
     </Setting>\r
     <Setting Name="updateFile" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">http://download.m0k.org/handbrake/windows/update.txt</Value>\r
@@ -126,7 +126,7 @@
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="CliVersion" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">0.9.1</Value>\r
+      <Value Profile="(Default)">0.9.2</Value>\r
     </Setting>\r
     <Setting Name="GuiDebug" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
@@ -149,5 +149,8 @@
     <Setting Name="selectedPreset" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
+    <Setting Name="chapterMarker" Type="System.String" Scope="User">\r
+      <Value Profile="(Default)" />\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/app.config b/win/C#/app.config
index 8b3000c..3601168 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -8,7 +8,7 @@
     <userSettings>\r
         <Handbrake.Properties.Settings>\r
             <setting name="GuiVersion" serializeAs="String">\r
-                <value>2.4.1</value>\r
+                <value>2.4.2</value>\r
             </setting>\r
             <setting name="updateFile" serializeAs="String">\r
                 <value>http://download.m0k.org/handbrake/windows/update.txt</value>\r
@@ -128,7 +128,7 @@
                 <value />\r
             </setting>\r
             <setting name="CliVersion" serializeAs="String">\r
-                <value>0.9.1</value>\r
+                <value>0.9.2</value>\r
             </setting>\r
             <setting name="GuiDebug" serializeAs="String">\r
                 <value>Checked</value>\r
@@ -148,6 +148,9 @@
             <setting name="selectedPreset" serializeAs="String">\r
                 <value />\r
             </setting>\r
+            <setting name="chapterMarker" serializeAs="String">\r
+                <value />\r
+            </setting>\r
         </Handbrake.Properties.Settings>\r
     </userSettings>\r
 </configuration>
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index fd8777a..8cdaf1b 100644 (file)
--- 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();\r
             this.btn_removePreset = new System.Windows.Forms.Button();\r
             this.btn_addPreset = new System.Windows.Forms.Button();\r
+            this.button1 = new System.Windows.Forms.Button();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -79,6 +80,8 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             this.OnlineDocumentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_wiki = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_faq = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -140,7 +143,7 @@ namespace Handbrake
             this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
-            this.Label37 = new System.Windows.Forms.Label();\r
+            this.lbl_largeMp4Warning = new System.Windows.Forms.Label();\r
             this.Label22 = new System.Windows.Forms.Label();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label2 = new System.Windows.Forms.Label();\r
@@ -149,6 +152,7 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
+            this.lbl_anamorphicError = new System.Windows.Forms.Label();\r
             this.label24 = new System.Windows.Forms.Label();\r
             this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
             this.label11 = new System.Windows.Forms.Label();\r
@@ -176,8 +180,7 @@ namespace Handbrake
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.groupBox3 = new System.Windows.Forms.GroupBox();\r
-            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.tabPage4 = new System.Windows.Forms.TabPage();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -192,6 +195,7 @@ namespace Handbrake
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
             this.groupBox3.SuspendLayout();\r
+            this.tabPage4.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -207,7 +211,7 @@ namespace Handbrake
             // DVD_Save\r
             // \r
             this.DVD_Save.DefaultExt = "mp4";\r
-            this.DVD_Save.Filter = "*.mp4|*.mp4|*.m4v|*.m4v|*.avi|*.avi|*.ogm|*.ogm|*.mkv|*.mkv";\r
+            this.DVD_Save.Filter = "mp4|.mp4|m4v|.m4v|avi|.avi|ogm|.ogm|mkv|.mkv";\r
             // \r
             // File_Save\r
             // \r
@@ -470,11 +474,12 @@ namespace Handbrake
             this.check_largeFile.Text = "Larger mp4 Files (> 4GB)";\r
             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of mp4 files greater than 4GB.");\r
             this.check_largeFile.UseVisualStyleBackColor = true;\r
-            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
+            this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
             // \r
             // check_turbo\r
             // \r
             this.check_turbo.AutoSize = true;\r
+            this.check_turbo.Enabled = false;\r
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.check_turbo.Location = new System.Drawing.Point(37, 84);\r
             this.check_turbo.Name = "check_turbo";\r
@@ -598,7 +603,7 @@ namespace Handbrake
             "Constant Quality Rate",\r
             "Deux Six Quatre",\r
             "Film",\r
-            "iPhone",\r
+            "iPhone / iPod Touch",\r
             "iPod High-Rez",\r
             "iPod Low-Rez",\r
             "Normal",\r
@@ -647,6 +652,23 @@ namespace Handbrake
             this.btn_addPreset.UseVisualStyleBackColor = false;\r
             this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
             // \r
+            // button1\r
+            // \r
+            this.button1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.button1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.button1.Location = new System.Drawing.Point(8, 13);\r
+            this.button1.Name = "button1";\r
+            this.button1.Size = new System.Drawing.Size(114, 22);\r
+            this.button1.TabIndex = 109;\r
+            this.button1.TabStop = false;\r
+            this.button1.Text = "Test Query Parser";\r
+            this.ToolTip.SetToolTip(this.button1, "Open a preset which you have saved.");\r
+            this.button1.UseVisualStyleBackColor = false;\r
+            this.button1.Click += new System.EventHandler(this.button1_Click);\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";\r
@@ -674,7 +696,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(103, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -772,6 +794,18 @@ namespace Handbrake
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);\r
             this.HelpToolStripMenuItem.Text = "&Help";\r
             // \r
+            // mnu_quickStart\r
+            // \r
+            this.mnu_quickStart.Name = "mnu_quickStart";\r
+            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);\r
+            this.mnu_quickStart.Text = "Quick Start Information";\r
+            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);\r
+            // \r
+            // toolStripSeparator1\r
+            // \r
+            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);\r
+            // \r
             // OnlineDocumentationToolStripMenuItem\r
             // \r
             this.OnlineDocumentationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -1045,7 +1079,7 @@ namespace Handbrake
             this.lbl_update.AutoSize = true;\r
             this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_update.Location = new System.Drawing.Point(93, 540);\r
+            this.lbl_update.Location = new System.Drawing.Point(108, 540);\r
             this.lbl_update.Name = "lbl_update";\r
             this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
             this.lbl_update.TabIndex = 98;\r
@@ -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)));\r
             this.Version.Location = new System.Drawing.Point(11, 540);\r
             this.Version.Name = "Version";\r
-            this.Version.Size = new System.Drawing.Size(84, 20);\r
+            this.Version.Size = new System.Drawing.Size(105, 20);\r
             this.Version.TabIndex = 97;\r
-            this.Version.Text = "Version 0.9.1";\r
+            this.Version.Text = "Version {0.0.0}";\r
             // \r
             // lbl_encode\r
             // \r
@@ -1139,6 +1173,7 @@ namespace Handbrake
             this.TabPage6.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage6.TabIndex = 6;\r
             this.TabPage6.Text = "Query Editor";\r
+            this.TabPage6.UseVisualStyleBackColor = true;\r
             // \r
             // btn_copy\r
             // \r
@@ -1226,6 +1261,7 @@ namespace Handbrake
             this.h264Tab.Size = new System.Drawing.Size(639, 211);\r
             this.h264Tab.TabIndex = 5;\r
             this.h264Tab.Text = "H.264";\r
+            this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
             // Label43\r
             // \r
@@ -1314,6 +1350,7 @@ namespace Handbrake
             this.TabPage2.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
+            this.TabPage2.UseVisualStyleBackColor = true;\r
             // \r
             // Label19\r
             // \r
@@ -1447,7 +1484,7 @@ namespace Handbrake
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.TabPage3.Controls.Add(this.check_grayscale);\r
-            this.TabPage3.Controls.Add(this.Label37);\r
+            this.TabPage3.Controls.Add(this.lbl_largeMp4Warning);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
             this.TabPage3.Controls.Add(this.CheckCRF);\r
@@ -1469,6 +1506,7 @@ namespace Handbrake
             this.TabPage3.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
+            this.TabPage3.UseVisualStyleBackColor = true;\r
             // \r
             // check_grayscale\r
             // \r
@@ -1481,15 +1519,15 @@ namespace Handbrake
             this.check_grayscale.Text = "Grayscale Encoding";\r
             this.check_grayscale.UseVisualStyleBackColor = true;\r
             // \r
-            // Label37\r
+            // lbl_largeMp4Warning\r
             // \r
-            this.Label37.AutoSize = true;\r
-            this.Label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label37.Location = new System.Drawing.Point(35, 127);\r
-            this.Label37.Name = "Label37";\r
-            this.Label37.Size = new System.Drawing.Size(241, 12);\r
-            this.Label37.TabIndex = 57;\r
-            this.Label37.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";\r
+            this.lbl_largeMp4Warning.AutoSize = true;\r
+            this.lbl_largeMp4Warning.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_largeMp4Warning.Location = new System.Drawing.Point(35, 127);\r
+            this.lbl_largeMp4Warning.Name = "lbl_largeMp4Warning";\r
+            this.lbl_largeMp4Warning.Size = new System.Drawing.Size(241, 12);\r
+            this.lbl_largeMp4Warning.TabIndex = 57;\r
+            this.lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";\r
             // \r
             // Label22\r
             // \r
@@ -1511,6 +1549,7 @@ namespace Handbrake
             this.check_2PassEncode.TabIndex = 54;\r
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.check_2PassEncode.UseVisualStyleBackColor = true;\r
+            this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
             // \r
             // Label2\r
             // \r
@@ -1565,6 +1604,7 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage1.Controls.Add(this.lbl_anamorphicError);\r
             this.TabPage1.Controls.Add(this.label24);\r
             this.TabPage1.Controls.Add(this.drp_deNoise);\r
             this.TabPage1.Controls.Add(this.label11);\r
@@ -1594,6 +1634,19 @@ namespace Handbrake
             this.TabPage1.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
+            this.TabPage1.UseVisualStyleBackColor = true;\r
+            // \r
+            // lbl_anamorphicError\r
+            // \r
+            this.lbl_anamorphicError.AutoSize = true;\r
+            this.lbl_anamorphicError.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_anamorphicError.ForeColor = System.Drawing.Color.Red;\r
+            this.lbl_anamorphicError.Location = new System.Drawing.Point(436, 149);\r
+            this.lbl_anamorphicError.Name = "lbl_anamorphicError";\r
+            this.lbl_anamorphicError.Size = new System.Drawing.Size(176, 24);\r
+            this.lbl_anamorphicError.TabIndex = 52;\r
+            this.lbl_anamorphicError.Text = "Must be disabled to allow width or \r\nheight to be altered";\r
+            this.lbl_anamorphicError.Visible = false;\r
             // \r
             // label24\r
             // \r
@@ -1670,10 +1723,10 @@ namespace Handbrake
             this.drp_deInterlace_option.FormattingEnabled = true;\r
             this.drp_deInterlace_option.Items.AddRange(new object[] {\r
             "None",\r
-            "Origional (Fast)",\r
+            "Original (Fast)",\r
             "yadif (Slow)",\r
             "yadif + mcdeint (Slower)",\r
-            "yadif + mcdeint  (Slowest)"});\r
+            "yadif + mcdeint (Slowest)"});\r
             this.drp_deInterlace_option.Location = new System.Drawing.Point(416, 63);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
@@ -1856,6 +1909,7 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.TabPage2);\r
             this.advancedOptions.Controls.Add(this.h264Tab);\r
             this.advancedOptions.Controls.Add(this.TabPage6);\r
+            this.advancedOptions.Controls.Add(this.tabPage4);\r
             this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.advancedOptions.Location = new System.Drawing.Point(14, 276);\r
             this.advancedOptions.Name = "advancedOptions";\r
@@ -1901,17 +1955,15 @@ namespace Handbrake
             this.groupBox3.TabStop = false;\r
             this.groupBox3.Text = "Preset Functions";\r
             // \r
-            // mnu_quickStart\r
-            // \r
-            this.mnu_quickStart.Name = "mnu_quickStart";\r
-            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);\r
-            this.mnu_quickStart.Text = "Quick Start Information";\r
-            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);\r
-            // \r
-            // toolStripSeparator1\r
+            // tabPage4\r
             // \r
-            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);\r
+            this.tabPage4.Controls.Add(this.button1);\r
+            this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPage4.Name = "tabPage4";\r
+            this.tabPage4.Size = new System.Drawing.Size(639, 211);\r
+            this.tabPage4.TabIndex = 7;\r
+            this.tabPage4.Text = "Development";\r
+            this.tabPage4.UseVisualStyleBackColor = true;\r
             // \r
             // frmMain\r
             // \r
@@ -1960,6 +2012,7 @@ namespace Handbrake
             this.groupBox_dest.PerformLayout();\r
             this.groupBox2.ResumeLayout(false);\r
             this.groupBox3.ResumeLayout(false);\r
+            this.tabPage4.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -2052,7 +2105,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label18;\r
         internal System.Windows.Forms.ComboBox drp_audioSampleRate;\r
         internal System.Windows.Forms.TabPage TabPage3;\r
-        internal System.Windows.Forms.Label Label37;\r
+        internal System.Windows.Forms.Label lbl_largeMp4Warning;\r
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
         internal System.Windows.Forms.CheckBox CheckCRF;\r
@@ -2114,6 +2167,9 @@ namespace Handbrake
         private System.Windows.Forms.GroupBox groupBox3;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
+        internal System.Windows.Forms.Button button1;\r
+        private System.Windows.Forms.Label lbl_anamorphicError;\r
+        private System.Windows.Forms.TabPage tabPage4;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 06bc526..bc8b486 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -152,6 +152,12 @@ namespace Handbrake
                     {\r
                         check_largeFile.CheckState = CheckState.Checked;\r
                     }\r
+\r
+                    if (Properties.Settings.Default.chapterMarker == "Checked")\r
+                    {\r
+                        Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+                    }\r
+                   \r
                     // Audio Settings Tab\r
                     drp_audioBitrate.Text = Properties.Settings.Default.AudioBitrate;\r
                     drp_audioSampleRate.Text = Properties.Settings.Default.AudioSampleRate;\r
@@ -463,7 +469,8 @@ namespace Handbrake
 \r
         private void btn_copy_Click(object sender, EventArgs e)\r
         {\r
-            Clipboard.SetText(QueryEditorText.Text, TextDataFormat.Text);\r
+            if (QueryEditorText.Text != "")\r
+                Clipboard.SetText(QueryEditorText.Text, TextDataFormat.Text);\r
         }\r
 \r
         private void showQueue()\r
@@ -695,6 +702,7 @@ namespace Handbrake
             Properties.Settings.Default.detelecine = check_detelecine.CheckState.ToString();\r
             Properties.Settings.Default.denoise = drp_deNoise.Text;\r
             Properties.Settings.Default.deblock = check_deblock.CheckState.ToString();\r
+            Properties.Settings.Default.chapterMarker = Check_ChapterMarkers.CheckState.ToString();\r
             //Audio Settings Tab\r
             Properties.Settings.Default.AudioBitrate = drp_audioBitrate.Text;\r
             Properties.Settings.Default.AudioSampleRate = drp_audioSampleRate.Text;\r
@@ -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)");\r
                     setMkv();\r
                     break;\r
-                case "iPhone":\r
-                    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)");\r
+                case "iPhone / iPod Touch":\r
+                    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)");\r
                     break;\r
                 case "iPod High-Rez":\r
-                    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)");\r
+                    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)");\r
                     break;\r
                 case "iPod Low-Rez":\r
-                    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)");\r
+                    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)");\r
                     break;\r
                 case "Normal":\r
                     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)");\r
@@ -1056,13 +1064,14 @@ namespace Handbrake
 \r
         private void text_width_TextChanged(object sender, EventArgs e)\r
         {\r
-\r
             try\r
             {\r
                 if (CheckPixelRatio.Checked)\r
                 {\r
                     text_width.Text = "";\r
-                    text_width.BackColor = Color.White;\r
+                    text_width.BackColor = Color.LightCoral;\r
+                    CheckPixelRatio.BackColor = Color.LightCoral;\r
+                    lbl_anamorphicError.Visible = true;\r
                 }\r
                 else\r
                 {\r
@@ -1091,7 +1100,7 @@ namespace Handbrake
                     {\r
                         text_height.Text = height.ToString();\r
                     }\r
-                }\r
+                }                   \r
             }\r
             catch (Exception)\r
             {\r
@@ -1106,25 +1115,25 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                if (text_height.Text != "Auto")\r
-                {\r
-                    if (CheckPixelRatio.Checked)\r
+                if (CheckPixelRatio.Checked)\r
                     {\r
                         text_height.Text = "";\r
-                        text_width.BackColor = Color.White;\r
+                        text_height.BackColor = Color.LightCoral;\r
+                        CheckPixelRatio.BackColor = Color.LightCoral;\r
+                        lbl_anamorphicError.Visible = true;\r
+                }\r
+                else\r
+                {\r
+                    if ((int.Parse(text_height.Text) % 16) != 0)\r
+                    {\r
+                            text_height.BackColor = Color.LightCoral;\r
                     }\r
                     else\r
                     {\r
-                        if ((int.Parse(text_height.Text) % 16) != 0)\r
-                        {\r
-                            text_height.BackColor = Color.LightCoral;\r
-                        }\r
-                        else\r
-                        {\r
                             text_height.BackColor = Color.LightGreen;\r
-                        }\r
                     }\r
                 }\r
+\r
             } catch(Exception){\r
                 // No need to alert the user.\r
             }\r
@@ -1182,6 +1191,36 @@ namespace Handbrake
             text_height.Text = "";\r
             text_width.BackColor = Color.White;\r
             text_height.BackColor = Color.White;\r
+            CheckPixelRatio.BackColor = frmMain.DefaultBackColor;\r
+            lbl_anamorphicError.Visible = false;\r
+        }\r
+\r
+        private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (check_2PassEncode.CheckState.ToString() == "Checked")\r
+            {\r
+                check_turbo.Enabled = true;\r
+            }\r
+            else\r
+            {\r
+                check_turbo.Enabled = false;\r
+                check_turbo.CheckState = CheckState.Unchecked;\r
+            }\r
+        }\r
+\r
+        private void check_largeFile_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (!text_destination.Text.Contains(".mp4"))\r
+            {\r
+                lbl_largeMp4Warning.Text = "Warning: Only mp4 files are supported";\r
+                lbl_largeMp4Warning.ForeColor = Color.Red;\r
+                check_largeFile.CheckState = CheckState.Unchecked;\r
+            }\r
+            else\r
+            {\r
+                lbl_largeMp4Warning.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";\r
+                lbl_largeMp4Warning.ForeColor = Color.Black;\r
+            }\r
         }\r
 \r
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
@@ -1289,14 +1328,7 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void check_largeFile_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (!text_destination.Text.Contains(".mp4"))\r
-            {\r
-                MessageBox.Show("This option is only compatible with the mp4 file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-                check_largeFile.CheckState = CheckState.Unchecked;\r
-            }\r
-        }\r
+\r
 \r
         private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -1541,8 +1573,8 @@ namespace Handbrake
                 case "None":\r
                     deinterlace = "";\r
                     break;\r
-                case "Origional (Fast)":\r
-                    deinterlace = " --deinterlace=1";\r
+                case "Original (Fast)":\r
+                    deinterlace = " --deinterlace=" + '"' + "-1" + '"';\r
                     break;\r
                 case "yadif (Slow)":\r
                     deinterlace = " --deinterlace=" + '"' + "0" + '"';\r
@@ -1585,8 +1617,7 @@ namespace Handbrake
             string denoise = "";\r
             string CRF = CheckCRF.CheckState.ToString();\r
 \r
-\r
-            if ((CRF == "Checked"))\r
+            if (CRF == "Checked")\r
                 CRF = " -Q ";\r
             else\r
                 CRF = "";\r
@@ -1651,7 +1682,7 @@ namespace Handbrake
                     break;\r
             }\r
 \r
-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + videoFramerate + turboH264 + largeFile + deblock + detelecine + denoise;\r
+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + largeFile + deblock + detelecine + denoise;\r
             // ----------------------------------------------------------------------\r
 \r
             // Audio Settings Tab\r
@@ -1700,7 +1731,7 @@ namespace Handbrake
                     Mixdown = "6ch";\r
                     break;\r
                 default:\r
-                    Mixdown = "stero";\r
+                    Mixdown = "";\r
                     break;\r
             }\r
 \r
@@ -1753,6 +1784,27 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+\r
+\r
+        private Functions.QueryParser thisQuery;\r
+        private void button1_Click(object sender, EventArgs e)\r
+        {\r
+            String query = "";\r
+            if (QueryEditorText.Text == "")\r
+            {\r
+                query = GenerateTheQuery();\r
+            }\r
+            else\r
+            {\r
+                query = QueryEditorText.Text;\r
+            }\r
+            thisQuery = Functions.QueryParser.Parse(query);\r
+            MessageBox.Show(thisQuery.DeTelecine.ToString());\r
+        }\r
+\r
+\r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index e11f7f8..8f40029 100644 (file)
--- 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);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(724, 335);\r
+            this.ClientSize = new System.Drawing.Size(727, 336);\r
             this.ControlBox = false;\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.label3);\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index a08591c..07c0f40 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -120,8 +120,8 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        #region Queue Management\r
 \r
+        #region Queue Management\r
         private void btn_up_Click(object sender, EventArgs e)\r
         {\r
             int count = list_queue.Items.Count;\r
@@ -162,6 +162,8 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
+\r
+\r
         #region Window Management\r
 \r
         private void btn_Close_Click(object sender, EventArgs e)\r