WinGui:

- Enable TabStops on the Main Toolbar and Tabs Panel.
- Reset some of the tab indexes.


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

2 files changed, 127 insertions, 128 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index aa4f207b8..1b3c26404 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -111,7 +111,6 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();

             this.Label3 = new System.Windows.Forms.Label();

             this.tab_audio = new System.Windows.Forms.TabPage();

-            this.AudioSettings = new Handbrake.Controls.AudioPanel();

             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);

             this.tab_video = new System.Windows.Forms.TabPage();

             this.lbl_rfwarn = new System.Windows.Forms.Label();

@@ -125,17 +124,13 @@ namespace Handbrake
             this.lbl_SliderValue = new System.Windows.Forms.Label();

             this.lbl_framerate = new System.Windows.Forms.Label();

             this.tab_picture = new System.Windows.Forms.TabPage();

-            this.PictureSettings = new Handbrake.Controls.PictureSettings();

             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();

             this.tabs_panel = new System.Windows.Forms.TabControl();

             this.tab_filters = new System.Windows.Forms.TabPage();

-            this.Filters = new Handbrake.Controls.Filters();

             this.tab_subtitles = new System.Windows.Forms.TabPage();

-            this.Subtitles = new Handbrake.Controls.Subtitles();

             this.tab_chapters = new System.Windows.Forms.TabPage();

             this.label31 = new System.Windows.Forms.Label();

             this.tab_advanced = new System.Windows.Forms.TabPage();

-            this.x264Panel = new Handbrake.Controls.x264Panel();

             this.tab_query = new System.Windows.Forms.TabPage();

             this.btn_clear = new System.Windows.Forms.Button();

             this.label34 = new System.Windows.Forms.Label();

@@ -180,6 +175,11 @@ namespace Handbrake
             this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();

             this.openPreset = new System.Windows.Forms.OpenFileDialog();

             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();

+            this.PictureSettings = new Handbrake.Controls.PictureSettings();

+            this.Filters = new Handbrake.Controls.Filters();

+            this.AudioSettings = new Handbrake.Controls.AudioPanel();

+            this.Subtitles = new Handbrake.Controls.Subtitles();

+            this.x264Panel = new Handbrake.Controls.x264Panel();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -197,6 +197,7 @@ namespace Handbrake
             this.tab_advanced.SuspendLayout();

             this.tab_query.SuspendLayout();

             this.groupBox2.SuspendLayout();

+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();

             this.splitContainer1.Panel1.SuspendLayout();

             this.splitContainer1.Panel2.SuspendLayout();

             this.splitContainer1.SuspendLayout();

@@ -243,7 +244,7 @@ namespace Handbrake
             this.text_destination.Location = new System.Drawing.Point(36, 3);

             this.text_destination.Name = "text_destination";

             this.text_destination.Size = new System.Drawing.Size(603, 21);

-            this.text_destination.TabIndex = 1;

+            this.text_destination.TabIndex = 6;

             this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");

             this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);

             // 

@@ -258,7 +259,7 @@ namespace Handbrake
             this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35);

             this.drp_videoEncoder.Name = "drp_videoEncoder";

             this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21);

-            this.drp_videoEncoder.TabIndex = 1;

+            this.drp_videoEncoder.TabIndex = 16;

             this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");

             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);

             // 

@@ -270,7 +271,7 @@ namespace Handbrake
             this.check_largeFile.Location = new System.Drawing.Point(179, 5);

             this.check_largeFile.Name = "check_largeFile";

             this.check_largeFile.Size = new System.Drawing.Size(91, 17);

-            this.check_largeFile.TabIndex = 4;

+            this.check_largeFile.TabIndex = 10;

             this.check_largeFile.Text = "Large file size";

             this.ToolTip.SetToolTip(this.check_largeFile, "Caution: This option will likely break device compatibility with all but the Appl" +

                     "eTV Take 2.\r\nChecking this box enables a 64bit mp4 file which can be over 4GB.");

@@ -283,8 +284,8 @@ namespace Handbrake
             this.check_turbo.Enabled = false;

             this.check_turbo.Location = new System.Drawing.Point(146, 143);

             this.check_turbo.Name = "check_turbo";

-            this.check_turbo.Size = new System.Drawing.Size(99, 17);

-            this.check_turbo.TabIndex = 7;

+            this.check_turbo.Size = new System.Drawing.Size(101, 17);

+            this.check_turbo.TabIndex = 20;

             this.check_turbo.Text = "Turbo first Pass";

             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");

             this.check_turbo.UseVisualStyleBackColor = false;

@@ -306,7 +307,7 @@ namespace Handbrake
             this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62);

             this.drp_videoFramerate.Name = "drp_videoFramerate";

             this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21);

-            this.drp_videoFramerate.TabIndex = 2;

+            this.drp_videoFramerate.TabIndex = 17;

             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");

             this.drp_videoFramerate.SelectedIndexChanged += new System.EventHandler(this.drp_videoFramerate_SelectedIndexChanged);

             // 

@@ -319,7 +320,7 @@ namespace Handbrake
             this.slider_videoQuality.Maximum = 100;

             this.slider_videoQuality.Name = "slider_videoQuality";

             this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);

-            this.slider_videoQuality.TabIndex = 14;

+            this.slider_videoQuality.TabIndex = 26;

             this.slider_videoQuality.TickFrequency = 17;

             this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. ");

             this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);

@@ -330,7 +331,7 @@ namespace Handbrake
             this.text_filesize.Location = new System.Drawing.Point(511, 36);

             this.text_filesize.Name = "text_filesize";

             this.text_filesize.Size = new System.Drawing.Size(81, 21);

-            this.text_filesize.TabIndex = 12;

+            this.text_filesize.TabIndex = 24;

             this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");

             // 

             // text_bitrate

@@ -338,7 +339,7 @@ namespace Handbrake
             this.text_bitrate.Location = new System.Drawing.Point(511, 63);

             this.text_bitrate.Name = "text_bitrate";

             this.text_bitrate.Size = new System.Drawing.Size(81, 21);

-            this.text_bitrate.TabIndex = 10;

+            this.text_bitrate.TabIndex = 25;

             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");

             // 

             // btn_setDefault

@@ -349,8 +350,7 @@ namespace Handbrake
             this.btn_setDefault.Location = new System.Drawing.Point(135, 8);

             this.btn_setDefault.Name = "btn_setDefault";

             this.btn_setDefault.Size = new System.Drawing.Size(101, 22);

-            this.btn_setDefault.TabIndex = 1;

-            this.btn_setDefault.TabStop = false;

+            this.btn_setDefault.TabIndex = 39;

             this.btn_setDefault.Text = "Set Default";

             this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.");

             this.btn_setDefault.UseVisualStyleBackColor = true;

@@ -364,7 +364,7 @@ namespace Handbrake
             this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5);

             this.check_optimiseMP4.Name = "check_optimiseMP4";

             this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17);

-            this.check_optimiseMP4.TabIndex = 25;

+            this.check_optimiseMP4.TabIndex = 11;

             this.check_optimiseMP4.Text = "Web optimized";

             this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +

                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +

@@ -379,7 +379,7 @@ namespace Handbrake
             this.check_iPodAtom.Location = new System.Drawing.Point(378, 5);

             this.check_iPodAtom.Name = "check_iPodAtom";

             this.check_iPodAtom.Size = new System.Drawing.Size(102, 17);

-            this.check_iPodAtom.TabIndex = 26;

+            this.check_iPodAtom.TabIndex = 12;

             this.check_iPodAtom.Text = "iPod 5G support";

             this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" +

                     " not enabled for H.264 encodes.");

@@ -402,7 +402,7 @@ namespace Handbrake
             this.data_chpt.Name = "data_chpt";

             this.data_chpt.RowHeadersVisible = false;

             this.data_chpt.Size = new System.Drawing.Size(684, 236);

-            this.data_chpt.TabIndex = 3;

+            this.data_chpt.TabIndex = 30;

             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));

             // 

             // number

@@ -458,8 +458,7 @@ namespace Handbrake
             this.btn_addPreset.Location = new System.Drawing.Point(3, 8);

             this.btn_addPreset.Name = "btn_addPreset";

             this.btn_addPreset.Size = new System.Drawing.Size(49, 22);

-            this.btn_addPreset.TabIndex = 3;

-            this.btn_addPreset.TabStop = false;

+            this.btn_addPreset.TabIndex = 37;

             this.btn_addPreset.Text = "Add";

             this.ToolTip.SetToolTip(this.btn_addPreset, "This option will take the current settings and add it as a new preset.");

             this.btn_addPreset.UseVisualStyleBackColor = true;

@@ -473,8 +472,7 @@ namespace Handbrake
             this.btn_removePreset.Location = new System.Drawing.Point(58, 8);

             this.btn_removePreset.Name = "btn_removePreset";

             this.btn_removePreset.Size = new System.Drawing.Size(71, 22);

-            this.btn_removePreset.TabIndex = 4;

-            this.btn_removePreset.TabStop = false;

+            this.btn_removePreset.TabIndex = 38;

             this.btn_removePreset.Text = "Remove";

             this.ToolTip.SetToolTip(this.btn_removePreset, "Remove the selected preset from the panel above.");

             this.btn_removePreset.UseVisualStyleBackColor = true;

@@ -490,7 +488,7 @@ namespace Handbrake
             this.drop_format.Location = new System.Drawing.Point(67, 3);

             this.drop_format.Name = "drop_format";

             this.drop_format.Size = new System.Drawing.Size(106, 21);

-            this.drop_format.TabIndex = 28;

+            this.drop_format.TabIndex = 9;

             this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.\r\nHandBrake supports MKV and MP4(M4v)");

             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);

             // 

@@ -501,7 +499,7 @@ namespace Handbrake
             this.drop_chapterFinish.Location = new System.Drawing.Point(509, 3);

             this.drop_chapterFinish.Name = "drop_chapterFinish";

             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);

-            this.drop_chapterFinish.TabIndex = 10;

+            this.drop_chapterFinish.TabIndex = 5;

             this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);

             // 

@@ -512,7 +510,7 @@ namespace Handbrake
             this.drop_chapterStart.Location = new System.Drawing.Point(383, 3);

             this.drop_chapterStart.Name = "drop_chapterStart";

             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);

-            this.drop_chapterStart.TabIndex = 9;

+            this.drop_chapterStart.TabIndex = 4;

             this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.chapersChanged);

             // 

@@ -523,7 +521,7 @@ namespace Handbrake
             this.drop_angle.Location = new System.Drawing.Point(209, 3);

             this.drop_angle.Name = "drop_angle";

             this.drop_angle.Size = new System.Drawing.Size(45, 21);

-            this.drop_angle.TabIndex = 45;

+            this.drop_angle.TabIndex = 2;

             this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");

             // 

             // drp_dvdtitle

@@ -535,7 +533,7 @@ namespace Handbrake
             this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);

             this.drp_dvdtitle.Name = "drp_dvdtitle";

             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);

-            this.drp_dvdtitle.TabIndex = 7;

+            this.drp_dvdtitle.TabIndex = 1;

             this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\n\r\nWhen a DVD is in use, HandBrake will try " +

                     "to determine the \"Main Feature\" title automatically.\r\nPlease note, this is not a" +

                     "lways accurate and should be checked.");

@@ -550,7 +548,7 @@ namespace Handbrake
             this.btn_importChapters.Location = new System.Drawing.Point(544, 28);

             this.btn_importChapters.Name = "btn_importChapters";

             this.btn_importChapters.Size = new System.Drawing.Size(75, 23);

-            this.btn_importChapters.TabIndex = 14;

+            this.btn_importChapters.TabIndex = 31;

             this.btn_importChapters.Text = "Import";

             this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip"));

             this.btn_importChapters.UseVisualStyleBackColor = true;

@@ -564,7 +562,7 @@ namespace Handbrake
             this.btn_export.Location = new System.Drawing.Point(625, 28);

             this.btn_export.Name = "btn_export";

             this.btn_export.Size = new System.Drawing.Size(75, 23);

-            this.btn_export.TabIndex = 15;

+            this.btn_export.TabIndex = 32;

             this.btn_export.Text = "Export";

             this.ToolTip.SetToolTip(this.btn_export, resources.GetString("btn_export.ToolTip"));

             this.btn_export.UseVisualStyleBackColor = true;

@@ -581,7 +579,7 @@ namespace Handbrake
             this.drop_mode.Location = new System.Drawing.Point(295, 3);

             this.drop_mode.Name = "drop_mode";

             this.drop_mode.Size = new System.Drawing.Size(77, 21);

-            this.drop_mode.TabIndex = 46;

+            this.drop_mode.TabIndex = 3;

             this.ToolTip.SetToolTip(this.drop_mode, resources.GetString("drop_mode.ToolTip"));

             this.drop_mode.SelectedIndexChanged += new System.EventHandler(this.drop_mode_SelectedIndexChanged);

             // 

@@ -593,7 +591,7 @@ namespace Handbrake
             this.btn_generate_Query.Location = new System.Drawing.Point(16, 104);

             this.btn_generate_Query.Name = "btn_generate_Query";

             this.btn_generate_Query.Size = new System.Drawing.Size(126, 22);

-            this.btn_generate_Query.TabIndex = 2;

+            this.btn_generate_Query.TabIndex = 34;

             this.btn_generate_Query.Text = "Generate Query";

             this.ToolTip.SetToolTip(this.btn_generate_Query, "This will allow you to override the generated query.\r\nNote, The query in the box " +

                     "below will always override any automatically generated query, even if you change" +

@@ -614,7 +612,7 @@ namespace Handbrake
             this.treeView_presets.Name = "treeView_presets";

             this.treeView_presets.ShowLines = false;

             this.treeView_presets.Size = new System.Drawing.Size(240, 424);

-            this.treeView_presets.TabIndex = 0;

+            this.treeView_presets.TabIndex = 8;

             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);

             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);

             this.treeView_presets.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TreeViewPresetsMouseMove);

@@ -939,15 +937,6 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";

             this.tab_audio.UseVisualStyleBackColor = true;

             // 

-            // AudioSettings

-            // 

-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

-            this.AudioSettings.Name = "AudioSettings";

-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

-            this.AudioSettings.TabIndex = 0;

-            // 

             // AudioMenuRowHeightHack

             // 

             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;

@@ -1001,8 +990,8 @@ namespace Handbrake
             this.checkMaximumFramerate.BackColor = System.Drawing.Color.Transparent;

             this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89);

             this.checkMaximumFramerate.Name = "checkMaximumFramerate";

-            this.checkMaximumFramerate.Size = new System.Drawing.Size(131, 17);

-            this.checkMaximumFramerate.TabIndex = 19;

+            this.checkMaximumFramerate.Size = new System.Drawing.Size(132, 17);

+            this.checkMaximumFramerate.TabIndex = 18;

             this.checkMaximumFramerate.Text = "Peak Framerate (VFR)";

             this.checkMaximumFramerate.UseVisualStyleBackColor = false;

             // 

@@ -1012,8 +1001,8 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;

             this.radio_cq.Location = new System.Drawing.Point(365, 97);

             this.radio_cq.Name = "radio_cq";

-            this.radio_cq.Size = new System.Drawing.Size(105, 17);

-            this.radio_cq.TabIndex = 18;

+            this.radio_cq.Size = new System.Drawing.Size(110, 17);

+            this.radio_cq.TabIndex = 23;

             this.radio_cq.Text = "Constant Quality:";

             this.radio_cq.UseVisualStyleBackColor = false;

             this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);

@@ -1025,8 +1014,8 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;

             this.radio_avgBitrate.Location = new System.Drawing.Point(365, 64);

             this.radio_avgBitrate.Name = "radio_avgBitrate";

-            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);

-            this.radio_avgBitrate.TabIndex = 17;

+            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);

+            this.radio_avgBitrate.TabIndex = 22;

             this.radio_avgBitrate.TabStop = true;

             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";

             this.radio_avgBitrate.UseVisualStyleBackColor = false;

@@ -1038,8 +1027,8 @@ namespace Handbrake
             this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;

             this.radio_targetFilesize.Location = new System.Drawing.Point(365, 37);

             this.radio_targetFilesize.Name = "radio_targetFilesize";

-            this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);

-            this.radio_targetFilesize.TabIndex = 16;

+            this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);

+            this.radio_targetFilesize.TabIndex = 21;

             this.radio_targetFilesize.Text = "Target Size (MB):";

             this.radio_targetFilesize.UseVisualStyleBackColor = false;

             this.radio_targetFilesize.CheckedChanged += new System.EventHandler(this.radio_targetFilesize_CheckedChanged);

@@ -1061,8 +1050,8 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;

             this.check_2PassEncode.Location = new System.Drawing.Point(125, 120);

             this.check_2PassEncode.Name = "check_2PassEncode";

-            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);

-            this.check_2PassEncode.TabIndex = 6;

+            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);

+            this.check_2PassEncode.TabIndex = 19;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.check_2PassEncode.UseVisualStyleBackColor = false;

             this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);

@@ -1111,26 +1100,14 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

-            // PictureSettings

-            // 

-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

-            this.PictureSettings.CurrentlySelectedPreset = null;

-            this.PictureSettings.Enabled = false;

-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

-            this.PictureSettings.Name = "PictureSettings";

-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);

-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

-            this.PictureSettings.TabIndex = 0;

-            // 

             // Check_ChapterMarkers

             // 

             this.Check_ChapterMarkers.AutoSize = true;

             this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;

             this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);

             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";

-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);

-            this.Check_ChapterMarkers.TabIndex = 1;

+            this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);

+            this.Check_ChapterMarkers.TabIndex = 29;

             this.Check_ChapterMarkers.Text = "Create chapter markers";

             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;

             this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);

@@ -1149,8 +1126,7 @@ namespace Handbrake
             this.tabs_panel.Name = "tabs_panel";

             this.tabs_panel.SelectedIndex = 0;

             this.tabs_panel.Size = new System.Drawing.Size(732, 334);

-            this.tabs_panel.TabIndex = 5;

-            this.tabs_panel.TabStop = false;

+            this.tabs_panel.TabIndex = 13;

             // 

             // tab_filters

             // 

@@ -1162,15 +1138,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";

             this.tab_filters.UseVisualStyleBackColor = true;

             // 

-            // Filters

-            // 

-            this.Filters.BackColor = System.Drawing.Color.Transparent;

-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Filters.Location = new System.Drawing.Point(0, 0);

-            this.Filters.Name = "Filters";

-            this.Filters.Size = new System.Drawing.Size(713, 310);

-            this.Filters.TabIndex = 0;

-            // 

             // tab_subtitles

             // 

             this.tab_subtitles.Controls.Add(this.Subtitles);

@@ -1182,15 +1149,6 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";

             this.tab_subtitles.UseVisualStyleBackColor = true;

             // 

-            // Subtitles

-            // 

-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Subtitles.Location = new System.Drawing.Point(0, 0);

-            this.Subtitles.Name = "Subtitles";

-            this.Subtitles.Size = new System.Drawing.Size(722, 310);

-            this.Subtitles.TabIndex = 0;

-            // 

             // tab_chapters

             // 

             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;

@@ -1229,16 +1187,6 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

-            // x264Panel

-            // 

-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.x264Panel.Location = new System.Drawing.Point(0, 0);

-            this.x264Panel.Name = "x264Panel";

-            this.x264Panel.Size = new System.Drawing.Size(720, 306);

-            this.x264Panel.TabIndex = 0;

-            this.x264Panel.X264Query = "";

-            // 

             // tab_query

             // 

             this.tab_query.Controls.Add(this.btn_clear);

@@ -1261,7 +1209,7 @@ namespace Handbrake
             this.btn_clear.Location = new System.Drawing.Point(634, 104);

             this.btn_clear.Name = "btn_clear";

             this.btn_clear.Size = new System.Drawing.Size(75, 22);

-            this.btn_clear.TabIndex = 4;

+            this.btn_clear.TabIndex = 36;

             this.btn_clear.Text = "Clear";

             this.btn_clear.UseVisualStyleBackColor = true;

             this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);

@@ -1292,7 +1240,7 @@ namespace Handbrake
             this.rtf_query.Location = new System.Drawing.Point(16, 132);

             this.rtf_query.Name = "rtf_query";

             this.rtf_query.Size = new System.Drawing.Size(693, 161);

-            this.rtf_query.TabIndex = 5;

+            this.rtf_query.TabIndex = 35;

             this.rtf_query.Text = "";

             // 

             // groupBox2

@@ -1302,7 +1250,7 @@ namespace Handbrake
             this.groupBox2.Location = new System.Drawing.Point(750, 70);

             this.groupBox2.Name = "groupBox2";

             this.groupBox2.Size = new System.Drawing.Size(246, 482);

-            this.groupBox2.TabIndex = 6;

+            this.groupBox2.TabIndex = 100;

             this.groupBox2.TabStop = false;

             this.groupBox2.Text = "Presets";

             // 

@@ -1342,7 +1290,8 @@ namespace Handbrake
             this.toolStrip1.Name = "toolStrip1";

             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

             this.toolStrip1.Size = new System.Drawing.Size(1002, 39);

-            this.toolStrip1.TabIndex = 1;

+            this.toolStrip1.TabIndex = 0;

+            this.toolStrip1.TabStop = true;

             this.toolStrip1.Text = "toolStrip1";

             // 

             // btn_source

@@ -1556,7 +1505,7 @@ namespace Handbrake
             this.btn_destBrowse.Location = new System.Drawing.Point(645, 3);

             this.btn_destBrowse.Name = "btn_destBrowse";

             this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);

-            this.btn_destBrowse.TabIndex = 13;

+            this.btn_destBrowse.TabIndex = 7;

             this.btn_destBrowse.Text = "Browse";

             this.btn_destBrowse.UseVisualStyleBackColor = true;

             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);

@@ -1623,7 +1572,7 @@ namespace Handbrake
             this.Label10.Location = new System.Drawing.Point(3, 7);

             this.Label10.Name = "Label10";

             this.Label10.Size = new System.Drawing.Size(31, 13);

-            this.Label10.TabIndex = 6;

+            this.Label10.TabIndex = 2;

             this.Label10.Text = "Title:";

             // 

             // lbl_angle

@@ -1695,7 +1644,7 @@ namespace Handbrake
             this.labelSource.Location = new System.Drawing.Point(55, 0);

             this.labelSource.Name = "labelSource";

             this.labelSource.Size = new System.Drawing.Size(137, 13);

-            this.labelSource.TabIndex = 52;

+            this.labelSource.TabIndex = 1;

             this.labelSource.Text = "Select \"Source\" to continue";

             // 

             // labelStaticSource

@@ -1706,7 +1655,7 @@ namespace Handbrake
             this.labelStaticSource.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);

             this.labelStaticSource.Name = "labelStaticSource";

             this.labelStaticSource.Size = new System.Drawing.Size(49, 13);

-            this.labelStaticSource.TabIndex = 51;

+            this.labelStaticSource.TabIndex = 1;

             this.labelStaticSource.Text = "Source:";

             // 

             // SourceLayoutPanel

@@ -1730,6 +1679,55 @@ namespace Handbrake
             // 

             this.File_ChapterImport.Filter = "CSV Files|*.csv";

             // 

+            // PictureSettings

+            // 

+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

+            this.PictureSettings.CurrentlySelectedPreset = null;

+            this.PictureSettings.Enabled = false;

+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

+            this.PictureSettings.Name = "PictureSettings";

+            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);

+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

+            this.PictureSettings.TabIndex = 14;

+            // 

+            // Filters

+            // 

+            this.Filters.BackColor = System.Drawing.Color.Transparent;

+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Filters.Location = new System.Drawing.Point(0, 0);

+            this.Filters.Name = "Filters";

+            this.Filters.Size = new System.Drawing.Size(713, 310);

+            this.Filters.TabIndex = 15;

+            // 

+            // AudioSettings

+            // 

+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

+            this.AudioSettings.Name = "AudioSettings";

+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

+            this.AudioSettings.TabIndex = 27;

+            // 

+            // Subtitles

+            // 

+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Subtitles.Location = new System.Drawing.Point(0, 0);

+            this.Subtitles.Name = "Subtitles";

+            this.Subtitles.Size = new System.Drawing.Size(722, 310);

+            this.Subtitles.TabIndex = 28;

+            // 

+            // x264Panel

+            // 

+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.x264Panel.Location = new System.Drawing.Point(0, 0);

+            this.x264Panel.Name = "x264Panel";

+            this.x264Panel.Size = new System.Drawing.Size(720, 306);

+            this.x264Panel.TabIndex = 33;

+            this.x264Panel.X264Query = "";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

@@ -1778,6 +1776,7 @@ namespace Handbrake
             this.groupBox2.ResumeLayout(false);

             this.splitContainer1.Panel1.ResumeLayout(false);

             this.splitContainer1.Panel2.ResumeLayout(false);

+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();

             this.splitContainer1.ResumeLayout(false);

             this.toolStrip1.ResumeLayout(false);

             this.toolStrip1.PerformLayout();

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index bb2f6f7f3..4a84da4e3 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -112,30 +112,30 @@
     <value>2.0</value>

   </resheader>

   <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

   <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>False</value>

   </metadata>

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

+  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>1106, 15</value>

   </metadata>

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

+  <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>556, 15</value>

   </metadata>

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

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>18, 15</value>

   </metadata>

-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>True</value>

   </metadata>

-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>True</value>

   </metadata>

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

+  <metadata name="ChaptersMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>578, 54</value>

   </metadata>

   <data name="data_chpt.ToolTip" xml:space="preserve">

@@ -173,22 +173,22 @@ The Following options are not 100% accurate:
 - Encode video between a start and end time, measured in seconds

 - Encode video between a start and end frame.</value>

   </data>

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

+  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>1354, 15</value>

   </metadata>

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

+  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>232, 15</value>

   </metadata>

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

+  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>450, 15</value>

   </metadata>

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

+  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>343, 15</value>

   </metadata>

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

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

     <value>106, 15</value>

   </metadata>

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

+  <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 54</value>

   </metadata>

   <data name="label34.Text" xml:space="preserve">

@@ -197,13 +197,13 @@ Don't forget to re-generate this query if you change any GUI options.
 Note that this will also override the "Add to Queue" query as well.

 Clear the text box below to return to the internal query generation.</value>

   </data>

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

+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>767, 15</value>

   </metadata>

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

+  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>871, 15</value>

   </metadata>

-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA

@@ -583,13 +583,13 @@ Clear the text box below to return to the internal query generation.</value>
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==

 </value>

   </data>

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

+  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>1244, 15</value>

   </metadata>

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

+  <metadata name="hbproc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>220, 54</value>

   </metadata>

-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>98</value>

   </metadata>

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

@@ -971,13 +971,13 @@ Clear the text box below to return to the internal query generation.</value>
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==

 </value>

   </data>

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

+  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>664, 15</value>

   </metadata>

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

+  <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>310, 54</value>

   </metadata>

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

+  <metadata name="File_ChapterImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>423, 54</value>

   </metadata>

 </root>
\ No newline at end of file