OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 16 Aug 2007 16:44:41 +0000 (16:44 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 16 Aug 2007 16:44:41 +0000 (16:44 +0000)
- presets added in line with http://handbrake.m0k.org/trac/wiki/BuiltInPresets

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

win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmMain.resx

index 63ecde8..16e8c45 100644 (file)
@@ -67,16 +67,23 @@ namespace Handbrake
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
             this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_preset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_animation = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_appleTv = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_bedlam = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_blind = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_broke = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_Classic = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_CQR = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_DSQ = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_film = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_iphone = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_presetPS3 = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_ipod = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_ipodLow = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_normal = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_ps3 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_psp = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_qt = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_television = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_film = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_Classic = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_normal = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_ProgramDefaultOptions = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -296,7 +303,7 @@ namespace Handbrake
             this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_Browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Browse.Location = new System.Drawing.Point(415, 22);\r
+            this.btn_Browse.Location = new System.Drawing.Point(424, 22);\r
             this.btn_Browse.Name = "btn_Browse";\r
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 2;\r
@@ -453,6 +460,7 @@ namespace Handbrake
             // \r
             this.ISO_Open.DefaultExt = "ISO";\r
             this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.mpeg;*.vob";\r
+            this.ISO_Open.SupportMultiDottedExtensions = true;\r
             // \r
             // FileToolStripMenuItem\r
             // \r
@@ -556,54 +564,153 @@ namespace Handbrake
             // \r
             this.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control;\r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_preset,\r
+            this.mnu_animation,\r
             this.mnu_appleTv,\r
+            this.mnu_bedlam,\r
+            this.mnu_blind,\r
+            this.mnu_broke,\r
+            this.mnu_Classic,\r
+            this.mnu_CQR,\r
+            this.mnu_DSQ,\r
+            this.mnu_film,\r
             this.mnu_iphone,\r
-            this.mnu_presetPS3,\r
+            this.mnu_ipod,\r
+            this.mnu_ipodLow,\r
+            this.mnu_normal,\r
+            this.mnu_ps3,\r
             this.mnu_psp,\r
             this.mnu_qt,\r
             this.mnu_television,\r
-            this.mnu_film,\r
-            this.mnu_Classic,\r
-            this.mnu_normal,\r
             this.ToolStripSeparator4,\r
             this.mnu_ProgramDefaultOptions});\r
             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";\r
             this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);\r
             this.PresetsToolStripMenuItem.Text = "&Presets";\r
             // \r
-            // mnu_preset\r
+            // mnu_animation\r
             // \r
-            this.mnu_preset.Name = "mnu_preset";\r
-            this.mnu_preset.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_preset.Text = "iPod";\r
-            this.mnu_preset.Click += new System.EventHandler(this.mnu_preset_ipod133_Click);\r
+            this.mnu_animation.Name = "mnu_animation";\r
+            this.mnu_animation.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_animation.Text = "Animation";\r
+            this.mnu_animation.ToolTipText = "HandBrake\'s settings for cartoons, anime, and CGI.";\r
+            this.mnu_animation.Click += new System.EventHandler(this.mnu_animation_Click);\r
             // \r
             // mnu_appleTv\r
             // \r
             this.mnu_appleTv.Name = "mnu_appleTv";\r
             this.mnu_appleTv.Size = new System.Drawing.Size(276, 22);\r
             this.mnu_appleTv.Text = "Apple TV";\r
+            this.mnu_appleTv.ToolTipText = "HandBrake\'s settings for the AppleTV. \r\nProvides a good balance between quality a" +\r
+                "nd file size, and optimizes performance.";\r
             this.mnu_appleTv.Click += new System.EventHandler(this.mnu_appleTv_Click);\r
             // \r
+            // mnu_bedlam\r
+            // \r
+            this.mnu_bedlam.Name = "mnu_bedlam";\r
+            this.mnu_bedlam.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_bedlam.Text = "Bedlam";\r
+            this.mnu_bedlam.ToolTipText = "HandBrake\'s settings maxed out for slowest encoding and highest quality. \r\nUse at" +\r
+                " your own risk. So slow it\'s not just insane...it\'s a trip to the looney bin.";\r
+            this.mnu_bedlam.Click += new System.EventHandler(this.mnu_bedlam_Click);\r
+            // \r
+            // mnu_blind\r
+            // \r
+            this.mnu_blind.Name = "mnu_blind";\r
+            this.mnu_blind.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_blind.Text = "Blind";\r
+            this.mnu_blind.ToolTipText = "HandBrake\'s preset for impatient people who don\'t care about picture quality.";\r
+            this.mnu_blind.Click += new System.EventHandler(this.mnu_blind_Click);\r
+            // \r
+            // mnu_broke\r
+            // \r
+            this.mnu_broke.Name = "mnu_broke";\r
+            this.mnu_broke.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_broke.Text = "Broke";\r
+            this.mnu_broke.ToolTipText = "HandBrake\'s preset for people without a lot of money to waste on hard drives. \r\nT" +\r
+                "ries to maximize quality for burning to CDs, so you can party like it\'s 1999.";\r
+            this.mnu_broke.Click += new System.EventHandler(this.mnu_broke_Click);\r
+            // \r
+            // mnu_Classic\r
+            // \r
+            this.mnu_Classic.Name = "mnu_Classic";\r
+            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_Classic.Text = "Classic";\r
+            this.mnu_Classic.ToolTipText = "HandBrake\'s traditional, faster, lower-quality settings.";\r
+            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);\r
+            // \r
+            // mnu_CQR\r
+            // \r
+            this.mnu_CQR.Name = "mnu_CQR";\r
+            this.mnu_CQR.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_CQR.Text = "Constant Quality Rate";\r
+            this.mnu_CQR.ToolTipText = "HandBrake\'s preset for consistently excellent quality in one pass, \r\nwith the dow" +\r
+                "nside of entirely unpredictable file sizes and bitrates.";\r
+            this.mnu_CQR.Click += new System.EventHandler(this.mnu_CQR_Click);\r
+            // \r
+            // mnu_DSQ\r
+            // \r
+            this.mnu_DSQ.Name = "mnu_DSQ";\r
+            this.mnu_DSQ.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_DSQ.Text = "Deux Six Quatre";\r
+            this.mnu_DSQ.ToolTipText = resources.GetString("mnu_DSQ.ToolTipText");\r
+            this.mnu_DSQ.Click += new System.EventHandler(this.mnu_DSQ_Click);\r
+            // \r
+            // mnu_film\r
+            // \r
+            this.mnu_film.Name = "mnu_film";\r
+            this.mnu_film.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_film.Text = "Film";\r
+            this.mnu_film.ToolTipText = "HandBrake\'s preset for feature films.";\r
+            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);\r
+            // \r
             // mnu_iphone\r
             // \r
             this.mnu_iphone.Name = "mnu_iphone";\r
             this.mnu_iphone.Size = new System.Drawing.Size(276, 22);\r
             this.mnu_iphone.Text = "iPhone";\r
+            this.mnu_iphone.ToolTipText = "HandBrake\'s settings for the iPhone.";\r
+            this.mnu_iphone.Click += new System.EventHandler(this.mnu_iphone_Click);\r
+            // \r
+            // mnu_ipod\r
             // \r
-            // mnu_presetPS3\r
+            this.mnu_ipod.Name = "mnu_ipod";\r
+            this.mnu_ipod.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_ipod.Text = "iPod High Rez";\r
+            this.mnu_ipod.ToolTipText = "HandBrake\'s high resolution settings for the iPod.\r\nGood video quality, great for" +\r
+                " viewing on a TV using your iPod.";\r
+            this.mnu_ipod.Click += new System.EventHandler(this.mnu_ipod_Click);\r
             // \r
-            this.mnu_presetPS3.Name = "mnu_presetPS3";\r
-            this.mnu_presetPS3.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_presetPS3.Text = "PS3";\r
-            this.mnu_presetPS3.Click += new System.EventHandler(this.mnu_presetPS3_Click);\r
+            // mnu_ipodLow\r
+            // \r
+            this.mnu_ipodLow.Name = "mnu_ipodLow";\r
+            this.mnu_ipodLow.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_ipodLow.Text = "iPod Low Rez";\r
+            this.mnu_ipodLow.ToolTipText = "HandBrake\'s low resolution settings for the iPod. \r\nOptimized for great playback " +\r
+                "on the iPod screen, with smaller file size.";\r
+            this.mnu_ipodLow.Click += new System.EventHandler(this.mnu_ipodLow_Click);\r
+            // \r
+            // mnu_normal\r
+            // \r
+            this.mnu_normal.Name = "mnu_normal";\r
+            this.mnu_normal.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_normal.Text = "Normal";\r
+            this.mnu_normal.ToolTipText = "HandBrake\'s normal, default settings.";\r
+            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);\r
+            // \r
+            // mnu_ps3\r
+            // \r
+            this.mnu_ps3.Name = "mnu_ps3";\r
+            this.mnu_ps3.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_ps3.Text = "PS3";\r
+            this.mnu_ps3.ToolTipText = "HandBrake\'s settings for the Sony PlayStation 3.";\r
+            this.mnu_ps3.Click += new System.EventHandler(this.mnu_PS3_Click);\r
             // \r
             // mnu_psp\r
             // \r
             this.mnu_psp.Name = "mnu_psp";\r
             this.mnu_psp.Size = new System.Drawing.Size(276, 22);\r
             this.mnu_psp.Text = "PSP";\r
+            this.mnu_psp.ToolTipText = "HandBrake\'s settings for the Sony PlayStation Portable.";\r
             this.mnu_psp.Click += new System.EventHandler(this.mnu_psp_Click);\r
             // \r
             // mnu_qt\r
@@ -611,6 +718,8 @@ namespace Handbrake
             this.mnu_qt.Name = "mnu_qt";\r
             this.mnu_qt.Size = new System.Drawing.Size(276, 22);\r
             this.mnu_qt.Text = "Quicktime";\r
+            this.mnu_qt.ToolTipText = "HandBrake\'s high quality settings for use with QuickTime. \r\nIt can be slow, so us" +\r
+                "e it when the Normal preset doesn\'t look good enough.";\r
             this.mnu_qt.Click += new System.EventHandler(this.mnu_qt_Click);\r
             // \r
             // mnu_television\r
@@ -618,29 +727,9 @@ namespace Handbrake
             this.mnu_television.Name = "mnu_television";\r
             this.mnu_television.Size = new System.Drawing.Size(276, 22);\r
             this.mnu_television.Text = "Television";\r
+            this.mnu_television.ToolTipText = "HandBrake\'s settings for video from television.";\r
             this.mnu_television.Click += new System.EventHandler(this.mnu_television_Click);\r
             // \r
-            // mnu_film\r
-            // \r
-            this.mnu_film.Name = "mnu_film";\r
-            this.mnu_film.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_film.Text = "Film";\r
-            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);\r
-            // \r
-            // mnu_Classic\r
-            // \r
-            this.mnu_Classic.Name = "mnu_Classic";\r
-            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_Classic.Text = "Classic";\r
-            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);\r
-            // \r
-            // mnu_normal\r
-            // \r
-            this.mnu_normal.Name = "mnu_normal";\r
-            this.mnu_normal.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_normal.Text = "Normal";\r
-            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);\r
-            // \r
             // ToolStripSeparator4\r
             // \r
             this.ToolStripSeparator4.Name = "ToolStripSeparator4";\r
@@ -668,8 +757,8 @@ namespace Handbrake
             // \r
             this.OnlineDocumentationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.mnu_wiki,\r
-            this.mnu_onlineDocs,\r
-            this.mnu_faq});\r
+            this.mnu_faq,\r
+            this.mnu_onlineDocs});\r
             this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";\r
             this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(190, 22);\r
             this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";\r
@@ -677,15 +766,15 @@ namespace Handbrake
             // mnu_wiki\r
             // \r
             this.mnu_wiki.Name = "mnu_wiki";\r
-            this.mnu_wiki.Size = new System.Drawing.Size(157, 22);\r
-            this.mnu_wiki.Text = "Wiki";\r
+            this.mnu_wiki.Size = new System.Drawing.Size(195, 22);\r
+            this.mnu_wiki.Text = "Wiki / User Guides";\r
             this.mnu_wiki.Click += new System.EventHandler(this.mnu_wiki_Click);\r
             // \r
             // mnu_onlineDocs\r
             // \r
             this.mnu_onlineDocs.Name = "mnu_onlineDocs";\r
-            this.mnu_onlineDocs.Size = new System.Drawing.Size(157, 22);\r
-            this.mnu_onlineDocs.Text = "Documentation";\r
+            this.mnu_onlineDocs.Size = new System.Drawing.Size(195, 22);\r
+            this.mnu_onlineDocs.Text = "Full Documentation List";\r
             this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);\r
             // \r
             // mnu_faq\r
@@ -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)));\r
             this.RadioDVD.Location = new System.Drawing.Point(358, 18);\r
             this.RadioDVD.Name = "RadioDVD";\r
-            this.RadioDVD.Size = new System.Drawing.Size(51, 17);\r
+            this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
             this.RadioDVD.TabIndex = 20;\r
             this.RadioDVD.TabStop = true;\r
-            this.RadioDVD.Text = "DVD";\r
+            this.RadioDVD.Text = "Folder";\r
             this.RadioDVD.UseVisualStyleBackColor = true;\r
             // \r
             // Label17\r
@@ -1909,9 +1998,8 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_options;\r
         internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_preset;\r
+        internal System.Windows.Forms.ToolStripMenuItem mnu_ipod;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_appleTv;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_presetPS3;\r
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator4;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_ProgramDefaultOptions;\r
         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;\r
@@ -2041,6 +2129,14 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_normal;\r
         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_open;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_bedlam;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_blind;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_broke;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_animation;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_CQR;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_DSQ;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_ipodLow;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_ps3;\r
 \r
     }\r
 }
\ No newline at end of file
index c8068cc..def400c 100644 (file)
@@ -413,74 +413,113 @@ namespace Handbrake
         #endregion\r
 \r
         #region Presets Menu\r
+        // Need to write a handler for file extension\r
 \r
-        private void mnu_preset_ipod133_Click(object sender, EventArgs e)\r
+        private void mnu_animation_Click(object sender, EventArgs e)\r
         {\r
-            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
-            text_width.Text = "640";\r
-            text_height.Text = "Auto";\r
-            drp_videoEncoder.Text = "H.264 (iPod)";\r
+            // NEEDS MKV\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            text_width.Text = "";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264";\r
             text_bitrate.Text = "1000";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
-            rtf_h264advanced.Text = "";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            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";\r
+            drp_deInterlace_option.Text = "Origional (Fast)";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
-\r
-\r
         private void mnu_appleTv_Click(object sender, EventArgs e)\r
         {\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "2500";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
-            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:no-dct-decimate=1:trellis=2";\r
+            rtf_h264advanced.Text = "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
             drp_crop.Text = "No Crop";\r
-            \r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
-        private void mnu_presetPS3_Click(object sender, EventArgs e)\r
+        private void mnu_bedlam_Click(object sender, EventArgs e)\r
         {\r
-            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            // NEEDS MKV\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "1800";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
-            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AC3";\r
         }\r
 \r
-        //------------------------------NEW PRESETS START HERE---------------------------\r
-        private void mnu_normal_Click(object sender, EventArgs e)\r
+        private void mnu_blind_Click(object sender, EventArgs e)\r
         {\r
             CheckPixelRatio.CheckState = CheckState.Unchecked;\r
-            text_width.Text = "";\r
+            text_width.Text = "512";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "512";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
-            drp_audioBitrate.Text = "160";\r
-            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            drp_audioBitrate.Text = "128";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            rtf_h264advanced.Text = "";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_broke_Click(object sender, EventArgs e)\r
+        {\r
+            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            text_width.Text = "640";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264";\r
+            text_bitrate.Text = "";\r
+            text_filesize.Text = "695";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "128";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
         private void mnu_Classic_Click(object sender, EventArgs e)\r
@@ -489,86 +528,258 @@ namespace Handbrake
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "1000";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Unchecked;\r
+            drp_audioSampleRate.Text = "48";\r
+            rtf_h264advanced.Text = "";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_CQR_Click(object sender, EventArgs e)\r
+        {\r
+            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
+            text_width.Text = "";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264";\r
+            text_bitrate.Text = "";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 64;\r
+            SliderValue.Text = "64%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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 ";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AC3";\r
         }\r
 \r
-        private void mnu_film_Click(object sender, EventArgs e)\r
+        private void mnu_DSQ_Click(object sender, EventArgs e)\r
         {\r
-            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            // Needs MKV\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "1600";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AC3";\r
+        }\r
+\r
+        private void mnu_film_Click(object sender, EventArgs e)\r
+        {\r
+            // Needs MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
+            text_width.Text = "";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264";\r
+            text_bitrate.Text = "2000";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AC3";\r
         }\r
 \r
-        private void mnu_television_Click(object sender, EventArgs e)\r
+        private void mnu_iphone_Click(object sender, EventArgs e)\r
         {\r
             CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            text_width.Text = "480";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264 (iPod)";\r
+            text_bitrate.Text = "960";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "128";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            rtf_h264advanced.Text = "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_ipod_Click(object sender, EventArgs e)\r
+        {\r
+            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            text_width.Text = "640";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264 (iPod)";\r
+            text_bitrate.Text = "1500";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_ipodLow_Click(object sender, EventArgs e)\r
+        {\r
+            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            text_width.Text = "320";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264 (iPod)";\r
+            text_bitrate.Text = "700";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_normal_Click(object sender, EventArgs e)\r
+        {\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "1500";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            rtf_h264advanced.Text = "ref=2:bframes=2:subme=5:me=umh";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_PS3_Click(object sender, EventArgs e)\r
+        {\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
+            text_width.Text = "";\r
+            text_height.Text = "";\r
+            drp_videoEncoder.Text = "H.264";\r
+            text_bitrate.Text = "2500";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            rtf_h264advanced.Text = "level=41:subme=5:me=umh";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
-        private void mnu_qt_Click(object sender, EventArgs e)\r
+        private void mnu_psp_Click(object sender, EventArgs e)\r
         {\r
             CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+            text_width.Text = "368";\r
+            text_height.Text = "208";\r
+            drp_videoEncoder.Text = "H.264";\r
+            text_bitrate.Text = "1024";\r
+            text_filesize.Text = "";\r
+            slider_videoQuality.Value = 0;\r
+            SliderValue.Text = "0%";\r
+            drp_audioBitrate.Text = "160";\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+            drp_audioSampleRate.Text = "48";\r
+            rtf_h264advanced.Text = "";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
+            drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Unchecked;\r
+            drp_audioCodec.Text = "AAC";\r
+        }\r
+\r
+        private void mnu_qt_Click(object sender, EventArgs e)\r
+        {\r
+            CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "2000";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
-            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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";\r
+            drp_deInterlace_option.Text = "None";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
-        private void mnu_psp_Click(object sender, EventArgs e)\r
+        private void mnu_television_Click(object sender, EventArgs e)\r
         {\r
+            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Unchecked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
             drp_videoEncoder.Text = "H.264";\r
-            text_bitrate.Text = "3000";\r
+            text_bitrate.Text = "1300";\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
             drp_audioBitrate.Text = "160";\r
-            CheckPixelRatio.CheckState = CheckState.Checked;\r
+            Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "level=41";\r
+            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";\r
+            drp_deInterlace_option.Text = "Origional (Fast)";\r
+            check_2PassEncode.CheckState = CheckState.Checked;\r
             drp_crop.Text = "No Crop";\r
+            check_turbo.CheckState = CheckState.Checked;\r
+            drp_audioCodec.Text = "AAC";\r
         }\r
 \r
 \r
+\r
         private void mnu_ProgramDefaultOptions_Click(object sender, EventArgs e)\r
         {\r
             //Source\r
@@ -622,14 +833,14 @@ namespace Handbrake
            Process.Start("http://handbrake.m0k.org/trac");\r
         }\r
 \r
-        private void mnu_onlineDocs_Click(object sender, EventArgs e)\r
+        private void mnu_faq_Click(object sender, EventArgs e)\r
         {\r
-            Process.Start("http://handbrake.m0k.org/?page_id=11");\r
+            Process.Start("http://handbrake.m0k.org/trac/wiki/WindowsGuiFaq");\r
         }\r
 \r
-        private void mnu_faq_Click(object sender, EventArgs e)\r
+        private void mnu_onlineDocs_Click(object sender, EventArgs e)\r
         {\r
-            Process.Start("http://handbrake.m0k.org/trac/wiki/WindowsGuiFaq");\r
+            Process.Start("http://handbrake.m0k.org/?page_id=11");\r
         }\r
 \r
         private void mnu_homepage_Click(object sender, EventArgs e)\r
@@ -1622,11 +1833,6 @@ namespace Handbrake
         }\r
 \r
         #endregion\r
-\r
-\r
-      \r
-\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file
index f8feed8..3bfbc2a 100644 (file)
         Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=\r
 </value>\r
   </data>\r
+  <data name="mnu_DSQ.ToolTipText" xml:space="preserve">\r
+    <value>HandBrake's preset for true high profile x264 quality. \r
+A good balance of quality and speed, based on community standards found in the wild. \r
+This preset will give you a much better sense of x264's capabilities than vanilla main profile.</value>\r
+  </data>\r
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>94, 17</value>\r
   </metadata>\r