OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.Designer.cs
index 5814bda..5aa4796 100644 (file)
@@ -36,8 +36,10 @@ namespace Handbrake
         {\r
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\r
+            System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -72,7 +74,6 @@ namespace Handbrake
             this.drp_audenc_2 = new System.Windows.Forms.ComboBox();\r
             this.drp_audbit_2 = new System.Windows.Forms.ComboBox();\r
             this.drp_audsr_2 = new System.Windows.Forms.ComboBox();\r
-            this.check_fileMode = new System.Windows.Forms.CheckBox();\r
             this.drp_audsr_3 = new System.Windows.Forms.ComboBox();\r
             this.drp_audbit_3 = new System.Windows.Forms.ComboBox();\r
             this.drp_audenc_3 = new System.Windows.Forms.ComboBox();\r
@@ -81,6 +82,11 @@ namespace Handbrake
             this.drp_audbit_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audenc_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audmix_4 = new System.Windows.Forms.ComboBox();\r
+            this.drop_format = new System.Windows.Forms.ComboBox();\r
+            this.lbl_src_res = new System.Windows.Forms.Label();\r
+            this.lbl_duration = new System.Windows.Forms.Label();\r
+            this.label_duration = new System.Windows.Forms.Label();\r
+            this.label7 = new System.Windows.Forms.Label();\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
@@ -91,34 +97,33 @@ namespace Handbrake
             this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
             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_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\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
-            this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_handbrake_forums = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
-            this.btn_Browse = new System.Windows.Forms.Button();\r
             this.Label13 = new System.Windows.Forms.Label();\r
             this.Label17 = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label10 = new System.Windows.Forms.Label();\r
             this.groupBox_output = new System.Windows.Forms.GroupBox();\r
+            this.label5 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
-            this.lbl_encode = new System.Windows.Forms.Label();\r
             this.TabPage2 = new System.Windows.Forms.TabPage();\r
             this.lbl_drc4 = new System.Windows.Forms.Label();\r
             this.lbl_drc3 = new System.Windows.Forms.Label();\r
@@ -126,10 +131,10 @@ namespace Handbrake
             this.lbl_drc1 = new System.Windows.Forms.Label();\r
             this.trackBar4 = new System.Windows.Forms.TrackBar();\r
             this.drp_track4Audio = new System.Windows.Forms.ComboBox();\r
-            this.label21 = new System.Windows.Forms.Label();\r
+            this.lbl_t4 = new System.Windows.Forms.Label();\r
             this.trackBar3 = new System.Windows.Forms.TrackBar();\r
             this.drp_track3Audio = new System.Windows.Forms.ComboBox();\r
-            this.label18 = new System.Windows.Forms.Label();\r
+            this.lbl_t3 = new System.Windows.Forms.Label();\r
             this.trackBar2 = new System.Windows.Forms.TrackBar();\r
             this.label16 = new System.Windows.Forms.Label();\r
             this.trackBar1 = new System.Windows.Forms.TrackBar();\r
@@ -160,6 +165,12 @@ 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.slider_deblock = new System.Windows.Forms.TrackBar();\r
+            this.label8 = new System.Windows.Forms.Label();\r
+            this.lbl_deblockVal = new System.Windows.Forms.Label();\r
+            this.check_customCrop = new System.Windows.Forms.RadioButton();\r
+            this.check_autoCrop = new System.Windows.Forms.RadioButton();\r
+            this.check_decomb = new System.Windows.Forms.CheckBox();\r
             this.label6 = new System.Windows.Forms.Label();\r
             this.drp_anamorphic = new System.Windows.Forms.ComboBox();\r
             this.text_bottom = new System.Windows.Forms.NumericUpDown();\r
@@ -175,19 +186,14 @@ namespace Handbrake
             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
-            this.check_deblock = new System.Windows.Forms.CheckBox();\r
             this.check_detelecine = new System.Windows.Forms.CheckBox();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
-            this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
-            this.Label8 = new System.Windows.Forms.Label();\r
             this.Label1 = new System.Windows.Forms.Label();\r
             this.Label53 = new System.Windows.Forms.Label();\r
             this.Label52 = new System.Windows.Forms.Label();\r
             this.Label51 = new System.Windows.Forms.Label();\r
-            this.Label50 = new System.Windows.Forms.Label();\r
             this.Label15 = new System.Windows.Forms.Label();\r
-            this.drp_crop = new System.Windows.Forms.ComboBox();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
@@ -196,13 +202,10 @@ namespace Handbrake
             this.label43 = new System.Windows.Forms.Label();\r
             this.btn_reset = new System.Windows.Forms.Button();\r
             this.rtf_x264Query = new System.Windows.Forms.RichTextBox();\r
-            this.label35 = new System.Windows.Forms.Label();\r
             this.check_Cabac = new System.Windows.Forms.CheckBox();\r
-            this.label36 = new System.Windows.Forms.Label();\r
             this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
-            this.label37 = new System.Windows.Forms.Label();\r
             this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
-            this.label39 = new System.Windows.Forms.Label();\r
+            this.lbl_trellis = new System.Windows.Forms.Label();\r
             this.drop_trellis = new System.Windows.Forms.ComboBox();\r
             this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
             this.label41 = new System.Windows.Forms.Label();\r
@@ -210,7 +213,6 @@ namespace Handbrake
             this.panel3 = new System.Windows.Forms.Panel();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
-            this.label44 = new System.Windows.Forms.Label();\r
             this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
             this.label45 = new System.Windows.Forms.Label();\r
             this.drop_analysis = new System.Windows.Forms.ComboBox();\r
@@ -220,25 +222,19 @@ namespace Handbrake
             this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
             this.label54 = new System.Windows.Forms.Label();\r
             this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
-            this.label57 = new System.Windows.Forms.Label();\r
             this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
-            this.label58 = new System.Windows.Forms.Label();\r
             this.check_BidirectionalRefinement = new System.Windows.Forms.CheckBox();\r
-            this.label59 = new System.Windows.Forms.Label();\r
-            this.check_bFrameDistortion = new System.Windows.Forms.CheckBox();\r
-            this.label60 = new System.Windows.Forms.Label();\r
+            this.check_bFrameRateDistortion = new System.Windows.Forms.CheckBox();\r
             this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
-            this.label61 = new System.Windows.Forms.Label();\r
+            this.lbl_direct_prediction = new System.Windows.Forms.Label();\r
             this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
             this.label62 = new System.Windows.Forms.Label();\r
             this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
-            this.label63 = new System.Windows.Forms.Label();\r
             this.label64 = new System.Windows.Forms.Label();\r
             this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
             this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
             this.tabPage4 = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
-            this.btn_copy2C = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
             this.btn_generate_Query = new System.Windows.Forms.Button();\r
             this.label33 = new System.Windows.Forms.Label();\r
@@ -248,14 +244,25 @@ namespace Handbrake
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.treeView_presets = new System.Windows.Forms.TreeView();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
-            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
             this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
             this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.btn_minimize = new System.Windows.Forms.ToolStripButton();\r
+            this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
+            this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
+            this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
             Label38 = new System.Windows.Forms.Label();\r
+            notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -268,6 +275,7 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();\r
             this.TabPage3.SuspendLayout();\r
             this.TabPage1.SuspendLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_bottom)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_top)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_left)).BeginInit();\r
@@ -279,6 +287,7 @@ namespace Handbrake
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
+            this.StatusStrip.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -286,12 +295,27 @@ namespace Handbrake
             Label38.AutoSize = true;\r
             Label38.BackColor = System.Drawing.Color.Transparent;\r
             Label38.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            Label38.Location = new System.Drawing.Point(304, 65);\r
+            Label38.Location = new System.Drawing.Point(334, 38);\r
             Label38.Name = "Label38";\r
             Label38.Size = new System.Drawing.Size(108, 13);\r
             Label38.TabIndex = 11;\r
             Label38.Text = "Target Size (MB):";\r
             // \r
+            // notifyIconMenu\r
+            // \r
+            notifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_restore});\r
+            notifyIconMenu.Name = "notifyIconMenu";\r
+            notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
+            notifyIconMenu.Size = new System.Drawing.Size(129, 26);\r
+            // \r
+            // btn_restore\r
+            // \r
+            this.btn_restore.Name = "btn_restore";\r
+            this.btn_restore.Size = new System.Drawing.Size(128, 22);\r
+            this.btn_restore.Text = "Restore";\r
+            this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);\r
+            // \r
             // DVD_Save\r
             // \r
             this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|avi|*.avi|ogm|*.ogm|mkv|*.mkv";\r
@@ -352,9 +376,9 @@ namespace Handbrake
             this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_source.Location = new System.Drawing.Point(99, 19);\r
             this.text_source.Name = "text_source";\r
-            this.text_source.Size = new System.Drawing.Size(429, 21);\r
+            this.text_source.Size = new System.Drawing.Size(584, 21);\r
             this.text_source.TabIndex = 1;\r
-            this.text_source.Text = "Click \'Browse\' to continue";\r
+            this.text_source.Text = "Click \'Source\' to continue";\r
             this.ToolTip.SetToolTip(this.text_source, "The input source location.");\r
             // \r
             // text_destination\r
@@ -362,7 +386,7 @@ namespace Handbrake
             this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_destination.Location = new System.Drawing.Point(99, 19);\r
             this.text_destination.Name = "text_destination";\r
-            this.text_destination.Size = new System.Drawing.Size(493, 21);\r
+            this.text_destination.Size = new System.Drawing.Size(503, 21);\r
             this.text_destination.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");\r
             this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);\r
@@ -373,12 +397,13 @@ namespace Handbrake
             this.drp_videoEncoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_videoEncoder.FormattingEnabled = true;\r
             this.drp_videoEncoder.Items.AddRange(new object[] {\r
-            "Mpeg 4",\r
-            "Xvid",\r
-            "H.264"});\r
-            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);\r
+            "MPEG-4 (FFmpeg)",\r
+            "MPEG-4 (XviD)",\r
+            "H.264 (x264)",\r
+            "VP3 (Theora)"});\r
+            this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
-            this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
+            this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21);\r
             this.drp_videoEncoder.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
@@ -398,9 +423,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_1.Location = new System.Drawing.Point(537, 53);\r
+            this.drp_audbit_1.Location = new System.Drawing.Point(546, 53);\r
             this.drp_audbit_1.Name = "drp_audbit_1";\r
-            this.drp_audbit_1.Size = new System.Drawing.Size(79, 20);\r
+            this.drp_audbit_1.Size = new System.Drawing.Size(70, 20);\r
             this.drp_audbit_1.TabIndex = 11;\r
             this.drp_audbit_1.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_1, "Set the Audio Bit-Rate");\r
@@ -410,6 +435,7 @@ namespace Handbrake
             this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_1.FormattingEnabled = true;\r
             this.drp_audsr_1.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
@@ -417,9 +443,9 @@ namespace Handbrake
             "22.05"});\r
             this.drp_audsr_1.Location = new System.Drawing.Point(488, 53);\r
             this.drp_audsr_1.Name = "drp_audsr_1";\r
-            this.drp_audsr_1.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_1.Size = new System.Drawing.Size(55, 20);\r
             this.drp_audsr_1.TabIndex = 9;\r
-            this.drp_audsr_1.Text = "48";\r
+            this.drp_audsr_1.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");\r
             // \r
             // check_largeFile\r
@@ -427,7 +453,7 @@ namespace Handbrake
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.BackColor = System.Drawing.Color.Transparent;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(261, 23);\r
+            this.check_largeFile.Location = new System.Drawing.Point(193, 22);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(82, 17);\r
             this.check_largeFile.TabIndex = 4;\r
@@ -435,7 +461,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV (V" +\r
                     "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");\r
             this.check_largeFile.UseVisualStyleBackColor = false;\r
-            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
             // \r
             // check_turbo\r
             // \r
@@ -443,10 +468,10 @@ namespace Handbrake
             this.check_turbo.BackColor = System.Drawing.Color.Transparent;\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, 151);\r
+            this.check_turbo.Location = new System.Drawing.Point(37, 184);\r
             this.check_turbo.Name = "check_turbo";\r
             this.check_turbo.Size = new System.Drawing.Size(115, 17);\r
-            this.check_turbo.TabIndex = 3;\r
+            this.check_turbo.TabIndex = 7;\r
             this.check_turbo.Text = "Turbo first Pass";\r
             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
             this.check_turbo.UseVisualStyleBackColor = false;\r
@@ -465,16 +490,16 @@ namespace Handbrake
             "24",\r
             "25",\r
             "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 35);\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 68);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
             this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21);\r
-            this.drp_videoFramerate.TabIndex = 7;\r
+            this.drp_videoFramerate.TabIndex = 2;\r
             this.drp_videoFramerate.Text = "Same as source";\r
-            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
+            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");\r
             // \r
             // slider_videoQuality\r
             // \r
-            this.slider_videoQuality.Location = new System.Drawing.Point(435, 90);\r
+            this.slider_videoQuality.Location = new System.Drawing.Point(468, 91);\r
             this.slider_videoQuality.Maximum = 100;\r
             this.slider_videoQuality.Name = "slider_videoQuality";\r
             this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
@@ -486,7 +511,7 @@ namespace Handbrake
             // text_filesize\r
             // \r
             this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_filesize.Location = new System.Drawing.Point(446, 63);\r
+            this.text_filesize.Location = new System.Drawing.Point(476, 36);\r
             this.text_filesize.Name = "text_filesize";\r
             this.text_filesize.Size = new System.Drawing.Size(81, 21);\r
             this.text_filesize.TabIndex = 12;\r
@@ -496,7 +521,7 @@ namespace Handbrake
             // text_bitrate\r
             // \r
             this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_bitrate.Location = new System.Drawing.Point(446, 36);\r
+            this.text_bitrate.Location = new System.Drawing.Point(476, 63);\r
             this.text_bitrate.Name = "text_bitrate";\r
             this.text_bitrate.Size = new System.Drawing.Size(81, 21);\r
             this.text_bitrate.TabIndex = 10;\r
@@ -523,7 +548,7 @@ namespace Handbrake
             this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(115, 502);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(115, 508);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
             this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
@@ -551,26 +576,26 @@ namespace Handbrake
             this.drp_audmix_1.TabIndex = 7;\r
             this.drp_audmix_1.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_audmix_1, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);\r
+            this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_1_SelectedIndexChanged);\r
             // \r
             // text_height\r
             // \r
             this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_height.ForeColor = System.Drawing.SystemColors.InfoText;\r
-            this.text_height.Location = new System.Drawing.Point(504, 35);\r
+            this.text_height.Location = new System.Drawing.Point(498, 81);\r
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
-            this.text_height.TabIndex = 28;\r
+            this.text_height.TabIndex = 19;\r
             this.ToolTip.SetToolTip(this.text_height, "Video Resolution (Height)\r\nCan only be altered when Anamorphic is set to \"None\"");\r
             this.text_height.TextChanged += new System.EventHandler(this.text_height_TextChanged);\r
             // \r
             // text_width\r
             // \r
             this.text_width.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_width.Location = new System.Drawing.Point(413, 35);\r
+            this.text_width.Location = new System.Drawing.Point(407, 81);\r
             this.text_width.Name = "text_width";\r
             this.text_width.Size = new System.Drawing.Size(64, 21);\r
-            this.text_width.TabIndex = 26;\r
+            this.text_width.TabIndex = 17;\r
             this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)\r\nCan only be altered when Anamorphic is set to \"None\" or" +\r
                     " \"Loose\"");\r
             this.text_width.TextChanged += new System.EventHandler(this.text_width_TextChanged);\r
@@ -580,7 +605,7 @@ namespace Handbrake
             this.check_optimiseMP4.AutoSize = true;\r
             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(349, 23);\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(281, 22);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
             this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
             this.check_optimiseMP4.TabIndex = 25;\r
@@ -589,14 +614,13 @@ namespace Handbrake
                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +\r
                     "ly be used with H.264 ");\r
             this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
-            this.check_optimiseMP4.Click += new System.EventHandler(this.check_optimiseMP4_Clicked);\r
             // \r
             // check_iPodAtom\r
             // \r
             this.check_iPodAtom.AutoSize = true;\r
             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
             this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(498, 23);\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(430, 22);\r
             this.check_iPodAtom.Name = "check_iPodAtom";\r
             this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
             this.check_iPodAtom.TabIndex = 26;\r
@@ -604,7 +628,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods.\r\nEncodes will not sync if this is not " +\r
                     "enabled for H.264 encodes");\r
             this.check_iPodAtom.UseVisualStyleBackColor = false;\r
-            this.check_iPodAtom.Click += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
             // \r
             // data_chpt\r
             // \r
@@ -623,9 +646,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -642,14 +665,13 @@ namespace Handbrake
             this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addPreset.Location = new System.Drawing.Point(10, 502);\r
+            this.btn_addPreset.Location = new System.Drawing.Point(10, 508);\r
             this.btn_addPreset.Name = "btn_addPreset";\r
             this.btn_addPreset.Size = new System.Drawing.Size(35, 22);\r
             this.btn_addPreset.TabIndex = 3;\r
             this.btn_addPreset.TabStop = false;\r
             this.btn_addPreset.Text = "Add";\r
-            this.ToolTip.SetToolTip(this.btn_addPreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
-                    " > Options");\r
+            this.ToolTip.SetToolTip(this.btn_addPreset, "Add a preset to the preset panel");\r
             this.btn_addPreset.UseVisualStyleBackColor = true;\r
             this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
             // \r
@@ -658,14 +680,13 @@ namespace Handbrake
             this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_removePreset.Location = new System.Drawing.Point(51, 502);\r
+            this.btn_removePreset.Location = new System.Drawing.Point(51, 508);\r
             this.btn_removePreset.Name = "btn_removePreset";\r
             this.btn_removePreset.Size = new System.Drawing.Size(58, 22);\r
             this.btn_removePreset.TabIndex = 4;\r
             this.btn_removePreset.TabStop = false;\r
             this.btn_removePreset.Text = "Remove";\r
-            this.ToolTip.SetToolTip(this.btn_removePreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
-                    " > Options");\r
+            this.ToolTip.SetToolTip(this.btn_removePreset, "Remove a preset from the panel above.");\r
             this.btn_removePreset.UseVisualStyleBackColor = true;\r
             this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
             // \r
@@ -680,7 +701,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_2.Location = new System.Drawing.Point(353, 93);\r
+            this.drp_audmix_2.Location = new System.Drawing.Point(353, 92);\r
             this.drp_audmix_2.Name = "drp_audmix_2";\r
             this.drp_audmix_2.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_2.TabIndex = 19;\r
@@ -714,7 +735,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_2.Location = new System.Drawing.Point(236, 93);\r
+            this.drp_audenc_2.Location = new System.Drawing.Point(236, 92);\r
             this.drp_audenc_2.Name = "drp_audenc_2";\r
             this.drp_audenc_2.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_2.TabIndex = 18;\r
@@ -737,9 +758,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_2.Location = new System.Drawing.Point(537, 93);\r
+            this.drp_audbit_2.Location = new System.Drawing.Point(546, 92);\r
             this.drp_audbit_2.Name = "drp_audbit_2";\r
-            this.drp_audbit_2.Size = new System.Drawing.Size(80, 20);\r
+            this.drp_audbit_2.Size = new System.Drawing.Size(71, 20);\r
             this.drp_audbit_2.TabIndex = 21;\r
             this.drp_audbit_2.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_2, "Set the Audio Bit-Rate");\r
@@ -749,50 +770,37 @@ namespace Handbrake
             this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_2.FormattingEnabled = true;\r
             this.drp_audsr_2.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_2.Location = new System.Drawing.Point(488, 93);\r
+            this.drp_audsr_2.Location = new System.Drawing.Point(488, 92);\r
             this.drp_audsr_2.Name = "drp_audsr_2";\r
-            this.drp_audsr_2.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_2.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_2.TabIndex = 20;\r
-            this.drp_audsr_2.Text = "48";\r
+            this.drp_audsr_2.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");\r
             // \r
-            // check_fileMode\r
-            // \r
-            this.check_fileMode.AutoSize = true;\r
-            this.check_fileMode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_fileMode.Location = new System.Drawing.Point(618, 21);\r
-            this.check_fileMode.Name = "check_fileMode";\r
-            this.check_fileMode.Size = new System.Drawing.Size(79, 17);\r
-            this.check_fileMode.TabIndex = 11;\r
-            this.check_fileMode.Text = "File Mode";\r
-            this.ToolTip.SetToolTip(this.check_fileMode, "Displays a File selection dialog box instead of the standard folder selection.\r\nW" +\r
-                    "ith the file dialog box, you can select the folllowing file types:\r\n.vob, .ts, ." +\r
-                    "mpg, .mpeg and .m2t");\r
-            this.check_fileMode.UseVisualStyleBackColor = true;\r
-            // \r
             // drp_audsr_3\r
             // \r
             this.drp_audsr_3.Enabled = false;\r
             this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_3.FormattingEnabled = true;\r
             this.drp_audsr_3.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_3.Location = new System.Drawing.Point(488, 129);\r
+            this.drp_audsr_3.Location = new System.Drawing.Point(488, 133);\r
             this.drp_audsr_3.Name = "drp_audsr_3";\r
-            this.drp_audsr_3.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_3.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_3.TabIndex = 28;\r
-            this.drp_audsr_3.Text = "48";\r
+            this.drp_audsr_3.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");\r
-            this.drp_audsr_3.Visible = false;\r
             // \r
             // drp_audbit_3\r
             // \r
@@ -810,13 +818,12 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_3.Location = new System.Drawing.Point(537, 129);\r
+            this.drp_audbit_3.Location = new System.Drawing.Point(546, 133);\r
             this.drp_audbit_3.Name = "drp_audbit_3";\r
-            this.drp_audbit_3.Size = new System.Drawing.Size(80, 20);\r
+            this.drp_audbit_3.Size = new System.Drawing.Size(71, 20);\r
             this.drp_audbit_3.TabIndex = 29;\r
             this.drp_audbit_3.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_3, "Set the Audio Bit-Rate");\r
-            this.drp_audbit_3.Visible = false;\r
             // \r
             // drp_audenc_3\r
             // \r
@@ -828,13 +835,12 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_3.Location = new System.Drawing.Point(236, 129);\r
+            this.drp_audenc_3.Location = new System.Drawing.Point(236, 133);\r
             this.drp_audenc_3.Name = "drp_audenc_3";\r
             this.drp_audenc_3.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_3.TabIndex = 26;\r
             this.drp_audenc_3.Text = "AAC";\r
             this.ToolTip.SetToolTip(this.drp_audenc_3, "Select an audio encoder.");\r
-            this.drp_audenc_3.Visible = false;\r
             this.drp_audenc_3.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_3_SelectedIndexChanged);\r
             // \r
             // drp_audmix_3\r
@@ -849,13 +855,12 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_3.Location = new System.Drawing.Point(353, 129);\r
+            this.drp_audmix_3.Location = new System.Drawing.Point(353, 133);\r
             this.drp_audmix_3.Name = "drp_audmix_3";\r
             this.drp_audmix_3.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_3.TabIndex = 27;\r
             this.drp_audmix_3.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_audmix_3, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audmix_3.Visible = false;\r
             this.drp_audmix_3.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_3_SelectedIndexChanged);\r
             // \r
             // drp_audsr_4\r
@@ -864,18 +869,18 @@ namespace Handbrake
             this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_4.FormattingEnabled = true;\r
             this.drp_audsr_4.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_4.Location = new System.Drawing.Point(488, 167);\r
+            this.drp_audsr_4.Location = new System.Drawing.Point(488, 175);\r
             this.drp_audsr_4.Name = "drp_audsr_4";\r
-            this.drp_audsr_4.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_4.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_4.TabIndex = 36;\r
-            this.drp_audsr_4.Text = "48";\r
+            this.drp_audsr_4.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");\r
-            this.drp_audsr_4.Visible = false;\r
             // \r
             // drp_audbit_4\r
             // \r
@@ -893,13 +898,12 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_4.Location = new System.Drawing.Point(537, 167);\r
+            this.drp_audbit_4.Location = new System.Drawing.Point(546, 175);\r
             this.drp_audbit_4.Name = "drp_audbit_4";\r
-            this.drp_audbit_4.Size = new System.Drawing.Size(80, 20);\r
+            this.drp_audbit_4.Size = new System.Drawing.Size(70, 20);\r
             this.drp_audbit_4.TabIndex = 37;\r
             this.drp_audbit_4.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_4, "Set the Audio Bit-Rate");\r
-            this.drp_audbit_4.Visible = false;\r
             // \r
             // drp_audenc_4\r
             // \r
@@ -911,13 +915,12 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_4.Location = new System.Drawing.Point(236, 167);\r
+            this.drp_audenc_4.Location = new System.Drawing.Point(236, 175);\r
             this.drp_audenc_4.Name = "drp_audenc_4";\r
             this.drp_audenc_4.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_4.TabIndex = 34;\r
             this.drp_audenc_4.Text = "AAC";\r
             this.ToolTip.SetToolTip(this.drp_audenc_4, "Select an audio encoder.");\r
-            this.drp_audenc_4.Visible = false;\r
             this.drp_audenc_4.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_4_SelectedIndexChanged);\r
             // \r
             // drp_audmix_4\r
@@ -932,15 +935,75 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_4.Location = new System.Drawing.Point(353, 167);\r
+            this.drp_audmix_4.Location = new System.Drawing.Point(353, 175);\r
             this.drp_audmix_4.Name = "drp_audmix_4";\r
             this.drp_audmix_4.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_4.TabIndex = 35;\r
             this.drp_audmix_4.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_audmix_4, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audmix_4.Visible = false;\r
             this.drp_audmix_4.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_4_SelectedIndexChanged);\r
             // \r
+            // drop_format\r
+            // \r
+            this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_format.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_format.FormattingEnabled = true;\r
+            this.drop_format.Items.AddRange(new object[] {\r
+            "MP4 File",\r
+            "M4V File",\r
+            "MKV File",\r
+            "AVI File",\r
+            "OGM File"});\r
+            this.drop_format.Location = new System.Drawing.Point(75, 19);\r
+            this.drop_format.Name = "drop_format";\r
+            this.drop_format.Size = new System.Drawing.Size(106, 21);\r
+            this.drop_format.TabIndex = 28;\r
+            this.ToolTip.SetToolTip(this.drop_format, "Select a video encoder");\r
+            this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
+            // \r
+            // lbl_src_res\r
+            // \r
+            this.lbl_src_res.AutoSize = true;\r
+            this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_src_res.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_src_res.Location = new System.Drawing.Point(405, 34);\r
+            this.lbl_src_res.Name = "lbl_src_res";\r
+            this.lbl_src_res.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_src_res.TabIndex = 13;\r
+            this.lbl_src_res.Text = "Select a Title";\r
+            // \r
+            // lbl_duration\r
+            // \r
+            this.lbl_duration.AutoSize = true;\r
+            this.lbl_duration.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_duration.Location = new System.Drawing.Point(553, 56);\r
+            this.lbl_duration.Name = "lbl_duration";\r
+            this.lbl_duration.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_duration.TabIndex = 43;\r
+            this.lbl_duration.Text = "Select a Title";\r
+            // \r
+            // label_duration\r
+            // \r
+            this.label_duration.AutoSize = true;\r
+            this.label_duration.BackColor = System.Drawing.Color.Transparent;\r
+            this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label_duration.Location = new System.Drawing.Point(486, 55);\r
+            this.label_duration.Name = "label_duration";\r
+            this.label_duration.Size = new System.Drawing.Size(61, 13);\r
+            this.label_duration.TabIndex = 42;\r
+            this.label_duration.Text = "Duration:";\r
+            // \r
+            // label7\r
+            // \r
+            this.label7.AutoSize = true;\r
+            this.label7.BackColor = System.Drawing.Color.Transparent;\r
+            this.label7.Location = new System.Drawing.Point(311, 34);\r
+            this.label7.Name = "label7";\r
+            this.label7.Size = new System.Drawing.Size(52, 13);\r
+            this.label7.TabIndex = 12;\r
+            this.label7.Text = "Source:";\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
@@ -953,7 +1016,7 @@ namespace Handbrake
             // ISO_Open\r
             // \r
             this.ISO_Open.DefaultExt = "ISO";\r
-            this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;*.mpeg;";\r
+            this.ISO_Open.Filter = "All Files|*.*";\r
             this.ISO_Open.RestoreDirectory = true;\r
             this.ISO_Open.SupportMultiDottedExtensions = true;\r
             // \r
@@ -998,7 +1061,7 @@ namespace Handbrake
             // \r
             this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.mnu_encode,\r
-            this.mnu_viewDVDdata,\r
+            this.mnu_encodeLog,\r
             this.ToolStripSeparator5,\r
             this.mnu_options});\r
             this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";\r
@@ -1010,68 +1073,84 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
             this.mnu_encode.Name = "mnu_encode";\r
             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));\r
-            this.mnu_encode.Size = new System.Drawing.Size(217, 22);\r
+            this.mnu_encode.Size = new System.Drawing.Size(203, 22);\r
             this.mnu_encode.Text = "Show Queue";\r
             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
             // \r
-            // mnu_viewDVDdata\r
+            // mnu_encodeLog\r
             // \r
-            this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
-            this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";\r
-            this.mnu_viewDVDdata.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));\r
-            this.mnu_viewDVDdata.Size = new System.Drawing.Size(217, 22);\r
-            this.mnu_viewDVDdata.Text = "View DVD data";\r
-            this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);\r
+            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
+            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
+            this.mnu_encodeLog.Size = new System.Drawing.Size(203, 22);\r
+            this.mnu_encodeLog.Text = "Activity Window";\r
+            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
             // \r
             // ToolStripSeparator5\r
             // \r
             this.ToolStripSeparator5.Name = "ToolStripSeparator5";\r
-            this.ToolStripSeparator5.Size = new System.Drawing.Size(214, 6);\r
+            this.ToolStripSeparator5.Size = new System.Drawing.Size(200, 6);\r
             // \r
             // mnu_options\r
             // \r
             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
             this.mnu_options.Name = "mnu_options";\r
-            this.mnu_options.Size = new System.Drawing.Size(217, 22);\r
+            this.mnu_options.Size = new System.Drawing.Size(203, 22);\r
             this.mnu_options.Text = "Options";\r
             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
             // \r
             // PresetsToolStripMenuItem\r
             // \r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_SelectDefault,\r
+            this.mnu_presetReset,\r
+            this.mnu_delete_preset,\r
             this.toolStripSeparator7,\r
-            this.mnu_presetReset});\r
+            this.btn_new_preset,\r
+            this.mnu_SelectDefault});\r
             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";\r
             this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);\r
             this.PresetsToolStripMenuItem.Text = "&Presets";\r
             // \r
-            // mnu_SelectDefault\r
+            // mnu_presetReset\r
             // \r
-            this.mnu_SelectDefault.Name = "mnu_SelectDefault";\r
-            this.mnu_SelectDefault.Size = new System.Drawing.Size(215, 22);\r
-            this.mnu_SelectDefault.Text = "Select Default Preset";\r
-            this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";\r
-            this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);\r
+            this.mnu_presetReset.Name = "mnu_presetReset";\r
+            this.mnu_presetReset.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_presetReset.Text = "Update Built-in Presets";\r
+            this.mnu_presetReset.ToolTipText = "Resets all presets.";\r
+            this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);\r
+            // \r
+            // mnu_delete_preset\r
+            // \r
+            this.mnu_delete_preset.Name = "mnu_delete_preset";\r
+            this.mnu_delete_preset.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_delete_preset.Text = "Delete Built-in Presets";\r
+            this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click);\r
             // \r
             // toolStripSeparator7\r
             // \r
             this.toolStripSeparator7.Name = "toolStripSeparator7";\r
             this.toolStripSeparator7.Size = new System.Drawing.Size(212, 6);\r
             // \r
-            // mnu_presetReset\r
+            // btn_new_preset\r
             // \r
-            this.mnu_presetReset.Name = "mnu_presetReset";\r
-            this.mnu_presetReset.Size = new System.Drawing.Size(215, 22);\r
-            this.mnu_presetReset.Text = "Update Built-in Presets";\r
-            this.mnu_presetReset.ToolTipText = "Resets all presets.";\r
-            this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);\r
+            this.btn_new_preset.Name = "btn_new_preset";\r
+            this.btn_new_preset.Size = new System.Drawing.Size(215, 22);\r
+            this.btn_new_preset.Text = "New Preset";\r
+            this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click);\r
+            // \r
+            // mnu_SelectDefault\r
+            // \r
+            this.mnu_SelectDefault.Name = "mnu_SelectDefault";\r
+            this.mnu_SelectDefault.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_SelectDefault.Text = "Select Default Preset";\r
+            this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";\r
+            this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);\r
             // \r
             // HelpToolStripMenuItem\r
             // \r
             this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.OnlineDocumentationToolStripMenuItem,\r
+            this.mnu_user_guide,\r
             this.mnu_handbrake_home,\r
+            this.mnu_handbrake_forums,\r
             this.ToolStripSeparator3,\r
             this.mnu_UpdateCheck,\r
             this.toolStripSeparator6,\r
@@ -1080,65 +1159,51 @@ namespace Handbrake
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
             this.HelpToolStripMenuItem.Text = "&Help";\r
             // \r
-            // OnlineDocumentationToolStripMenuItem\r
-            // \r
-            this.OnlineDocumentationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_wiki,\r
-            this.mnu_faq,\r
-            this.mnu_onlineDocs});\r
-            this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";\r
-            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(213, 22);\r
-            this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";\r
-            // \r
-            // mnu_wiki\r
-            // \r
-            this.mnu_wiki.Name = "mnu_wiki";\r
-            this.mnu_wiki.Size = new System.Drawing.Size(217, 22);\r
-            this.mnu_wiki.Text = "Wiki / User Guides";\r
-            this.mnu_wiki.Click += new System.EventHandler(this.mnu_wiki_Click);\r
-            // \r
-            // mnu_faq\r
-            // \r
-            this.mnu_faq.Name = "mnu_faq";\r
-            this.mnu_faq.Size = new System.Drawing.Size(217, 22);\r
-            this.mnu_faq.Text = "FAQ";\r
-            this.mnu_faq.Click += new System.EventHandler(this.mnu_faq_Click);\r
-            // \r
-            // mnu_onlineDocs\r
+            // mnu_user_guide\r
             // \r
-            this.mnu_onlineDocs.Name = "mnu_onlineDocs";\r
-            this.mnu_onlineDocs.Size = new System.Drawing.Size(217, 22);\r
-            this.mnu_onlineDocs.Text = "Full Documentation List";\r
-            this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);\r
+            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
+            this.mnu_user_guide.Name = "mnu_user_guide";\r
+            this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_user_guide.Text = "HandBrake User Guide";\r
+            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
             // \r
             // mnu_handbrake_home\r
             // \r
+            this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;\r
             this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
-            this.mnu_handbrake_home.Size = new System.Drawing.Size(213, 22);\r
+            this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);\r
             this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
             this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);\r
             // \r
+            // mnu_handbrake_forums\r
+            // \r
+            this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";\r
+            this.mnu_handbrake_forums.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_handbrake_forums.Text = "HandBrake Forums";\r
+            this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);\r
+            // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
-            this.ToolStripSeparator3.Size = new System.Drawing.Size(210, 6);\r
+            this.ToolStripSeparator3.Size = new System.Drawing.Size(212, 6);\r
             // \r
             // mnu_UpdateCheck\r
             // \r
             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";\r
-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(213, 22);\r
+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(215, 22);\r
             this.mnu_UpdateCheck.Text = "Check for Updates";\r
             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);\r
             // \r
             // toolStripSeparator6\r
             // \r
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
-            this.toolStripSeparator6.Size = new System.Drawing.Size(210, 6);\r
+            this.toolStripSeparator6.Size = new System.Drawing.Size(212, 6);\r
             // \r
             // mnu_about\r
             // \r
+            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
             this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(213, 22);\r
+            this.mnu_about.Size = new System.Drawing.Size(215, 22);\r
             this.mnu_about.Text = "About...";\r
             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
             // \r
@@ -1153,14 +1218,14 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(931, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(958, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
             // GroupBox1\r
             // \r
-            this.GroupBox1.Controls.Add(this.btn_Browse);\r
-            this.GroupBox1.Controls.Add(this.check_fileMode);\r
+            this.GroupBox1.Controls.Add(this.lbl_duration);\r
+            this.GroupBox1.Controls.Add(this.label_duration);\r
             this.GroupBox1.Controls.Add(this.Label13);\r
             this.GroupBox1.Controls.Add(this.drop_chapterFinish);\r
             this.GroupBox1.Controls.Add(this.drop_chapterStart);\r
@@ -1171,24 +1236,13 @@ namespace Handbrake
             this.GroupBox1.Controls.Add(this.Label10);\r
             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
-            this.GroupBox1.Location = new System.Drawing.Point(14, 73);\r
+            this.GroupBox1.Location = new System.Drawing.Point(12, 70);\r
             this.GroupBox1.Name = "GroupBox1";\r
             this.GroupBox1.Size = new System.Drawing.Size(705, 87);\r
-            this.GroupBox1.TabIndex = 1;\r
+            this.GroupBox1.TabIndex = 2;\r
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
             // \r
-            // btn_Browse\r
-            // \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(534, 18);\r
-            this.btn_Browse.Name = "btn_Browse";\r
-            this.btn_Browse.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_Browse.TabIndex = 12;\r
-            this.btn_Browse.Text = "Browse";\r
-            this.btn_Browse.UseVisualStyleBackColor = true;\r
-            this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
-            // \r
             // Label13\r
             // \r
             this.Label13.AutoSize = true;\r
@@ -1234,30 +1288,41 @@ namespace Handbrake
             // \r
             // groupBox_output\r
             // \r
-            this.groupBox_output.Controls.Add(this.drp_videoEncoder);\r
-            this.groupBox_output.Controls.Add(this.Label47);\r
+            this.groupBox_output.Controls.Add(this.drop_format);\r
+            this.groupBox_output.Controls.Add(this.label5);\r
             this.groupBox_output.Controls.Add(this.check_largeFile);\r
             this.groupBox_output.Controls.Add(this.check_iPodAtom);\r
             this.groupBox_output.Controls.Add(this.check_optimiseMP4);\r
             this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_output.Location = new System.Drawing.Point(14, 217);\r
+            this.groupBox_output.Location = new System.Drawing.Point(12, 214);\r
             this.groupBox_output.Name = "groupBox_output";\r
             this.groupBox_output.Size = new System.Drawing.Size(705, 50);\r
-            this.groupBox_output.TabIndex = 3;\r
+            this.groupBox_output.TabIndex = 4;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
             // \r
+            // label5\r
+            // \r
+            this.label5.AutoSize = true;\r
+            this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label5.ForeColor = System.Drawing.Color.Black;\r
+            this.label5.Location = new System.Drawing.Point(17, 23);\r
+            this.label5.Name = "label5";\r
+            this.label5.Size = new System.Drawing.Size(52, 13);\r
+            this.label5.TabIndex = 27;\r
+            this.label5.Text = "Format:";\r
+            // \r
             // Label47\r
             // \r
             this.Label47.AutoSize = true;\r
             this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label47.ForeColor = System.Drawing.Color.Black;\r
-            this.Label47.Location = new System.Drawing.Point(17, 24);\r
+            this.Label47.Location = new System.Drawing.Point(13, 39);\r
             this.Label47.Name = "Label47";\r
-            this.Label47.Size = new System.Drawing.Size(62, 13);\r
+            this.Label47.Size = new System.Drawing.Size(84, 13);\r
             this.Label47.TabIndex = 0;\r
-            this.Label47.Text = "Encoder: ";\r
+            this.Label47.Text = "Video Codec:";\r
             // \r
             // Label3\r
             // \r
@@ -1270,18 +1335,6 @@ namespace Handbrake
             this.Label3.TabIndex = 0;\r
             this.Label3.Text = "File:";\r
             // \r
-            // lbl_encode\r
-            // \r
-            this.lbl_encode.AutoSize = true;\r
-            this.lbl_encode.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(448, 36);\r
-            this.lbl_encode.Name = "lbl_encode";\r
-            this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
-            this.lbl_encode.TabIndex = 5;\r
-            this.lbl_encode.Text = "Encoding started...";\r
-            this.lbl_encode.Visible = false;\r
-            // \r
             // TabPage2\r
             // \r
             this.TabPage2.BackColor = System.Drawing.Color.Transparent;\r
@@ -1295,14 +1348,14 @@ namespace Handbrake
             this.TabPage2.Controls.Add(this.drp_audenc_4);\r
             this.TabPage2.Controls.Add(this.drp_audmix_4);\r
             this.TabPage2.Controls.Add(this.drp_track4Audio);\r
-            this.TabPage2.Controls.Add(this.label21);\r
+            this.TabPage2.Controls.Add(this.lbl_t4);\r
             this.TabPage2.Controls.Add(this.trackBar3);\r
             this.TabPage2.Controls.Add(this.drp_audsr_3);\r
             this.TabPage2.Controls.Add(this.drp_audbit_3);\r
             this.TabPage2.Controls.Add(this.drp_audenc_3);\r
             this.TabPage2.Controls.Add(this.drp_audmix_3);\r
             this.TabPage2.Controls.Add(this.drp_track3Audio);\r
-            this.TabPage2.Controls.Add(this.label18);\r
+            this.TabPage2.Controls.Add(this.lbl_t3);\r
             this.TabPage2.Controls.Add(this.trackBar2);\r
             this.TabPage2.Controls.Add(this.label16);\r
             this.TabPage2.Controls.Add(this.trackBar1);\r
@@ -1333,7 +1386,7 @@ namespace Handbrake
             this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage2.Name = "TabPage2";\r
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(697, 302);\r
+            this.TabPage2.Size = new System.Drawing.Size(697, 316);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
             // \r
@@ -1342,31 +1395,29 @@ namespace Handbrake
             this.lbl_drc4.AutoSize = true;\r
             this.lbl_drc4.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc4.Location = new System.Drawing.Point(670, 165);\r
+            this.lbl_drc4.Location = new System.Drawing.Point(670, 176);\r
             this.lbl_drc4.Name = "lbl_drc4";\r
             this.lbl_drc4.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc4.TabIndex = 39;\r
             this.lbl_drc4.Text = "1:";\r
-            this.lbl_drc4.Visible = false;\r
             // \r
             // lbl_drc3\r
             // \r
             this.lbl_drc3.AutoSize = true;\r
             this.lbl_drc3.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc3.Location = new System.Drawing.Point(670, 131);\r
+            this.lbl_drc3.Location = new System.Drawing.Point(670, 135);\r
             this.lbl_drc3.Name = "lbl_drc3";\r
             this.lbl_drc3.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc3.TabIndex = 31;\r
             this.lbl_drc3.Text = "1:";\r
-            this.lbl_drc3.Visible = false;\r
             // \r
             // lbl_drc2\r
             // \r
             this.lbl_drc2.AutoSize = true;\r
             this.lbl_drc2.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc2.Location = new System.Drawing.Point(670, 91);\r
+            this.lbl_drc2.Location = new System.Drawing.Point(670, 90);\r
             this.lbl_drc2.Name = "lbl_drc2";\r
             this.lbl_drc2.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc2.TabIndex = 23;\r
@@ -1387,14 +1438,13 @@ namespace Handbrake
             // \r
             this.trackBar4.Enabled = false;\r
             this.trackBar4.LargeChange = 0;\r
-            this.trackBar4.Location = new System.Drawing.Point(620, 161);\r
+            this.trackBar4.Location = new System.Drawing.Point(620, 169);\r
             this.trackBar4.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar4.Maximum = 30;\r
             this.trackBar4.Name = "trackBar4";\r
             this.trackBar4.Size = new System.Drawing.Size(49, 42);\r
             this.trackBar4.TabIndex = 38;\r
             this.trackBar4.TickFrequency = 10;\r
-            this.trackBar4.Visible = false;\r
             this.trackBar4.ValueChanged += new System.EventHandler(this.trackBar4_Scroll);\r
             // \r
             // drp_track4Audio\r
@@ -1403,37 +1453,34 @@ namespace Handbrake
             this.drp_track4Audio.FormattingEnabled = true;\r
             this.drp_track4Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track4Audio.Location = new System.Drawing.Point(36, 166);\r
+            this.drp_track4Audio.Location = new System.Drawing.Point(36, 174);\r
             this.drp_track4Audio.Name = "drp_track4Audio";\r
             this.drp_track4Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track4Audio.TabIndex = 33;\r
-            this.drp_track4Audio.Visible = false;\r
             this.drp_track4Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track4Audio_SelectedIndexChanged);\r
             // \r
-            // label21\r
+            // lbl_t4\r
             // \r
-            this.label21.AutoSize = true;\r
-            this.label21.BackColor = System.Drawing.Color.Transparent;\r
-            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label21.Location = new System.Drawing.Point(13, 169);\r
-            this.label21.Name = "label21";\r
-            this.label21.Size = new System.Drawing.Size(19, 13);\r
-            this.label21.TabIndex = 32;\r
-            this.label21.Text = "4:";\r
-            this.label21.Visible = false;\r
+            this.lbl_t4.AutoSize = true;\r
+            this.lbl_t4.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_t4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_t4.Location = new System.Drawing.Point(13, 177);\r
+            this.lbl_t4.Name = "lbl_t4";\r
+            this.lbl_t4.Size = new System.Drawing.Size(19, 13);\r
+            this.lbl_t4.TabIndex = 32;\r
+            this.lbl_t4.Text = "4:";\r
             // \r
             // trackBar3\r
             // \r
             this.trackBar3.Enabled = false;\r
             this.trackBar3.LargeChange = 0;\r
-            this.trackBar3.Location = new System.Drawing.Point(620, 123);\r
+            this.trackBar3.Location = new System.Drawing.Point(620, 128);\r
             this.trackBar3.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar3.Maximum = 30;\r
             this.trackBar3.Name = "trackBar3";\r
             this.trackBar3.Size = new System.Drawing.Size(49, 42);\r
             this.trackBar3.TabIndex = 30;\r
             this.trackBar3.TickFrequency = 10;\r
-            this.trackBar3.Visible = false;\r
             this.trackBar3.ValueChanged += new System.EventHandler(this.trackBar3_Scroll);\r
             // \r
             // drp_track3Audio\r
@@ -1442,29 +1489,27 @@ namespace Handbrake
             this.drp_track3Audio.FormattingEnabled = true;\r
             this.drp_track3Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track3Audio.Location = new System.Drawing.Point(36, 128);\r
+            this.drp_track3Audio.Location = new System.Drawing.Point(36, 132);\r
             this.drp_track3Audio.Name = "drp_track3Audio";\r
             this.drp_track3Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track3Audio.TabIndex = 25;\r
-            this.drp_track3Audio.Visible = false;\r
             this.drp_track3Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track3Audio_SelectedIndexChanged);\r
             // \r
-            // label18\r
+            // lbl_t3\r
             // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(13, 131);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(19, 13);\r
-            this.label18.TabIndex = 24;\r
-            this.label18.Text = "3:";\r
-            this.label18.Visible = false;\r
+            this.lbl_t3.AutoSize = true;\r
+            this.lbl_t3.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_t3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_t3.Location = new System.Drawing.Point(13, 135);\r
+            this.lbl_t3.Name = "lbl_t3";\r
+            this.lbl_t3.Size = new System.Drawing.Size(19, 13);\r
+            this.lbl_t3.TabIndex = 24;\r
+            this.lbl_t3.Text = "3:";\r
             // \r
             // trackBar2\r
             // \r
             this.trackBar2.LargeChange = 0;\r
-            this.trackBar2.Location = new System.Drawing.Point(620, 87);\r
+            this.trackBar2.Location = new System.Drawing.Point(620, 86);\r
             this.trackBar2.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar2.Maximum = 30;\r
             this.trackBar2.Name = "trackBar2";\r
@@ -1528,7 +1573,7 @@ namespace Handbrake
             this.label67.AutoSize = true;\r
             this.label67.BackColor = System.Drawing.Color.Transparent;\r
             this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label67.Location = new System.Drawing.Point(478, 24);\r
+            this.label67.Location = new System.Drawing.Point(479, 24);\r
             this.label67.Name = "label67";\r
             this.label67.Size = new System.Drawing.Size(65, 24);\r
             this.label67.TabIndex = 10;\r
@@ -1585,7 +1630,7 @@ namespace Handbrake
             this.drp_track2Audio.FormattingEnabled = true;\r
             this.drp_track2Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track2Audio.Location = new System.Drawing.Point(36, 92);\r
+            this.drp_track2Audio.Location = new System.Drawing.Point(36, 91);\r
             this.drp_track2Audio.Name = "drp_track2Audio";\r
             this.drp_track2Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track2Audio.TabIndex = 17;\r
@@ -1596,7 +1641,7 @@ namespace Handbrake
             this.label28.AutoSize = true;\r
             this.label28.BackColor = System.Drawing.Color.Transparent;\r
             this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label28.Location = new System.Drawing.Point(13, 95);\r
+            this.label28.Location = new System.Drawing.Point(13, 94);\r
             this.label28.Name = "label28";\r
             this.label28.Size = new System.Drawing.Size(19, 13);\r
             this.label28.TabIndex = 16;\r
@@ -1640,13 +1685,11 @@ namespace Handbrake
             this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_track1Audio.FormattingEnabled = true;\r
             this.drp_track1Audio.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "None"});\r
+            "Automatic"});\r
             this.drp_track1Audio.Location = new System.Drawing.Point(36, 54);\r
             this.drp_track1Audio.Name = "drp_track1Audio";\r
             this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track1Audio.TabIndex = 3;\r
-            this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);\r
             // \r
             // Label32\r
             // \r
@@ -1662,6 +1705,8 @@ namespace Handbrake
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage3.Controls.Add(this.drp_videoEncoder);\r
+            this.TabPage3.Controls.Add(this.Label47);\r
             this.TabPage3.Controls.Add(this.label25);\r
             this.TabPage3.Controls.Add(this.lbl_vfr);\r
             this.TabPage3.Controls.Add(this.check_grayscale);\r
@@ -1681,7 +1726,7 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(697, 302);\r
+            this.TabPage3.Size = new System.Drawing.Size(697, 316);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video";\r
             // \r
@@ -1692,19 +1737,19 @@ namespace Handbrake
             this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.label25.Location = new System.Drawing.Point(13, 13);\r
             this.label25.Name = "label25";\r
-            this.label25.Size = new System.Drawing.Size(76, 13);\r
-            this.label25.TabIndex = 28;\r
-            this.label25.Text = "Framerate";\r
+            this.label25.Size = new System.Drawing.Size(43, 13);\r
+            this.label25.TabIndex = 0;\r
+            this.label25.Text = "Video";\r
             // \r
             // lbl_vfr\r
             // \r
             this.lbl_vfr.AutoSize = true;\r
             this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_vfr.Location = new System.Drawing.Point(123, 64);\r
+            this.lbl_vfr.Location = new System.Drawing.Point(123, 97);\r
             this.lbl_vfr.Name = "lbl_vfr";\r
             this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
-            this.lbl_vfr.TabIndex = 27;\r
+            this.lbl_vfr.TabIndex = 3;\r
             this.lbl_vfr.Text = "(VFR On)";\r
             this.lbl_vfr.Visible = false;\r
             // \r
@@ -1713,10 +1758,10 @@ namespace Handbrake
             this.check_grayscale.AutoSize = true;\r
             this.check_grayscale.BackColor = System.Drawing.Color.Transparent;\r
             this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_grayscale.Location = new System.Drawing.Point(16, 105);\r
+            this.check_grayscale.Location = new System.Drawing.Point(16, 138);\r
             this.check_grayscale.Name = "check_grayscale";\r
             this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
-            this.check_grayscale.TabIndex = 1;\r
+            this.check_grayscale.TabIndex = 5;\r
             this.check_grayscale.Text = "Grayscale Encoding";\r
             this.check_grayscale.UseVisualStyleBackColor = false;\r
             // \r
@@ -1725,10 +1770,10 @@ namespace Handbrake
             this.Label22.AutoSize = true;\r
             this.Label22.BackColor = System.Drawing.Color.Transparent;\r
             this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label22.Location = new System.Drawing.Point(13, 85);\r
+            this.Label22.Location = new System.Drawing.Point(13, 118);\r
             this.Label22.Name = "Label22";\r
             this.Label22.Size = new System.Drawing.Size(191, 13);\r
-            this.Label22.TabIndex = 0;\r
+            this.Label22.TabIndex = 4;\r
             this.Label22.Text = "Advanced Encoding Settings";\r
             // \r
             // check_2PassEncode\r
@@ -1736,10 +1781,10 @@ namespace Handbrake
             this.check_2PassEncode.AutoSize = true;\r
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_2PassEncode.Location = new System.Drawing.Point(16, 128);\r
+            this.check_2PassEncode.Location = new System.Drawing.Point(16, 161);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
             this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);\r
-            this.check_2PassEncode.TabIndex = 2;\r
+            this.check_2PassEncode.TabIndex = 6;\r
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.check_2PassEncode.UseVisualStyleBackColor = false;\r
             this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
@@ -1749,7 +1794,7 @@ namespace Handbrake
             this.Label2.AutoSize = true;\r
             this.Label2.BackColor = System.Drawing.Color.Transparent;\r
             this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label2.Location = new System.Drawing.Point(304, 13);\r
+            this.Label2.Location = new System.Drawing.Point(334, 13);\r
             this.Label2.Name = "Label2";\r
             this.Label2.Size = new System.Drawing.Size(53, 13);\r
             this.Label2.TabIndex = 8;\r
@@ -1760,7 +1805,7 @@ namespace Handbrake
             this.Label42.AutoSize = true;\r
             this.Label42.BackColor = System.Drawing.Color.Transparent;\r
             this.Label42.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label42.Location = new System.Drawing.Point(304, 38);\r
+            this.Label42.Location = new System.Drawing.Point(334, 65);\r
             this.Label42.Name = "Label42";\r
             this.Label42.Size = new System.Drawing.Size(117, 13);\r
             this.Label42.TabIndex = 9;\r
@@ -1771,7 +1816,7 @@ namespace Handbrake
             this.SliderValue.AutoSize = true;\r
             this.SliderValue.BackColor = System.Drawing.Color.Transparent;\r
             this.SliderValue.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.SliderValue.Location = new System.Drawing.Point(599, 96);\r
+            this.SliderValue.Location = new System.Drawing.Point(641, 100);\r
             this.SliderValue.Name = "SliderValue";\r
             this.SliderValue.Size = new System.Drawing.Size(23, 12);\r
             this.SliderValue.TabIndex = 15;\r
@@ -1782,10 +1827,10 @@ namespace Handbrake
             this.Label46.AutoSize = true;\r
             this.Label46.BackColor = System.Drawing.Color.Transparent;\r
             this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label46.Location = new System.Drawing.Point(13, 38);\r
+            this.Label46.Location = new System.Drawing.Point(13, 71);\r
             this.Label46.Name = "Label46";\r
             this.Label46.Size = new System.Drawing.Size(106, 13);\r
-            this.Label46.TabIndex = 6;\r
+            this.Label46.TabIndex = 1;\r
             this.Label46.Text = "Framerate (FPS):";\r
             // \r
             // Label40\r
@@ -1793,7 +1838,7 @@ namespace Handbrake
             this.Label40.AutoSize = true;\r
             this.Label40.BackColor = System.Drawing.Color.Transparent;\r
             this.Label40.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label40.Location = new System.Drawing.Point(304, 95);\r
+            this.Label40.Location = new System.Drawing.Point(334, 99);\r
             this.Label40.Name = "Label40";\r
             this.Label40.Size = new System.Drawing.Size(107, 13);\r
             this.Label40.TabIndex = 13;\r
@@ -1802,6 +1847,14 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage1.Controls.Add(this.slider_deblock);\r
+            this.TabPage1.Controls.Add(this.label8);\r
+            this.TabPage1.Controls.Add(this.lbl_deblockVal);\r
+            this.TabPage1.Controls.Add(this.check_customCrop);\r
+            this.TabPage1.Controls.Add(this.check_autoCrop);\r
+            this.TabPage1.Controls.Add(this.check_decomb);\r
+            this.TabPage1.Controls.Add(this.lbl_src_res);\r
+            this.TabPage1.Controls.Add(this.label7);\r
             this.TabPage1.Controls.Add(this.label6);\r
             this.TabPage1.Controls.Add(this.drp_anamorphic);\r
             this.TabPage1.Controls.Add(this.text_bottom);\r
@@ -1819,35 +1872,97 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.label24);\r
             this.TabPage1.Controls.Add(this.drp_deNoise);\r
             this.TabPage1.Controls.Add(this.label11);\r
-            this.TabPage1.Controls.Add(this.check_deblock);\r
             this.TabPage1.Controls.Add(this.check_detelecine);\r
             this.TabPage1.Controls.Add(this.label4);\r
             this.TabPage1.Controls.Add(this.drp_deInterlace_option);\r
-            this.TabPage1.Controls.Add(this.lbl_RecomendedCrop);\r
-            this.TabPage1.Controls.Add(this.Label8);\r
             this.TabPage1.Controls.Add(this.Label1);\r
             this.TabPage1.Controls.Add(this.Label53);\r
             this.TabPage1.Controls.Add(this.Label52);\r
             this.TabPage1.Controls.Add(this.Label51);\r
-            this.TabPage1.Controls.Add(this.Label50);\r
             this.TabPage1.Controls.Add(this.Label15);\r
-            this.TabPage1.Controls.Add(this.drp_crop);\r
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(697, 302);\r
+            this.TabPage1.Size = new System.Drawing.Size(697, 316);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
+            // slider_deblock\r
+            // \r
+            this.slider_deblock.Location = new System.Drawing.Point(407, 264);\r
+            this.slider_deblock.Maximum = 15;\r
+            this.slider_deblock.Name = "slider_deblock";\r
+            this.slider_deblock.Size = new System.Drawing.Size(174, 42);\r
+            this.slider_deblock.TabIndex = 35;\r
+            this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);\r
+            // \r
+            // label8\r
+            // \r
+            this.label8.AutoSize = true;\r
+            this.label8.BackColor = System.Drawing.Color.Transparent;\r
+            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label8.Location = new System.Drawing.Point(311, 269);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(58, 13);\r
+            this.label8.TabIndex = 37;\r
+            this.label8.Text = "Deblock:";\r
+            // \r
+            // lbl_deblockVal\r
+            // \r
+            this.lbl_deblockVal.AutoSize = true;\r
+            this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_deblockVal.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_deblockVal.Location = new System.Drawing.Point(585, 269);\r
+            this.lbl_deblockVal.Name = "lbl_deblockVal";\r
+            this.lbl_deblockVal.Size = new System.Drawing.Size(14, 13);\r
+            this.lbl_deblockVal.TabIndex = 36;\r
+            this.lbl_deblockVal.Text = "0";\r
+            // \r
+            // check_customCrop\r
+            // \r
+            this.check_customCrop.AutoSize = true;\r
+            this.check_customCrop.Location = new System.Drawing.Point(16, 58);\r
+            this.check_customCrop.Name = "check_customCrop";\r
+            this.check_customCrop.Size = new System.Drawing.Size(74, 17);\r
+            this.check_customCrop.TabIndex = 34;\r
+            this.check_customCrop.Text = "Custom:";\r
+            this.check_customCrop.UseVisualStyleBackColor = true;\r
+            this.check_customCrop.CheckedChanged += new System.EventHandler(this.check_customCrop_CheckedChanged);\r
+            // \r
+            // check_autoCrop\r
+            // \r
+            this.check_autoCrop.AutoSize = true;\r
+            this.check_autoCrop.Checked = true;\r
+            this.check_autoCrop.Location = new System.Drawing.Point(16, 34);\r
+            this.check_autoCrop.Name = "check_autoCrop";\r
+            this.check_autoCrop.Size = new System.Drawing.Size(82, 17);\r
+            this.check_autoCrop.TabIndex = 33;\r
+            this.check_autoCrop.TabStop = true;\r
+            this.check_autoCrop.Text = "Automatic";\r
+            this.check_autoCrop.UseVisualStyleBackColor = true;\r
+            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
+            // \r
+            // check_decomb\r
+            // \r
+            this.check_decomb.AutoSize = true;\r
+            this.check_decomb.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_decomb.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_decomb.Location = new System.Drawing.Point(314, 188);\r
+            this.check_decomb.Name = "check_decomb";\r
+            this.check_decomb.Size = new System.Drawing.Size(73, 17);\r
+            this.check_decomb.TabIndex = 32;\r
+            this.check_decomb.Text = "Decomb";\r
+            this.check_decomb.UseVisualStyleBackColor = false;\r
+            // \r
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
             this.label6.BackColor = System.Drawing.Color.Transparent;\r
             this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(311, 89);\r
+            this.label6.Location = new System.Drawing.Point(311, 111);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(80, 13);\r
-            this.label6.TabIndex = 37;\r
+            this.label6.TabIndex = 20;\r
             this.label6.Text = "Anamorphic:";\r
             // \r
             // drp_anamorphic\r
@@ -1859,15 +1974,16 @@ namespace Handbrake
             "None",\r
             "Strict",\r
             "Loose"});\r
-            this.drp_anamorphic.Location = new System.Drawing.Point(414, 86);\r
+            this.drp_anamorphic.Location = new System.Drawing.Point(407, 108);\r
             this.drp_anamorphic.Name = "drp_anamorphic";\r
             this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);\r
-            this.drp_anamorphic.TabIndex = 36;\r
+            this.drp_anamorphic.TabIndex = 21;\r
             this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);\r
             // \r
             // text_bottom\r
             // \r
-            this.text_bottom.Location = new System.Drawing.Point(133, 146);\r
+            this.text_bottom.Enabled = false;\r
+            this.text_bottom.Location = new System.Drawing.Point(96, 147);\r
             this.text_bottom.Maximum = new decimal(new int[] {\r
             1080,\r
             0,\r
@@ -1875,11 +1991,12 @@ namespace Handbrake
             0});\r
             this.text_bottom.Name = "text_bottom";\r
             this.text_bottom.Size = new System.Drawing.Size(44, 21);\r
-            this.text_bottom.TabIndex = 35;\r
+            this.text_bottom.TabIndex = 9;\r
             // \r
             // text_top\r
             // \r
-            this.text_top.Location = new System.Drawing.Point(133, 105);\r
+            this.text_top.Enabled = false;\r
+            this.text_top.Location = new System.Drawing.Point(96, 101);\r
             this.text_top.Maximum = new decimal(new int[] {\r
             1080,\r
             0,\r
@@ -1887,11 +2004,12 @@ namespace Handbrake
             0});\r
             this.text_top.Name = "text_top";\r
             this.text_top.Size = new System.Drawing.Size(44, 21);\r
-            this.text_top.TabIndex = 34;\r
+            this.text_top.TabIndex = 6;\r
             // \r
             // text_left\r
             // \r
-            this.text_left.Location = new System.Drawing.Point(77, 126);\r
+            this.text_left.Enabled = false;\r
+            this.text_left.Location = new System.Drawing.Point(45, 123);\r
             this.text_left.Maximum = new decimal(new int[] {\r
             1920,\r
             0,\r
@@ -1899,11 +2017,12 @@ namespace Handbrake
             0});\r
             this.text_left.Name = "text_left";\r
             this.text_left.Size = new System.Drawing.Size(44, 21);\r
-            this.text_left.TabIndex = 33;\r
+            this.text_left.TabIndex = 4;\r
             // \r
             // text_right\r
             // \r
-            this.text_right.Location = new System.Drawing.Point(187, 126);\r
+            this.text_right.Enabled = false;\r
+            this.text_right.Location = new System.Drawing.Point(147, 123);\r
             this.text_right.Maximum = new decimal(new int[] {\r
             1920,\r
             0,\r
@@ -1911,7 +2030,7 @@ namespace Handbrake
             0});\r
             this.text_right.Name = "text_right";\r
             this.text_right.Size = new System.Drawing.Size(44, 21);\r
-            this.text_right.TabIndex = 32;\r
+            this.text_right.TabIndex = 7;\r
             // \r
             // label26\r
             // \r
@@ -1921,7 +2040,7 @@ namespace Handbrake
             this.label26.Location = new System.Drawing.Point(311, 13);\r
             this.label26.Name = "label26";\r
             this.label26.Size = new System.Drawing.Size(34, 13);\r
-            this.label26.TabIndex = 31;\r
+            this.label26.TabIndex = 11;\r
             this.label26.Text = "Size";\r
             // \r
             // Label56\r
@@ -1930,10 +2049,10 @@ namespace Handbrake
             this.Label56.BackColor = System.Drawing.Color.Transparent;\r
             this.Label56.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label56.ForeColor = System.Drawing.Color.Black;\r
-            this.Label56.Location = new System.Drawing.Point(483, 38);\r
+            this.Label56.Location = new System.Drawing.Point(477, 85);\r
             this.Label56.Name = "Label56";\r
             this.Label56.Size = new System.Drawing.Size(15, 13);\r
-            this.Label56.TabIndex = 27;\r
+            this.Label56.TabIndex = 18;\r
             this.Label56.Text = "x";\r
             // \r
             // lbl_Aspect\r
@@ -1941,10 +2060,10 @@ namespace Handbrake
             this.lbl_Aspect.AutoSize = true;\r
             this.lbl_Aspect.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_Aspect.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_Aspect.Location = new System.Drawing.Point(412, 62);\r
+            this.lbl_Aspect.Location = new System.Drawing.Point(405, 58);\r
             this.lbl_Aspect.Name = "lbl_Aspect";\r
             this.lbl_Aspect.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_Aspect.TabIndex = 30;\r
+            this.lbl_Aspect.TabIndex = 15;\r
             this.lbl_Aspect.Text = "Select a Title";\r
             // \r
             // Label91\r
@@ -1952,10 +2071,10 @@ namespace Handbrake
             this.Label91.AutoSize = true;\r
             this.Label91.BackColor = System.Drawing.Color.Transparent;\r
             this.Label91.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label91.Location = new System.Drawing.Point(311, 61);\r
+            this.Label91.Location = new System.Drawing.Point(311, 57);\r
             this.Label91.Name = "Label91";\r
             this.Label91.Size = new System.Drawing.Size(83, 13);\r
-            this.Label91.TabIndex = 29;\r
+            this.Label91.TabIndex = 14;\r
             this.Label91.Text = "Aspect Ratio:";\r
             // \r
             // Label55\r
@@ -1964,10 +2083,10 @@ namespace Handbrake
             this.Label55.BackColor = System.Drawing.Color.Transparent;\r
             this.Label55.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label55.ForeColor = System.Drawing.Color.Black;\r
-            this.Label55.Location = new System.Drawing.Point(311, 37);\r
+            this.Label55.Location = new System.Drawing.Point(311, 84);\r
             this.Label55.Name = "Label55";\r
             this.Label55.Size = new System.Drawing.Size(85, 13);\r
-            this.Label55.TabIndex = 25;\r
+            this.Label55.TabIndex = 16;\r
             this.Label55.Text = "Width/Height:";\r
             // \r
             // check_vfr\r
@@ -1975,10 +2094,10 @@ namespace Handbrake
             this.check_vfr.AutoSize = true;\r
             this.check_vfr.BackColor = System.Drawing.Color.Transparent;\r
             this.check_vfr.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_vfr.Location = new System.Drawing.Point(413, 143);\r
+            this.check_vfr.Location = new System.Drawing.Point(413, 165);\r
             this.check_vfr.Name = "check_vfr";\r
             this.check_vfr.Size = new System.Drawing.Size(48, 17);\r
-            this.check_vfr.TabIndex = 23;\r
+            this.check_vfr.TabIndex = 24;\r
             this.check_vfr.Text = "VFR";\r
             this.check_vfr.UseVisualStyleBackColor = false;\r
             this.check_vfr.CheckedChanged += new System.EventHandler(this.check_vfr_CheckedChanged);\r
@@ -1988,10 +2107,10 @@ namespace Handbrake
             this.label24.AutoSize = true;\r
             this.label24.BackColor = System.Drawing.Color.Transparent;\r
             this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(311, 120);\r
+            this.label24.Location = new System.Drawing.Point(311, 142);\r
             this.label24.Name = "label24";\r
             this.label24.Size = new System.Drawing.Size(49, 13);\r
-            this.label24.TabIndex = 13;\r
+            this.label24.TabIndex = 22;\r
             this.label24.Text = "Filters";\r
             // \r
             // drp_deNoise\r
@@ -2004,43 +2123,31 @@ namespace Handbrake
             "Weak",\r
             "Medium",\r
             "Strong"});\r
-            this.drp_deNoise.Location = new System.Drawing.Point(413, 218);\r
+            this.drp_deNoise.Location = new System.Drawing.Point(413, 237);\r
             this.drp_deNoise.Name = "drp_deNoise";\r
             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
-            this.drp_deNoise.TabIndex = 19;\r
+            this.drp_deNoise.TabIndex = 29;\r
             // \r
             // label11\r
             // \r
             this.label11.AutoSize = true;\r
             this.label11.BackColor = System.Drawing.Color.Transparent;\r
             this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label11.Location = new System.Drawing.Point(311, 221);\r
+            this.label11.Location = new System.Drawing.Point(311, 240);\r
             this.label11.Name = "label11";\r
             this.label11.Size = new System.Drawing.Size(58, 13);\r
-            this.label11.TabIndex = 18;\r
+            this.label11.TabIndex = 28;\r
             this.label11.Text = "Denoise:";\r
             // \r
-            // check_deblock\r
-            // \r
-            this.check_deblock.AutoSize = true;\r
-            this.check_deblock.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deblock.Location = new System.Drawing.Point(314, 166);\r
-            this.check_deblock.Name = "check_deblock";\r
-            this.check_deblock.Size = new System.Drawing.Size(72, 17);\r
-            this.check_deblock.TabIndex = 15;\r
-            this.check_deblock.Text = "Deblock";\r
-            this.check_deblock.UseVisualStyleBackColor = false;\r
-            // \r
             // check_detelecine\r
             // \r
             this.check_detelecine.AutoSize = true;\r
             this.check_detelecine.BackColor = System.Drawing.Color.Transparent;\r
             this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_detelecine.Location = new System.Drawing.Point(314, 143);\r
+            this.check_detelecine.Location = new System.Drawing.Point(314, 165);\r
             this.check_detelecine.Name = "check_detelecine";\r
             this.check_detelecine.Size = new System.Drawing.Size(86, 17);\r
-            this.check_detelecine.TabIndex = 14;\r
+            this.check_detelecine.TabIndex = 23;\r
             this.check_detelecine.Text = "Detelecine";\r
             this.check_detelecine.UseVisualStyleBackColor = false;\r
             // \r
@@ -2049,10 +2156,10 @@ namespace Handbrake
             this.label4.AutoSize = true;\r
             this.label4.BackColor = System.Drawing.Color.Transparent;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(311, 193);\r
+            this.label4.Location = new System.Drawing.Point(311, 212);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(77, 13);\r
-            this.label4.TabIndex = 16;\r
+            this.label4.TabIndex = 26;\r
             this.label4.Text = "Deinterlace:";\r
             // \r
             // drp_deInterlace_option\r
@@ -2065,31 +2172,10 @@ namespace Handbrake
             "Fast",\r
             "Slow",\r
             "Slower"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(413, 190);\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(413, 209);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
-            this.drp_deInterlace_option.TabIndex = 17;\r
-            // \r
-            // lbl_RecomendedCrop\r
-            // \r
-            this.lbl_RecomendedCrop.AutoSize = true;\r
-            this.lbl_RecomendedCrop.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_RecomendedCrop.Location = new System.Drawing.Point(116, 69);\r
-            this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";\r
-            this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_RecomendedCrop.TabIndex = 4;\r
-            this.lbl_RecomendedCrop.Text = "Select a Title";\r
-            // \r
-            // Label8\r
-            // \r
-            this.Label8.AutoSize = true;\r
-            this.Label8.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label8.Location = new System.Drawing.Point(13, 68);\r
-            this.Label8.Name = "Label8";\r
-            this.Label8.Size = new System.Drawing.Size(70, 13);\r
-            this.Label8.TabIndex = 2;\r
-            this.Label8.Text = "Auto Crop:";\r
+            this.drp_deInterlace_option.TabIndex = 27;\r
             // \r
             // Label1\r
             // \r
@@ -2107,7 +2193,7 @@ namespace Handbrake
             this.Label53.AutoSize = true;\r
             this.Label53.BackColor = System.Drawing.Color.Transparent;\r
             this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label53.Location = new System.Drawing.Point(130, 174);\r
+            this.Label53.Location = new System.Drawing.Point(94, 171);\r
             this.Label53.Name = "Label53";\r
             this.Label53.Size = new System.Drawing.Size(48, 13);\r
             this.Label53.TabIndex = 10;\r
@@ -2118,7 +2204,7 @@ namespace Handbrake
             this.Label52.AutoSize = true;\r
             this.Label52.BackColor = System.Drawing.Color.Transparent;\r
             this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label52.Location = new System.Drawing.Point(139, 89);\r
+            this.Label52.Location = new System.Drawing.Point(103, 86);\r
             this.Label52.Name = "Label52";\r
             this.Label52.Size = new System.Drawing.Size(28, 13);\r
             this.Label52.TabIndex = 5;\r
@@ -2129,49 +2215,23 @@ namespace Handbrake
             this.Label51.AutoSize = true;\r
             this.Label51.BackColor = System.Drawing.Color.Transparent;\r
             this.Label51.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label51.Location = new System.Drawing.Point(237, 128);\r
+            this.Label51.Location = new System.Drawing.Point(190, 125);\r
             this.Label51.Name = "Label51";\r
             this.Label51.Size = new System.Drawing.Size(36, 13);\r
-            this.Label51.TabIndex = 12;\r
+            this.Label51.TabIndex = 8;\r
             this.Label51.Text = "Right";\r
             // \r
-            // Label50\r
-            // \r
-            this.Label50.AutoSize = true;\r
-            this.Label50.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label50.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label50.Location = new System.Drawing.Point(13, 37);\r
-            this.Label50.Name = "Label50";\r
-            this.Label50.Size = new System.Drawing.Size(88, 13);\r
-            this.Label50.TabIndex = 1;\r
-            this.Label50.Text = "Select Option:";\r
-            // \r
             // Label15\r
             // \r
             this.Label15.AutoSize = true;\r
             this.Label15.BackColor = System.Drawing.Color.Transparent;\r
             this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label15.Location = new System.Drawing.Point(43, 128);\r
+            this.Label15.Location = new System.Drawing.Point(13, 125);\r
             this.Label15.Name = "Label15";\r
             this.Label15.Size = new System.Drawing.Size(28, 13);\r
-            this.Label15.TabIndex = 7;\r
+            this.Label15.TabIndex = 3;\r
             this.Label15.Text = "Left";\r
             // \r
-            // drp_crop\r
-            // \r
-            this.drp_crop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_crop.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_crop.FormattingEnabled = true;\r
-            this.drp_crop.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "Custom",\r
-            "No Crop"});\r
-            this.drp_crop.Location = new System.Drawing.Point(118, 34);\r
-            this.drp_crop.Name = "drp_crop";\r
-            this.drp_crop.Size = new System.Drawing.Size(123, 21);\r
-            this.drp_crop.TabIndex = 3;\r
-            this.drp_crop.SelectedIndexChanged += new System.EventHandler(this.drp_crop_SelectedIndexChanged);\r
-            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -2194,10 +2254,10 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.h264Tab);\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, 281);\r
+            this.advancedOptions.Location = new System.Drawing.Point(12, 274);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(705, 328);\r
+            this.advancedOptions.Size = new System.Drawing.Size(705, 342);\r
             this.advancedOptions.TabIndex = 5;\r
             this.advancedOptions.TabStop = false;\r
             // \r
@@ -2209,7 +2269,7 @@ namespace Handbrake
             this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);\r
             this.tab_chapters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_chapters.Name = "tab_chapters";\r
-            this.tab_chapters.Size = new System.Drawing.Size(697, 302);\r
+            this.tab_chapters.Size = new System.Drawing.Size(697, 316);\r
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
             // \r
@@ -2230,13 +2290,10 @@ namespace Handbrake
             this.h264Tab.Controls.Add(this.label43);\r
             this.h264Tab.Controls.Add(this.btn_reset);\r
             this.h264Tab.Controls.Add(this.rtf_x264Query);\r
-            this.h264Tab.Controls.Add(this.label35);\r
             this.h264Tab.Controls.Add(this.check_Cabac);\r
-            this.h264Tab.Controls.Add(this.label36);\r
             this.h264Tab.Controls.Add(this.check_noDCTDecimate);\r
-            this.h264Tab.Controls.Add(this.label37);\r
             this.h264Tab.Controls.Add(this.check_noFastPSkip);\r
-            this.h264Tab.Controls.Add(this.label39);\r
+            this.h264Tab.Controls.Add(this.lbl_trellis);\r
             this.h264Tab.Controls.Add(this.drop_trellis);\r
             this.h264Tab.Controls.Add(this.drop_deblockBeta);\r
             this.h264Tab.Controls.Add(this.label41);\r
@@ -2244,7 +2301,6 @@ namespace Handbrake
             this.h264Tab.Controls.Add(this.panel3);\r
             this.h264Tab.Controls.Add(this.panel1);\r
             this.h264Tab.Controls.Add(this.panel2);\r
-            this.h264Tab.Controls.Add(this.label44);\r
             this.h264Tab.Controls.Add(this.check_8x8DCT);\r
             this.h264Tab.Controls.Add(this.label45);\r
             this.h264Tab.Controls.Add(this.drop_analysis);\r
@@ -2254,19 +2310,14 @@ namespace Handbrake
             this.h264Tab.Controls.Add(this.drop_MotionEstimationRange);\r
             this.h264Tab.Controls.Add(this.label54);\r
             this.h264Tab.Controls.Add(this.drop_MotionEstimationMethod);\r
-            this.h264Tab.Controls.Add(this.label57);\r
             this.h264Tab.Controls.Add(this.check_pyrmidalBFrames);\r
-            this.h264Tab.Controls.Add(this.label58);\r
             this.h264Tab.Controls.Add(this.check_BidirectionalRefinement);\r
-            this.h264Tab.Controls.Add(this.label59);\r
-            this.h264Tab.Controls.Add(this.check_bFrameDistortion);\r
-            this.h264Tab.Controls.Add(this.label60);\r
+            this.h264Tab.Controls.Add(this.check_bFrameRateDistortion);\r
             this.h264Tab.Controls.Add(this.check_weightedBFrames);\r
-            this.h264Tab.Controls.Add(this.label61);\r
+            this.h264Tab.Controls.Add(this.lbl_direct_prediction);\r
             this.h264Tab.Controls.Add(this.drop_directPrediction);\r
             this.h264Tab.Controls.Add(this.label62);\r
             this.h264Tab.Controls.Add(this.drop_bFrames);\r
-            this.h264Tab.Controls.Add(this.label63);\r
             this.h264Tab.Controls.Add(this.label64);\r
             this.h264Tab.Controls.Add(this.drop_refFrames);\r
             this.h264Tab.Controls.Add(this.check_mixedReferences);\r
@@ -2274,7 +2325,7 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(697, 302);\r
+            this.h264Tab.Size = new System.Drawing.Size(697, 316);\r
             this.h264Tab.TabIndex = 8;\r
             this.h264Tab.Text = "Advanced";\r
             // \r
@@ -2291,7 +2342,7 @@ namespace Handbrake
             // \r
             // btn_reset\r
             // \r
-            this.btn_reset.Location = new System.Drawing.Point(13, 226);\r
+            this.btn_reset.Location = new System.Drawing.Point(13, 224);\r
             this.btn_reset.Name = "btn_reset";\r
             this.btn_reset.Size = new System.Drawing.Size(75, 23);\r
             this.btn_reset.TabIndex = 41;\r
@@ -2310,90 +2361,73 @@ namespace Handbrake
             this.rtf_x264Query.LostFocus += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
             this.rtf_x264Query.TextChanged += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
             // \r
-            // label35\r
-            // \r
-            this.label35.AutoSize = true;\r
-            this.label35.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label35.Location = new System.Drawing.Point(534, 213);\r
-            this.label35.Name = "label35";\r
-            this.label35.Size = new System.Drawing.Size(128, 12);\r
-            this.label35.TabIndex = 29;\r
-            this.label35.Text = "CABAC Entropy Coding:";\r
-            // \r
             // check_Cabac\r
             // \r
             this.check_Cabac.AutoSize = true;\r
+            this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_Cabac.Checked = true;\r
+            this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;\r
             this.check_Cabac.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_Cabac.Location = new System.Drawing.Point(668, 214);\r
+            this.check_Cabac.Location = new System.Drawing.Point(536, 214);\r
             this.check_Cabac.Name = "check_Cabac";\r
             this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_Cabac.Size = new System.Drawing.Size(12, 11);\r
+            this.check_Cabac.Size = new System.Drawing.Size(144, 16);\r
             this.check_Cabac.TabIndex = 40;\r
+            this.check_Cabac.Text = "CABAC Entropy Coding:";\r
             this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_Cabac.UseVisualStyleBackColor = true;\r
             this.check_Cabac.CheckStateChanged += new System.EventHandler(this.check_Cabac_CheckedChanged);\r
             // \r
-            // label36\r
-            // \r
-            this.label36.AutoSize = true;\r
-            this.label36.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label36.Location = new System.Drawing.Point(561, 194);\r
-            this.label36.Name = "label36";\r
-            this.label36.Size = new System.Drawing.Size(102, 12);\r
-            this.label36.TabIndex = 28;\r
-            this.label36.Text = "No DCT-Decimate:";\r
-            // \r
             // check_noDCTDecimate\r
             // \r
             this.check_noDCTDecimate.AutoSize = true;\r
+            this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_noDCTDecimate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noDCTDecimate.Location = new System.Drawing.Point(668, 195);\r
+            this.check_noDCTDecimate.Location = new System.Drawing.Point(562, 192);\r
             this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
             this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noDCTDecimate.Size = new System.Drawing.Size(12, 11);\r
+            this.check_noDCTDecimate.Size = new System.Drawing.Size(118, 16);\r
             this.check_noDCTDecimate.TabIndex = 39;\r
+            this.check_noDCTDecimate.Text = "No DCT-Decimate:";\r
             this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
             this.check_noDCTDecimate.CheckStateChanged += new System.EventHandler(this.check_noDCTDecimate_CheckedChanged);\r
             // \r
-            // label37\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(444, 193);\r
-            this.label37.Name = "label37";\r
-            this.label37.Size = new System.Drawing.Size(87, 12);\r
-            this.label37.TabIndex = 27;\r
-            this.label37.Text = "No Fast-P-Skip:";\r
-            // \r
             // check_noFastPSkip\r
             // \r
             this.check_noFastPSkip.AutoSize = true;\r
+            this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_noFastPSkip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noFastPSkip.Location = new System.Drawing.Point(537, 194);\r
+            this.check_noFastPSkip.Location = new System.Drawing.Point(444, 192);\r
             this.check_noFastPSkip.Name = "check_noFastPSkip";\r
             this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noFastPSkip.Size = new System.Drawing.Size(12, 11);\r
+            this.check_noFastPSkip.Size = new System.Drawing.Size(103, 16);\r
             this.check_noFastPSkip.TabIndex = 38;\r
+            this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
             this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
             this.check_noFastPSkip.CheckStateChanged += new System.EventHandler(this.check_noFastPSkip_CheckedChanged);\r
             // \r
-            // label39\r
+            // lbl_trellis\r
             // \r
-            this.label39.AutoSize = true;\r
-            this.label39.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label39.Location = new System.Drawing.Point(490, 169);\r
-            this.label39.Name = "label39";\r
-            this.label39.Size = new System.Drawing.Size(41, 12);\r
-            this.label39.TabIndex = 26;\r
-            this.label39.Text = "Trellis:";\r
+            this.lbl_trellis.AutoSize = true;\r
+            this.lbl_trellis.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_trellis.Location = new System.Drawing.Point(490, 169);\r
+            this.lbl_trellis.Name = "lbl_trellis";\r
+            this.lbl_trellis.Size = new System.Drawing.Size(41, 12);\r
+            this.lbl_trellis.TabIndex = 26;\r
+            this.lbl_trellis.Text = "Trellis:";\r
             // \r
             // drop_trellis\r
             // \r
             this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_trellis.FormattingEnabled = true;\r
+            this.drop_trellis.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "0",\r
+            "1",\r
+            "2"});\r
             this.drop_trellis.Location = new System.Drawing.Point(537, 166);\r
             this.drop_trellis.Name = "drop_trellis";\r
             this.drop_trellis.Size = new System.Drawing.Size(143, 20);\r
@@ -2403,8 +2437,23 @@ namespace Handbrake
             // drop_deblockBeta\r
             // \r
             this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_deblockBeta.FormattingEnabled = true;\r
+            this.drop_deblockBeta.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "-6",\r
+            "-5",\r
+            "-4",\r
+            "-3",\r
+            "-2",\r
+            "-1",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6"});\r
             this.drop_deblockBeta.Location = new System.Drawing.Point(611, 139);\r
             this.drop_deblockBeta.Name = "drop_deblockBeta";\r
             this.drop_deblockBeta.Size = new System.Drawing.Size(69, 20);\r
@@ -2424,8 +2473,23 @@ namespace Handbrake
             // drop_deblockAlpha\r
             // \r
             this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_deblockAlpha.FormattingEnabled = true;\r
+            this.drop_deblockAlpha.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "-6",\r
+            "-5",\r
+            "-4",\r
+            "-3",\r
+            "-2",\r
+            "-1",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6"});\r
             this.drop_deblockAlpha.Location = new System.Drawing.Point(537, 139);\r
             this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
             this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 20);\r
@@ -2459,25 +2523,17 @@ namespace Handbrake
             this.panel2.Size = new System.Drawing.Size(284, 1);\r
             this.panel2.TabIndex = 21;\r
             // \r
-            // label44\r
-            // \r
-            this.label44.AutoSize = true;\r
-            this.label44.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label44.Location = new System.Drawing.Point(606, 109);\r
-            this.label44.Name = "label44";\r
-            this.label44.Size = new System.Drawing.Size(55, 12);\r
-            this.label44.TabIndex = 23;\r
-            this.label44.Text = "8x8 DCT:";\r
-            // \r
             // check_8x8DCT\r
             // \r
             this.check_8x8DCT.AutoSize = true;\r
+            this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_8x8DCT.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_8x8DCT.Location = new System.Drawing.Point(664, 109);\r
+            this.check_8x8DCT.Location = new System.Drawing.Point(608, 106);\r
             this.check_8x8DCT.Name = "check_8x8DCT";\r
             this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_8x8DCT.Size = new System.Drawing.Size(12, 11);\r
+            this.check_8x8DCT.Size = new System.Drawing.Size(71, 16);\r
             this.check_8x8DCT.TabIndex = 34;\r
+            this.check_8x8DCT.Text = "8x8 DCT:";\r
             this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_8x8DCT.UseVisualStyleBackColor = true;\r
             this.check_8x8DCT.CheckStateChanged += new System.EventHandler(this.check_8x8DCT_CheckedChanged);\r
@@ -2495,8 +2551,12 @@ namespace Handbrake
             // drop_analysis\r
             // \r
             this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_analysis.FormattingEnabled = true;\r
+            this.drop_analysis.Items.AddRange(new object[] {\r
+            "Default (some)",\r
+            "None",\r
+            "All"});\r
             this.drop_analysis.Location = new System.Drawing.Point(537, 105);\r
             this.drop_analysis.Name = "drop_analysis";\r
             this.drop_analysis.Size = new System.Drawing.Size(63, 20);\r
@@ -2516,8 +2576,18 @@ namespace Handbrake
             // drop_subpixelMotionEstimation\r
             // \r
             this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
+            this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
+            "Default (6)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7"});\r
             this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(537, 69);\r
             this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
             this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 20);\r
@@ -2537,8 +2607,71 @@ namespace Handbrake
             // drop_MotionEstimationRange\r
             // \r
             this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_MotionEstimationRange.FormattingEnabled = true;\r
+            this.drop_MotionEstimationRange.Items.AddRange(new object[] {\r
+            "Default (16)",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16",\r
+            "17",\r
+            "18",\r
+            "19",\r
+            "20",\r
+            "21",\r
+            "22",\r
+            "23",\r
+            "24",\r
+            "25",\r
+            "26",\r
+            "27",\r
+            "28",\r
+            "29",\r
+            "30",\r
+            "31",\r
+            "32",\r
+            "33",\r
+            "34",\r
+            "35",\r
+            "36",\r
+            "37",\r
+            "38",\r
+            "39",\r
+            "40",\r
+            "41",\r
+            "42",\r
+            "43",\r
+            "44",\r
+            "45",\r
+            "46",\r
+            "47",\r
+            "48",\r
+            "49",\r
+            "50",\r
+            "51",\r
+            "52",\r
+            "53",\r
+            "54",\r
+            "55",\r
+            "56",\r
+            "57",\r
+            "58",\r
+            "59",\r
+            "60",\r
+            "61",\r
+            "62",\r
+            "63",\r
+            "64"});\r
             this.drop_MotionEstimationRange.Location = new System.Drawing.Point(537, 40);\r
             this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
             this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 20);\r
@@ -2558,122 +2691,101 @@ namespace Handbrake
             // drop_MotionEstimationMethod\r
             // \r
             this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_MotionEstimationMethod.FormattingEnabled = true;\r
             this.drop_MotionEstimationMethod.ItemHeight = 12;\r
+            this.drop_MotionEstimationMethod.Items.AddRange(new object[] {\r
+            "Default (Hexagon)",\r
+            "Diamond",\r
+            "Hexagon",\r
+            "Uneven Multi-Hexagon",\r
+            "Exhaustive"});\r
             this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(537, 11);\r
             this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
             this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 20);\r
             this.drop_MotionEstimationMethod.TabIndex = 30;\r
             this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationMethod_SelectedIndexChanged);\r
             // \r
-            // label57\r
-            // \r
-            this.label57.AutoSize = true;\r
-            this.label57.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label57.Location = new System.Drawing.Point(41, 204);\r
-            this.label57.Name = "label57";\r
-            this.label57.Size = new System.Drawing.Size(105, 12);\r
-            this.label57.TabIndex = 9;\r
-            this.label57.Text = "Pyrmidal B-Frames:";\r
-            // \r
             // check_pyrmidalBFrames\r
             // \r
             this.check_pyrmidalBFrames.AutoSize = true;\r
+            this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_pyrmidalBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(157, 205);\r
+            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(46, 198);\r
             this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
             this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(12, 11);\r
+            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(121, 16);\r
             this.check_pyrmidalBFrames.TabIndex = 17;\r
+            this.check_pyrmidalBFrames.Text = "Pyrmidal B-Frames:";\r
             this.check_pyrmidalBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
             this.check_pyrmidalBFrames.CheckStateChanged += new System.EventHandler(this.check_pyrmidalBFrames_CheckedChanged);\r
             // \r
-            // label58\r
-            // \r
-            this.label58.AutoSize = true;\r
-            this.label58.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label58.Location = new System.Drawing.Point(15, 184);\r
-            this.label58.Name = "label58";\r
-            this.label58.Size = new System.Drawing.Size(131, 12);\r
-            this.label58.TabIndex = 8;\r
-            this.label58.Text = "Bidirectional Refinement:";\r
-            // \r
             // check_BidirectionalRefinement\r
             // \r
             this.check_BidirectionalRefinement.AutoSize = true;\r
+            this.check_BidirectionalRefinement.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_BidirectionalRefinement.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_BidirectionalRefinement.Location = new System.Drawing.Point(157, 185);\r
+            this.check_BidirectionalRefinement.Location = new System.Drawing.Point(20, 180);\r
             this.check_BidirectionalRefinement.Name = "check_BidirectionalRefinement";\r
             this.check_BidirectionalRefinement.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_BidirectionalRefinement.Size = new System.Drawing.Size(12, 11);\r
+            this.check_BidirectionalRefinement.Size = new System.Drawing.Size(147, 16);\r
             this.check_BidirectionalRefinement.TabIndex = 16;\r
+            this.check_BidirectionalRefinement.Text = "Bidirectional Refinement:";\r
             this.check_BidirectionalRefinement.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_BidirectionalRefinement.UseVisualStyleBackColor = true;\r
             this.check_BidirectionalRefinement.CheckStateChanged += new System.EventHandler(this.check_BidirectionalRefinement_CheckedChanged);\r
             // \r
-            // label59\r
-            // \r
-            this.label59.AutoSize = true;\r
-            this.label59.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label59.Location = new System.Drawing.Point(15, 164);\r
-            this.label59.Name = "label59";\r
-            this.label59.Size = new System.Drawing.Size(131, 12);\r
-            this.label59.TabIndex = 7;\r
-            this.label59.Text = "B-Frame Rate Distortion:";\r
-            // \r
-            // check_bFrameDistortion\r
-            // \r
-            this.check_bFrameDistortion.AutoSize = true;\r
-            this.check_bFrameDistortion.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_bFrameDistortion.Location = new System.Drawing.Point(157, 165);\r
-            this.check_bFrameDistortion.Name = "check_bFrameDistortion";\r
-            this.check_bFrameDistortion.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_bFrameDistortion.Size = new System.Drawing.Size(12, 11);\r
-            this.check_bFrameDistortion.TabIndex = 15;\r
-            this.check_bFrameDistortion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_bFrameDistortion.UseVisualStyleBackColor = true;\r
-            this.check_bFrameDistortion.CheckStateChanged += new System.EventHandler(this.check_bFrameDistortion_CheckedChanged);\r
-            // \r
-            // label60\r
-            // \r
-            this.label60.AutoSize = true;\r
-            this.label60.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label60.Location = new System.Drawing.Point(39, 146);\r
-            this.label60.Name = "label60";\r
-            this.label60.Size = new System.Drawing.Size(107, 12);\r
-            this.label60.TabIndex = 6;\r
-            this.label60.Text = "Weighted B-Frames:";\r
+            // check_bFrameRateDistortion\r
+            // \r
+            this.check_bFrameRateDistortion.AutoSize = true;\r
+            this.check_bFrameRateDistortion.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_bFrameRateDistortion.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_bFrameRateDistortion.Location = new System.Drawing.Point(20, 162);\r
+            this.check_bFrameRateDistortion.Name = "check_bFrameRateDistortion";\r
+            this.check_bFrameRateDistortion.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_bFrameRateDistortion.Size = new System.Drawing.Size(147, 16);\r
+            this.check_bFrameRateDistortion.TabIndex = 15;\r
+            this.check_bFrameRateDistortion.Text = "B-Frame Rate Distortion:";\r
+            this.check_bFrameRateDistortion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_bFrameRateDistortion.UseVisualStyleBackColor = true;\r
+            this.check_bFrameRateDistortion.CheckStateChanged += new System.EventHandler(this.check_bFrameDistortion_CheckedChanged);\r
             // \r
             // check_weightedBFrames\r
             // \r
             this.check_weightedBFrames.AutoSize = true;\r
+            this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_weightedBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_weightedBFrames.Location = new System.Drawing.Point(157, 147);\r
+            this.check_weightedBFrames.Location = new System.Drawing.Point(44, 144);\r
             this.check_weightedBFrames.Name = "check_weightedBFrames";\r
             this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_weightedBFrames.Size = new System.Drawing.Size(12, 11);\r
+            this.check_weightedBFrames.Size = new System.Drawing.Size(123, 16);\r
             this.check_weightedBFrames.TabIndex = 14;\r
-            this.check_weightedBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
             this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
             this.check_weightedBFrames.CheckStateChanged += new System.EventHandler(this.check_weightedBFrames_CheckedChanged);\r
             // \r
-            // label61\r
+            // lbl_direct_prediction\r
             // \r
-            this.label61.AutoSize = true;\r
-            this.label61.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label61.Location = new System.Drawing.Point(52, 121);\r
-            this.label61.Name = "label61";\r
-            this.label61.Size = new System.Drawing.Size(94, 12);\r
-            this.label61.TabIndex = 5;\r
-            this.label61.Text = "Direct Prediction:";\r
+            this.lbl_direct_prediction.AutoSize = true;\r
+            this.lbl_direct_prediction.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_direct_prediction.Location = new System.Drawing.Point(52, 121);\r
+            this.lbl_direct_prediction.Name = "lbl_direct_prediction";\r
+            this.lbl_direct_prediction.Size = new System.Drawing.Size(94, 12);\r
+            this.lbl_direct_prediction.TabIndex = 5;\r
+            this.lbl_direct_prediction.Text = "Direct Prediction:";\r
             // \r
             // drop_directPrediction\r
             // \r
             this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_directPrediction.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_directPrediction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_directPrediction.FormattingEnabled = true;\r
+            this.drop_directPrediction.Items.AddRange(new object[] {\r
+            "Default (Spatial)",\r
+            "None",\r
+            "Spatial",\r
+            "Temporal",\r
+            "Automatic"});\r
             this.drop_directPrediction.Location = new System.Drawing.Point(157, 118);\r
             this.drop_directPrediction.Name = "drop_directPrediction";\r
             this.drop_directPrediction.Size = new System.Drawing.Size(121, 20);\r
@@ -2693,24 +2805,33 @@ namespace Handbrake
             // drop_bFrames\r
             // \r
             this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_bFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_bFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_bFrames.FormattingEnabled = true;\r
+            this.drop_bFrames.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16"});\r
             this.drop_bFrames.Location = new System.Drawing.Point(157, 91);\r
             this.drop_bFrames.Name = "drop_bFrames";\r
             this.drop_bFrames.Size = new System.Drawing.Size(121, 20);\r
             this.drop_bFrames.TabIndex = 12;\r
             this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
             // \r
-            // label63\r
-            // \r
-            this.label63.AutoSize = true;\r
-            this.label63.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label63.Location = new System.Drawing.Point(48, 64);\r
-            this.label63.Name = "label63";\r
-            this.label63.Size = new System.Drawing.Size(98, 12);\r
-            this.label63.TabIndex = 2;\r
-            this.label63.Text = "Mixed References:";\r
-            // \r
             // label64\r
             // \r
             this.label64.AutoSize = true;\r
@@ -2724,8 +2845,27 @@ namespace Handbrake
             // drop_refFrames\r
             // \r
             this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_refFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drop_refFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
             this.drop_refFrames.FormattingEnabled = true;\r
+            this.drop_refFrames.Items.AddRange(new object[] {\r
+            "Default (1)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16"});\r
             this.drop_refFrames.Location = new System.Drawing.Point(157, 37);\r
             this.drop_refFrames.Name = "drop_refFrames";\r
             this.drop_refFrames.Size = new System.Drawing.Size(121, 20);\r
@@ -2735,12 +2875,14 @@ namespace Handbrake
             // check_mixedReferences\r
             // \r
             this.check_mixedReferences.AutoSize = true;\r
+            this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_mixedReferences.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_mixedReferences.Location = new System.Drawing.Point(157, 65);\r
+            this.check_mixedReferences.Location = new System.Drawing.Point(54, 63);\r
             this.check_mixedReferences.Name = "check_mixedReferences";\r
             this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_mixedReferences.Size = new System.Drawing.Size(12, 11);\r
+            this.check_mixedReferences.Size = new System.Drawing.Size(114, 16);\r
             this.check_mixedReferences.TabIndex = 11;\r
+            this.check_mixedReferences.Text = "Mixed References:";\r
             this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.check_mixedReferences.UseVisualStyleBackColor = true;\r
             this.check_mixedReferences.CheckStateChanged += new System.EventHandler(this.check_mixedReferences_CheckedChanged);\r
@@ -2748,14 +2890,13 @@ namespace Handbrake
             // tabPage4\r
             // \r
             this.tabPage4.Controls.Add(this.btn_clear);\r
-            this.tabPage4.Controls.Add(this.btn_copy2C);\r
             this.tabPage4.Controls.Add(this.label34);\r
             this.tabPage4.Controls.Add(this.btn_generate_Query);\r
             this.tabPage4.Controls.Add(this.label33);\r
             this.tabPage4.Controls.Add(this.rtf_query);\r
             this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage4.Name = "tabPage4";\r
-            this.tabPage4.Size = new System.Drawing.Size(697, 302);\r
+            this.tabPage4.Size = new System.Drawing.Size(697, 316);\r
             this.tabPage4.TabIndex = 7;\r
             this.tabPage4.Text = "Query Editor";\r
             // \r
@@ -2772,19 +2913,6 @@ namespace Handbrake
             this.btn_clear.UseVisualStyleBackColor = true;\r
             this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);\r
             // \r
-            // btn_copy2C\r
-            // \r
-            this.btn_copy2C.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_copy2C.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_copy2C.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_copy2C.Location = new System.Drawing.Point(148, 75);\r
-            this.btn_copy2C.Name = "btn_copy2C";\r
-            this.btn_copy2C.Size = new System.Drawing.Size(136, 22);\r
-            this.btn_copy2C.TabIndex = 3;\r
-            this.btn_copy2C.Text = "Copy to clipboard";\r
-            this.btn_copy2C.UseVisualStyleBackColor = true;\r
-            this.btn_copy2C.Click += new System.EventHandler(this.btn_copy2C_Click);\r
-            // \r
             // label34\r
             // \r
             this.label34.AutoSize = true;\r
@@ -2835,17 +2963,17 @@ namespace Handbrake
             this.groupBox_dest.Controls.Add(this.text_destination);\r
             this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_dest.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_dest.Location = new System.Drawing.Point(14, 163);\r
+            this.groupBox_dest.Location = new System.Drawing.Point(12, 160);\r
             this.groupBox_dest.Name = "groupBox_dest";\r
             this.groupBox_dest.Size = new System.Drawing.Size(705, 50);\r
-            this.groupBox_dest.TabIndex = 2;\r
+            this.groupBox_dest.TabIndex = 3;\r
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
             // \r
             // btn_destBrowse\r
             // \r
             this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_destBrowse.Location = new System.Drawing.Point(598, 18);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(608, 17);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);\r
             this.btn_destBrowse.TabIndex = 13;\r
@@ -2861,67 +2989,116 @@ namespace Handbrake
             this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox2.Location = new System.Drawing.Point(729, 73);\r
+            this.groupBox2.Location = new System.Drawing.Point(728, 70);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(198, 536);\r
-            this.groupBox2.TabIndex = 11;\r
+            this.groupBox2.Size = new System.Drawing.Size(218, 546);\r
+            this.groupBox2.TabIndex = 6;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
             // treeView_presets\r
             // \r
-            this.treeView_presets.ForeColor = System.Drawing.Color.Navy;\r
+            this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue;\r
             this.treeView_presets.FullRowSelect = true;\r
             this.treeView_presets.HideSelection = false;\r
-            this.treeView_presets.ItemHeight = 17;\r
+            this.treeView_presets.ItemHeight = 21;\r
             this.treeView_presets.Location = new System.Drawing.Point(10, 23);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
-            this.treeView_presets.Size = new System.Drawing.Size(177, 473);\r
-            this.treeView_presets.TabIndex = 2;\r
+            this.treeView_presets.Size = new System.Drawing.Size(198, 473);\r
+            this.treeView_presets.TabIndex = 0;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
+            this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);\r
             // \r
             // toolStrip1\r
             // \r
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_source,\r
+            this.toolStripSeparator10,\r
             this.btn_start,\r
-            this.toolStripSeparator1,\r
             this.btn_add2Queue,\r
             this.btn_showQueue,\r
             this.toolStripSeparator4,\r
             this.btn_ActivityWindow,\r
-            this.toolStripSeparator8});\r
+            this.toolStripSeparator8,\r
+            this.btn_minimize});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
-            this.toolStrip1.Size = new System.Drawing.Size(931, 39);\r
-            this.toolStrip1.TabIndex = 13;\r
+            this.toolStrip1.Size = new System.Drawing.Size(958, 39);\r
+            this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
+            // btn_source\r
+            // \r
+            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_file_source,\r
+            this.btn_dvd_source,\r
+            this.toolStripSeparator1,\r
+            this.mnu_dvd_drive});\r
+            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\r
+            this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_source.Name = "btn_source";\r
+            this.btn_source.Size = new System.Drawing.Size(90, 36);\r
+            this.btn_source.Text = "Source";\r
+            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
+            // \r
+            // btn_file_source\r
+            // \r
+            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
+            this.btn_file_source.Name = "btn_file_source";\r
+            this.btn_file_source.Size = new System.Drawing.Size(214, 22);\r
+            this.btn_file_source.Text = "Video File";\r
+            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
+            // \r
+            // btn_dvd_source\r
+            // \r
+            this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));\r
+            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_dvd_source.Name = "btn_dvd_source";\r
+            this.btn_dvd_source.Size = new System.Drawing.Size(214, 22);\r
+            this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";\r
+            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
+            // \r
+            // toolStripSeparator1\r
+            // \r
+            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6);\r
+            // \r
+            // mnu_dvd_drive\r
+            // \r
+            this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;\r
+            this.mnu_dvd_drive.Name = "mnu_dvd_drive";\r
+            this.mnu_dvd_drive.Size = new System.Drawing.Size(214, 22);\r
+            this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
+            this.mnu_dvd_drive.Visible = false;\r
+            this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);\r
+            // \r
+            // toolStripSeparator10\r
+            // \r
+            this.toolStripSeparator10.Name = "toolStripSeparator10";\r
+            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);\r
+            // \r
             // btn_start\r
             // \r
             this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\r
             this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_start.Name = "btn_start";\r
-            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
+            this.btn_start.Size = new System.Drawing.Size(70, 36);\r
             this.btn_start.Text = "Start";\r
             this.btn_start.ToolTipText = "Start the encoding process";\r
             this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
             // \r
-            // toolStripSeparator1\r
-            // \r
-            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39);\r
-            // \r
             // btn_add2Queue\r
             // \r
             this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\r
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_add2Queue.Name = "btn_add2Queue";\r
-            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);\r
+            this.btn_add2Queue.Size = new System.Drawing.Size(122, 36);\r
             this.btn_add2Queue.Text = "Add to Queue";\r
             this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
@@ -2932,7 +3109,7 @@ namespace Handbrake
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_showQueue.Name = "btn_showQueue";\r
-            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);\r
+            this.btn_showQueue.Size = new System.Drawing.Size(115, 36);\r
             this.btn_showQueue.Tag = "";\r
             this.btn_showQueue.Text = "Show Queue";\r
             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
@@ -2948,7 +3125,7 @@ namespace Handbrake
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);\r
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(132, 36);\r
             this.btn_ActivityWindow.Text = "Activity Window";\r
             this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
                 "ently running encode.";\r
@@ -2959,25 +3136,62 @@ namespace Handbrake
             this.toolStripSeparator8.Name = "toolStripSeparator8";\r
             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // btn_minimize\r
+            // \r
+            this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;\r
+            this.btn_minimize.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_minimize.Name = "btn_minimize";\r
+            this.btn_minimize.Size = new System.Drawing.Size(162, 36);\r
+            this.btn_minimize.Text = "Minimize To System Tray";\r
+            this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);\r
+            // \r
+            // notifyIcon\r
+            // \r
+            this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
+            this.notifyIcon.BalloonTipText = "HandBrake Status Here";\r
+            this.notifyIcon.BalloonTipTitle = "HandBrake";\r
+            this.notifyIcon.ContextMenuStrip = notifyIconMenu;\r
+            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));\r
+            this.notifyIcon.Text = "HandBrake";\r
+            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);\r
+            // \r
+            // StatusStrip\r
+            // \r
+            this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.lbl_encode});\r
+            this.StatusStrip.Location = new System.Drawing.Point(0, 629);\r
+            this.StatusStrip.Name = "StatusStrip";\r
+            this.StatusStrip.Size = new System.Drawing.Size(958, 22);\r
+            this.StatusStrip.TabIndex = 7;\r
+            this.StatusStrip.Text = "statusStrip1";\r
+            // \r
+            // lbl_encode\r
+            // \r
+            this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_encode.Name = "lbl_encode";\r
+            this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
+            this.lbl_encode.Text = "{0}";\r
+            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(931, 617);\r
-            this.Controls.Add(this.lbl_encode);\r
-            this.Controls.Add(this.toolStrip1);\r
-            this.Controls.Add(this.groupBox2);\r
+            this.ClientSize = new System.Drawing.Size(958, 651);\r
+            this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.groupBox_dest);\r
-            this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.groupBox_output);\r
-            this.Controls.Add(this.GroupBox1);\r
+            this.Controls.Add(this.groupBox2);\r
+            this.Controls.Add(this.advancedOptions);\r
+            this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.frmMainMenu);\r
+            this.Controls.Add(this.StatusStrip);\r
             this.DoubleBuffered = true;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
-            this.MinimumSize = new System.Drawing.Size(680, 580);\r
+            this.MinimumSize = new System.Drawing.Size(946, 668);\r
             this.Name = "frmMain";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
-            this.Text = "Handbrake";\r
+            this.Text = "HandBrake";\r
+            notifyIconMenu.ResumeLayout(false);\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();\r
             this.frmMainMenu.ResumeLayout(false);\r
@@ -2996,6 +3210,7 @@ namespace Handbrake
             this.TabPage3.PerformLayout();\r
             this.TabPage1.ResumeLayout(false);\r
             this.TabPage1.PerformLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_bottom)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_top)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_left)).EndInit();\r
@@ -3012,6 +3227,8 @@ namespace Handbrake
             this.groupBox2.ResumeLayout(false);\r
             this.toolStrip1.ResumeLayout(false);\r
             this.toolStrip1.PerformLayout();\r
+            this.StatusStrip.ResumeLayout(false);\r
+            this.StatusStrip.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -3026,16 +3243,11 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_exit;\r
         internal System.Windows.Forms.ToolStripMenuItem ToolsToolStripMenuItem;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_encode;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_viewDVDdata;\r
         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_presetReset;\r
         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripMenuItem OnlineDocumentationToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_wiki;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_onlineDocs;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_faq;\r
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_about;\r
         internal System.Windows.Forms.MenuStrip frmMainMenu;\r
@@ -3053,7 +3265,6 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drp_videoEncoder;\r
         internal System.Windows.Forms.Label Label47;\r
         internal System.Windows.Forms.TextBox text_destination;\r
-        private System.Windows.Forms.Label lbl_encode;\r
         internal System.Windows.Forms.TabPage TabPage2;\r
         internal System.Windows.Forms.ComboBox drp_audmix_1;\r
         internal System.Windows.Forms.ComboBox drp_track1Audio;\r
@@ -3075,15 +3286,11 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label42;\r
         internal System.Windows.Forms.TabPage TabPage1;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
-        internal System.Windows.Forms.Label lbl_RecomendedCrop;\r
-        internal System.Windows.Forms.Label Label8;\r
         internal System.Windows.Forms.Label Label1;\r
         internal System.Windows.Forms.Label Label53;\r
         internal System.Windows.Forms.Label Label52;\r
         internal System.Windows.Forms.Label Label51;\r
-        internal System.Windows.Forms.Label Label50;\r
         internal System.Windows.Forms.Label Label15;\r
-        internal System.Windows.Forms.ComboBox drp_crop;\r
         internal System.Windows.Forms.TabControl advancedOptions;\r
         internal System.Windows.Forms.Label Label46;\r
         private System.Windows.Forms.GroupBox groupBox_dest;\r
@@ -3092,9 +3299,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label20;\r
         internal System.Windows.Forms.CheckBox check_grayscale;\r
         internal System.Windows.Forms.Label label24;\r
-        internal System.Windows.Forms.ComboBox drp_deNoise;\r
         internal System.Windows.Forms.Label label11;\r
-        internal System.Windows.Forms.CheckBox check_deblock;\r
         internal System.Windows.Forms.CheckBox check_detelecine;\r
         internal System.Windows.Forms.Label label4;\r
         internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
@@ -3105,12 +3310,9 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
         private System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.OpenFileDialog File_Open;\r
-        private System.Windows.Forms.OpenFileDialog ISO_Open;\r
-        private System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_open;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
-        private System.Windows.Forms.TreeView treeView_presets;\r
         internal System.Windows.Forms.CheckBox check_vfr;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
         internal System.Windows.Forms.Label lbl_vfr;\r
@@ -3137,13 +3339,10 @@ namespace Handbrake
         private System.Windows.Forms.Label label34;\r
         internal System.Windows.Forms.Button btn_generate_Query;\r
         internal System.Windows.Forms.Label label33;\r
-        private System.Windows.Forms.RichTextBox rtf_query;\r
         internal System.Windows.Forms.Button btn_clear;\r
-        internal System.Windows.Forms.Button btn_copy2C;\r
         private System.Windows.Forms.ToolStrip toolStrip1;\r
         private System.Windows.Forms.ToolStripButton btn_start;\r
         private System.Windows.Forms.ToolStripButton btn_add2Queue;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
         private System.Windows.Forms.ToolStripButton btn_showQueue;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;\r
@@ -3158,13 +3357,10 @@ namespace Handbrake
         internal System.Windows.Forms.RichTextBox rtf_x264Query;\r
         internal System.Windows.Forms.Label label43;\r
         internal System.Windows.Forms.Button btn_reset;\r
-        internal System.Windows.Forms.Label label35;\r
         internal System.Windows.Forms.CheckBox check_Cabac;\r
-        internal System.Windows.Forms.Label label36;\r
         internal System.Windows.Forms.CheckBox check_noDCTDecimate;\r
-        internal System.Windows.Forms.Label label37;\r
         internal System.Windows.Forms.CheckBox check_noFastPSkip;\r
-        internal System.Windows.Forms.Label label39;\r
+        internal System.Windows.Forms.Label lbl_trellis;\r
         internal System.Windows.Forms.ComboBox drop_trellis;\r
         internal System.Windows.Forms.ComboBox drop_deblockBeta;\r
         internal System.Windows.Forms.Label label41;\r
@@ -3172,7 +3368,6 @@ namespace Handbrake
         internal System.Windows.Forms.Panel panel3;\r
         internal System.Windows.Forms.Panel panel1;\r
         internal System.Windows.Forms.Panel panel2;\r
-        internal System.Windows.Forms.Label label44;\r
         internal System.Windows.Forms.CheckBox check_8x8DCT;\r
         internal System.Windows.Forms.Label label45;\r
         internal System.Windows.Forms.ComboBox drop_analysis;\r
@@ -3182,19 +3377,14 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_MotionEstimationRange;\r
         internal System.Windows.Forms.Label label54;\r
         internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;\r
-        internal System.Windows.Forms.Label label57;\r
         internal System.Windows.Forms.CheckBox check_pyrmidalBFrames;\r
-        internal System.Windows.Forms.Label label58;\r
         internal System.Windows.Forms.CheckBox check_BidirectionalRefinement;\r
-        internal System.Windows.Forms.Label label59;\r
-        internal System.Windows.Forms.CheckBox check_bFrameDistortion;\r
-        internal System.Windows.Forms.Label label60;\r
+        internal System.Windows.Forms.CheckBox check_bFrameRateDistortion;\r
         internal System.Windows.Forms.CheckBox check_weightedBFrames;\r
-        internal System.Windows.Forms.Label label61;\r
+        internal System.Windows.Forms.Label lbl_direct_prediction;\r
         internal System.Windows.Forms.ComboBox drop_directPrediction;\r
         internal System.Windows.Forms.Label label62;\r
         internal System.Windows.Forms.ComboBox drop_bFrames;\r
-        internal System.Windows.Forms.Label label63;\r
         internal System.Windows.Forms.Label label64;\r
         internal System.Windows.Forms.ComboBox drop_refFrames;\r
         internal System.Windows.Forms.CheckBox check_mixedReferences;\r
@@ -3212,8 +3402,6 @@ namespace Handbrake
         private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
         private System.Windows.Forms.GroupBox groupBox3;\r
         private System.Windows.Forms.GroupBox groupBox5;\r
-        private System.Windows.Forms.CheckBox check_fileMode;\r
-        private System.Windows.Forms.Button btn_Browse;\r
         private System.Windows.Forms.Button btn_destBrowse;\r
         internal System.Windows.Forms.TrackBar trackBar1;\r
         internal System.Windows.Forms.Label lbl_drc4;\r
@@ -3225,17 +3413,50 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drp_audenc_4;\r
         internal System.Windows.Forms.ComboBox drp_audmix_4;\r
         internal System.Windows.Forms.ComboBox drp_track4Audio;\r
-        internal System.Windows.Forms.Label label21;\r
+        internal System.Windows.Forms.Label lbl_t4;\r
         internal System.Windows.Forms.TrackBar trackBar3;\r
         internal System.Windows.Forms.ComboBox drp_audsr_3;\r
         internal System.Windows.Forms.ComboBox drp_audbit_3;\r
         internal System.Windows.Forms.ComboBox drp_audenc_3;\r
         internal System.Windows.Forms.ComboBox drp_audmix_3;\r
         internal System.Windows.Forms.ComboBox drp_track3Audio;\r
-        internal System.Windows.Forms.Label label18;\r
+        internal System.Windows.Forms.Label lbl_t3;\r
         internal System.Windows.Forms.TrackBar trackBar2;\r
         internal System.Windows.Forms.Label label16;\r
         internal System.Windows.Forms.Label lbl_drc1;\r
+        internal System.Windows.Forms.TreeView treeView_presets;\r
+        internal System.Windows.Forms.RichTextBox rtf_query;\r
+        private System.Windows.Forms.NotifyIcon notifyIcon;\r
+        private System.Windows.Forms.ToolStripButton btn_minimize;\r
+        private System.Windows.Forms.ToolStripMenuItem btn_restore;\r
+        internal System.Windows.Forms.Label lbl_src_res;\r
+        internal System.Windows.Forms.Label label7;\r
+        internal System.Windows.Forms.Label lbl_duration;\r
+        internal System.Windows.Forms.Label label_duration;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;\r
+        private System.Windows.Forms.ToolStripMenuItem btn_file_source;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;\r
+        private System.Windows.Forms.ToolStripMenuItem btn_new_preset;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_forums;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_user_guide;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive;\r
+        private System.Windows.Forms.ToolStripDropDownButton btn_source;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
+        private System.Windows.Forms.ToolStripMenuItem btn_dvd_source;\r
+        internal System.Windows.Forms.ComboBox drop_format;\r
+        internal System.Windows.Forms.Label label5;\r
+        internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;\r
+        private System.Windows.Forms.StatusStrip StatusStrip;\r
+        private System.Windows.Forms.ToolStripStatusLabel lbl_encode;\r
+        internal System.Windows.Forms.CheckBox check_decomb;\r
+        internal System.Windows.Forms.RadioButton check_customCrop;\r
+        internal System.Windows.Forms.RadioButton check_autoCrop;\r
+        internal System.Windows.Forms.Label lbl_deblockVal;\r
+        internal System.Windows.Forms.TrackBar slider_deblock;\r
+        internal System.Windows.Forms.ComboBox drp_deNoise;\r
+        internal System.Windows.Forms.Label label8;\r
+        internal System.Windows.Forms.OpenFileDialog ISO_Open;\r
+        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
 \r
     }\r
 }
\ No newline at end of file