WinGui:

 - The options panel (frmOptions) is now completely wrapped in TableLayoutPanels.
 - The rest of the GUI has been changed to Tahoma, 8pt font.
 - QueueHandler and it's related classes have been refactored and documented.
 - new option has been added that prompts the user before encoding when the query under the "Query Editor" tab does not match the GUI settings. It can be disabled in the options window.
 - A bug where "last_encode_log.txt" failed to be read has been fixed that was caused by exiting the CLI window shortly after starting the encode.

Thansk to darkassassin

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

1 files changed, 177 insertions, 159 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index acd18f3b2..316885914 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -64,7 +64,6 @@ namespace Handbrake
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();

             this.drop_chapterStart = new System.Windows.Forms.ComboBox();

             this.drop_angle = new System.Windows.Forms.ComboBox();

-            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();

             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();

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

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

@@ -96,7 +95,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.radio_cq = new System.Windows.Forms.RadioButton();

@@ -108,17 +106,13 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();

             this.Label46 = 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();

@@ -157,16 +151,23 @@ namespace Handbrake
             this.btn_destBrowse = new System.Windows.Forms.Button();

             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();

             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

-            this.Label10 = new System.Windows.Forms.Label();

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

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

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

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

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

-            this.labelStaticSource = new System.Windows.Forms.Label();

-            this.labelSource = new System.Windows.Forms.Label();

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

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

+            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();

+            this.labelSource = new System.Windows.Forms.Label();

+            this.Label10 = new System.Windows.Forms.Label();

+            this.labelStaticSource = new System.Windows.Forms.Label();

+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();

+            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();

@@ -191,6 +192,7 @@ namespace Handbrake
             this.tableLayoutPanel2.SuspendLayout();

             this.tableLayoutPanel3.SuspendLayout();

             this.tableLayoutPanel1.SuspendLayout();

+            this.flowLayoutPanel1.SuspendLayout();

             this.SuspendLayout();

             // 

             // notifyIconMenu

@@ -199,12 +201,12 @@ namespace Handbrake
             this.btn_restore});

             notifyIconMenu.Name = "notifyIconMenu";

             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

-            notifyIconMenu.Size = new System.Drawing.Size(124, 26);

+            notifyIconMenu.Size = new System.Drawing.Size(114, 26);

             // 

             // btn_restore

             // 

             this.btn_restore.Name = "btn_restore";

-            this.btn_restore.Size = new System.Drawing.Size(123, 22);

+            this.btn_restore.Size = new System.Drawing.Size(113, 22);

             this.btn_restore.Text = "Restore";

             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);

             // 

@@ -251,7 +253,7 @@ namespace Handbrake
             this.check_largeFile.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_largeFile.AutoSize = true;

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

-            this.check_largeFile.Location = new System.Drawing.Point(166, 5);

+            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;

@@ -275,6 +277,7 @@ namespace Handbrake
             // 

             // drp_videoFramerate

             // 

+            this.drp_videoFramerate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_videoFramerate.FormattingEnabled = true;

             this.drp_videoFramerate.Items.AddRange(new object[] {

             "Same as source",

@@ -290,7 +293,6 @@ namespace Handbrake
             this.drp_videoFramerate.Name = "drp_videoFramerate";

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

             this.drp_videoFramerate.TabIndex = 2;

-            this.drp_videoFramerate.Text = "Same as source";

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

             // 

             // slider_videoQuality

@@ -345,7 +347,7 @@ namespace Handbrake
             this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_optimiseMP4.AutoSize = true;

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

-            this.check_optimiseMP4.Location = new System.Drawing.Point(263, 5);

+            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;

@@ -360,7 +362,7 @@ namespace Handbrake
             this.check_iPodAtom.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_iPodAtom.AutoSize = true;

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

-            this.check_iPodAtom.Location = new System.Drawing.Point(365, 5);

+            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;

@@ -388,9 +390,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -441,7 +443,7 @@ namespace Handbrake
             this.drop_format.Items.AddRange(new object[] {

             "MP4 File",

             "MKV File"});

-            this.drop_format.Location = new System.Drawing.Point(54, 3);

+            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;

@@ -450,23 +452,23 @@ namespace Handbrake
             // 

             // drop_chapterFinish

             // 

+            this.drop_chapterFinish.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_chapterFinish.FormattingEnabled = true;

             this.drop_chapterFinish.Location = new System.Drawing.Point(447, 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.Text = "Auto";

             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.drop_chapterFinish_SelectedIndexChanged);

             // 

             // drop_chapterStart

             // 

+            this.drop_chapterStart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_chapterStart.FormattingEnabled = true;

             this.drop_chapterStart.Location = new System.Drawing.Point(321, 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.Text = "Auto";

             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.drop_chapterStart_SelectedIndexChanged);

             // 

@@ -480,21 +482,6 @@ namespace Handbrake
             this.drop_angle.TabIndex = 45;

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

             // 

-            // drp_dvdtitle

-            // 

-            this.drp_dvdtitle.FormattingEnabled = true;

-            this.drp_dvdtitle.Items.AddRange(new object[] {

-            "Automatic"});

-            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.Text = "Automatic";

-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +

-                    "ter you have scanned a source.");

-            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);

-            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);

-            // 

             // DVD_Open

             // 

             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";

@@ -517,13 +504,13 @@ namespace Handbrake
             this.mnu_killCLI,

             this.mnu_exit});

             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";

-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);

+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);

             this.FileToolStripMenuItem.Text = "&File";

             // 

             // mnu_killCLI

             // 

             this.mnu_killCLI.Name = "mnu_killCLI";

-            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);

+            this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);

             this.mnu_killCLI.Text = "Cancel Scan";

             this.mnu_killCLI.Visible = false;

             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);

@@ -531,7 +518,7 @@ namespace Handbrake
             // mnu_exit

             // 

             this.mnu_exit.Name = "mnu_exit";

-            this.mnu_exit.Size = new System.Drawing.Size(143, 22);

+            this.mnu_exit.Size = new System.Drawing.Size(138, 22);

             this.mnu_exit.Text = "E&xit";

             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);

             // 

@@ -548,7 +535,7 @@ namespace Handbrake
             this.ToolStripSeparator5,

             this.mnu_options});

             this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";

-            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);

+            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);

             this.ToolsToolStripMenuItem.Text = "&Tools";

             // 

             // mnu_encode

@@ -556,7 +543,7 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;

             this.mnu_encode.Name = "mnu_encode";

             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));

-            this.mnu_encode.Size = new System.Drawing.Size(186, 22);

+            this.mnu_encode.Size = new System.Drawing.Size(184, 22);

             this.mnu_encode.Text = "Show Queue";

             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);

             // 

@@ -564,20 +551,20 @@ namespace Handbrake
             // 

             this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;

             this.mnu_encodeLog.Name = "mnu_encodeLog";

-            this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22);

+            this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22);

             this.mnu_encodeLog.Text = "Activity Window";

             this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);

             // 

             // ToolStripSeparator5

             // 

             this.ToolStripSeparator5.Name = "ToolStripSeparator5";

-            this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6);

+            this.ToolStripSeparator5.Size = new System.Drawing.Size(181, 6);

             // 

             // mnu_options

             // 

             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;

             this.mnu_options.Name = "mnu_options";

-            this.mnu_options.Size = new System.Drawing.Size(186, 22);

+            this.mnu_options.Size = new System.Drawing.Size(184, 22);

             this.mnu_options.Text = "Options";

             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);

             // 

@@ -590,7 +577,7 @@ namespace Handbrake
             this.btn_new_preset,

             this.mnu_SelectDefault});

             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";

-            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);

+            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);

             this.PresetsToolStripMenuItem.Text = "&Presets";

             // 

             // mnu_presetReset

@@ -639,14 +626,14 @@ namespace Handbrake
             this.toolStripSeparator6,

             this.mnu_about});

             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";

-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);

+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);

             this.HelpToolStripMenuItem.Text = "&Help";

             // 

             // mnu_user_guide

             // 

             this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;

             this.mnu_user_guide.Name = "mnu_user_guide";

-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);

+            this.mnu_user_guide.Size = new System.Drawing.Size(194, 22);

             this.mnu_user_guide.Text = "HandBrake User Guide";

             this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);

             // 

@@ -654,39 +641,39 @@ namespace Handbrake
             // 

             this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;

             this.mnu_handbrake_home.Name = "mnu_handbrake_home";

-            this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22);

+            this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22);

             this.mnu_handbrake_home.Text = "HandBrake Homepage";

             this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);

             // 

             // mnu_handbrake_forums

             // 

             this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";

-            this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22);

+            this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22);

             this.mnu_handbrake_forums.Text = "HandBrake Forums";

             this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);

             // 

             // ToolStripSeparator3

             // 

             this.ToolStripSeparator3.Name = "ToolStripSeparator3";

-            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);

+            this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6);

             // 

             // mnu_UpdateCheck

             // 

             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";

-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);

+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22);

             this.mnu_UpdateCheck.Text = "Check for Updates";

             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);

             // 

             // toolStripSeparator6

             // 

             this.toolStripSeparator6.Name = "toolStripSeparator6";

-            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);

+            this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6);

             // 

             // mnu_about

             // 

             this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;

             this.mnu_about.Name = "mnu_about";

-            this.mnu_about.Size = new System.Drawing.Size(192, 22);

+            this.mnu_about.Size = new System.Drawing.Size(194, 22);

             this.mnu_about.Text = "About...";

             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);

             // 

@@ -711,9 +698,9 @@ namespace Handbrake
             this.label5.ForeColor = System.Drawing.Color.Black;

             this.label5.Location = new System.Drawing.Point(3, 7);

             this.label5.Name = "label5";

-            this.label5.Size = new System.Drawing.Size(45, 13);

+            this.label5.Size = new System.Drawing.Size(58, 13);

             this.label5.TabIndex = 27;

-            this.label5.Text = "Format:";

+            this.label5.Text = "Container:";

             // 

             // Label47

             // 

@@ -749,15 +736,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;

@@ -891,16 +869,9 @@ namespace Handbrake
             this.tab_picture.Padding = new System.Windows.Forms.Padding(3);

             this.tab_picture.Size = new System.Drawing.Size(724, 308);

             this.tab_picture.TabIndex = 0;

-            this.tab_picture.Text = "Picture Settings";

+            this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

-            // PictureSettings

-            // 

-            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.Name = "PictureSettings";

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

-            this.PictureSettings.TabIndex = 0;

             // 

             // Check_ChapterMarkers

             // 

@@ -941,15 +912,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);

@@ -961,15 +923,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;

@@ -1006,16 +959,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);

@@ -1144,40 +1087,40 @@ namespace Handbrake
             this.pmnu_saveChanges,

             this.pmnu_delete});

             this.presets_menu.Name = "presets_menu";

-            this.presets_menu.Size = new System.Drawing.Size(155, 98);

+            this.presets_menu.Size = new System.Drawing.Size(148, 98);

             this.presets_menu.Text = ";";

             this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);

             // 

             // pmnu_expandAll

             // 

             this.pmnu_expandAll.Name = "pmnu_expandAll";

-            this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22);

             this.pmnu_expandAll.Text = "Expand All";

             this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);

             // 

             // pmnu_collapse

             // 

             this.pmnu_collapse.Name = "pmnu_collapse";

-            this.pmnu_collapse.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_collapse.Size = new System.Drawing.Size(147, 22);

             this.pmnu_collapse.Text = "Collapse All";

             this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);

             // 

             // sep1

             // 

             this.sep1.Name = "sep1";

-            this.sep1.Size = new System.Drawing.Size(151, 6);

+            this.sep1.Size = new System.Drawing.Size(144, 6);

             // 

             // pmnu_saveChanges

             // 

             this.pmnu_saveChanges.Name = "pmnu_saveChanges";

-            this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22);

             this.pmnu_saveChanges.Text = "Save Changes";

             this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);

             // 

             // pmnu_delete

             // 

             this.pmnu_delete.Name = "pmnu_delete";

-            this.pmnu_delete.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_delete.Size = new System.Drawing.Size(147, 22);

             this.pmnu_delete.Text = "Delete";

             this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);

             // 

@@ -1211,7 +1154,7 @@ namespace Handbrake
             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_source.Name = "btn_source";

-            this.btn_source.Size = new System.Drawing.Size(85, 36);

+            this.btn_source.Size = new System.Drawing.Size(88, 36);

             this.btn_source.Text = "Source";

             this.btn_source.ToolTipText = "Open a new source file or folder.";

             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);

@@ -1220,7 +1163,7 @@ namespace Handbrake
             // 

             this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;

             this.btn_file_source.Name = "btn_file_source";

-            this.btn_file_source.Size = new System.Drawing.Size(194, 22);

+            this.btn_file_source.Size = new System.Drawing.Size(192, 22);

             this.btn_file_source.Text = "Video File";

             this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);

             // 

@@ -1229,20 +1172,20 @@ namespace Handbrake
             this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));

             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_dvd_source.Name = "btn_dvd_source";

-            this.btn_dvd_source.Size = new System.Drawing.Size(194, 22);

+            this.btn_dvd_source.Size = new System.Drawing.Size(192, 22);

             this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";

             this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);

             // 

             // toolStripSeparator1

             // 

             this.toolStripSeparator1.Name = "toolStripSeparator1";

-            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);

+            this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6);

             // 

             // mnu_dvd_drive

             // 

             this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;

             this.mnu_dvd_drive.Name = "mnu_dvd_drive";

-            this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22);

+            this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22);

             this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";

             this.mnu_dvd_drive.Visible = false;

             this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);

@@ -1269,7 +1212,7 @@ namespace Handbrake
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_add2Queue.Name = "btn_add2Queue";

-            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);

+            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);

             this.btn_add2Queue.Text = "Add to Queue";

             this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";

             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);

@@ -1280,7 +1223,7 @@ namespace Handbrake
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_showQueue.Name = "btn_showQueue";

-            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);

+            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);

             this.btn_showQueue.Tag = "";

             this.btn_showQueue.Text = "Show Queue";

             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);

@@ -1296,7 +1239,7 @@ namespace Handbrake
             this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.tb_preview.Name = "tb_preview";

-            this.tb_preview.Size = new System.Drawing.Size(81, 36);

+            this.tb_preview.Size = new System.Drawing.Size(84, 36);

             this.tb_preview.Text = "Preview";

             this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);

             // 

@@ -1306,7 +1249,7 @@ namespace Handbrake
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_ActivityWindow.Name = "btn_ActivityWindow";

-            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);

+            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);

             this.btn_ActivityWindow.Text = "Activity Window";

             this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +

                 "ently running encode.";

@@ -1448,17 +1391,6 @@ namespace Handbrake
             this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27);

             this.tableLayoutPanel1.TabIndex = 49;

             // 

-            // Label10

-            // 

-            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

-            this.Label10.AutoSize = true;

-            this.Label10.ForeColor = System.Drawing.Color.Black;

-            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.Text = "Title:";

-            // 

             // lbl_angle

             // 

             this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

@@ -1513,30 +1445,11 @@ namespace Handbrake
             this.lbl_duration.TabIndex = 43;

             this.lbl_duration.Text = "--:--:--";

             // 

-            // labelStaticSource

-            // 

-            this.labelStaticSource.AutoSize = true;

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

-            this.labelStaticSource.Location = new System.Drawing.Point(12, 70);

-            this.labelStaticSource.Name = "labelStaticSource";

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

-            this.labelStaticSource.TabIndex = 51;

-            this.labelStaticSource.Text = "Source:";

-            // 

-            // labelSource

-            // 

-            this.labelSource.AutoSize = true;

-            this.labelSource.Location = new System.Drawing.Point(67, 70);

-            this.labelSource.Name = "labelSource";

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

-            this.labelSource.TabIndex = 52;

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

-            // 

             // labelStaticDestination

             // 

             this.labelStaticDestination.AutoSize = true;

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

-            this.labelStaticDestination.Location = new System.Drawing.Point(12, 116);

+            this.labelStaticDestination.Location = new System.Drawing.Point(9, 116);

             this.labelStaticDestination.Name = "labelStaticDestination";

             this.labelStaticDestination.Size = new System.Drawing.Size(75, 13);

             this.labelStaticDestination.TabIndex = 53;

@@ -1546,29 +1459,133 @@ namespace Handbrake
             // 

             this.labelPreset.AutoSize = true;

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

-            this.labelPreset.Location = new System.Drawing.Point(13, 164);

+            this.labelPreset.Location = new System.Drawing.Point(9, 164);

             this.labelPreset.Name = "labelPreset";

             this.labelPreset.Size = new System.Drawing.Size(180, 13);

             this.labelPreset.TabIndex = 54;

             this.labelPreset.Text = "Output Settings (Preset: None)";

             // 

+            // drp_dvdtitle

+            // 

+            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drp_dvdtitle.FormattingEnabled = true;

+            this.drp_dvdtitle.Items.AddRange(new object[] {

+            "Automatic"});

+            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.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +

+                    "ter you have scanned a source.");

+            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);

+            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);

+            // 

+            // labelSource

+            // 

+            this.labelSource.AutoSize = true;

+            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.Text = "Select \"Source\" to continue";

+            // 

+            // Label10

+            // 

+            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.Label10.AutoSize = true;

+            this.Label10.ForeColor = System.Drawing.Color.Black;

+            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.Text = "Title:";

+            // 

+            // labelStaticSource

+            // 

+            this.labelStaticSource.AutoSize = true;

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

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

+            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.Text = "Source:";

+            // 

+            // flowLayoutPanel1

+            // 

+            this.flowLayoutPanel1.AutoSize = true;

+            this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.flowLayoutPanel1.Controls.Add(this.labelStaticSource);

+            this.flowLayoutPanel1.Controls.Add(this.labelSource);

+            this.flowLayoutPanel1.Location = new System.Drawing.Point(9, 70);

+            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);

+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";

+            this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13);

+            this.flowLayoutPanel1.TabIndex = 55;

+            // 

+            // PictureSettings

+            // 

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

+            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.Size = new System.Drawing.Size(666, 279);

+            this.PictureSettings.TabIndex = 0;

+            // 

+            // 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;

+            // 

+            // 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;

+            // 

+            // 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;

+            // 

+            // 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 = "";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

             this.ClientSize = new System.Drawing.Size(1000, 582);

-            this.Controls.Add(this.labelStaticSource);

-            this.Controls.Add(this.labelSource);

             this.Controls.Add(this.tableLayoutPanel3);

-            this.Controls.Add(this.labelStaticDestination);

             this.Controls.Add(this.toolStrip1);

-            this.Controls.Add(this.labelPreset);

+            this.Controls.Add(this.flowLayoutPanel1);

             this.Controls.Add(this.frmMainMenu);

             this.Controls.Add(this.tableLayoutPanel2);

-            this.Controls.Add(this.tableLayoutPanel1);

+            this.Controls.Add(this.labelPreset);

             this.Controls.Add(this.groupBox2);

             this.Controls.Add(this.StatusStrip);

+            this.Controls.Add(this.labelStaticDestination);

+            this.Controls.Add(this.tableLayoutPanel1);

             this.Controls.Add(this.tabs_panel);

             this.DoubleBuffered = true;

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

@@ -1608,6 +1625,8 @@ namespace Handbrake
             this.tableLayoutPanel3.PerformLayout();

             this.tableLayoutPanel1.ResumeLayout(false);

             this.tableLayoutPanel1.PerformLayout();

+            this.flowLayoutPanel1.ResumeLayout(false);

+            this.flowLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -1726,8 +1745,6 @@ namespace Handbrake
         private Button btn_destBrowse;

         private TableLayoutPanel tableLayoutPanel3;

         private TableLayoutPanel tableLayoutPanel1;

-        internal Label Label10;

-        internal ComboBox drp_dvdtitle;

         internal Label lbl_angle;

         internal ComboBox drop_angle;

         internal Label Label9;

@@ -1737,11 +1754,12 @@ namespace Handbrake
         internal Label label_duration;

         internal Label lbl_duration;

         private Label labelStaticDestination;

-        private Label labelSource;

-        private Label labelStaticSource;

         internal Label labelPreset;

         internal Handbrake.Controls.PictureSettings PictureSettings;

-

- 

+        private Label labelSource;

+        internal ComboBox drp_dvdtitle;

+        internal Label Label10;

+        private Label labelStaticSource;

+        private FlowLayoutPanel flowLayoutPanel1;

     }

 }
\ No newline at end of file