WinGui:

- presets added in line with http://handbrake.m0k.org/trac/wiki/BuiltInPresets

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

3 files changed, 409 insertions, 102 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 63ecde8eb..16e8c45bc 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -67,16 +67,23 @@ namespace Handbrake
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

             this.ToolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();

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

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

@@ -296,7 +303,7 @@ namespace Handbrake
             this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_Browse.Location = new System.Drawing.Point(415, 22);

+            this.btn_Browse.Location = new System.Drawing.Point(424, 22);

             this.btn_Browse.Name = "btn_Browse";

             this.btn_Browse.Size = new System.Drawing.Size(78, 22);

             this.btn_Browse.TabIndex = 2;

@@ -453,6 +460,7 @@ namespace Handbrake
             // 

             this.ISO_Open.DefaultExt = "ISO";

             this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.mpeg;*.vob";

+            this.ISO_Open.SupportMultiDottedExtensions = true;

             // 

             // FileToolStripMenuItem

             // 

@@ -556,54 +564,153 @@ namespace Handbrake
             // 

             this.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control;

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

-            this.mnu_preset,

+            this.mnu_animation,

             this.mnu_appleTv,

+            this.mnu_bedlam,

+            this.mnu_blind,

+            this.mnu_broke,

+            this.mnu_Classic,

+            this.mnu_CQR,

+            this.mnu_DSQ,

+            this.mnu_film,

             this.mnu_iphone,

-            this.mnu_presetPS3,

+            this.mnu_ipod,

+            this.mnu_ipodLow,

+            this.mnu_normal,

+            this.mnu_ps3,

             this.mnu_psp,

             this.mnu_qt,

             this.mnu_television,

-            this.mnu_film,

-            this.mnu_Classic,

-            this.mnu_normal,

             this.ToolStripSeparator4,

             this.mnu_ProgramDefaultOptions});

             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";

             this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);

             this.PresetsToolStripMenuItem.Text = "&Presets";

             // 

-            // mnu_preset

+            // mnu_animation

             // 

-            this.mnu_preset.Name = "mnu_preset";

-            this.mnu_preset.Size = new System.Drawing.Size(276, 22);

-            this.mnu_preset.Text = "iPod";

-            this.mnu_preset.Click += new System.EventHandler(this.mnu_preset_ipod133_Click);

+            this.mnu_animation.Name = "mnu_animation";

+            this.mnu_animation.Size = new System.Drawing.Size(276, 22);

+            this.mnu_animation.Text = "Animation";

+            this.mnu_animation.ToolTipText = "HandBrake\'s settings for cartoons, anime, and CGI.";

+            this.mnu_animation.Click += new System.EventHandler(this.mnu_animation_Click);

             // 

             // mnu_appleTv

             // 

             this.mnu_appleTv.Name = "mnu_appleTv";

             this.mnu_appleTv.Size = new System.Drawing.Size(276, 22);

             this.mnu_appleTv.Text = "Apple TV";

+            this.mnu_appleTv.ToolTipText = "HandBrake\'s settings for the AppleTV. \r\nProvides a good balance between quality a" +

+                "nd file size, and optimizes performance.";

             this.mnu_appleTv.Click += new System.EventHandler(this.mnu_appleTv_Click);

             // 

+            // mnu_bedlam

+            // 

+            this.mnu_bedlam.Name = "mnu_bedlam";

+            this.mnu_bedlam.Size = new System.Drawing.Size(276, 22);

+            this.mnu_bedlam.Text = "Bedlam";

+            this.mnu_bedlam.ToolTipText = "HandBrake\'s settings maxed out for slowest encoding and highest quality. \r\nUse at" +

+                " your own risk. So slow it\'s not just insane...it\'s a trip to the looney bin.";

+            this.mnu_bedlam.Click += new System.EventHandler(this.mnu_bedlam_Click);

+            // 

+            // mnu_blind

+            // 

+            this.mnu_blind.Name = "mnu_blind";

+            this.mnu_blind.Size = new System.Drawing.Size(276, 22);

+            this.mnu_blind.Text = "Blind";

+            this.mnu_blind.ToolTipText = "HandBrake\'s preset for impatient people who don\'t care about picture quality.";

+            this.mnu_blind.Click += new System.EventHandler(this.mnu_blind_Click);

+            // 

+            // mnu_broke

+            // 

+            this.mnu_broke.Name = "mnu_broke";

+            this.mnu_broke.Size = new System.Drawing.Size(276, 22);

+            this.mnu_broke.Text = "Broke";

+            this.mnu_broke.ToolTipText = "HandBrake\'s preset for people without a lot of money to waste on hard drives. \r\nT" +

+                "ries to maximize quality for burning to CDs, so you can party like it\'s 1999.";

+            this.mnu_broke.Click += new System.EventHandler(this.mnu_broke_Click);

+            // 

+            // mnu_Classic

+            // 

+            this.mnu_Classic.Name = "mnu_Classic";

+            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);

+            this.mnu_Classic.Text = "Classic";

+            this.mnu_Classic.ToolTipText = "HandBrake\'s traditional, faster, lower-quality settings.";

+            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);

+            // 

+            // mnu_CQR

+            // 

+            this.mnu_CQR.Name = "mnu_CQR";

+            this.mnu_CQR.Size = new System.Drawing.Size(276, 22);

+            this.mnu_CQR.Text = "Constant Quality Rate";

+            this.mnu_CQR.ToolTipText = "HandBrake\'s preset for consistently excellent quality in one pass, \r\nwith the dow" +

+                "nside of entirely unpredictable file sizes and bitrates.";

+            this.mnu_CQR.Click += new System.EventHandler(this.mnu_CQR_Click);

+            // 

+            // mnu_DSQ

+            // 

+            this.mnu_DSQ.Name = "mnu_DSQ";

+            this.mnu_DSQ.Size = new System.Drawing.Size(276, 22);

+            this.mnu_DSQ.Text = "Deux Six Quatre";

+            this.mnu_DSQ.ToolTipText = resources.GetString("mnu_DSQ.ToolTipText");

+            this.mnu_DSQ.Click += new System.EventHandler(this.mnu_DSQ_Click);

+            // 

+            // mnu_film

+            // 

+            this.mnu_film.Name = "mnu_film";

+            this.mnu_film.Size = new System.Drawing.Size(276, 22);

+            this.mnu_film.Text = "Film";

+            this.mnu_film.ToolTipText = "HandBrake\'s preset for feature films.";

+            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);

+            // 

             // mnu_iphone

             // 

             this.mnu_iphone.Name = "mnu_iphone";

             this.mnu_iphone.Size = new System.Drawing.Size(276, 22);

             this.mnu_iphone.Text = "iPhone";

+            this.mnu_iphone.ToolTipText = "HandBrake\'s settings for the iPhone.";

+            this.mnu_iphone.Click += new System.EventHandler(this.mnu_iphone_Click);

+            // 

+            // mnu_ipod

             // 

-            // mnu_presetPS3

+            this.mnu_ipod.Name = "mnu_ipod";

+            this.mnu_ipod.Size = new System.Drawing.Size(276, 22);

+            this.mnu_ipod.Text = "iPod High Rez";

+            this.mnu_ipod.ToolTipText = "HandBrake\'s high resolution settings for the iPod.\r\nGood video quality, great for" +

+                " viewing on a TV using your iPod.";

+            this.mnu_ipod.Click += new System.EventHandler(this.mnu_ipod_Click);

             // 

-            this.mnu_presetPS3.Name = "mnu_presetPS3";

-            this.mnu_presetPS3.Size = new System.Drawing.Size(276, 22);

-            this.mnu_presetPS3.Text = "PS3";

-            this.mnu_presetPS3.Click += new System.EventHandler(this.mnu_presetPS3_Click);

+            // mnu_ipodLow

+            // 

+            this.mnu_ipodLow.Name = "mnu_ipodLow";

+            this.mnu_ipodLow.Size = new System.Drawing.Size(276, 22);

+            this.mnu_ipodLow.Text = "iPod Low Rez";

+            this.mnu_ipodLow.ToolTipText = "HandBrake\'s low resolution settings for the iPod. \r\nOptimized for great playback " +

+                "on the iPod screen, with smaller file size.";

+            this.mnu_ipodLow.Click += new System.EventHandler(this.mnu_ipodLow_Click);

+            // 

+            // mnu_normal

+            // 

+            this.mnu_normal.Name = "mnu_normal";

+            this.mnu_normal.Size = new System.Drawing.Size(276, 22);

+            this.mnu_normal.Text = "Normal";

+            this.mnu_normal.ToolTipText = "HandBrake\'s normal, default settings.";

+            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);

+            // 

+            // mnu_ps3

+            // 

+            this.mnu_ps3.Name = "mnu_ps3";

+            this.mnu_ps3.Size = new System.Drawing.Size(276, 22);

+            this.mnu_ps3.Text = "PS3";

+            this.mnu_ps3.ToolTipText = "HandBrake\'s settings for the Sony PlayStation 3.";

+            this.mnu_ps3.Click += new System.EventHandler(this.mnu_PS3_Click);

             // 

             // mnu_psp

             // 

             this.mnu_psp.Name = "mnu_psp";

             this.mnu_psp.Size = new System.Drawing.Size(276, 22);

             this.mnu_psp.Text = "PSP";

+            this.mnu_psp.ToolTipText = "HandBrake\'s settings for the Sony PlayStation Portable.";

             this.mnu_psp.Click += new System.EventHandler(this.mnu_psp_Click);

             // 

             // mnu_qt

@@ -611,6 +718,8 @@ namespace Handbrake
             this.mnu_qt.Name = "mnu_qt";

             this.mnu_qt.Size = new System.Drawing.Size(276, 22);

             this.mnu_qt.Text = "Quicktime";

+            this.mnu_qt.ToolTipText = "HandBrake\'s high quality settings for use with QuickTime. \r\nIt can be slow, so us" +

+                "e it when the Normal preset doesn\'t look good enough.";

             this.mnu_qt.Click += new System.EventHandler(this.mnu_qt_Click);

             // 

             // mnu_television

@@ -618,29 +727,9 @@ namespace Handbrake
             this.mnu_television.Name = "mnu_television";

             this.mnu_television.Size = new System.Drawing.Size(276, 22);

             this.mnu_television.Text = "Television";

+            this.mnu_television.ToolTipText = "HandBrake\'s settings for video from television.";

             this.mnu_television.Click += new System.EventHandler(this.mnu_television_Click);

             // 

-            // mnu_film

-            // 

-            this.mnu_film.Name = "mnu_film";

-            this.mnu_film.Size = new System.Drawing.Size(276, 22);

-            this.mnu_film.Text = "Film";

-            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);

-            // 

-            // mnu_Classic

-            // 

-            this.mnu_Classic.Name = "mnu_Classic";

-            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);

-            this.mnu_Classic.Text = "Classic";

-            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);

-            // 

-            // mnu_normal

-            // 

-            this.mnu_normal.Name = "mnu_normal";

-            this.mnu_normal.Size = new System.Drawing.Size(276, 22);

-            this.mnu_normal.Text = "Normal";

-            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);

-            // 

             // ToolStripSeparator4

             // 

             this.ToolStripSeparator4.Name = "ToolStripSeparator4";

@@ -668,8 +757,8 @@ namespace Handbrake
             // 

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

             this.mnu_wiki,

-            this.mnu_onlineDocs,

-            this.mnu_faq});

+            this.mnu_faq,

+            this.mnu_onlineDocs});

             this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";

             this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(190, 22);

             this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";

@@ -677,15 +766,15 @@ namespace Handbrake
             // mnu_wiki

             // 

             this.mnu_wiki.Name = "mnu_wiki";

-            this.mnu_wiki.Size = new System.Drawing.Size(157, 22);

-            this.mnu_wiki.Text = "Wiki";

+            this.mnu_wiki.Size = new System.Drawing.Size(195, 22);

+            this.mnu_wiki.Text = "Wiki / User Guides";

             this.mnu_wiki.Click += new System.EventHandler(this.mnu_wiki_Click);

             // 

             // mnu_onlineDocs

             // 

             this.mnu_onlineDocs.Name = "mnu_onlineDocs";

-            this.mnu_onlineDocs.Size = new System.Drawing.Size(157, 22);

-            this.mnu_onlineDocs.Text = "Documentation";

+            this.mnu_onlineDocs.Size = new System.Drawing.Size(195, 22);

+            this.mnu_onlineDocs.Text = "Full Documentation List";

             this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);

             // 

             // mnu_faq

@@ -795,10 +884,10 @@ namespace Handbrake
             this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.RadioDVD.Location = new System.Drawing.Point(358, 18);

             this.RadioDVD.Name = "RadioDVD";

-            this.RadioDVD.Size = new System.Drawing.Size(51, 17);

+            this.RadioDVD.Size = new System.Drawing.Size(60, 17);

             this.RadioDVD.TabIndex = 20;

             this.RadioDVD.TabStop = true;

-            this.RadioDVD.Text = "DVD";

+            this.RadioDVD.Text = "Folder";

             this.RadioDVD.UseVisualStyleBackColor = true;

             // 

             // Label17

@@ -1909,9 +1998,8 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;

         internal System.Windows.Forms.ToolStripMenuItem mnu_options;

         internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;

-        internal System.Windows.Forms.ToolStripMenuItem mnu_preset;

+        internal System.Windows.Forms.ToolStripMenuItem mnu_ipod;

         internal System.Windows.Forms.ToolStripMenuItem mnu_appleTv;

-        internal System.Windows.Forms.ToolStripMenuItem mnu_presetPS3;

         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator4;

         internal System.Windows.Forms.ToolStripMenuItem mnu_ProgramDefaultOptions;

         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;

@@ -2041,6 +2129,14 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_normal;

         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;

         private System.Windows.Forms.ToolStripMenuItem mnu_open;

+        private System.Windows.Forms.ToolStripMenuItem mnu_bedlam;

+        private System.Windows.Forms.ToolStripMenuItem mnu_blind;

+        private System.Windows.Forms.ToolStripMenuItem mnu_broke;

+        private System.Windows.Forms.ToolStripMenuItem mnu_animation;

+        private System.Windows.Forms.ToolStripMenuItem mnu_CQR;

+        private System.Windows.Forms.ToolStripMenuItem mnu_DSQ;

+        private System.Windows.Forms.ToolStripMenuItem mnu_ipodLow;

+        private System.Windows.Forms.ToolStripMenuItem mnu_ps3;

 

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c8068cce2..def400cd5 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -413,74 +413,113 @@ namespace Handbrake
         #endregion

 

         #region Presets Menu

+        // Need to write a handler for file extension

 

-        private void mnu_preset_ipod133_Click(object sender, EventArgs e)

+        private void mnu_animation_Click(object sender, EventArgs e)

         {

-            CheckPixelRatio.CheckState = CheckState.Unchecked;

-            text_width.Text = "640";

-            text_height.Text = "Auto";

-            drp_videoEncoder.Text = "H.264 (iPod)";

+            // NEEDS MKV

+            CheckPixelRatio.CheckState = CheckState.Checked;

+            text_width.Text = "";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264";

             text_bitrate.Text = "1000";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

-            rtf_h264advanced.Text = "";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2";

+            drp_deInterlace_option.Text = "Origional (Fast)";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AAC";

         }

 

-

-

         private void mnu_appleTv_Click(object sender, EventArgs e)

         {

+            CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "2500";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

-            CheckPixelRatio.CheckState = CheckState.Checked;

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:no-dct-decimate=1:trellis=2";

+            rtf_h264advanced.Text = "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

             drp_crop.Text = "No Crop";

-            

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

         }

 

-        private void mnu_presetPS3_Click(object sender, EventArgs e)

+        private void mnu_bedlam_Click(object sender, EventArgs e)

         {

-            CheckPixelRatio.CheckState = CheckState.Unchecked;

+            // NEEDS MKV

+            CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "1800";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

-            CheckPixelRatio.CheckState = CheckState.Checked;

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AC3";

         }

 

-        //------------------------------NEW PRESETS START HERE---------------------------

-        private void mnu_normal_Click(object sender, EventArgs e)

+        private void mnu_blind_Click(object sender, EventArgs e)

         {

             CheckPixelRatio.CheckState = CheckState.Unchecked;

-            text_width.Text = "";

+            text_width.Text = "512";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "512";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

-            drp_audioBitrate.Text = "160";

-            CheckPixelRatio.CheckState = CheckState.Checked;

+            drp_audioBitrate.Text = "128";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_broke_Click(object sender, EventArgs e)

+        {

+            CheckPixelRatio.CheckState = CheckState.Unchecked;

+            text_width.Text = "640";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264";

+            text_bitrate.Text = "";

+            text_filesize.Text = "695";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "128";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:b-pyramid::direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AAC";

         }

 

         private void mnu_Classic_Click(object sender, EventArgs e)

@@ -489,86 +528,258 @@ namespace Handbrake
             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "1000";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Unchecked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_CQR_Click(object sender, EventArgs e)

+        {

+            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

+            text_width.Text = "";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264";

+            text_bitrate.Text = "";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 64;

+            SliderValue.Text = "64%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh ";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AC3";

         }

 

-        private void mnu_film_Click(object sender, EventArgs e)

+        private void mnu_DSQ_Click(object sender, EventArgs e)

         {

-            CheckPixelRatio.CheckState = CheckState.Unchecked;

+            // Needs MKV

+            CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "1600";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AC3";

+        }

+

+        private void mnu_film_Click(object sender, EventArgs e)

+        {

+            // Needs MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

+            text_width.Text = "";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264";

+            text_bitrate.Text = "2000";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "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";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AC3";

         }

 

-        private void mnu_television_Click(object sender, EventArgs e)

+        private void mnu_iphone_Click(object sender, EventArgs e)

         {

             CheckPixelRatio.CheckState = CheckState.Unchecked;

+            text_width.Text = "480";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264 (iPod)";

+            text_bitrate.Text = "960";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "128";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_ipod_Click(object sender, EventArgs e)

+        {

+            CheckPixelRatio.CheckState = CheckState.Unchecked;

+            text_width.Text = "640";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264 (iPod)";

+            text_bitrate.Text = "1500";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "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";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_ipodLow_Click(object sender, EventArgs e)

+        {

+            CheckPixelRatio.CheckState = CheckState.Unchecked;

+            text_width.Text = "320";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264 (iPod)";

+            text_bitrate.Text = "700";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "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";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_normal_Click(object sender, EventArgs e)

+        {

+            CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "1500";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "ref=2:bframes=2:subme=5:me=umh";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_PS3_Click(object sender, EventArgs e)

+        {

             CheckPixelRatio.CheckState = CheckState.Checked;

+            text_width.Text = "";

+            text_height.Text = "";

+            drp_videoEncoder.Text = "H.264";

+            text_bitrate.Text = "2500";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "level=41:subme=5:me=umh";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

         }

 

-        private void mnu_qt_Click(object sender, EventArgs e)

+        private void mnu_psp_Click(object sender, EventArgs e)

         {

             CheckPixelRatio.CheckState = CheckState.Unchecked;

+            text_width.Text = "368";

+            text_height.Text = "208";

+            drp_videoEncoder.Text = "H.264";

+            text_bitrate.Text = "1024";

+            text_filesize.Text = "";

+            slider_videoQuality.Value = 0;

+            SliderValue.Text = "0%";

+            drp_audioBitrate.Text = "160";

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

+            drp_audioSampleRate.Text = "48";

+            rtf_h264advanced.Text = "";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Unchecked;

+            drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Unchecked;

+            drp_audioCodec.Text = "AAC";

+        }

+

+        private void mnu_qt_Click(object sender, EventArgs e)

+        {

+            CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "2000";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

-            CheckPixelRatio.CheckState = CheckState.Checked;

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct-auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip";

+            drp_deInterlace_option.Text = "None";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AAC";

         }

 

-        private void mnu_psp_Click(object sender, EventArgs e)

+        private void mnu_television_Click(object sender, EventArgs e)

         {

+            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Unchecked;

             text_width.Text = "";

             text_height.Text = "";

             drp_videoEncoder.Text = "H.264";

-            text_bitrate.Text = "3000";

+            text_bitrate.Text = "1300";

             text_filesize.Text = "";

             slider_videoQuality.Value = 0;

             SliderValue.Text = "0%";

             drp_audioBitrate.Text = "160";

-            CheckPixelRatio.CheckState = CheckState.Checked;

+            Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            rtf_h264advanced.Text = "level=41";

+            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip";

+            drp_deInterlace_option.Text = "Origional (Fast)";

+            check_2PassEncode.CheckState = CheckState.Checked;

             drp_crop.Text = "No Crop";

+            check_turbo.CheckState = CheckState.Checked;

+            drp_audioCodec.Text = "AAC";

         }

 

 

+

         private void mnu_ProgramDefaultOptions_Click(object sender, EventArgs e)

         {

             //Source

@@ -622,14 +833,14 @@ namespace Handbrake
            Process.Start("http://handbrake.m0k.org/trac");

         }

 

-        private void mnu_onlineDocs_Click(object sender, EventArgs e)

+        private void mnu_faq_Click(object sender, EventArgs e)

         {

-            Process.Start("http://handbrake.m0k.org/?page_id=11");

+            Process.Start("http://handbrake.m0k.org/trac/wiki/WindowsGuiFaq");

         }

 

-        private void mnu_faq_Click(object sender, EventArgs e)

+        private void mnu_onlineDocs_Click(object sender, EventArgs e)

         {

-            Process.Start("http://handbrake.m0k.org/trac/wiki/WindowsGuiFaq");

+            Process.Start("http://handbrake.m0k.org/?page_id=11");

         }

 

         private void mnu_homepage_Click(object sender, EventArgs e)

@@ -1622,11 +1833,6 @@ namespace Handbrake
         }

 

         #endregion

-

-

-      

-

-

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

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index f8feed8cd..3bfbc2a11 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -172,6 +172,11 @@
         Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=

 </value>

   </data>

+  <data name="mnu_DSQ.ToolTipText" xml:space="preserve">

+    <value>HandBrake's preset for true high profile x264 quality. 

+A good balance of quality and speed, based on community standards found in the wild. 

+This preset will give you a much better sense of x264's capabilities than vanilla main profile.</value>

+  </data>

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

     <value>94, 17</value>

   </metadata>