OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.Designer.cs
index 526f9c4..6bc5215 100644 (file)
@@ -4,6 +4,9 @@
           Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
+using System;\r
+using System.Windows.Forms;\r
+\r
 namespace Handbrake\r
 {\r
     partial class frmMain\r
@@ -45,22 +48,15 @@ namespace Handbrake
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();\r
             this.drop_chapterStart = new System.Windows.Forms.ComboBox();\r
             this.drp_dvdtitle = new System.Windows.Forms.ComboBox();\r
-            this.text_source = new System.Windows.Forms.TextBox();\r
             this.text_destination = new System.Windows.Forms.TextBox();\r
             this.drp_videoEncoder = new System.Windows.Forms.ComboBox();\r
-            this.drp_audbit_1 = new System.Windows.Forms.ComboBox();\r
-            this.drp_audsr_1 = new System.Windows.Forms.ComboBox();\r
             this.check_largeFile = new System.Windows.Forms.CheckBox();\r
             this.check_turbo = new System.Windows.Forms.CheckBox();\r
             this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
             this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
             this.text_filesize = new System.Windows.Forms.TextBox();\r
             this.text_bitrate = new System.Windows.Forms.TextBox();\r
-            this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
             this.btn_setDefault = new System.Windows.Forms.Button();\r
-            this.drp_audmix_1 = new System.Windows.Forms.ComboBox();\r
-            this.text_height = new System.Windows.Forms.TextBox();\r
-            this.text_width = new System.Windows.Forms.TextBox();\r
             this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.data_chpt = new System.Windows.Forms.DataGridView();\r
@@ -68,31 +64,11 @@ namespace Handbrake
             this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.btn_addPreset = new System.Windows.Forms.Button();\r
             this.btn_removePreset = new System.Windows.Forms.Button();\r
-            this.drp_audenc_1 = new System.Windows.Forms.ComboBox();\r
             this.drop_format = new System.Windows.Forms.ComboBox();\r
-            this.check_customCrop = new System.Windows.Forms.RadioButton();\r
-            this.check_autoCrop = new System.Windows.Forms.RadioButton();\r
-            this.check_Cabac = new System.Windows.Forms.CheckBox();\r
-            this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
-            this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
-            this.drop_trellis = new System.Windows.Forms.ComboBox();\r
-            this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
-            this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();\r
-            this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
-            this.drop_analysis = new System.Windows.Forms.ComboBox();\r
-            this.drop_subpixelMotionEstimation = new System.Windows.Forms.ComboBox();\r
-            this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
-            this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
-            this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
-            this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
-            this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
-            this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
-            this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
-            this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
-            this.lbl_src_res = new System.Windows.Forms.Label();\r
+            this.text_source = new System.Windows.Forms.TextBox();\r
+            this.drop_angle = new System.Windows.Forms.ComboBox();\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
@@ -120,9 +96,8 @@ namespace Handbrake
             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.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_qptest = new System.Windows.Forms.ToolStripMenuItem();\r
             this.gb_source = new System.Windows.Forms.GroupBox();\r
+            this.lbl_angle = new System.Windows.Forms.Label();\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
@@ -131,38 +106,10 @@ namespace Handbrake
             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.TabPage2 = new System.Windows.Forms.TabPage();\r
-            this.lv_audioList = new System.Windows.Forms.ListView();\r
-            this.col_Source = new System.Windows.Forms.ColumnHeader();\r
-            this.col_codec = new System.Windows.Forms.ColumnHeader();\r
-            this.col_mixdown = new System.Windows.Forms.ColumnHeader();\r
-            this.col_samplerate = new System.Windows.Forms.ColumnHeader();\r
-            this.col_bitrate = new System.Windows.Forms.ColumnHeader();\r
-            this.col_drc = new System.Windows.Forms.ColumnHeader();\r
-            this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
-            this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.audioList_remove = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.tab_audio = new System.Windows.Forms.TabPage();\r
+            this.audioPanel = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
-            this.btn_RemoveAudioTrack = new System.Windows.Forms.Button();\r
-            this.btn_addAudioTrack = new System.Windows.Forms.Button();\r
-            this.lbl_drc = new System.Windows.Forms.Label();\r
-            this.label16 = new System.Windows.Forms.Label();\r
-            this.tb_drc = new System.Windows.Forms.TrackBar();\r
-            this.groupBox5 = new System.Windows.Forms.GroupBox();\r
-            this.groupBox3 = new System.Windows.Forms.GroupBox();\r
-            this.label68 = new System.Windows.Forms.Label();\r
-            this.label67 = new System.Windows.Forms.Label();\r
-            this.label66 = new System.Windows.Forms.Label();\r
-            this.label65 = new System.Windows.Forms.Label();\r
-            this.label14 = new System.Windows.Forms.Label();\r
-            this.check_forced = new System.Windows.Forms.CheckBox();\r
-            this.label27 = new System.Windows.Forms.Label();\r
-            this.Label19 = new System.Windows.Forms.Label();\r
-            this.Label20 = new System.Windows.Forms.Label();\r
-            this.drp_track1Audio = new System.Windows.Forms.ComboBox();\r
-            this.TabPage3 = new System.Windows.Forms.TabPage();\r
+            this.tab_video = new System.Windows.Forms.TabPage();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
             this.radio_avgBitrate = new System.Windows.Forms.RadioButton();\r
             this.radio_targetFilesize = new System.Windows.Forms.RadioButton();\r
@@ -172,48 +119,25 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
-            this.TabPage1 = new System.Windows.Forms.TabPage();\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
-            this.text_top = new System.Windows.Forms.NumericUpDown();\r
-            this.text_left = new System.Windows.Forms.NumericUpDown();\r
-            this.text_right = new System.Windows.Forms.NumericUpDown();\r
-            this.label26 = new System.Windows.Forms.Label();\r
-            this.Label56 = new System.Windows.Forms.Label();\r
-            this.lbl_Aspect = new System.Windows.Forms.Label();\r
-            this.Label91 = new System.Windows.Forms.Label();\r
-            this.Label55 = 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.Label15 = new System.Windows.Forms.Label();\r
+            this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.pictureSettings = new Handbrake.Controls.PictureSettings();\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.label24 = new System.Windows.Forms.Label();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
-            this.tab_Filters = new System.Windows.Forms.TabPage();\r
+            this.tab_filters = new System.Windows.Forms.TabPage();\r
+            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
+            this.ctl_denoise = new Handbrake.Denoise();\r
+            this.ctl_decomb = new Handbrake.Decomb();\r
+            this.ctl_detelecine = new Handbrake.Detelecine();\r
+            this.tab_subtitles = new System.Windows.Forms.TabPage();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
-            this.h264Tab = new System.Windows.Forms.TabPage();\r
-            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.lbl_trellis = new System.Windows.Forms.Label();\r
-            this.label41 = new System.Windows.Forms.Label();\r
-            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.label45 = new System.Windows.Forms.Label();\r
-            this.label48 = new System.Windows.Forms.Label();\r
-            this.label49 = new System.Windows.Forms.Label();\r
-            this.label54 = new System.Windows.Forms.Label();\r
-            this.lbl_direct_prediction = new System.Windows.Forms.Label();\r
-            this.label62 = new System.Windows.Forms.Label();\r
-            this.label64 = new System.Windows.Forms.Label();\r
+            this.tab_advanced = new System.Windows.Forms.TabPage();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -242,17 +166,12 @@ namespace Handbrake
             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.tb_preview = new System.Windows.Forms.ToolStripDropDownButton();\r
-            this.mnu_qtpreview = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_vlcpreview = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
             this.btn_ActivityWindow = 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
-            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
-            this.ctl_denoise = new Handbrake.Denoise();\r
-            this.ctl_decomb = new Handbrake.Decomb();\r
-            this.ctl_detelecine = new Handbrake.Detelecine();\r
+            this.hbproc = new System.Diagnostics.Process();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -260,20 +179,15 @@ namespace Handbrake
             this.frmMainMenu.SuspendLayout();\r
             this.gb_source.SuspendLayout();\r
             this.groupBox_output.SuspendLayout();\r
-            this.TabPage2.SuspendLayout();\r
-            this.audioMenu.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();\r
-            this.TabPage3.SuspendLayout();\r
-            this.TabPage1.SuspendLayout();\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
-            ((System.ComponentModel.ISupportInitialize)(this.text_right)).BeginInit();\r
+            this.tab_audio.SuspendLayout();\r
+            this.tab_video.SuspendLayout();\r
+            this.tab_picture.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();\r
             this.tabs_panel.SuspendLayout();\r
-            this.tab_Filters.SuspendLayout();\r
+            this.tab_filters.SuspendLayout();\r
+            this.tab_subtitles.SuspendLayout();\r
             this.tab_chapters.SuspendLayout();\r
-            this.h264Tab.SuspendLayout();\r
+            this.tab_advanced.SuspendLayout();\r
             this.tab_query.SuspendLayout();\r
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
@@ -291,18 +205,18 @@ namespace Handbrake
             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
+            notifyIconMenu.Size = new System.Drawing.Size(124, 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.Size = new System.Drawing.Size(123, 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|mkv|*.mkv|avi|*.avi|ogm|*.ogm";\r
+            this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|mkv|*.mkv";\r
             this.DVD_Save.SupportMultiDottedExtensions = true;\r
             // \r
             // File_Save\r
@@ -321,7 +235,7 @@ namespace Handbrake
             // \r
             this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterFinish.FormattingEnabled = true;\r
-            this.drop_chapterFinish.Location = new System.Drawing.Point(427, 52);\r
+            this.drop_chapterFinish.Location = new System.Drawing.Point(503, 52);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 10;\r
@@ -333,7 +247,7 @@ namespace Handbrake
             // \r
             this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterStart.FormattingEnabled = true;\r
-            this.drop_chapterStart.Location = new System.Drawing.Point(295, 52);\r
+            this.drop_chapterStart.Location = new System.Drawing.Point(371, 52);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 9;\r
@@ -347,7 +261,7 @@ namespace Handbrake
             this.drp_dvdtitle.FormattingEnabled = true;\r
             this.drp_dvdtitle.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_dvdtitle.Location = new System.Drawing.Point(99, 52);\r
+            this.drp_dvdtitle.Location = new System.Drawing.Point(75, 52);\r
             this.drp_dvdtitle.Name = "drp_dvdtitle";\r
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 7;\r
@@ -357,23 +271,12 @@ namespace Handbrake
             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
             // \r
-            // text_source\r
-            // \r
-            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.ReadOnly = true;\r
-            this.text_source.Size = new System.Drawing.Size(584, 21);\r
-            this.text_source.TabIndex = 1;\r
-            this.text_source.Text = "Click \'Source\' to continue";\r
-            this.ToolTip.SetToolTip(this.text_source, "Location of the source input file, folder or dvd.");\r
-            // \r
             // text_destination\r
             // \r
             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.Location = new System.Drawing.Point(75, 19);\r
             this.text_destination.Name = "text_destination";\r
-            this.text_destination.Size = new System.Drawing.Size(503, 21);\r
+            this.text_destination.Size = new System.Drawing.Size(549, 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
@@ -385,7 +288,6 @@ namespace Handbrake
             this.drp_videoEncoder.FormattingEnabled = true;\r
             this.drp_videoEncoder.Items.AddRange(new object[] {\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
@@ -395,48 +297,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
             // \r
-            // drp_audbit_1\r
-            // \r
-            this.drp_audbit_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audbit_1.FormattingEnabled = true;\r
-            this.drp_audbit_1.Items.AddRange(new object[] {\r
-            "32",\r
-            "40",\r
-            "48",\r
-            "56",\r
-            "64",\r
-            "80",\r
-            "86",\r
-            "112",\r
-            "128",\r
-            "160"});\r
-            this.drp_audbit_1.Location = new System.Drawing.Point(526, 52);\r
-            this.drp_audbit_1.Name = "drp_audbit_1";\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
-            this.drp_audbit_1.SelectedIndexChanged += new System.EventHandler(this.drp_audbit_1_SelectedIndexChanged);\r
-            // \r
-            // drp_audsr_1\r
-            // \r
-            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
-            "24",\r
-            "22.05"});\r
-            this.drp_audsr_1.Location = new System.Drawing.Point(468, 52);\r
-            this.drp_audsr_1.Name = "drp_audsr_1";\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 = "Auto";\r
-            this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");\r
-            this.drp_audsr_1.SelectedIndexChanged += new System.EventHandler(this.drp_audsr_1_SelectedIndexChanged);\r
-            // \r
             // check_largeFile\r
             // \r
             this.check_largeFile.AutoSize = true;\r
@@ -489,10 +349,11 @@ namespace Handbrake
             // slider_videoQuality\r
             // \r
             this.slider_videoQuality.Enabled = false;\r
-            this.slider_videoQuality.Location = new System.Drawing.Point(337, 120);\r
+            this.slider_videoQuality.Location = new System.Drawing.Point(347, 120);\r
+            this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0);\r
             this.slider_videoQuality.Maximum = 100;\r
             this.slider_videoQuality.Name = "slider_videoQuality";\r
-            this.slider_videoQuality.Size = new System.Drawing.Size(322, 42);\r
+            this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);\r
             this.slider_videoQuality.TabIndex = 14;\r
             this.slider_videoQuality.TickFrequency = 17;\r
             this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");\r
@@ -517,29 +378,14 @@ namespace Handbrake
             this.text_bitrate.TabIndex = 10;\r
             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
             // \r
-            // drp_subtitle\r
-            // \r
-            this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_subtitle.FormattingEnabled = true;\r
-            this.drp_subtitle.Items.AddRange(new object[] {\r
-            "None",\r
-            "Autoselect"});\r
-            this.drp_subtitle.Location = new System.Drawing.Point(79, 285);\r
-            this.drp_subtitle.Name = "drp_subtitle";\r
-            this.drp_subtitle.Size = new System.Drawing.Size(138, 21);\r
-            this.drp_subtitle.TabIndex = 43;\r
-            this.drp_subtitle.Text = "None";\r
-            this.ToolTip.SetToolTip(this.drp_subtitle, resources.GetString("drp_subtitle.ToolTip"));\r
-            this.drp_subtitle.SelectedIndexChanged += new System.EventHandler(this.drp_subtitle_SelectedIndexChanged);\r
-            // \r
             // btn_setDefault\r
             // \r
             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.Font = new System.Drawing.Font("Verdana", 8.25F, 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(108, 8);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(135, 8);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
-            this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
+            this.btn_setDefault.Size = new System.Drawing.Size(101, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
             this.btn_setDefault.TabStop = false;\r
             this.btn_setDefault.Text = "Set Default";\r
@@ -548,47 +394,6 @@ namespace Handbrake
             this.btn_setDefault.UseVisualStyleBackColor = true;\r
             this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);\r
             // \r
-            // drp_audmix_1\r
-            // \r
-            this.drp_audmix_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audmix_1.FormattingEnabled = true;\r
-            this.drp_audmix_1.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "Mono",\r
-            "Stereo",\r
-            "Dolby Surround",\r
-            "Dolby Pro Logic II",\r
-            "6 Channel Discrete"});\r
-            this.drp_audmix_1.Location = new System.Drawing.Point(333, 52);\r
-            this.drp_audmix_1.Name = "drp_audmix_1";\r
-            this.drp_audmix_1.Size = new System.Drawing.Size(129, 20);\r
-            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_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(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 = 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(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 = 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
-            // \r
             // check_optimiseMP4\r
             // \r
             this.check_optimiseMP4.AutoSize = true;\r
@@ -631,7 +436,7 @@ namespace Handbrake
             this.data_chpt.MultiSelect = false;\r
             this.data_chpt.Name = "data_chpt";\r
             this.data_chpt.RowHeadersVisible = false;\r
-            this.data_chpt.Size = new System.Drawing.Size(661, 234);\r
+            this.data_chpt.Size = new System.Drawing.Size(684, 234);\r
             this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
@@ -640,25 +445,27 @@ namespace Handbrake
             dataGridViewCellStyle1.Format = "N0";\r
             dataGridViewCellStyle1.NullValue = null;\r
             this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
+            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;\r
             this.number.Width = 165;\r
             // \r
             // name\r
             // \r
             this.name.HeaderText = "Chapter Name";\r
             this.name.Name = "name";\r
-            this.name.Width = 460;\r
+            this.name.Width = 480;\r
             // \r
             // btn_addPreset\r
             // \r
             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.Font = new System.Drawing.Font("Verdana", 8.25F, 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(3, 8);\r
             this.btn_addPreset.Name = "btn_addPreset";\r
-            this.btn_addPreset.Size = new System.Drawing.Size(35, 22);\r
+            this.btn_addPreset.Size = new System.Drawing.Size(49, 22);\r
             this.btn_addPreset.TabIndex = 3;\r
             this.btn_addPreset.TabStop = false;\r
             this.btn_addPreset.Text = "Add";\r
@@ -669,11 +476,11 @@ namespace Handbrake
             // btn_removePreset\r
             // \r
             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.Font = new System.Drawing.Font("Verdana", 8.25F, 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(44, 8);\r
+            this.btn_removePreset.Location = new System.Drawing.Point(58, 8);\r
             this.btn_removePreset.Name = "btn_removePreset";\r
-            this.btn_removePreset.Size = new System.Drawing.Size(58, 22);\r
+            this.btn_removePreset.Size = new System.Drawing.Size(71, 22);\r
             this.btn_removePreset.TabIndex = 4;\r
             this.btn_removePreset.TabStop = false;\r
             this.btn_removePreset.Text = "Remove";\r
@@ -681,23 +488,6 @@ namespace Handbrake
             this.btn_removePreset.UseVisualStyleBackColor = true;\r
             this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
             // \r
-            // drp_audenc_1\r
-            // \r
-            this.drp_audenc_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audenc_1.FormattingEnabled = true;\r
-            this.drp_audenc_1.Items.AddRange(new object[] {\r
-            "AAC",\r
-            "MP3",\r
-            "Vorbis",\r
-            "AC3"});\r
-            this.drp_audenc_1.Location = new System.Drawing.Point(216, 52);\r
-            this.drp_audenc_1.Name = "drp_audenc_1";\r
-            this.drp_audenc_1.Size = new System.Drawing.Size(111, 20);\r
-            this.drp_audenc_1.TabIndex = 5;\r
-            this.drp_audenc_1.Text = "AAC";\r
-            this.ToolTip.SetToolTip(this.drp_audenc_1, "Select an audio encoder.");\r
-            this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged);\r
-            // \r
             // drop_format\r
             // \r
             this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -706,9 +496,7 @@ namespace Handbrake
             this.drop_format.Items.AddRange(new object[] {\r
             "MP4 File",\r
             "M4V File",\r
-            "MKV File",\r
-            "AVI File",\r
-            "OGM File"});\r
+            "MKV 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
@@ -716,455 +504,34 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.");\r
             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\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.ToolTip.SetToolTip(this.check_customCrop, "Set some custom cropping values.");\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.ToolTip.SetToolTip(this.check_autoCrop, "Automatically set cropping values.");\r
-            this.check_autoCrop.UseVisualStyleBackColor = true;\r
-            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\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(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(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.ToolTip.SetToolTip(this.check_Cabac, resources.GetString("check_Cabac.ToolTip"));\r
-            this.check_Cabac.UseVisualStyleBackColor = true;\r
-            this.check_Cabac.CheckStateChanged += new System.EventHandler(this.check_Cabac_CheckedChanged);\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(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(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.ToolTip.SetToolTip(this.check_noDCTDecimate, "Only use this with constant quality encoding. \r\nIt increases quality but also bit" +\r
-                    "rate/file size.");\r
-            this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
-            this.check_noDCTDecimate.CheckStateChanged += new System.EventHandler(this.check_noDCTDecimate_CheckedChanged);\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(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(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.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, \r\nbut it also slows " +\r
-                    "down the encode.");\r
-            this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
-            this.check_noFastPSkip.CheckStateChanged += new System.EventHandler(this.check_noFastPSkip_CheckedChanged);\r
-            // \r
-            // drop_trellis\r
-            // \r
-            this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_trellis.TabIndex = 37;\r
-            this.ToolTip.SetToolTip(this.drop_trellis, "Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate o" +\r
-                    "r increase quality. \r\nA value of 2 forces it to be used more often than a value " +\r
-                    "of 1.");\r
-            this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.drop_trellis_SelectedIndexChanged);\r
-            // \r
-            // drop_deblockBeta\r
-            // \r
-            this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_deblockBeta.TabIndex = 36;\r
-            this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));\r
-            this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.drop_deblockBeta_SelectedIndexChanged);\r
-            // \r
-            // drop_deblockAlpha\r
-            // \r
-            this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_deblockAlpha.TabIndex = 35;\r
-            this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));\r
-            this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.drop_deblockAlpha_SelectedIndexChanged);\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(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(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.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
-            this.check_8x8DCT.UseVisualStyleBackColor = true;\r
-            this.check_8x8DCT.CheckStateChanged += new System.EventHandler(this.check_8x8DCT_CheckedChanged);\r
-            // \r
-            // drop_analysis\r
-            // \r
-            this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_analysis.TabIndex = 33;\r
-            this.ToolTip.SetToolTip(this.drop_analysis, resources.GetString("drop_analysis.ToolTip"));\r
-            this.drop_analysis.SelectedIndexChanged += new System.EventHandler(this.drop_analysis_SelectedIndexChanged);\r
-            // \r
-            // drop_subpixelMotionEstimation\r
-            // \r
-            this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            "8",\r
-            "9"});\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
-            this.drop_subpixelMotionEstimation.TabIndex = 32;\r
-            this.ToolTip.SetToolTip(this.drop_subpixelMotionEstimation, resources.GetString("drop_subpixelMotionEstimation.ToolTip"));\r
-            this.drop_subpixelMotionEstimation.SelectedIndexChanged += new System.EventHandler(this.drop_subpixelMotionEstimation_SelectedIndexChanged);\r
-            // \r
-            // drop_MotionEstimationRange\r
-            // \r
-            this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_MotionEstimationRange.TabIndex = 31;\r
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));\r
-            this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationRange_SelectedIndexChanged);\r
-            // \r
-            // drop_MotionEstimationMethod\r
-            // \r
-            this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));\r
-            this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationMethod_SelectedIndexChanged);\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(46, 165);\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(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.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));\r
-            this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
-            this.check_pyrmidalBFrames.CheckStateChanged += new System.EventHandler(this.check_pyrmidalBFrames_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(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(123, 16);\r
-            this.check_weightedBFrames.TabIndex = 14;\r
-            this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
-            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));\r
-            this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
-            this.check_weightedBFrames.CheckStateChanged += new System.EventHandler(this.check_weightedBFrames_CheckedChanged);\r
-            // \r
-            // drop_directPrediction\r
-            // \r
-            this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_directPrediction.TabIndex = 13;\r
-            this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));\r
-            this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.drop_directPrediction_SelectedIndexChanged);\r
-            // \r
-            // drop_bFrames\r
-            // \r
-            this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +\r
-                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +\r
-                    "l: 9-16. ");\r
-            this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
-            // \r
-            // drop_refFrames\r
-            // \r
-            this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\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
-            this.drop_refFrames.TabIndex = 10;\r
-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. The more you add, the higher the quality \97 but the slower th" +\r
-                    "e encode. ");\r
-            this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged);\r
-            // \r
-            // 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(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(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.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different parts of a frame will refer back to different prior frame" +\r
-                    "s, \r\ndepending on what\'s best for that part of the image. ");\r
-            this.check_mixedReferences.UseVisualStyleBackColor = true;\r
-            this.check_mixedReferences.CheckStateChanged += new System.EventHandler(this.check_mixedReferences_CheckedChanged);\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
+            // text_source\r
+            // \r
+            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(75, 19);\r
+            this.text_source.Name = "text_source";\r
+            this.text_source.ReadOnly = true;\r
+            this.text_source.Size = new System.Drawing.Size(642, 21);\r
+            this.text_source.TabIndex = 1;\r
+            this.text_source.Text = "Click \'Source\' to continue";\r
+            this.ToolTip.SetToolTip(this.text_source, "Location of the source input file, folder or dvd.");\r
+            // \r
+            // drop_angle\r
+            // \r
+            this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drop_angle.FormattingEnabled = true;\r
+            this.drop_angle.Location = new System.Drawing.Point(250, 52);\r
+            this.drop_angle.Name = "drop_angle";\r
+            this.drop_angle.Size = new System.Drawing.Size(45, 21);\r
+            this.drop_angle.TabIndex = 45;\r
+            this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");\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(569, 56);\r
+            this.lbl_duration.Location = new System.Drawing.Point(645, 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
@@ -1175,22 +542,12 @@ namespace Handbrake
             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(502, 55);\r
+            this.label_duration.Location = new System.Drawing.Point(578, 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
@@ -1394,32 +751,18 @@ namespace Handbrake
             this.FileToolStripMenuItem,\r
             this.ToolsToolStripMenuItem,\r
             this.PresetsToolStripMenuItem,\r
-            this.HelpToolStripMenuItem,\r
-            this.debugToolStripMenuItem});\r
+            this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
             this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
-            this.frmMainMenu.Size = new System.Drawing.Size(995, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(1000, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip";\r
             // \r
-            // debugToolStripMenuItem\r
-            // \r
-            this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_qptest});\r
-            this.debugToolStripMenuItem.Name = "debugToolStripMenuItem";\r
-            this.debugToolStripMenuItem.Size = new System.Drawing.Size(56, 20);\r
-            this.debugToolStripMenuItem.Text = "Debug";\r
-            // \r
-            // mnu_qptest\r
-            // \r
-            this.mnu_qptest.Name = "mnu_qptest";\r
-            this.mnu_qptest.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_qptest.Text = "Query Parser Tester";\r
-            this.mnu_qptest.Click += new System.EventHandler(this.mnu_qptest_Click);\r
-            // \r
             // gb_source\r
             // \r
+            this.gb_source.Controls.Add(this.drop_angle);\r
+            this.gb_source.Controls.Add(this.lbl_angle);\r
             this.gb_source.Controls.Add(this.lbl_duration);\r
             this.gb_source.Controls.Add(this.label_duration);\r
             this.gb_source.Controls.Add(this.Label13);\r
@@ -1434,16 +777,27 @@ namespace Handbrake
             this.gb_source.ForeColor = System.Drawing.Color.Black;\r
             this.gb_source.Location = new System.Drawing.Point(9, 70);\r
             this.gb_source.Name = "gb_source";\r
-            this.gb_source.Size = new System.Drawing.Size(721, 87);\r
+            this.gb_source.Size = new System.Drawing.Size(732, 87);\r
             this.gb_source.TabIndex = 2;\r
             this.gb_source.TabStop = false;\r
             this.gb_source.Text = "Source";\r
             // \r
+            // lbl_angle\r
+            // \r
+            this.lbl_angle.AutoSize = true;\r
+            this.lbl_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_angle.ForeColor = System.Drawing.Color.Black;\r
+            this.lbl_angle.Location = new System.Drawing.Point(200, 55);\r
+            this.lbl_angle.Name = "lbl_angle";\r
+            this.lbl_angle.Size = new System.Drawing.Size(44, 13);\r
+            this.lbl_angle.TabIndex = 44;\r
+            this.lbl_angle.Text = "Angle:";\r
+            // \r
             // Label13\r
             // \r
             this.Label13.AutoSize = true;\r
             this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label13.Location = new System.Drawing.Point(370, 55);\r
+            this.Label13.Location = new System.Drawing.Point(446, 55);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(51, 13);\r
             this.Label13.TabIndex = 10;\r
@@ -1465,7 +819,7 @@ namespace Handbrake
             this.Label9.AutoSize = true;\r
             this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label9.ForeColor = System.Drawing.Color.Black;\r
-            this.Label9.Location = new System.Drawing.Point(225, 55);\r
+            this.Label9.Location = new System.Drawing.Point(301, 55);\r
             this.Label9.Name = "Label9";\r
             this.Label9.Size = new System.Drawing.Size(64, 13);\r
             this.Label9.TabIndex = 8;\r
@@ -1493,7 +847,7 @@ namespace Handbrake
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox_output.Location = new System.Drawing.Point(9, 214);\r
             this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(721, 50);\r
+            this.groupBox_output.Size = new System.Drawing.Size(732, 50);\r
             this.groupBox_output.TabIndex = 4;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
@@ -1531,129 +885,25 @@ namespace Handbrake
             this.Label3.TabIndex = 0;\r
             this.Label3.Text = "File:";\r
             // \r
-            // TabPage2\r
-            // \r
-            this.TabPage2.BackColor = System.Drawing.Color.Transparent;\r
-            this.TabPage2.Controls.Add(this.lv_audioList);\r
-            this.TabPage2.Controls.Add(this.btn_RemoveAudioTrack);\r
-            this.TabPage2.Controls.Add(this.btn_addAudioTrack);\r
-            this.TabPage2.Controls.Add(this.lbl_drc);\r
-            this.TabPage2.Controls.Add(this.label16);\r
-            this.TabPage2.Controls.Add(this.tb_drc);\r
-            this.TabPage2.Controls.Add(this.groupBox5);\r
-            this.TabPage2.Controls.Add(this.groupBox3);\r
-            this.TabPage2.Controls.Add(this.label68);\r
-            this.TabPage2.Controls.Add(this.label67);\r
-            this.TabPage2.Controls.Add(this.label66);\r
-            this.TabPage2.Controls.Add(this.label65);\r
-            this.TabPage2.Controls.Add(this.label14);\r
-            this.TabPage2.Controls.Add(this.drp_audenc_1);\r
-            this.TabPage2.Controls.Add(this.check_forced);\r
-            this.TabPage2.Controls.Add(this.label27);\r
-            this.TabPage2.Controls.Add(this.drp_subtitle);\r
-            this.TabPage2.Controls.Add(this.Label19);\r
-            this.TabPage2.Controls.Add(this.Label20);\r
-            this.TabPage2.Controls.Add(this.drp_audmix_1);\r
-            this.TabPage2.Controls.Add(this.drp_track1Audio);\r
-            this.TabPage2.Controls.Add(this.drp_audbit_1);\r
-            this.TabPage2.Controls.Add(this.drp_audsr_1);\r
-            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(713, 316);\r
-            this.TabPage2.TabIndex = 3;\r
-            this.TabPage2.Text = "Audio && Subtitles";\r
-            this.TabPage2.UseVisualStyleBackColor = true;\r
-            // \r
-            // lv_audioList\r
-            // \r
-            this.lv_audioList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {\r
-            this.col_Source,\r
-            this.col_codec,\r
-            this.col_mixdown,\r
-            this.col_samplerate,\r
-            this.col_bitrate,\r
-            this.col_drc});\r
-            this.lv_audioList.ContextMenuStrip = this.audioMenu;\r
-            this.lv_audioList.FullRowSelect = true;\r
-            this.lv_audioList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
-            this.lv_audioList.HideSelection = false;\r
-            this.lv_audioList.LabelWrap = false;\r
-            this.lv_audioList.Location = new System.Drawing.Point(16, 79);\r
-            this.lv_audioList.MultiSelect = false;\r
-            this.lv_audioList.Name = "lv_audioList";\r
-            this.lv_audioList.Size = new System.Drawing.Size(668, 147);\r
-            this.lv_audioList.SmallImageList = this.AudioMenuRowHeightHack;\r
-            this.lv_audioList.TabIndex = 48;\r
-            this.lv_audioList.UseCompatibleStateImageBehavior = false;\r
-            this.lv_audioList.View = System.Windows.Forms.View.Details;\r
-            this.lv_audioList.SelectedIndexChanged += new System.EventHandler(this.lv_audioList_SelectedIndexChanged);\r
-            // \r
-            // col_Source\r
-            // \r
-            this.col_Source.Text = "Source";\r
-            this.col_Source.Width = 170;\r
-            // \r
-            // col_codec\r
-            // \r
-            this.col_codec.Text = "Audio Codec";\r
-            this.col_codec.Width = 88;\r
-            // \r
-            // col_mixdown\r
-            // \r
-            this.col_mixdown.Text = "Mixdown";\r
-            this.col_mixdown.Width = 127;\r
-            // \r
-            // col_samplerate\r
-            // \r
-            this.col_samplerate.Text = "Samplerate (Kbps)";\r
-            this.col_samplerate.Width = 124;\r
-            // \r
-            // col_bitrate\r
-            // \r
-            this.col_bitrate.Text = "Bitrate (Kbps)";\r
-            this.col_bitrate.Width = 95;\r
-            // \r
-            // col_drc\r
-            // \r
-            this.col_drc.Text = "DRC";\r
-            // \r
-            // audioMenu\r
-            // \r
-            this.audioMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.audioList_moveup,\r
-            this.audioList_movedown,\r
-            this.toolStripSeparator2,\r
-            this.audioList_remove});\r
-            this.audioMenu.Name = "audioMenu";\r
-            this.audioMenu.Size = new System.Drawing.Size(152, 76);\r
-            // \r
-            // audioList_moveup\r
-            // \r
-            this.audioList_moveup.Name = "audioList_moveup";\r
-            this.audioList_moveup.Size = new System.Drawing.Size(151, 22);\r
-            this.audioList_moveup.Text = "Move Up";\r
-            this.audioList_moveup.Click += new System.EventHandler(this.audioList_moveup_Click);\r
-            // \r
-            // audioList_movedown\r
-            // \r
-            this.audioList_movedown.Name = "audioList_movedown";\r
-            this.audioList_movedown.Size = new System.Drawing.Size(151, 22);\r
-            this.audioList_movedown.Text = "Move Down";\r
-            this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.audioList_movedown.Click += new System.EventHandler(this.audioList_movedown_Click);\r
-            // \r
-            // toolStripSeparator2\r
-            // \r
-            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(148, 6);\r
-            // \r
-            // audioList_remove\r
-            // \r
-            this.audioList_remove.Name = "audioList_remove";\r
-            this.audioList_remove.Size = new System.Drawing.Size(151, 22);\r
-            this.audioList_remove.Text = "Remove";\r
-            this.audioList_remove.Click += new System.EventHandler(this.audioList_remove_Click);\r
+            // tab_audio\r
+            // \r
+            this.tab_audio.BackColor = System.Drawing.Color.Transparent;\r
+            this.tab_audio.Controls.Add(this.audioPanel);\r
+            this.tab_audio.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_audio.Name = "tab_audio";\r
+            this.tab_audio.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_audio.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_audio.TabIndex = 3;\r
+            this.tab_audio.Text = "Audio";\r
+            this.tab_audio.UseVisualStyleBackColor = true;\r
+            // \r
+            // audioPanel\r
+            // \r
+            this.audioPanel.BackColor = System.Drawing.Color.Transparent;\r
+            this.audioPanel.Location = new System.Drawing.Point(0, 0);\r
+            this.audioPanel.Name = "audioPanel";\r
+            this.audioPanel.Size = new System.Drawing.Size(715, 310);\r
+            this.audioPanel.TabIndex = 0;\r
             // \r
             // AudioMenuRowHeightHack\r
             // \r
@@ -1661,220 +911,31 @@ namespace Handbrake
             this.AudioMenuRowHeightHack.ImageSize = new System.Drawing.Size(1, 18);\r
             this.AudioMenuRowHeightHack.TransparentColor = System.Drawing.Color.Transparent;\r
             // \r
-            // btn_RemoveAudioTrack\r
-            // \r
-            this.btn_RemoveAudioTrack.BackColor = System.Drawing.SystemColors.Control;\r
-            this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(132, 232);\r
-            this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack";\r
-            this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(111, 23);\r
-            this.btn_RemoveAudioTrack.TabIndex = 47;\r
-            this.btn_RemoveAudioTrack.Text = "Remove";\r
-            this.btn_RemoveAudioTrack.UseVisualStyleBackColor = false;\r
-            this.btn_RemoveAudioTrack.Click += new System.EventHandler(this.btn_RemoveAudioTrack_Click);\r
-            // \r
-            // btn_addAudioTrack\r
-            // \r
-            this.btn_addAudioTrack.BackColor = System.Drawing.SystemColors.Control;\r
-            this.btn_addAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 232);\r
-            this.btn_addAudioTrack.Name = "btn_addAudioTrack";\r
-            this.btn_addAudioTrack.Size = new System.Drawing.Size(111, 23);\r
-            this.btn_addAudioTrack.TabIndex = 46;\r
-            this.btn_addAudioTrack.Text = "Add Track";\r
-            this.btn_addAudioTrack.UseVisualStyleBackColor = false;\r
-            this.btn_addAudioTrack.Click += new System.EventHandler(this.btn_addAudioTrack_Click);\r
-            // \r
-            // lbl_drc\r
-            // \r
-            this.lbl_drc.AutoSize = true;\r
-            this.lbl_drc.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_drc.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc.Location = new System.Drawing.Point(650, 52);\r
-            this.lbl_drc.Name = "lbl_drc";\r
-            this.lbl_drc.Size = new System.Drawing.Size(14, 13);\r
-            this.lbl_drc.TabIndex = 15;\r
-            this.lbl_drc.Text = "0";\r
-            // \r
-            // label16\r
-            // \r
-            this.label16.AutoSize = true;\r
-            this.label16.BackColor = System.Drawing.Color.Transparent;\r
-            this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label16.Location = new System.Drawing.Point(608, 35);\r
-            this.label16.Name = "label16";\r
-            this.label16.Size = new System.Drawing.Size(28, 12);\r
-            this.label16.TabIndex = 14;\r
-            this.label16.Text = "DRC";\r
-            // \r
-            // tb_drc\r
-            // \r
-            this.tb_drc.LargeChange = 0;\r
-            this.tb_drc.Location = new System.Drawing.Point(599, 47);\r
-            this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
-            this.tb_drc.Maximum = 31;\r
-            this.tb_drc.Name = "tb_drc";\r
-            this.tb_drc.Size = new System.Drawing.Size(50, 42);\r
-            this.tb_drc.TabIndex = 13;\r
-            this.tb_drc.TickFrequency = 10;\r
-            this.tb_drc.ValueChanged += new System.EventHandler(this.tb_drc_Scroll);\r
-            // \r
-            // groupBox5\r
-            // \r
-            this.groupBox5.Location = new System.Drawing.Point(107, 13);\r
-            this.groupBox5.Name = "groupBox5";\r
-            this.groupBox5.Size = new System.Drawing.Size(577, 10);\r
-            this.groupBox5.TabIndex = 1;\r
-            this.groupBox5.TabStop = false;\r
-            // \r
-            // groupBox3\r
-            // \r
-            this.groupBox3.Location = new System.Drawing.Point(83, 260);\r
-            this.groupBox3.Name = "groupBox3";\r
-            this.groupBox3.Size = new System.Drawing.Size(601, 10);\r
-            this.groupBox3.TabIndex = 41;\r
-            this.groupBox3.TabStop = false;\r
-            // \r
-            // label68\r
-            // \r
-            this.label68.AutoSize = true;\r
-            this.label68.BackColor = System.Drawing.Color.Transparent;\r
-            this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label68.Location = new System.Drawing.Point(13, 13);\r
-            this.label68.Name = "label68";\r
-            this.label68.Size = new System.Drawing.Size(92, 13);\r
-            this.label68.TabIndex = 0;\r
-            this.label68.Text = "Audio Tracks";\r
-            // \r
-            // label67\r
-            // \r
-            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(464, 35);\r
-            this.label67.Name = "label67";\r
-            this.label67.Size = new System.Drawing.Size(62, 12);\r
-            this.label67.TabIndex = 10;\r
-            this.label67.Text = "Samplerate";\r
-            // \r
-            // label66\r
-            // \r
-            this.label66.AutoSize = true;\r
-            this.label66.BackColor = System.Drawing.Color.Transparent;\r
-            this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label66.Location = new System.Drawing.Point(539, 35);\r
-            this.label66.Name = "label66";\r
-            this.label66.Size = new System.Drawing.Size(39, 12);\r
-            this.label66.TabIndex = 12;\r
-            this.label66.Text = "Bitrate";\r
-            // \r
-            // label65\r
-            // \r
-            this.label65.AutoSize = true;\r
-            this.label65.BackColor = System.Drawing.Color.Transparent;\r
-            this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label65.Location = new System.Drawing.Point(235, 35);\r
-            this.label65.Name = "label65";\r
-            this.label65.Size = new System.Drawing.Size(69, 12);\r
-            this.label65.TabIndex = 6;\r
-            this.label65.Text = "Audio Codec";\r
-            // \r
-            // label14\r
-            // \r
-            this.label14.AutoSize = true;\r
-            this.label14.BackColor = System.Drawing.Color.Transparent;\r
-            this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label14.Location = new System.Drawing.Point(369, 35);\r
-            this.label14.Name = "label14";\r
-            this.label14.Size = new System.Drawing.Size(48, 12);\r
-            this.label14.TabIndex = 8;\r
-            this.label14.Text = "Mixdown";\r
-            // \r
-            // check_forced\r
-            // \r
-            this.check_forced.AutoSize = true;\r
-            this.check_forced.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_forced.Enabled = false;\r
-            this.check_forced.Location = new System.Drawing.Point(223, 288);\r
-            this.check_forced.Name = "check_forced";\r
-            this.check_forced.Size = new System.Drawing.Size(147, 17);\r
-            this.check_forced.TabIndex = 44;\r
-            this.check_forced.Text = "Forced Subtitles Only";\r
-            this.check_forced.UseVisualStyleBackColor = false;\r
-            // \r
-            // label27\r
-            // \r
-            this.label27.AutoSize = true;\r
-            this.label27.BackColor = System.Drawing.Color.Transparent;\r
-            this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label27.Location = new System.Drawing.Point(87, 35);\r
-            this.label27.Name = "label27";\r
-            this.label27.Size = new System.Drawing.Size(40, 12);\r
-            this.label27.TabIndex = 4;\r
-            this.label27.Text = "Source";\r
-            // \r
-            // Label19\r
-            // \r
-            this.Label19.AutoSize = true;\r
-            this.Label19.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label19.Location = new System.Drawing.Point(13, 260);\r
-            this.Label19.Name = "Label19";\r
-            this.Label19.Size = new System.Drawing.Size(64, 13);\r
-            this.Label19.TabIndex = 40;\r
-            this.Label19.Text = "Subtitles";\r
-            // \r
-            // Label20\r
-            // \r
-            this.Label20.AutoSize = true;\r
-            this.Label20.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label20.Location = new System.Drawing.Point(13, 288);\r
-            this.Label20.Name = "Label20";\r
-            this.Label20.Size = new System.Drawing.Size(61, 13);\r
-            this.Label20.TabIndex = 42;\r
-            this.Label20.Text = "Subtitles:";\r
-            // \r
-            // drp_track1Audio\r
-            // \r
-            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
-            this.drp_track1Audio.Location = new System.Drawing.Point(16, 53);\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.Text = "Automatic";\r
-            this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);\r
-            // \r
-            // TabPage3\r
-            // \r
-            this.TabPage3.BackColor = System.Drawing.Color.Transparent;\r
-            this.TabPage3.Controls.Add(this.radio_cq);\r
-            this.TabPage3.Controls.Add(this.radio_avgBitrate);\r
-            this.TabPage3.Controls.Add(this.radio_targetFilesize);\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.check_turbo);\r
-            this.TabPage3.Controls.Add(this.check_2PassEncode);\r
-            this.TabPage3.Controls.Add(this.Label2);\r
-            this.TabPage3.Controls.Add(this.text_filesize);\r
-            this.TabPage3.Controls.Add(this.slider_videoQuality);\r
-            this.TabPage3.Controls.Add(this.text_bitrate);\r
-            this.TabPage3.Controls.Add(this.SliderValue);\r
-            this.TabPage3.Controls.Add(this.Label46);\r
-            this.TabPage3.Controls.Add(this.drp_videoFramerate);\r
-            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(713, 316);\r
-            this.TabPage3.TabIndex = 2;\r
-            this.TabPage3.Text = "Video";\r
-            this.TabPage3.UseVisualStyleBackColor = true;\r
+            // tab_video\r
+            // \r
+            this.tab_video.BackColor = System.Drawing.Color.Transparent;\r
+            this.tab_video.Controls.Add(this.radio_cq);\r
+            this.tab_video.Controls.Add(this.radio_avgBitrate);\r
+            this.tab_video.Controls.Add(this.radio_targetFilesize);\r
+            this.tab_video.Controls.Add(this.drp_videoEncoder);\r
+            this.tab_video.Controls.Add(this.Label47);\r
+            this.tab_video.Controls.Add(this.label25);\r
+            this.tab_video.Controls.Add(this.check_turbo);\r
+            this.tab_video.Controls.Add(this.check_2PassEncode);\r
+            this.tab_video.Controls.Add(this.Label2);\r
+            this.tab_video.Controls.Add(this.text_filesize);\r
+            this.tab_video.Controls.Add(this.slider_videoQuality);\r
+            this.tab_video.Controls.Add(this.text_bitrate);\r
+            this.tab_video.Controls.Add(this.SliderValue);\r
+            this.tab_video.Controls.Add(this.Label46);\r
+            this.tab_video.Controls.Add(this.drp_videoFramerate);\r
+            this.tab_video.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_video.Name = "tab_video";\r
+            this.tab_video.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_video.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_video.TabIndex = 2;\r
+            this.tab_video.Text = "Video";\r
+            this.tab_video.UseVisualStyleBackColor = true;\r
             // \r
             // radio_cq\r
             // \r
@@ -1980,228 +1041,24 @@ namespace Handbrake
             this.check_grayscale.Text = "Grayscale Encoding";\r
             this.check_grayscale.UseVisualStyleBackColor = false;\r
             // \r
-            // TabPage1\r
-            // \r
-            this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
-            this.TabPage1.Controls.Add(this.check_customCrop);\r
-            this.TabPage1.Controls.Add(this.check_autoCrop);\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
-            this.TabPage1.Controls.Add(this.text_top);\r
-            this.TabPage1.Controls.Add(this.text_left);\r
-            this.TabPage1.Controls.Add(this.text_right);\r
-            this.TabPage1.Controls.Add(this.label26);\r
-            this.TabPage1.Controls.Add(this.Label56);\r
-            this.TabPage1.Controls.Add(this.lbl_Aspect);\r
-            this.TabPage1.Controls.Add(this.Label91);\r
-            this.TabPage1.Controls.Add(this.text_height);\r
-            this.TabPage1.Controls.Add(this.Label55);\r
-            this.TabPage1.Controls.Add(this.text_width);\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.Label15);\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(713, 316);\r
-            this.TabPage1.TabIndex = 0;\r
-            this.TabPage1.Text = "Picture Settings";\r
-            this.TabPage1.UseVisualStyleBackColor = true;\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, 111);\r
-            this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(80, 13);\r
-            this.label6.TabIndex = 20;\r
-            this.label6.Text = "Anamorphic:";\r
-            // \r
-            // drp_anamorphic\r
-            // \r
-            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_anamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_anamorphic.FormattingEnabled = true;\r
-            this.drp_anamorphic.Items.AddRange(new object[] {\r
-            "None",\r
-            "Strict",\r
-            "Loose"});\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 = 21;\r
-            this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);\r
-            // \r
-            // text_bottom\r
-            // \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
-            0,\r
-            0});\r
-            this.text_bottom.Name = "text_bottom";\r
-            this.text_bottom.Size = new System.Drawing.Size(44, 21);\r
-            this.text_bottom.TabIndex = 9;\r
-            // \r
-            // text_top\r
-            // \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
-            0,\r
-            0});\r
-            this.text_top.Name = "text_top";\r
-            this.text_top.Size = new System.Drawing.Size(44, 21);\r
-            this.text_top.TabIndex = 6;\r
-            // \r
-            // text_left\r
-            // \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
-            0,\r
-            0});\r
-            this.text_left.Name = "text_left";\r
-            this.text_left.Size = new System.Drawing.Size(44, 21);\r
-            this.text_left.TabIndex = 4;\r
-            // \r
-            // text_right\r
-            // \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
-            0,\r
-            0});\r
-            this.text_right.Name = "text_right";\r
-            this.text_right.Size = new System.Drawing.Size(44, 21);\r
-            this.text_right.TabIndex = 7;\r
-            // \r
-            // label26\r
-            // \r
-            this.label26.AutoSize = true;\r
-            this.label26.BackColor = System.Drawing.Color.Transparent;\r
-            this.label26.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            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 = 11;\r
-            this.label26.Text = "Size";\r
-            // \r
-            // Label56\r
-            // \r
-            this.Label56.AutoSize = true;\r
-            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(477, 85);\r
-            this.Label56.Name = "Label56";\r
-            this.Label56.Size = new System.Drawing.Size(15, 13);\r
-            this.Label56.TabIndex = 18;\r
-            this.Label56.Text = "x";\r
-            // \r
-            // lbl_Aspect\r
-            // \r
-            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(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 = 15;\r
-            this.lbl_Aspect.Text = "Select a Title";\r
-            // \r
-            // Label91\r
-            // \r
-            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, 57);\r
-            this.Label91.Name = "Label91";\r
-            this.Label91.Size = new System.Drawing.Size(83, 13);\r
-            this.Label91.TabIndex = 14;\r
-            this.Label91.Text = "Aspect Ratio:";\r
-            // \r
-            // Label55\r
-            // \r
-            this.Label55.AutoSize = true;\r
-            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, 84);\r
-            this.Label55.Name = "Label55";\r
-            this.Label55.Size = new System.Drawing.Size(85, 13);\r
-            this.Label55.TabIndex = 16;\r
-            this.Label55.Text = "Width/Height:";\r
-            // \r
-            // Label1\r
-            // \r
-            this.Label1.AutoSize = true;\r
-            this.Label1.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label1.Location = new System.Drawing.Point(13, 13);\r
-            this.Label1.Name = "Label1";\r
-            this.Label1.Size = new System.Drawing.Size(37, 13);\r
-            this.Label1.TabIndex = 0;\r
-            this.Label1.Text = "Crop";\r
-            // \r
-            // Label53\r
-            // \r
-            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(94, 171);\r
-            this.Label53.Name = "Label53";\r
-            this.Label53.Size = new System.Drawing.Size(48, 13);\r
-            this.Label53.TabIndex = 10;\r
-            this.Label53.Text = "Bottom";\r
-            // \r
-            // Label52\r
-            // \r
-            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(103, 86);\r
-            this.Label52.Name = "Label52";\r
-            this.Label52.Size = new System.Drawing.Size(28, 13);\r
-            this.Label52.TabIndex = 5;\r
-            this.Label52.Text = "Top";\r
-            // \r
-            // Label51\r
-            // \r
-            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(190, 125);\r
-            this.Label51.Name = "Label51";\r
-            this.Label51.Size = new System.Drawing.Size(36, 13);\r
-            this.Label51.TabIndex = 8;\r
-            this.Label51.Text = "Right";\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(13, 125);\r
-            this.Label15.Name = "Label15";\r
-            this.Label15.Size = new System.Drawing.Size(28, 13);\r
-            this.Label15.TabIndex = 3;\r
-            this.Label15.Text = "Left";\r
+            // tab_picture\r
+            // \r
+            this.tab_picture.BackColor = System.Drawing.Color.Transparent;\r
+            this.tab_picture.Controls.Add(this.pictureSettings);\r
+            this.tab_picture.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_picture.Name = "tab_picture";\r
+            this.tab_picture.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_picture.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_picture.TabIndex = 0;\r
+            this.tab_picture.Text = "Picture Settings";\r
+            this.tab_picture.UseVisualStyleBackColor = true;\r
+            // \r
+            // pictureSettings\r
+            // \r
+            this.pictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.pictureSettings.Name = "pictureSettings";\r
+            this.pictureSettings.Size = new System.Drawing.Size(713, 310);\r
+            this.pictureSettings.TabIndex = 0;\r
             // \r
             // slider_deblock\r
             // \r
@@ -2209,7 +1066,7 @@ namespace Handbrake
             this.slider_deblock.Maximum = 15;\r
             this.slider_deblock.Minimum = 4;\r
             this.slider_deblock.Name = "slider_deblock";\r
-            this.slider_deblock.Size = new System.Drawing.Size(174, 42);\r
+            this.slider_deblock.Size = new System.Drawing.Size(174, 45);\r
             this.slider_deblock.TabIndex = 35;\r
             this.slider_deblock.Value = 4;\r
             this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);\r
@@ -2241,7 +1098,7 @@ 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(16, 11);\r
+            this.label24.Location = new System.Drawing.Point(13, 13);\r
             this.label24.Name = "label24";\r
             this.label24.Size = new System.Drawing.Size(49, 13);\r
             this.label24.TabIndex = 22;\r
@@ -2262,38 +1119,100 @@ namespace Handbrake
             // \r
             // tabs_panel\r
             // \r
-            this.tabs_panel.Controls.Add(this.TabPage1);\r
-            this.tabs_panel.Controls.Add(this.tab_Filters);\r
-            this.tabs_panel.Controls.Add(this.TabPage3);\r
-            this.tabs_panel.Controls.Add(this.TabPage2);\r
+            this.tabs_panel.Controls.Add(this.tab_picture);\r
+            this.tabs_panel.Controls.Add(this.tab_filters);\r
+            this.tabs_panel.Controls.Add(this.tab_video);\r
+            this.tabs_panel.Controls.Add(this.tab_audio);\r
+            this.tabs_panel.Controls.Add(this.tab_subtitles);\r
             this.tabs_panel.Controls.Add(this.tab_chapters);\r
-            this.tabs_panel.Controls.Add(this.h264Tab);\r
+            this.tabs_panel.Controls.Add(this.tab_advanced);\r
             this.tabs_panel.Controls.Add(this.tab_query);\r
             this.tabs_panel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.tabs_panel.Location = new System.Drawing.Point(9, 274);\r
             this.tabs_panel.Name = "tabs_panel";\r
             this.tabs_panel.SelectedIndex = 0;\r
-            this.tabs_panel.Size = new System.Drawing.Size(721, 342);\r
+            this.tabs_panel.Size = new System.Drawing.Size(732, 342);\r
             this.tabs_panel.TabIndex = 5;\r
             this.tabs_panel.TabStop = false;\r
             // \r
-            // tab_Filters\r
-            // \r
-            this.tab_Filters.Controls.Add(this.ctl_deinterlace);\r
-            this.tab_Filters.Controls.Add(this.ctl_denoise);\r
-            this.tab_Filters.Controls.Add(this.ctl_decomb);\r
-            this.tab_Filters.Controls.Add(this.ctl_detelecine);\r
-            this.tab_Filters.Controls.Add(this.slider_deblock);\r
-            this.tab_Filters.Controls.Add(this.label24);\r
-            this.tab_Filters.Controls.Add(this.check_grayscale);\r
-            this.tab_Filters.Controls.Add(this.label8);\r
-            this.tab_Filters.Controls.Add(this.lbl_deblockVal);\r
-            this.tab_Filters.Location = new System.Drawing.Point(4, 22);\r
-            this.tab_Filters.Name = "tab_Filters";\r
-            this.tab_Filters.Size = new System.Drawing.Size(713, 316);\r
-            this.tab_Filters.TabIndex = 9;\r
-            this.tab_Filters.Text = "Video Filters";\r
-            this.tab_Filters.UseVisualStyleBackColor = true;\r
+            // tab_filters\r
+            // \r
+            this.tab_filters.Controls.Add(this.ctl_deinterlace);\r
+            this.tab_filters.Controls.Add(this.ctl_denoise);\r
+            this.tab_filters.Controls.Add(this.ctl_decomb);\r
+            this.tab_filters.Controls.Add(this.ctl_detelecine);\r
+            this.tab_filters.Controls.Add(this.slider_deblock);\r
+            this.tab_filters.Controls.Add(this.label24);\r
+            this.tab_filters.Controls.Add(this.check_grayscale);\r
+            this.tab_filters.Controls.Add(this.label8);\r
+            this.tab_filters.Controls.Add(this.lbl_deblockVal);\r
+            this.tab_filters.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_filters.Name = "tab_filters";\r
+            this.tab_filters.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_filters.TabIndex = 9;\r
+            this.tab_filters.Text = "Video Filters";\r
+            this.tab_filters.UseVisualStyleBackColor = true;\r
+            // \r
+            // ctl_deinterlace\r
+            // \r
+            this.ctl_deinterlace.AutoSize = true;\r
+            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
+            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
+            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_deinterlace.TabIndex = 41;\r
+            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
+            // \r
+            // ctl_denoise\r
+            // \r
+            this.ctl_denoise.AutoSize = true;\r
+            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
+            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_denoise.Name = "ctl_denoise";\r
+            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_denoise.TabIndex = 40;\r
+            // \r
+            // ctl_decomb\r
+            // \r
+            this.ctl_decomb.AutoSize = true;\r
+            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
+            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_decomb.Name = "ctl_decomb";\r
+            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_decomb.TabIndex = 39;\r
+            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
+            // \r
+            // ctl_detelecine\r
+            // \r
+            this.ctl_detelecine.AutoSize = true;\r
+            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
+            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_detelecine.Name = "ctl_detelecine";\r
+            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_detelecine.TabIndex = 38;\r
+            // \r
+            // tab_subtitles\r
+            // \r
+            this.tab_subtitles.Controls.Add(this.Subtitles);\r
+            this.tab_subtitles.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_subtitles.Name = "tab_subtitles";\r
+            this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_subtitles.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_subtitles.TabIndex = 10;\r
+            this.tab_subtitles.Text = "Subtitles";\r
+            this.tab_subtitles.UseVisualStyleBackColor = true;\r
+            // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
             // \r
             // tab_chapters\r
             // \r
@@ -2303,7 +1222,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(713, 316);\r
+            this.tab_chapters.Size = new System.Drawing.Size(724, 316);\r
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
             this.tab_chapters.UseVisualStyleBackColor = true;\r
@@ -2319,198 +1238,26 @@ namespace Handbrake
             this.label31.TabIndex = 0;\r
             this.label31.Text = "Chapter Markers";\r
             // \r
-            // h264Tab\r
-            // \r
-            this.h264Tab.BackColor = System.Drawing.Color.Transparent;\r
-            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.check_Cabac);\r
-            this.h264Tab.Controls.Add(this.check_noDCTDecimate);\r
-            this.h264Tab.Controls.Add(this.check_noFastPSkip);\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
-            this.h264Tab.Controls.Add(this.drop_deblockAlpha);\r
-            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.check_8x8DCT);\r
-            this.h264Tab.Controls.Add(this.label45);\r
-            this.h264Tab.Controls.Add(this.drop_analysis);\r
-            this.h264Tab.Controls.Add(this.label48);\r
-            this.h264Tab.Controls.Add(this.drop_subpixelMotionEstimation);\r
-            this.h264Tab.Controls.Add(this.label49);\r
-            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.check_pyrmidalBFrames);\r
-            this.h264Tab.Controls.Add(this.check_weightedBFrames);\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.label64);\r
-            this.h264Tab.Controls.Add(this.drop_refFrames);\r
-            this.h264Tab.Controls.Add(this.check_mixedReferences);\r
-            this.h264Tab.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            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(713, 316);\r
-            this.h264Tab.TabIndex = 8;\r
-            this.h264Tab.Text = "Advanced";\r
-            this.h264Tab.UseVisualStyleBackColor = true;\r
-            // \r
-            // label43\r
-            // \r
-            this.label43.AutoSize = true;\r
-            this.label43.BackColor = System.Drawing.Color.Transparent;\r
-            this.label43.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label43.Location = new System.Drawing.Point(13, 13);\r
-            this.label43.Name = "label43";\r
-            this.label43.Size = new System.Drawing.Size(165, 13);\r
-            this.label43.TabIndex = 0;\r
-            this.label43.Text = "Advanced H.264 Options";\r
-            // \r
-            // btn_reset\r
-            // \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
-            this.btn_reset.Text = "Reset All";\r
-            this.btn_reset.UseVisualStyleBackColor = true;\r
-            this.btn_reset.Click += new System.EventHandler(this.btn_reset_Click);\r
-            // \r
-            // rtf_x264Query\r
-            // \r
-            this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.rtf_x264Query.Location = new System.Drawing.Point(13, 253);\r
-            this.rtf_x264Query.Name = "rtf_x264Query";\r
-            this.rtf_x264Query.Size = new System.Drawing.Size(667, 43);\r
-            this.rtf_x264Query.TabIndex = 42;\r
-            this.rtf_x264Query.Text = "";\r
-            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
-            // lbl_trellis\r
-            // \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
-            // label41\r
-            // \r
-            this.label41.AutoSize = true;\r
-            this.label41.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label41.Location = new System.Drawing.Point(466, 147);\r
-            this.label41.Name = "label41";\r
-            this.label41.Size = new System.Drawing.Size(65, 12);\r
-            this.label41.TabIndex = 25;\r
-            this.label41.Text = "Deblocking:";\r
-            // \r
-            // panel3\r
-            // \r
-            this.panel3.BackColor = System.Drawing.Color.Black;\r
-            this.panel3.Location = new System.Drawing.Point(396, 131);\r
-            this.panel3.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(284, 1);\r
-            this.panel3.TabIndex = 24;\r
-            // \r
-            // panel1\r
-            // \r
-            this.panel1.BackColor = System.Drawing.Color.Black;\r
-            this.panel1.Location = new System.Drawing.Point(13, 84);\r
-            this.panel1.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel1.Name = "panel1";\r
-            this.panel1.Size = new System.Drawing.Size(284, 1);\r
-            this.panel1.TabIndex = 3;\r
-            // \r
-            // panel2\r
-            // \r
-            this.panel2.BackColor = System.Drawing.Color.Black;\r
-            this.panel2.Location = new System.Drawing.Point(396, 95);\r
-            this.panel2.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel2.Name = "panel2";\r
-            this.panel2.Size = new System.Drawing.Size(284, 1);\r
-            this.panel2.TabIndex = 21;\r
-            // \r
-            // label45\r
-            // \r
-            this.label45.AutoSize = true;\r
-            this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label45.Location = new System.Drawing.Point(478, 108);\r
-            this.label45.Name = "label45";\r
-            this.label45.Size = new System.Drawing.Size(53, 12);\r
-            this.label45.TabIndex = 22;\r
-            this.label45.Text = "Analysis:";\r
-            // \r
-            // label48\r
-            // \r
-            this.label48.AutoSize = true;\r
-            this.label48.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label48.Location = new System.Drawing.Point(385, 72);\r
-            this.label48.Name = "label48";\r
-            this.label48.Size = new System.Drawing.Size(146, 12);\r
-            this.label48.TabIndex = 20;\r
-            this.label48.Text = "Subpixel Motion Estimation:";\r
-            // \r
-            // label49\r
-            // \r
-            this.label49.AutoSize = true;\r
-            this.label49.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label49.Location = new System.Drawing.Point(397, 43);\r
-            this.label49.Name = "label49";\r
-            this.label49.Size = new System.Drawing.Size(134, 12);\r
-            this.label49.TabIndex = 19;\r
-            this.label49.Text = "Motion Estimation Range:";\r
-            // \r
-            // label54\r
-            // \r
-            this.label54.AutoSize = true;\r
-            this.label54.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label54.Location = new System.Drawing.Point(391, 14);\r
-            this.label54.Name = "label54";\r
-            this.label54.Size = new System.Drawing.Size(140, 12);\r
-            this.label54.TabIndex = 18;\r
-            this.label54.Text = "Motion Estimation Method:";\r
-            // \r
-            // lbl_direct_prediction\r
-            // \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
-            // label62\r
-            // \r
-            this.label62.AutoSize = true;\r
-            this.label62.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label62.Location = new System.Drawing.Point(88, 94);\r
-            this.label62.Name = "label62";\r
-            this.label62.Size = new System.Drawing.Size(58, 12);\r
-            this.label62.TabIndex = 4;\r
-            this.label62.Text = "B-Frames:";\r
-            // \r
-            // label64\r
-            // \r
-            this.label64.AutoSize = true;\r
-            this.label64.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label64.Location = new System.Drawing.Point(47, 40);\r
-            this.label64.Name = "label64";\r
-            this.label64.Size = new System.Drawing.Size(99, 12);\r
-            this.label64.TabIndex = 1;\r
-            this.label64.Text = "Reference Frames:";\r
+            // tab_advanced\r
+            // \r
+            this.tab_advanced.BackColor = System.Drawing.Color.Transparent;\r
+            this.tab_advanced.Controls.Add(this.x264Panel);\r
+            this.tab_advanced.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.tab_advanced.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_advanced.Name = "tab_advanced";\r
+            this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_advanced.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_advanced.TabIndex = 8;\r
+            this.tab_advanced.Text = "Advanced";\r
+            this.tab_advanced.UseVisualStyleBackColor = true;\r
+            // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
             // \r
             // tab_query\r
             // \r
@@ -2521,7 +1268,7 @@ namespace Handbrake
             this.tab_query.Controls.Add(this.rtf_query);\r
             this.tab_query.Location = new System.Drawing.Point(4, 22);\r
             this.tab_query.Name = "tab_query";\r
-            this.tab_query.Size = new System.Drawing.Size(713, 316);\r
+            this.tab_query.Size = new System.Drawing.Size(724, 316);\r
             this.tab_query.TabIndex = 7;\r
             this.tab_query.Text = "Query Editor";\r
             this.tab_query.UseVisualStyleBackColor = true;\r
@@ -2531,7 +1278,7 @@ namespace Handbrake
             this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_clear.Location = new System.Drawing.Point(602, 75);\r
+            this.btn_clear.Location = new System.Drawing.Point(634, 75);\r
             this.btn_clear.Name = "btn_clear";\r
             this.btn_clear.Size = new System.Drawing.Size(75, 22);\r
             this.btn_clear.TabIndex = 4;\r
@@ -2578,7 +1325,7 @@ namespace Handbrake
             this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.rtf_query.Location = new System.Drawing.Point(16, 103);\r
             this.rtf_query.Name = "rtf_query";\r
-            this.rtf_query.Size = new System.Drawing.Size(661, 182);\r
+            this.rtf_query.Size = new System.Drawing.Size(693, 194);\r
             this.rtf_query.TabIndex = 5;\r
             this.rtf_query.Text = "";\r
             // \r
@@ -2591,7 +1338,7 @@ namespace Handbrake
             this.groupBox_dest.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox_dest.Location = new System.Drawing.Point(9, 160);\r
             this.groupBox_dest.Name = "groupBox_dest";\r
-            this.groupBox_dest.Size = new System.Drawing.Size(721, 50);\r
+            this.groupBox_dest.Size = new System.Drawing.Size(732, 50);\r
             this.groupBox_dest.TabIndex = 3;\r
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
@@ -2599,7 +1346,7 @@ namespace Handbrake
             // 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(608, 17);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(642, 18);\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
@@ -2612,7 +1359,7 @@ namespace Handbrake
             this.groupBox2.Controls.Add(this.splitContainer1);\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(739, 70);\r
+            this.groupBox2.Location = new System.Drawing.Point(751, 70);\r
             this.groupBox2.Name = "groupBox2";\r
             this.groupBox2.Size = new System.Drawing.Size(245, 546);\r
             this.groupBox2.TabIndex = 6;\r
@@ -2665,45 +1412,46 @@ namespace Handbrake
             this.pmnu_saveChanges,\r
             this.pmnu_delete});\r
             this.presets_menu.Name = "presets_menu";\r
-            this.presets_menu.Size = new System.Drawing.Size(163, 98);\r
+            this.presets_menu.Size = new System.Drawing.Size(155, 98);\r
             this.presets_menu.Text = ";";\r
             this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);\r
             // \r
             // pmnu_expandAll\r
             // \r
             this.pmnu_expandAll.Name = "pmnu_expandAll";\r
-            this.pmnu_expandAll.Size = new System.Drawing.Size(162, 22);\r
+            this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_expandAll.Text = "Expand All";\r
             this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);\r
             // \r
             // pmnu_collapse\r
             // \r
             this.pmnu_collapse.Name = "pmnu_collapse";\r
-            this.pmnu_collapse.Size = new System.Drawing.Size(162, 22);\r
+            this.pmnu_collapse.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_collapse.Text = "Collapse All";\r
             this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);\r
             // \r
             // sep1\r
             // \r
             this.sep1.Name = "sep1";\r
-            this.sep1.Size = new System.Drawing.Size(159, 6);\r
+            this.sep1.Size = new System.Drawing.Size(151, 6);\r
             // \r
             // pmnu_saveChanges\r
             // \r
             this.pmnu_saveChanges.Name = "pmnu_saveChanges";\r
-            this.pmnu_saveChanges.Size = new System.Drawing.Size(162, 22);\r
+            this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_saveChanges.Text = "Save Changes";\r
             this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);\r
             // \r
             // pmnu_delete\r
             // \r
             this.pmnu_delete.Name = "pmnu_delete";\r
-            this.pmnu_delete.Size = new System.Drawing.Size(162, 22);\r
+            this.pmnu_delete.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_delete.Text = "Delete";\r
             this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);\r
             // \r
             // toolStrip1\r
             // \r
+            this.toolStrip1.BackColor = System.Drawing.Color.Transparent;\r
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.btn_source,\r
@@ -2717,7 +1465,7 @@ namespace Handbrake
             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(995, 39);\r
+            this.toolStrip1.Size = new System.Drawing.Size(1000, 39);\r
             this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
@@ -2732,7 +1480,7 @@ namespace Handbrake
             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.Size = new System.Drawing.Size(85, 36);\r
             this.btn_source.Text = "Source";\r
             this.btn_source.ToolTipText = "Open a new source file or folder.";\r
             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
@@ -2741,7 +1489,7 @@ namespace Handbrake
             // \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.Size = new System.Drawing.Size(194, 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
@@ -2750,20 +1498,20 @@ namespace Handbrake
             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.Size = new System.Drawing.Size(194, 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
+            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 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.Size = new System.Drawing.Size(194, 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
@@ -2779,7 +1527,7 @@ namespace Handbrake
             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(70, 36);\r
+            this.btn_start.Size = new System.Drawing.Size(67, 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
@@ -2790,7 +1538,7 @@ namespace Handbrake
             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(122, 36);\r
+            this.btn_add2Queue.Size = new System.Drawing.Size(110, 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
@@ -2801,7 +1549,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(115, 36);\r
+            this.btn_showQueue.Size = new System.Drawing.Size(104, 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
@@ -2813,29 +1561,13 @@ namespace Handbrake
             // \r
             // tb_preview\r
             // \r
-            this.tb_preview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_qtpreview,\r
-            this.mnu_vlcpreview});\r
             this.tb_preview.Image = global::Handbrake.Properties.Resources.picture;\r
             this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tb_preview.Name = "tb_preview";\r
-            this.tb_preview.Size = new System.Drawing.Size(95, 36);\r
+            this.tb_preview.Size = new System.Drawing.Size(81, 36);\r
             this.tb_preview.Text = "Preview";\r
-            // \r
-            // mnu_qtpreview\r
-            // \r
-            this.mnu_qtpreview.Name = "mnu_qtpreview";\r
-            this.mnu_qtpreview.Size = new System.Drawing.Size(203, 22);\r
-            this.mnu_qtpreview.Text = "Preview in QuickTime";\r
-            this.mnu_qtpreview.Click += new System.EventHandler(this.mnu_qtpreview_Click);\r
-            // \r
-            // mnu_vlcpreview\r
-            // \r
-            this.mnu_vlcpreview.Name = "mnu_vlcpreview";\r
-            this.mnu_vlcpreview.Size = new System.Drawing.Size(203, 22);\r
-            this.mnu_vlcpreview.Text = "Preview in VLC";\r
-            this.mnu_vlcpreview.Click += new System.EventHandler(this.mnu_vlcpreview_Click);\r
+            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
             // \r
             // btn_ActivityWindow\r
             // \r
@@ -2843,7 +1575,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(132, 36);\r
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 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
@@ -2863,9 +1595,9 @@ namespace Handbrake
             // \r
             this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.lbl_encode});\r
-            this.StatusStrip.Location = new System.Drawing.Point(0, 627);\r
+            this.StatusStrip.Location = new System.Drawing.Point(0, 623);\r
             this.StatusStrip.Name = "StatusStrip";\r
-            this.StatusStrip.Size = new System.Drawing.Size(995, 22);\r
+            this.StatusStrip.Size = new System.Drawing.Size(1000, 22);\r
             this.StatusStrip.TabIndex = 7;\r
             this.StatusStrip.Text = "statusStrip1";\r
             // \r
@@ -2876,54 +1608,23 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
-            // ctl_deinterlace\r
-            // \r
-            this.ctl_deinterlace.AutoSize = true;\r
-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_deinterlace.TabIndex = 41;\r
-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
-            // \r
-            // ctl_denoise\r
+            // hbproc\r
             // \r
-            this.ctl_denoise.AutoSize = true;\r
-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_denoise.Name = "ctl_denoise";\r
-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_denoise.TabIndex = 40;\r
-            // \r
-            // ctl_decomb\r
-            // \r
-            this.ctl_decomb.AutoSize = true;\r
-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_decomb.Name = "ctl_decomb";\r
-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_decomb.TabIndex = 39;\r
-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
-            // \r
-            // ctl_detelecine\r
-            // \r
-            this.ctl_detelecine.AutoSize = true;\r
-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_detelecine.Name = "ctl_detelecine";\r
-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_detelecine.TabIndex = 38;\r
+            this.hbproc.StartInfo.Domain = "";\r
+            this.hbproc.StartInfo.LoadUserProfile = false;\r
+            this.hbproc.StartInfo.Password = null;\r
+            this.hbproc.StartInfo.StandardErrorEncoding = null;\r
+            this.hbproc.StartInfo.StandardOutputEncoding = null;\r
+            this.hbproc.StartInfo.UserName = "";\r
+            this.hbproc.SynchronizingObject = this;\r
             // \r
             // frmMain\r
             // \r
+            this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.AutoScroll = true;\r
-            this.ClientSize = new System.Drawing.Size(995, 649);\r
+            this.ClientSize = new System.Drawing.Size(1000, 645);\r
             this.Controls.Add(this.gb_source);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.groupBox_output);\r
@@ -2946,26 +1647,18 @@ namespace Handbrake
             this.gb_source.PerformLayout();\r
             this.groupBox_output.ResumeLayout(false);\r
             this.groupBox_output.PerformLayout();\r
-            this.TabPage2.ResumeLayout(false);\r
-            this.TabPage2.PerformLayout();\r
-            this.audioMenu.ResumeLayout(false);\r
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();\r
-            this.TabPage3.ResumeLayout(false);\r
-            this.TabPage3.PerformLayout();\r
-            this.TabPage1.ResumeLayout(false);\r
-            this.TabPage1.PerformLayout();\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
-            ((System.ComponentModel.ISupportInitialize)(this.text_right)).EndInit();\r
+            this.tab_audio.ResumeLayout(false);\r
+            this.tab_video.ResumeLayout(false);\r
+            this.tab_video.PerformLayout();\r
+            this.tab_picture.ResumeLayout(false);\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();\r
             this.tabs_panel.ResumeLayout(false);\r
-            this.tab_Filters.ResumeLayout(false);\r
-            this.tab_Filters.PerformLayout();\r
+            this.tab_filters.ResumeLayout(false);\r
+            this.tab_filters.PerformLayout();\r
+            this.tab_subtitles.ResumeLayout(false);\r
             this.tab_chapters.ResumeLayout(false);\r
             this.tab_chapters.PerformLayout();\r
-            this.h264Tab.ResumeLayout(false);\r
-            this.h264Tab.PerformLayout();\r
+            this.tab_advanced.ResumeLayout(false);\r
             this.tab_query.ResumeLayout(false);\r
             this.tab_query.PerformLayout();\r
             this.groupBox_dest.ResumeLayout(false);\r
@@ -3007,7 +1700,6 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_chapterStart;\r
         internal System.Windows.Forms.ComboBox drp_dvdtitle;\r
         internal System.Windows.Forms.Label Label17;\r
-        internal System.Windows.Forms.TextBox text_source;\r
         internal System.Windows.Forms.Label Label9;\r
         internal System.Windows.Forms.Label Label10;\r
         internal System.Windows.Forms.GroupBox groupBox_output;\r
@@ -3015,12 +1707,8 @@ 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
-        internal System.Windows.Forms.TabPage TabPage2;\r
-        internal System.Windows.Forms.ComboBox drp_audmix_1;\r
-        internal System.Windows.Forms.ComboBox drp_track1Audio;\r
-        internal System.Windows.Forms.ComboBox drp_audbit_1;\r
-        internal System.Windows.Forms.ComboBox drp_audsr_1;\r
-        internal System.Windows.Forms.TabPage TabPage3;\r
+        internal System.Windows.Forms.TabPage tab_audio;\r
+        internal System.Windows.Forms.TabPage tab_video;\r
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
         internal System.Windows.Forms.Label Label2;\r
@@ -3030,19 +1718,11 @@ namespace Handbrake
         internal System.Windows.Forms.TrackBar slider_videoQuality;\r
         internal System.Windows.Forms.TextBox text_filesize;\r
         internal System.Windows.Forms.TextBox text_bitrate;\r
-        internal System.Windows.Forms.TabPage TabPage1;\r
+        internal System.Windows.Forms.TabPage tab_picture;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\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 Label15;\r
         internal System.Windows.Forms.TabControl tabs_panel;\r
         internal System.Windows.Forms.Label Label46;\r
         private System.Windows.Forms.GroupBox groupBox_dest;\r
-        internal System.Windows.Forms.ComboBox drp_subtitle;\r
-        internal System.Windows.Forms.Label Label19;\r
-        internal System.Windows.Forms.Label Label20;\r
         internal System.Windows.Forms.CheckBox check_grayscale;\r
         internal System.Windows.Forms.Label label24;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
@@ -3054,22 +1734,9 @@ namespace Handbrake
         private System.Windows.Forms.OpenFileDialog File_Open;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
-        internal System.Windows.Forms.Label label26;\r
-        internal System.Windows.Forms.Label Label56;\r
-        internal System.Windows.Forms.Label lbl_Aspect;\r
-        internal System.Windows.Forms.Label Label91;\r
-        internal System.Windows.Forms.TextBox text_height;\r
-        internal System.Windows.Forms.Label Label55;\r
-        internal System.Windows.Forms.TextBox text_width;\r
-        internal System.Windows.Forms.Label label27;\r
         private System.Windows.Forms.TabPage tab_chapters;\r
         internal System.Windows.Forms.Label label31;\r
-        internal System.Windows.Forms.NumericUpDown text_right;\r
-        internal System.Windows.Forms.NumericUpDown text_bottom;\r
-        internal System.Windows.Forms.NumericUpDown text_top;\r
-        internal System.Windows.Forms.NumericUpDown text_left;\r
         internal System.Windows.Forms.CheckBox check_optimiseMP4;\r
-        internal System.Windows.Forms.CheckBox check_forced;\r
         internal System.Windows.Forms.DataGridView data_chpt;\r
         private System.Windows.Forms.TabPage tab_query;\r
         private System.Windows.Forms.Label label34;\r
@@ -3086,59 +1753,12 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_removePreset;\r
         internal System.Windows.Forms.Button btn_addPreset;\r
         internal System.Windows.Forms.Label label25;\r
-        internal System.Windows.Forms.Label label6;\r
-        internal System.Windows.Forms.ComboBox drp_anamorphic;\r
-        internal System.Windows.Forms.TabPage h264Tab;\r
-        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.CheckBox check_Cabac;\r
-        internal System.Windows.Forms.CheckBox check_noDCTDecimate;\r
-        internal System.Windows.Forms.CheckBox check_noFastPSkip;\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
-        internal System.Windows.Forms.ComboBox drop_deblockAlpha;\r
-        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.CheckBox check_8x8DCT;\r
-        internal System.Windows.Forms.Label label45;\r
-        internal System.Windows.Forms.ComboBox drop_analysis;\r
-        internal System.Windows.Forms.Label label48;\r
-        internal System.Windows.Forms.ComboBox drop_subpixelMotionEstimation;\r
-        internal System.Windows.Forms.Label label49;\r
-        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.CheckBox check_pyrmidalBFrames;\r
-        internal System.Windows.Forms.CheckBox check_weightedBFrames;\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 label64;\r
-        internal System.Windows.Forms.ComboBox drop_refFrames;\r
-        internal System.Windows.Forms.CheckBox check_mixedReferences;\r
-        internal System.Windows.Forms.Label label65;\r
-        internal System.Windows.Forms.Label label14;\r
-        internal System.Windows.Forms.ComboBox drp_audenc_1;\r
-        internal System.Windows.Forms.Label label66;\r
-        internal System.Windows.Forms.Label label67;\r
-        internal System.Windows.Forms.Label label68;\r
-        private System.Windows.Forms.GroupBox groupBox3;\r
-        private System.Windows.Forms.GroupBox groupBox5;\r
+        internal System.Windows.Forms.TabPage tab_advanced;\r
         private System.Windows.Forms.Button btn_destBrowse;\r
-        internal System.Windows.Forms.TrackBar tb_drc;\r
-        internal System.Windows.Forms.Label label16;\r
-        internal System.Windows.Forms.Label lbl_drc;\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.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
@@ -3155,8 +1775,6 @@ namespace Handbrake
         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.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.Label label8;\r
@@ -3169,31 +1787,10 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator sep1;\r
         private System.Windows.Forms.ToolStripMenuItem pmnu_delete;\r
         private System.Windows.Forms.SplitContainer splitContainer1;\r
-        private System.Windows.Forms.Button btn_RemoveAudioTrack;\r
-        private System.Windows.Forms.Button btn_addAudioTrack;\r
-        private System.Windows.Forms.ColumnHeader col_Source;\r
-        private System.Windows.Forms.ColumnHeader col_codec;\r
-        private System.Windows.Forms.ColumnHeader col_mixdown;\r
-        private System.Windows.Forms.ColumnHeader col_samplerate;\r
-        private System.Windows.Forms.ColumnHeader col_bitrate;\r
-        private System.Windows.Forms.ColumnHeader col_drc;\r
-        internal System.Windows.Forms.ListView lv_audioList;\r
-        private System.Windows.Forms.ContextMenuStrip audioMenu;\r
-        private System.Windows.Forms.ToolStripMenuItem audioList_movedown;\r
-        private System.Windows.Forms.ToolStripMenuItem audioList_moveup;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
-        private System.Windows.Forms.ToolStripMenuItem audioList_remove;\r
         private System.Windows.Forms.ImageList AudioMenuRowHeightHack;\r
-        private System.Windows.Forms.ToolStripDropDownButton tb_preview;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_qtpreview;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_vlcpreview;\r
         private System.Windows.Forms.ToolStripMenuItem pmnu_saveChanges;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_killCLI;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn number;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
-        private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_qptest;\r
-        private System.Windows.Forms.TabPage tab_Filters;\r
+        private System.Windows.Forms.TabPage tab_filters;\r
         internal Deinterlace ctl_deinterlace;\r
         internal Denoise ctl_denoise;\r
         internal Decomb ctl_decomb;\r
@@ -3201,6 +1798,19 @@ namespace Handbrake
         internal System.Windows.Forms.RadioButton radio_cq;\r
         internal System.Windows.Forms.RadioButton radio_avgBitrate;\r
         internal System.Windows.Forms.RadioButton radio_targetFilesize;\r
+        internal Handbrake.Controls.x264Panel x264Panel;\r
+        private System.Windows.Forms.ToolStripButton tb_preview;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn number;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
+        internal TextBox text_source;\r
+        private System.Diagnostics.Process hbproc;\r
+        internal ComboBox drop_angle;\r
+        internal Label lbl_angle;\r
+        private TabPage tab_subtitles;\r
+        internal Handbrake.Controls.AudioPanel audioPanel;\r
+        internal Handbrake.Controls.PictureSettings pictureSettings;\r
+        internal Handbrake.Controls.Subtitles Subtitles;\r
 \r
\r
     }\r
 }
\ No newline at end of file