OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.Designer.cs
index 1b3c264..a5a3351 100644 (file)
@@ -39,7 +39,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -49,9 +49,7 @@ namespace Handbrake
             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.btn_setDefault = new System.Windows.Forms.Button();\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
@@ -60,8 +58,6 @@ namespace Handbrake
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\r
             this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.btn_addPreset = new System.Windows.Forms.Button();\r
-            this.btn_removePreset = new System.Windows.Forms.Button();\r
             this.drop_format = new System.Windows.Forms.ComboBox();\r
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();\r
             this.drop_chapterStart = new System.Windows.Forms.ComboBox();\r
@@ -92,45 +88,35 @@ namespace Handbrake
             this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_exportMacPreset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.label5 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
             this.lbl_rfwarn = new System.Windows.Forms.Label();\r
             this.checkMaximumFramerate = new System.Windows.Forms.CheckBox();\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
             this.label25 = new System.Windows.Forms.Label();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label2 = new System.Windows.Forms.Label();\r
             this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.lbl_framerate = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\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.Filters = new Handbrake.Controls.Filters();\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.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
@@ -138,6 +124,16 @@ namespace Handbrake
             this.rtf_query = new System.Windows.Forms.RichTextBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
+            this.presetsToolStrip = new System.Windows.Forms.ToolStrip();\r
+            this.BtnAddPreset = new System.Windows.Forms.ToolStripButton();\r
+            this.BtnRemovePreset = new System.Windows.Forms.ToolStripButton();\r
+            this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.MnuSetDefaultPreset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.MnuImportPreset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.MnuExportPreset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.MnuResetBuiltInPresets = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
             this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
             this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -152,6 +148,13 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.MnuUserGuide = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.MnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.MnuAboutHandBrake = new System.Windows.Forms.ToolStripMenuItem();\r
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();\r
@@ -175,11 +178,6 @@ namespace Handbrake
             this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -201,6 +199,7 @@ namespace Handbrake
             this.splitContainer1.Panel1.SuspendLayout();\r
             this.splitContainer1.Panel2.SuspendLayout();\r
             this.splitContainer1.SuspendLayout();\r
+            this.presetsToolStrip.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
             this.StatusStrip.SuspendLayout();\r
             this.tableLayoutPanel2.SuspendLayout();\r
@@ -244,7 +243,7 @@ namespace Handbrake
             this.text_destination.Location = new System.Drawing.Point(36, 3);\r
             this.text_destination.Name = "text_destination";\r
             this.text_destination.Size = new System.Drawing.Size(603, 21);\r
-            this.text_destination.TabIndex = 6;\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
             // \r
@@ -259,7 +258,7 @@ namespace Handbrake
             this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21);\r
-            this.drp_videoEncoder.TabIndex = 16;\r
+            this.drp_videoEncoder.TabIndex = 6;\r
             this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
             // \r
@@ -271,7 +270,7 @@ namespace Handbrake
             this.check_largeFile.Location = new System.Drawing.Point(179, 5);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(91, 17);\r
-            this.check_largeFile.TabIndex = 10;\r
+            this.check_largeFile.TabIndex = 2;\r
             this.check_largeFile.Text = "Large file size";\r
             this.ToolTip.SetToolTip(this.check_largeFile, "Caution: This option will likely break device compatibility with all but the Appl" +\r
                     "eTV Take 2.\r\nChecking this box enables a 64bit mp4 file which can be over 4GB.");\r
@@ -284,8 +283,8 @@ namespace Handbrake
             this.check_turbo.Enabled = false;\r
             this.check_turbo.Location = new System.Drawing.Point(146, 143);\r
             this.check_turbo.Name = "check_turbo";\r
-            this.check_turbo.Size = new System.Drawing.Size(101, 17);\r
-            this.check_turbo.TabIndex = 20;\r
+            this.check_turbo.Size = new System.Drawing.Size(99, 17);\r
+            this.check_turbo.TabIndex = 9;\r
             this.check_turbo.Text = "Turbo first Pass";\r
             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
             this.check_turbo.UseVisualStyleBackColor = false;\r
@@ -307,7 +306,7 @@ namespace Handbrake
             this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
             this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21);\r
-            this.drp_videoFramerate.TabIndex = 17;\r
+            this.drp_videoFramerate.TabIndex = 2;\r
             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");\r
             this.drp_videoFramerate.SelectedIndexChanged += new System.EventHandler(this.drp_videoFramerate_SelectedIndexChanged);\r
             // \r
@@ -315,47 +314,24 @@ namespace Handbrake
             // \r
             this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window;\r
             this.slider_videoQuality.Enabled = false;\r
-            this.slider_videoQuality.Location = new System.Drawing.Point(376, 120);\r
+            this.slider_videoQuality.Location = new System.Drawing.Point(376, 90);\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, 45);\r
-            this.slider_videoQuality.TabIndex = 26;\r
+            this.slider_videoQuality.TabIndex = 13;\r
             this.slider_videoQuality.TickFrequency = 17;\r
             this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. ");\r
             this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);\r
             // \r
-            // text_filesize\r
-            // \r
-            this.text_filesize.Enabled = false;\r
-            this.text_filesize.Location = new System.Drawing.Point(511, 36);\r
-            this.text_filesize.Name = "text_filesize";\r
-            this.text_filesize.Size = new System.Drawing.Size(81, 21);\r
-            this.text_filesize.TabIndex = 24;\r
-            this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");\r
-            // \r
             // text_bitrate\r
             // \r
-            this.text_bitrate.Location = new System.Drawing.Point(511, 63);\r
+            this.text_bitrate.Location = new System.Drawing.Point(511, 33);\r
             this.text_bitrate.Name = "text_bitrate";\r
             this.text_bitrate.Size = new System.Drawing.Size(81, 21);\r
-            this.text_bitrate.TabIndex = 25;\r
+            this.text_bitrate.TabIndex = 14;\r
             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
             // \r
-            // btn_setDefault\r
-            // \r
-            this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 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(135, 8);\r
-            this.btn_setDefault.Name = "btn_setDefault";\r
-            this.btn_setDefault.Size = new System.Drawing.Size(101, 22);\r
-            this.btn_setDefault.TabIndex = 39;\r
-            this.btn_setDefault.Text = "Set Default";\r
-            this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.");\r
-            this.btn_setDefault.UseVisualStyleBackColor = true;\r
-            this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);\r
-            // \r
             // check_optimiseMP4\r
             // \r
             this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
@@ -364,7 +340,7 @@ namespace Handbrake
             this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
             this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17);\r
-            this.check_optimiseMP4.TabIndex = 11;\r
+            this.check_optimiseMP4.TabIndex = 3;\r
             this.check_optimiseMP4.Text = "Web optimized";\r
             this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +\r
                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +\r
@@ -379,7 +355,7 @@ namespace Handbrake
             this.check_iPodAtom.Location = new System.Drawing.Point(378, 5);\r
             this.check_iPodAtom.Name = "check_iPodAtom";\r
             this.check_iPodAtom.Size = new System.Drawing.Size(102, 17);\r
-            this.check_iPodAtom.TabIndex = 12;\r
+            this.check_iPodAtom.TabIndex = 4;\r
             this.check_iPodAtom.Text = "iPod 5G support";\r
             this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" +\r
                     " not enabled for H.264 encodes.");\r
@@ -402,14 +378,14 @@ namespace Handbrake
             this.data_chpt.Name = "data_chpt";\r
             this.data_chpt.RowHeadersVisible = false;\r
             this.data_chpt.Size = new System.Drawing.Size(684, 236);\r
-            this.data_chpt.TabIndex = 30;\r
+            this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -450,34 +426,6 @@ namespace Handbrake
             this.btn_file_source.Text = "Video File";\r
             this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);\r
             // \r
-            // btn_addPreset\r
-            // \r
-            this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_addPreset.Font = new System.Drawing.Font("Tahoma", 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(49, 22);\r
-            this.btn_addPreset.TabIndex = 37;\r
-            this.btn_addPreset.Text = "Add";\r
-            this.ToolTip.SetToolTip(this.btn_addPreset, "This option will take the current settings and add it as a new preset.");\r
-            this.btn_addPreset.UseVisualStyleBackColor = true;\r
-            this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
-            // \r
-            // btn_removePreset\r
-            // \r
-            this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 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(58, 8);\r
-            this.btn_removePreset.Name = "btn_removePreset";\r
-            this.btn_removePreset.Size = new System.Drawing.Size(71, 22);\r
-            this.btn_removePreset.TabIndex = 38;\r
-            this.btn_removePreset.Text = "Remove";\r
-            this.ToolTip.SetToolTip(this.btn_removePreset, "Remove the selected preset from the panel above.");\r
-            this.btn_removePreset.UseVisualStyleBackColor = true;\r
-            this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
-            // \r
             // drop_format\r
             // \r
             this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -488,7 +436,7 @@ namespace Handbrake
             this.drop_format.Location = new System.Drawing.Point(67, 3);\r
             this.drop_format.Name = "drop_format";\r
             this.drop_format.Size = new System.Drawing.Size(106, 21);\r
-            this.drop_format.TabIndex = 9;\r
+            this.drop_format.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.\r\nHandBrake supports MKV and MP4(M4v)");\r
             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
             // \r
@@ -499,7 +447,7 @@ namespace Handbrake
             this.drop_chapterFinish.Location = new System.Drawing.Point(509, 3);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
-            this.drop_chapterFinish.TabIndex = 5;\r
+            this.drop_chapterFinish.TabIndex = 7;\r
             this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);\r
             // \r
@@ -510,7 +458,7 @@ namespace Handbrake
             this.drop_chapterStart.Location = new System.Drawing.Point(383, 3);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
-            this.drop_chapterStart.TabIndex = 4;\r
+            this.drop_chapterStart.TabIndex = 5;\r
             this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);\r
             // \r
@@ -521,7 +469,7 @@ namespace Handbrake
             this.drop_angle.Location = new System.Drawing.Point(209, 3);\r
             this.drop_angle.Name = "drop_angle";\r
             this.drop_angle.Size = new System.Drawing.Size(45, 21);\r
-            this.drop_angle.TabIndex = 2;\r
+            this.drop_angle.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
             // \r
             // drp_dvdtitle\r
@@ -548,7 +496,7 @@ namespace Handbrake
             this.btn_importChapters.Location = new System.Drawing.Point(544, 28);\r
             this.btn_importChapters.Name = "btn_importChapters";\r
             this.btn_importChapters.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_importChapters.TabIndex = 31;\r
+            this.btn_importChapters.TabIndex = 1;\r
             this.btn_importChapters.Text = "Import";\r
             this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip"));\r
             this.btn_importChapters.UseVisualStyleBackColor = true;\r
@@ -562,7 +510,7 @@ namespace Handbrake
             this.btn_export.Location = new System.Drawing.Point(625, 28);\r
             this.btn_export.Name = "btn_export";\r
             this.btn_export.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_export.TabIndex = 32;\r
+            this.btn_export.TabIndex = 0;\r
             this.btn_export.Text = "Export";\r
             this.ToolTip.SetToolTip(this.btn_export, resources.GetString("btn_export.ToolTip"));\r
             this.btn_export.UseVisualStyleBackColor = true;\r
@@ -579,7 +527,7 @@ namespace Handbrake
             this.drop_mode.Location = new System.Drawing.Point(295, 3);\r
             this.drop_mode.Name = "drop_mode";\r
             this.drop_mode.Size = new System.Drawing.Size(77, 21);\r
-            this.drop_mode.TabIndex = 3;\r
+            this.drop_mode.TabIndex = 4;\r
             this.ToolTip.SetToolTip(this.drop_mode, resources.GetString("drop_mode.ToolTip"));\r
             this.drop_mode.SelectedIndexChanged += new System.EventHandler(this.drop_mode_SelectedIndexChanged);\r
             // \r
@@ -591,7 +539,7 @@ namespace Handbrake
             this.btn_generate_Query.Location = new System.Drawing.Point(16, 104);\r
             this.btn_generate_Query.Name = "btn_generate_Query";\r
             this.btn_generate_Query.Size = new System.Drawing.Size(126, 22);\r
-            this.btn_generate_Query.TabIndex = 34;\r
+            this.btn_generate_Query.TabIndex = 2;\r
             this.btn_generate_Query.Text = "Generate Query";\r
             this.ToolTip.SetToolTip(this.btn_generate_Query, "This will allow you to override the generated query.\r\nNote, The query in the box " +\r
                     "below will always override any automatically generated query, even if you change" +\r
@@ -602,17 +550,17 @@ namespace Handbrake
             // treeView_presets\r
             // \r
             this.treeView_presets.ContextMenuStrip = this.presets_menu;\r
-            this.treeView_presets.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue;\r
             this.treeView_presets.FullRowSelect = true;\r
             this.treeView_presets.HideSelection = false;\r
             this.treeView_presets.ItemHeight = 21;\r
             this.treeView_presets.Location = new System.Drawing.Point(0, 0);\r
+            this.treeView_presets.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
             this.treeView_presets.Size = new System.Drawing.Size(240, 424);\r
-            this.treeView_presets.TabIndex = 8;\r
+            this.treeView_presets.TabIndex = 0;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);\r
             this.treeView_presets.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TreeViewPresetsMouseMove);\r
@@ -766,130 +714,17 @@ namespace Handbrake
             this.mnu_options.Text = "Options";\r
             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
             // \r
-            // PresetsToolStripMenuItem\r
-            // \r
-            this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_presetReset,\r
-            this.mnu_delete_preset,\r
-            this.toolStripSeparator7,\r
-            this.btn_new_preset,\r
-            this.mnu_importMacPreset,\r
-            this.mnu_exportMacPreset,\r
-            this.mnu_SelectDefault});\r
-            this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";\r
-            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);\r
-            this.PresetsToolStripMenuItem.Text = "&Presets";\r
-            // \r
-            // mnu_presetReset\r
-            // \r
-            this.mnu_presetReset.Name = "mnu_presetReset";\r
-            this.mnu_presetReset.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_presetReset.Text = "Update Built-in Presets";\r
-            this.mnu_presetReset.ToolTipText = "Resets all presets.";\r
-            this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);\r
-            // \r
-            // mnu_delete_preset\r
-            // \r
-            this.mnu_delete_preset.Name = "mnu_delete_preset";\r
-            this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_delete_preset.Text = "Delete Built-in Presets";\r
-            this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click);\r
-            // \r
-            // toolStripSeparator7\r
-            // \r
-            this.toolStripSeparator7.Name = "toolStripSeparator7";\r
-            this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);\r
-            // \r
-            // btn_new_preset\r
-            // \r
-            this.btn_new_preset.Name = "btn_new_preset";\r
-            this.btn_new_preset.Size = new System.Drawing.Size(194, 22);\r
-            this.btn_new_preset.Text = "Save Preset";\r
-            this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click);\r
-            // \r
-            // mnu_importMacPreset\r
-            // \r
-            this.mnu_importMacPreset.Name = "mnu_importMacPreset";\r
-            this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_importMacPreset.Text = "Import";\r
-            this.mnu_importMacPreset.ToolTipText = "Import a (plist - mac format) preset.\r\nYou can import plist presets from the Mac," +\r
-                " Linux and Windows GUI\'s";\r
-            this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);\r
-            // \r
-            // mnu_exportMacPreset\r
-            // \r
-            this.mnu_exportMacPreset.Name = "mnu_exportMacPreset";\r
-            this.mnu_exportMacPreset.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_exportMacPreset.Text = "Export (Experimental)";\r
-            this.mnu_exportMacPreset.ToolTipText = "Export a (plist - mac format) preset.\r\nThis can be imported by Mac, Linux or Wind" +\r
-                "ows GUI\'s";\r
-            this.mnu_exportMacPreset.Click += new System.EventHandler(this.mnu_exportMacPreset_Click);\r
-            // \r
-            // mnu_SelectDefault\r
-            // \r
-            this.mnu_SelectDefault.Name = "mnu_SelectDefault";\r
-            this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_SelectDefault.Text = "Select Default Preset";\r
-            this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";\r
-            this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);\r
-            // \r
-            // HelpToolStripMenuItem\r
-            // \r
-            this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_user_guide,\r
-            this.ToolStripSeparator3,\r
-            this.mnu_UpdateCheck,\r
-            this.toolStripSeparator6,\r
-            this.mnu_about});\r
-            this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";\r
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
-            this.HelpToolStripMenuItem.Text = "&Help";\r
-            // \r
-            // mnu_user_guide\r
-            // \r
-            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
-            this.mnu_user_guide.Name = "mnu_user_guide";\r
-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_user_guide.Text = "HandBrake User Guide";\r
-            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
-            // \r
-            // ToolStripSeparator3\r
-            // \r
-            this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
-            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);\r
-            // \r
-            // mnu_UpdateCheck\r
-            // \r
-            this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";\r
-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_UpdateCheck.Text = "Check for Updates";\r
-            this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);\r
-            // \r
-            // toolStripSeparator6\r
-            // \r
-            this.toolStripSeparator6.Name = "toolStripSeparator6";\r
-            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);\r
-            // \r
-            // mnu_about\r
-            // \r
-            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
-            this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_about.Text = "About...";\r
-            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
-            // \r
             // frmMainMenu\r
             // \r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.FileToolStripMenuItem,\r
-            this.ToolsToolStripMenuItem,\r
-            this.PresetsToolStripMenuItem,\r
-            this.HelpToolStripMenuItem});\r
+            this.ToolsToolStripMenuItem});\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(1002, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
+            this.frmMainMenu.TabStop = true;\r
             this.frmMainMenu.Text = "MenuStrip";\r
             // \r
             // label5\r
@@ -900,7 +735,7 @@ namespace Handbrake
             this.label5.Location = new System.Drawing.Point(3, 7);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(58, 13);\r
-            this.label5.TabIndex = 27;\r
+            this.label5.TabIndex = 0;\r
             this.label5.Text = "Container:";\r
             // \r
             // Label47\r
@@ -911,7 +746,7 @@ namespace Handbrake
             this.Label47.Location = new System.Drawing.Point(13, 39);\r
             this.Label47.Name = "Label47";\r
             this.Label47.Size = new System.Drawing.Size(70, 13);\r
-            this.Label47.TabIndex = 0;\r
+            this.Label47.TabIndex = 7;\r
             this.Label47.Text = "Video Codec:";\r
             // \r
             // Label3\r
@@ -937,6 +772,15 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -951,14 +795,12 @@ namespace Handbrake
             this.tab_video.Controls.Add(this.drp_videoFramerate);\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.lbl_SliderValue);\r
@@ -976,10 +818,10 @@ namespace Handbrake
             this.lbl_rfwarn.AutoSize = true;\r
             this.lbl_rfwarn.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_rfwarn.ForeColor = System.Drawing.Color.Red;\r
-            this.lbl_rfwarn.Location = new System.Drawing.Point(385, 165);\r
+            this.lbl_rfwarn.Location = new System.Drawing.Point(385, 135);\r
             this.lbl_rfwarn.Name = "lbl_rfwarn";\r
             this.lbl_rfwarn.Size = new System.Drawing.Size(321, 39);\r
-            this.lbl_rfwarn.TabIndex = 20;\r
+            this.lbl_rfwarn.TabIndex = 0;\r
             this.lbl_rfwarn.Text = "RF:0 is x264\'s lossless mode.\r\nThis will result in a very large output which may " +\r
                 "not be compatible\r\nwith your playback software.";\r
             this.lbl_rfwarn.Visible = false;\r
@@ -990,8 +832,8 @@ namespace Handbrake
             this.checkMaximumFramerate.BackColor = System.Drawing.Color.Transparent;\r
             this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89);\r
             this.checkMaximumFramerate.Name = "checkMaximumFramerate";\r
-            this.checkMaximumFramerate.Size = new System.Drawing.Size(132, 17);\r
-            this.checkMaximumFramerate.TabIndex = 18;\r
+            this.checkMaximumFramerate.Size = new System.Drawing.Size(131, 17);\r
+            this.checkMaximumFramerate.TabIndex = 1;\r
             this.checkMaximumFramerate.Text = "Peak Framerate (VFR)";\r
             this.checkMaximumFramerate.UseVisualStyleBackColor = false;\r
             // \r
@@ -999,10 +841,10 @@ namespace Handbrake
             // \r
             this.radio_cq.AutoSize = true;\r
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_cq.Location = new System.Drawing.Point(365, 97);\r
+            this.radio_cq.Location = new System.Drawing.Point(365, 67);\r
             this.radio_cq.Name = "radio_cq";\r
-            this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
-            this.radio_cq.TabIndex = 23;\r
+            this.radio_cq.Size = new System.Drawing.Size(105, 17);\r
+            this.radio_cq.TabIndex = 3;\r
             this.radio_cq.Text = "Constant Quality:";\r
             this.radio_cq.UseVisualStyleBackColor = false;\r
             this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);\r
@@ -1012,27 +854,15 @@ namespace Handbrake
             this.radio_avgBitrate.AutoSize = true;\r
             this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;\r
             this.radio_avgBitrate.Checked = true;\r
-            this.radio_avgBitrate.Location = new System.Drawing.Point(365, 64);\r
+            this.radio_avgBitrate.Location = new System.Drawing.Point(365, 34);\r
             this.radio_avgBitrate.Name = "radio_avgBitrate";\r
-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
-            this.radio_avgBitrate.TabIndex = 22;\r
+            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);\r
+            this.radio_avgBitrate.TabIndex = 4;\r
             this.radio_avgBitrate.TabStop = true;\r
             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
             this.radio_avgBitrate.UseVisualStyleBackColor = false;\r
             this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged);\r
             // \r
-            // radio_targetFilesize\r
-            // \r
-            this.radio_targetFilesize.AutoSize = true;\r
-            this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;\r
-            this.radio_targetFilesize.Location = new System.Drawing.Point(365, 37);\r
-            this.radio_targetFilesize.Name = "radio_targetFilesize";\r
-            this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);\r
-            this.radio_targetFilesize.TabIndex = 21;\r
-            this.radio_targetFilesize.Text = "Target Size (MB):";\r
-            this.radio_targetFilesize.UseVisualStyleBackColor = false;\r
-            this.radio_targetFilesize.CheckedChanged += new System.EventHandler(this.radio_targetFilesize_CheckedChanged);\r
-            // \r
             // label25\r
             // \r
             this.label25.AutoSize = true;\r
@@ -1041,7 +871,7 @@ namespace Handbrake
             this.label25.Location = new System.Drawing.Point(13, 13);\r
             this.label25.Name = "label25";\r
             this.label25.Size = new System.Drawing.Size(38, 13);\r
-            this.label25.TabIndex = 0;\r
+            this.label25.TabIndex = 8;\r
             this.label25.Text = "Video";\r
             // \r
             // check_2PassEncode\r
@@ -1050,8 +880,8 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_2PassEncode.Location = new System.Drawing.Point(125, 120);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
-            this.check_2PassEncode.TabIndex = 19;\r
+            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);\r
+            this.check_2PassEncode.TabIndex = 10;\r
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.check_2PassEncode.UseVisualStyleBackColor = false;\r
             this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);\r
@@ -1064,7 +894,7 @@ namespace Handbrake
             this.Label2.Location = new System.Drawing.Point(363, 13);\r
             this.Label2.Name = "Label2";\r
             this.Label2.Size = new System.Drawing.Size(47, 13);\r
-            this.Label2.TabIndex = 8;\r
+            this.Label2.TabIndex = 11;\r
             this.Label2.Text = "Quality";\r
             // \r
             // lbl_SliderValue\r
@@ -1072,7 +902,7 @@ namespace Handbrake
             this.lbl_SliderValue.AutoSize = true;\r
             this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_SliderValue.Location = new System.Drawing.Point(509, 100);\r
+            this.lbl_SliderValue.Location = new System.Drawing.Point(509, 70);\r
             this.lbl_SliderValue.Name = "lbl_SliderValue";\r
             this.lbl_SliderValue.Size = new System.Drawing.Size(21, 13);\r
             this.lbl_SliderValue.TabIndex = 15;\r
@@ -1085,7 +915,7 @@ namespace Handbrake
             this.lbl_framerate.Location = new System.Drawing.Point(13, 65);\r
             this.lbl_framerate.Name = "lbl_framerate";\r
             this.lbl_framerate.Size = new System.Drawing.Size(90, 13);\r
-            this.lbl_framerate.TabIndex = 1;\r
+            this.lbl_framerate.TabIndex = 16;\r
             this.lbl_framerate.Text = "Framerate (FPS):";\r
             // \r
             // tab_picture\r
@@ -1100,14 +930,26 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.CurrentlySelectedPreset = null;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
             this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;\r
             this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);\r
             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);\r
-            this.Check_ChapterMarkers.TabIndex = 29;\r
+            this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);\r
+            this.Check_ChapterMarkers.TabIndex = 4;\r
             this.Check_ChapterMarkers.Text = "Create chapter markers";\r
             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;\r
             this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);\r
@@ -1126,7 +968,7 @@ namespace Handbrake
             this.tabs_panel.Name = "tabs_panel";\r
             this.tabs_panel.SelectedIndex = 0;\r
             this.tabs_panel.Size = new System.Drawing.Size(732, 334);\r
-            this.tabs_panel.TabIndex = 13;\r
+            this.tabs_panel.TabIndex = 6;\r
             // \r
             // tab_filters\r
             // \r
@@ -1134,10 +976,19 @@ namespace Handbrake
             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, 308);\r
-            this.tab_filters.TabIndex = 9;\r
+            this.tab_filters.TabIndex = 1;\r
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -1145,10 +996,19 @@ namespace Handbrake
             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, 308);\r
-            this.tab_subtitles.TabIndex = 10;\r
+            this.tab_subtitles.TabIndex = 4;\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.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1160,7 +1020,7 @@ namespace Handbrake
             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(724, 308);\r
-            this.tab_chapters.TabIndex = 6;\r
+            this.tab_chapters.TabIndex = 5;\r
             this.tab_chapters.Text = "Chapters";\r
             this.tab_chapters.UseVisualStyleBackColor = true;\r
             // \r
@@ -1172,7 +1032,7 @@ namespace Handbrake
             this.label31.Location = new System.Drawing.Point(13, 13);\r
             this.label31.Name = "label31";\r
             this.label31.Size = new System.Drawing.Size(102, 13);\r
-            this.label31.TabIndex = 0;\r
+            this.label31.TabIndex = 2;\r
             this.label31.Text = "Chapter Markers";\r
             // \r
             // tab_advanced\r
@@ -1183,10 +1043,20 @@ namespace Handbrake
             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, 308);\r
-            this.tab_advanced.TabIndex = 8;\r
+            this.tab_advanced.TabIndex = 6;\r
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1209,7 +1079,7 @@ namespace Handbrake
             this.btn_clear.Location = new System.Drawing.Point(634, 104);\r
             this.btn_clear.Name = "btn_clear";\r
             this.btn_clear.Size = new System.Drawing.Size(75, 22);\r
-            this.btn_clear.TabIndex = 36;\r
+            this.btn_clear.TabIndex = 0;\r
             this.btn_clear.Text = "Clear";\r
             this.btn_clear.UseVisualStyleBackColor = true;\r
             this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);\r
@@ -1231,7 +1101,7 @@ namespace Handbrake
             this.label33.Location = new System.Drawing.Point(13, 13);\r
             this.label33.Name = "label33";\r
             this.label33.Size = new System.Drawing.Size(77, 13);\r
-            this.label33.TabIndex = 0;\r
+            this.label33.TabIndex = 3;\r
             this.label33.Text = "Query Editor";\r
             // \r
             // rtf_query\r
@@ -1240,7 +1110,7 @@ namespace Handbrake
             this.rtf_query.Location = new System.Drawing.Point(16, 132);\r
             this.rtf_query.Name = "rtf_query";\r
             this.rtf_query.Size = new System.Drawing.Size(693, 161);\r
-            this.rtf_query.TabIndex = 35;\r
+            this.rtf_query.TabIndex = 4;\r
             this.rtf_query.Text = "";\r
             // \r
             // groupBox2\r
@@ -1250,7 +1120,7 @@ namespace Handbrake
             this.groupBox2.Location = new System.Drawing.Point(750, 70);\r
             this.groupBox2.Name = "groupBox2";\r
             this.groupBox2.Size = new System.Drawing.Size(246, 482);\r
-            this.groupBox2.TabIndex = 100;\r
+            this.groupBox2.TabIndex = 4;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
@@ -1267,12 +1137,113 @@ namespace Handbrake
             // \r
             // splitContainer1.Panel2\r
             // \r
-            this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset);\r
-            this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset);\r
-            this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault);\r
+            this.splitContainer1.Panel2.Controls.Add(this.presetsToolStrip);\r
             this.splitContainer1.Size = new System.Drawing.Size(240, 462);\r
             this.splitContainer1.SplitterDistance = 424;\r
-            this.splitContainer1.TabIndex = 1;\r
+            this.splitContainer1.TabIndex = 0;\r
+            // \r
+            // presetsToolStrip\r
+            // \r
+            this.presetsToolStrip.CanOverflow = false;\r
+            this.presetsToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.presetsToolStrip.GripMargin = new System.Windows.Forms.Padding(0);\r
+            this.presetsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
+            this.presetsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.BtnAddPreset,\r
+            this.BtnRemovePreset,\r
+            this.toolStripDropDownButton2});\r
+            this.presetsToolStrip.Location = new System.Drawing.Point(0, 0);\r
+            this.presetsToolStrip.Name = "presetsToolStrip";\r
+            this.presetsToolStrip.Padding = new System.Windows.Forms.Padding(0);\r
+            this.presetsToolStrip.Size = new System.Drawing.Size(240, 34);\r
+            this.presetsToolStrip.TabIndex = 2;\r
+            this.presetsToolStrip.Text = "toolStrip2";\r
+            // \r
+            // BtnAddPreset\r
+            // \r
+            this.BtnAddPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.BtnAddPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.BtnAddPreset.Image = global::Handbrake.Properties.Resources.Add16;\r
+            this.BtnAddPreset.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.BtnAddPreset.Name = "BtnAddPreset";\r
+            this.BtnAddPreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
+            this.BtnAddPreset.Padding = new System.Windows.Forms.Padding(8, 0, 8, 0);\r
+            this.BtnAddPreset.Size = new System.Drawing.Size(65, 31);\r
+            this.BtnAddPreset.Text = "Add";\r
+            this.BtnAddPreset.Click += new System.EventHandler(this.BtnAddPreset_Click);\r
+            // \r
+            // BtnRemovePreset\r
+            // \r
+            this.BtnRemovePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.BtnRemovePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.BtnRemovePreset.Image = global::Handbrake.Properties.Resources.Close;\r
+            this.BtnRemovePreset.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.BtnRemovePreset.Name = "BtnRemovePreset";\r
+            this.BtnRemovePreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
+            this.BtnRemovePreset.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);\r
+            this.BtnRemovePreset.Size = new System.Drawing.Size(82, 31);\r
+            this.BtnRemovePreset.Text = "Remove";\r
+            this.BtnRemovePreset.Click += new System.EventHandler(this.BtnRemovePreset_Click);\r
+            // \r
+            // toolStripDropDownButton2\r
+            // \r
+            this.toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.MnuSetDefaultPreset,\r
+            this.toolStripSeparator3,\r
+            this.MnuImportPreset,\r
+            this.MnuExportPreset,\r
+            this.toolStripSeparator6,\r
+            this.MnuResetBuiltInPresets});\r
+            this.toolStripDropDownButton2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.toolStripDropDownButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.toolStripDropDownButton2.Image = global::Handbrake.Properties.Resources.Options24;\r
+            this.toolStripDropDownButton2.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.toolStripDropDownButton2.Name = "toolStripDropDownButton2";\r
+            this.toolStripDropDownButton2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
+            this.toolStripDropDownButton2.Size = new System.Drawing.Size(79, 31);\r
+            this.toolStripDropDownButton2.Text = "Options";\r
+            // \r
+            // MnuSetDefaultPreset\r
+            // \r
+            this.MnuSetDefaultPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.MnuSetDefaultPreset.Name = "MnuSetDefaultPreset";\r
+            this.MnuSetDefaultPreset.Size = new System.Drawing.Size(178, 22);\r
+            this.MnuSetDefaultPreset.Text = "Set Default";\r
+            this.MnuSetDefaultPreset.Click += new System.EventHandler(this.MnuSetDefaultPreset_Click);\r
+            // \r
+            // toolStripSeparator3\r
+            // \r
+            this.toolStripSeparator3.Name = "toolStripSeparator3";\r
+            this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6);\r
+            // \r
+            // MnuImportPreset\r
+            // \r
+            this.MnuImportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.MnuImportPreset.Name = "MnuImportPreset";\r
+            this.MnuImportPreset.Size = new System.Drawing.Size(178, 22);\r
+            this.MnuImportPreset.Text = "Import";\r
+            this.MnuImportPreset.Click += new System.EventHandler(this.MnuImportPreset_Click);\r
+            // \r
+            // MnuExportPreset\r
+            // \r
+            this.MnuExportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.MnuExportPreset.Name = "MnuExportPreset";\r
+            this.MnuExportPreset.Size = new System.Drawing.Size(178, 22);\r
+            this.MnuExportPreset.Text = "Export";\r
+            this.MnuExportPreset.Click += new System.EventHandler(this.MnuExportPreset_Click);\r
+            // \r
+            // toolStripSeparator6\r
+            // \r
+            this.toolStripSeparator6.Name = "toolStripSeparator6";\r
+            this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);\r
+            // \r
+            // MnuResetBuiltInPresets\r
+            // \r
+            this.MnuResetBuiltInPresets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.MnuResetBuiltInPresets.Name = "MnuResetBuiltInPresets";\r
+            this.MnuResetBuiltInPresets.Size = new System.Drawing.Size(178, 22);\r
+            this.MnuResetBuiltInPresets.Text = "Reset Built-In Presets";\r
+            this.MnuResetBuiltInPresets.Click += new System.EventHandler(this.MnuResetBuiltInPresets_Click);\r
             // \r
             // toolStrip1\r
             // \r
@@ -1285,12 +1256,14 @@ namespace Handbrake
             this.btn_showQueue,\r
             this.toolStripSeparator4,\r
             this.tb_preview,\r
-            this.btn_ActivityWindow});\r
+            this.btn_ActivityWindow,\r
+            this.toolStripSeparator8,\r
+            this.toolStripDropDownButton1});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
             this.toolStrip1.Size = new System.Drawing.Size(1002, 39);\r
-            this.toolStrip1.TabIndex = 0;\r
+            this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.TabStop = true;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
@@ -1416,6 +1389,63 @@ namespace Handbrake
                 "ently running encode.";\r
             this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
             // \r
+            // toolStripSeparator8\r
+            // \r
+            this.toolStripSeparator8.Name = "toolStripSeparator8";\r
+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
+            // \r
+            // toolStripDropDownButton1\r
+            // \r
+            this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
+            this.toolStripDropDownButton1.AutoSize = false;\r
+            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.MnuUserGuide,\r
+            this.toolStripSeparator9,\r
+            this.MnuCheckForUpdates,\r
+            this.toolStripSeparator11,\r
+            this.MnuAboutHandBrake});\r
+            this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Help24;\r
+            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";\r
+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 36);\r
+            this.toolStripDropDownButton1.Text = "Help";\r
+            // \r
+            // MnuUserGuide\r
+            // \r
+            this.MnuUserGuide.Image = global::Handbrake.Properties.Resources.info16;\r
+            this.MnuUserGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.MnuUserGuide.Name = "MnuUserGuide";\r
+            this.MnuUserGuide.Size = new System.Drawing.Size(192, 24);\r
+            this.MnuUserGuide.Text = "HandBrake User Guide";\r
+            this.MnuUserGuide.Click += new System.EventHandler(this.MnuUserGuide_Click);\r
+            // \r
+            // toolStripSeparator9\r
+            // \r
+            this.toolStripSeparator9.Name = "toolStripSeparator9";\r
+            this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6);\r
+            // \r
+            // MnuCheckForUpdates\r
+            // \r
+            this.MnuCheckForUpdates.Name = "MnuCheckForUpdates";\r
+            this.MnuCheckForUpdates.Size = new System.Drawing.Size(192, 24);\r
+            this.MnuCheckForUpdates.Text = "Check for Updates";\r
+            this.MnuCheckForUpdates.Click += new System.EventHandler(this.MnuCheckForUpdates_Click);\r
+            // \r
+            // toolStripSeparator11\r
+            // \r
+            this.toolStripSeparator11.Name = "toolStripSeparator11";\r
+            this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);\r
+            // \r
+            // MnuAboutHandBrake\r
+            // \r
+            this.MnuAboutHandBrake.Image = global::Handbrake.Properties.Resources.hb16;\r
+            this.MnuAboutHandBrake.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.MnuAboutHandBrake.Name = "MnuAboutHandBrake";\r
+            this.MnuAboutHandBrake.Size = new System.Drawing.Size(192, 24);\r
+            this.MnuAboutHandBrake.Text = "About HandBrake";\r
+            this.MnuAboutHandBrake.Click += new System.EventHandler(this.MnuAboutHandBrake_Click);\r
+            // \r
             // notifyIcon\r
             // \r
             this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
@@ -1495,7 +1525,7 @@ namespace Handbrake
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));\r
             this.tableLayoutPanel2.Size = new System.Drawing.Size(723, 29);\r
-            this.tableLayoutPanel2.TabIndex = 50;\r
+            this.tableLayoutPanel2.TabIndex = 3;\r
             // \r
             // btn_destBrowse\r
             // \r
@@ -1505,7 +1535,7 @@ namespace Handbrake
             this.btn_destBrowse.Location = new System.Drawing.Point(645, 3);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_destBrowse.TabIndex = 7;\r
+            this.btn_destBrowse.TabIndex = 2;\r
             this.btn_destBrowse.Text = "Browse";\r
             this.btn_destBrowse.UseVisualStyleBackColor = true;\r
             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
@@ -1529,7 +1559,7 @@ namespace Handbrake
             this.tableLayoutPanel3.RowCount = 1;\r
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel3.Size = new System.Drawing.Size(723, 27);\r
-            this.tableLayoutPanel3.TabIndex = 51;\r
+            this.tableLayoutPanel3.TabIndex = 5;\r
             // \r
             // tableLayoutPanel1\r
             // \r
@@ -1562,7 +1592,7 @@ namespace Handbrake
             this.tableLayoutPanel1.RowCount = 1;\r
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27);\r
-            this.tableLayoutPanel1.TabIndex = 49;\r
+            this.tableLayoutPanel1.TabIndex = 2;\r
             // \r
             // Label10\r
             // \r
@@ -1572,7 +1602,7 @@ namespace Handbrake
             this.Label10.Location = new System.Drawing.Point(3, 7);\r
             this.Label10.Name = "Label10";\r
             this.Label10.Size = new System.Drawing.Size(31, 13);\r
-            this.Label10.TabIndex = 2;\r
+            this.Label10.TabIndex = 0;\r
             this.Label10.Text = "Title:";\r
             // \r
             // lbl_angle\r
@@ -1583,7 +1613,7 @@ namespace Handbrake
             this.lbl_angle.Location = new System.Drawing.Point(165, 7);\r
             this.lbl_angle.Name = "lbl_angle";\r
             this.lbl_angle.Size = new System.Drawing.Size(38, 13);\r
-            this.lbl_angle.TabIndex = 44;\r
+            this.lbl_angle.TabIndex = 2;\r
             this.lbl_angle.Text = "Angle:";\r
             // \r
             // Label13\r
@@ -1593,7 +1623,7 @@ namespace Handbrake
             this.Label13.Location = new System.Drawing.Point(458, 7);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(45, 13);\r
-            this.Label13.TabIndex = 10;\r
+            this.Label13.TabIndex = 6;\r
             this.Label13.Text = "through";\r
             // \r
             // label_duration\r
@@ -1604,7 +1634,7 @@ namespace Handbrake
             this.label_duration.Location = new System.Drawing.Point(584, 7);\r
             this.label_duration.Name = "label_duration";\r
             this.label_duration.Size = new System.Drawing.Size(52, 13);\r
-            this.label_duration.TabIndex = 42;\r
+            this.label_duration.TabIndex = 8;\r
             this.label_duration.Text = "Duration:";\r
             // \r
             // lbl_duration\r
@@ -1615,7 +1645,7 @@ namespace Handbrake
             this.lbl_duration.Location = new System.Drawing.Point(642, 7);\r
             this.lbl_duration.Name = "lbl_duration";\r
             this.lbl_duration.Size = new System.Drawing.Size(39, 13);\r
-            this.lbl_duration.TabIndex = 43;\r
+            this.lbl_duration.TabIndex = 9;\r
             this.lbl_duration.Text = "--:--:--";\r
             // \r
             // labelStaticDestination\r
@@ -1625,7 +1655,7 @@ namespace Handbrake
             this.labelStaticDestination.Location = new System.Drawing.Point(9, 116);\r
             this.labelStaticDestination.Name = "labelStaticDestination";\r
             this.labelStaticDestination.Size = new System.Drawing.Size(75, 13);\r
-            this.labelStaticDestination.TabIndex = 53;\r
+            this.labelStaticDestination.TabIndex = 3;\r
             this.labelStaticDestination.Text = "Destination:";\r
             // \r
             // labelPreset\r
@@ -1635,7 +1665,7 @@ namespace Handbrake
             this.labelPreset.Location = new System.Drawing.Point(9, 164);\r
             this.labelPreset.Name = "labelPreset";\r
             this.labelPreset.Size = new System.Drawing.Size(180, 13);\r
-            this.labelPreset.TabIndex = 54;\r
+            this.labelPreset.TabIndex = 5;\r
             this.labelPreset.Text = "Output Settings (Preset: None)";\r
             // \r
             // labelSource\r
@@ -1655,7 +1685,7 @@ namespace Handbrake
             this.labelStaticSource.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);\r
             this.labelStaticSource.Name = "labelStaticSource";\r
             this.labelStaticSource.Size = new System.Drawing.Size(49, 13);\r
-            this.labelStaticSource.TabIndex = 1;\r
+            this.labelStaticSource.TabIndex = 0;\r
             this.labelStaticSource.Text = "Source:";\r
             // \r
             // SourceLayoutPanel\r
@@ -1668,7 +1698,7 @@ namespace Handbrake
             this.SourceLayoutPanel.Margin = new System.Windows.Forms.Padding(0);\r
             this.SourceLayoutPanel.Name = "SourceLayoutPanel";\r
             this.SourceLayoutPanel.Size = new System.Drawing.Size(195, 13);\r
-            this.SourceLayoutPanel.TabIndex = 55;\r
+            this.SourceLayoutPanel.TabIndex = 2;\r
             // \r
             // openPreset\r
             // \r
@@ -1679,55 +1709,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.CurrentlySelectedPreset = null;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 14;\r
-            // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 15;\r
-            // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 27;\r
-            // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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 = 28;\r
-            // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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 = 33;\r
-            this.x264Panel.X264Query = "";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -1776,8 +1757,11 @@ namespace Handbrake
             this.groupBox2.ResumeLayout(false);\r
             this.splitContainer1.Panel1.ResumeLayout(false);\r
             this.splitContainer1.Panel2.ResumeLayout(false);\r
+            this.splitContainer1.Panel2.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();\r
             this.splitContainer1.ResumeLayout(false);\r
+            this.presetsToolStrip.ResumeLayout(false);\r
+            this.presetsToolStrip.PerformLayout();\r
             this.toolStrip1.ResumeLayout(false);\r
             this.toolStrip1.PerformLayout();\r
             this.StatusStrip.ResumeLayout(false);\r
@@ -1805,11 +1789,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_encode;\r
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_options;\r
-        internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_presetReset;\r
-        internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_about;\r
         internal System.Windows.Forms.MenuStrip frmMainMenu;\r
         internal System.Windows.Forms.Label Label3;\r
         internal System.Windows.Forms.ComboBox drp_videoEncoder;\r
@@ -1824,20 +1803,14 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drp_videoFramerate;\r
         internal System.Windows.Forms.CheckBox check_2PassEncode;\r
         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 tab_picture;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
         internal System.Windows.Forms.TabControl tabs_panel;\r
         internal System.Windows.Forms.Label lbl_framerate;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
-        internal System.Windows.Forms.Button btn_setDefault;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
         private System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.OpenFileDialog File_Open;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
         private System.Windows.Forms.TabPage tab_chapters;\r
         internal System.Windows.Forms.Label label31;\r
@@ -1854,8 +1827,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripButton btn_showQueue;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;\r
-        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.TabPage tab_advanced;\r
         internal System.Windows.Forms.TreeView treeView_presets;\r
@@ -1864,9 +1835,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem btn_restore;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;\r
         private System.Windows.Forms.ToolStripMenuItem btn_file_source;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;\r
-        private System.Windows.Forms.ToolStripMenuItem btn_new_preset;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_user_guide;\r
         private System.Windows.Forms.ToolStripDropDownButton btn_source;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
         private System.Windows.Forms.ToolStripMenuItem btn_dvd_source;\r
@@ -1889,7 +1857,6 @@ namespace Handbrake
         private System.Windows.Forms.TabPage tab_filters;\r
         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.Diagnostics.Process hbproc;\r
@@ -1918,7 +1885,6 @@ namespace Handbrake
         internal Label Label10;\r
         private Label labelStaticSource;\r
         private FlowLayoutPanel SourceLayoutPanel;\r
-        private ToolStripMenuItem mnu_importMacPreset;\r
         private OpenFileDialog openPreset;\r
         private Button btn_importChapters;\r
         private OpenFileDialog File_ChapterImport;\r
@@ -1930,12 +1896,28 @@ namespace Handbrake
         private Button btn_export;\r
         private DataGridViewTextBoxColumn number;\r
         private DataGridViewTextBoxColumn name;\r
-        private ToolStripMenuItem mnu_exportMacPreset;\r
         private ToolStripProgressBar ProgressBarStatus;\r
         internal CheckBox checkMaximumFramerate;\r
         private ToolStripMenuItem btnTitleSpecific;\r
         private ToolStripMenuItem FileTitleSpecificScan;\r
         private ToolStripMenuItem FolderTitleSpecificScan;\r
         internal Label lbl_rfwarn;\r
+        private ToolStripSeparator toolStripSeparator8;\r
+        private ToolStripDropDownButton toolStripDropDownButton1;\r
+        private ToolStripMenuItem MnuUserGuide;\r
+        private ToolStripSeparator toolStripSeparator9;\r
+        private ToolStripMenuItem MnuCheckForUpdates;\r
+        private ToolStripSeparator toolStripSeparator11;\r
+        private ToolStripMenuItem MnuAboutHandBrake;\r
+        private ToolStrip presetsToolStrip;\r
+        private ToolStripButton BtnAddPreset;\r
+        private ToolStripButton BtnRemovePreset;\r
+        private ToolStripDropDownButton toolStripDropDownButton2;\r
+        private ToolStripMenuItem MnuSetDefaultPreset;\r
+        private ToolStripSeparator toolStripSeparator3;\r
+        private ToolStripMenuItem MnuImportPreset;\r
+        private ToolStripMenuItem MnuExportPreset;\r
+        private ToolStripSeparator toolStripSeparator6;\r
+        private ToolStripMenuItem MnuResetBuiltInPresets;\r
     }\r
 }
\ No newline at end of file