WinGui: Tweak the new audio panel options pane to give it a cleaner appearance and...

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

diff --git a/win/CS/frmOptions.Designer.cs b/win/CS/frmOptions.Designer.cs
index 37d5567e1cc14f80fc2cd19337b4dc065b5ef4f9..2cfcaf516d22525f9fa2f23dde38f1316f1706a8 100644 (file)
--- a/win/CS/frmOptions.Designer.cs
+++ b/win/CS/frmOptions.Designer.cs
@@ -71,46 +71,22 @@ namespace Handbrake
             this.txt_vlcPath = new System.Windows.Forms.TextBox();\r
             this.label36 = new System.Windows.Forms.Label();\r
             this.tab_audio_sub = new System.Windows.Forms.TabPage();\r
-            this.groupBox3 = new System.Windows.Forms.GroupBox();\r
-            this.label48 = new System.Windows.Forms.Label();\r
-            this.groupBox2 = new System.Windows.Forms.GroupBox();\r
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
-            this.radio_Audio_Selected = new System.Windows.Forms.RadioButton();\r
-            this.radio_Audio_None = new System.Windows.Forms.RadioButton();\r
-            this.radio_Audio_PrefOnly = new System.Windows.Forms.RadioButton();\r
-            this.radio_Audio_All = new System.Windows.Forms.RadioButton();\r
-            this.radio_Audio_First = new System.Windows.Forms.RadioButton();\r
-            this.label42 = new System.Windows.Forms.Label();\r
-            this.label43 = new System.Windows.Forms.Label();\r
-            this.check_AddCCTracks = new System.Windows.Forms.CheckBox();\r
-            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();\r
             this.label45 = new System.Windows.Forms.Label();\r
-            this.label41 = new System.Windows.Forms.Label();\r
-            this.label47 = new System.Windows.Forms.Label();\r
-            this.label46 = new System.Windows.Forms.Label();\r
+            this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.label44 = new System.Windows.Forms.Label();\r
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();\r
-            this.radio_Subtitle_Selected = new System.Windows.Forms.RadioButton();\r
-            this.radio_Subtitle_None = new System.Windows.Forms.RadioButton();\r
-            this.radio_Subtitle_PrefOnly = new System.Windows.Forms.RadioButton();\r
-            this.radio_Subtitle_All = new System.Windows.Forms.RadioButton();\r
-            this.radio_Subtitle_First = new System.Windows.Forms.RadioButton();\r
+            this.label41 = new System.Windows.Forms.Label();\r
+            this.cb_subtitleMode = new System.Windows.Forms.ComboBox();\r
+            this.cb_audioMode = new System.Windows.Forms.ComboBox();\r
+            this.label42 = new System.Windows.Forms.Label();\r
             this.check_AddOnlyOneAudioPerLanguage = new System.Windows.Forms.CheckBox();\r
-            this.groupBox1 = new System.Windows.Forms.GroupBox();\r
-            this.panel3 = new System.Windows.Forms.Panel();\r
-            this.button_moveLanguageDown = new System.Windows.Forms.Button();\r
-            this.button_moveLanguageUp = new System.Windows.Forms.Button();\r
-            this.label40 = new System.Windows.Forms.Label();\r
-            this.label39 = new System.Windows.Forms.Label();\r
-            this.button_clearLanguage = new System.Windows.Forms.Button();\r
-            this.button_removeLanguage = new System.Windows.Forms.Button();\r
-            this.button_addLanguage = new System.Windows.Forms.Button();\r
-            this.listBox_selectedLanguages = new System.Windows.Forms.ListBox();\r
-            this.listBox_availableLanguages = new System.Windows.Forms.ListBox();\r
+            this.check_AddCCTracks = new System.Windows.Forms.CheckBox();\r
+            this.label43 = new System.Windows.Forms.Label();\r
             this.label31 = new System.Windows.Forms.Label();\r
+            this.button_clearLanguage = new System.Windows.Forms.Button();\r
             this.label15 = new System.Windows.Forms.Label();\r
+            this.button_removeLanguage = new System.Windows.Forms.Button();\r
             this.drop_preferredLang = new System.Windows.Forms.ComboBox();\r
+            this.button_addLanguage = new System.Windows.Forms.Button();\r
             this.tab_cli = new System.Windows.Forms.TabPage();\r
             this.label11 = new System.Windows.Forms.Label();\r
             this.check_preventSleep = new System.Windows.Forms.CheckBox();\r
@@ -179,23 +155,25 @@ namespace Handbrake
             this.label37 = new System.Windows.Forms.Label();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
+            this.label46 = new System.Windows.Forms.Label();\r
+            this.label47 = new System.Windows.Forms.Label();\r
+            this.audioSelectionPanel = new System.Windows.Forms.Panel();\r
+            this.listBox_availableLanguages = new System.Windows.Forms.ListBox();\r
+            this.listBox_selectedLanguages = new System.Windows.Forms.ListBox();\r
+            this.button_moveLanguageDown = new System.Windows.Forms.Button();\r
+            this.button_moveLanguageUp = new System.Windows.Forms.Button();\r
+            this.label39 = new System.Windows.Forms.Label();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_outputFiles.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
             this.tab_audio_sub.SuspendLayout();\r
-            this.groupBox3.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
-            this.tableLayoutPanel1.SuspendLayout();\r
-            this.tableLayoutPanel2.SuspendLayout();\r
-            this.tableLayoutPanel4.SuspendLayout();\r
-            this.tableLayoutPanel3.SuspendLayout();\r
-            this.groupBox1.SuspendLayout();\r
-            this.panel3.SuspendLayout();\r
             this.tab_cli.SuspendLayout();\r
             this.tab_advanced.SuspendLayout();\r
             this.panel1.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
+            this.audioSelectionPanel.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // btn_close\r
@@ -465,7 +443,7 @@ namespace Handbrake
             this.check_autoNaming.AutoSize = true;\r
             this.check_autoNaming.Location = new System.Drawing.Point(111, 13);\r
             this.check_autoNaming.Name = "check_autoNaming";\r
-            this.check_autoNaming.Size = new System.Drawing.Size(171, 17);\r
+            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);\r
             this.check_autoNaming.TabIndex = 72;\r
             this.check_autoNaming.Text = "Automatically name output files";\r
             this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");\r
@@ -645,9 +623,10 @@ namespace Handbrake
             // \r
             // tab_audio_sub\r
             // \r
-            this.tab_audio_sub.Controls.Add(this.groupBox3);\r
+            this.tab_audio_sub.Controls.Add(this.label39);\r
+            this.tab_audio_sub.Controls.Add(this.audioSelectionPanel);\r
+            this.tab_audio_sub.Controls.Add(this.label45);\r
             this.tab_audio_sub.Controls.Add(this.groupBox2);\r
-            this.tab_audio_sub.Controls.Add(this.groupBox1);\r
             this.tab_audio_sub.Controls.Add(this.label31);\r
             this.tab_audio_sub.Controls.Add(this.label15);\r
             this.tab_audio_sub.Controls.Add(this.drop_preferredLang);\r
@@ -659,448 +638,148 @@ namespace Handbrake
             this.tab_audio_sub.Text = "Audio and Subtitles";\r
             this.tab_audio_sub.UseVisualStyleBackColor = true;\r
             // \r
-            // groupBox3\r
-            // \r
-            this.groupBox3.Controls.Add(this.label48);\r
-            this.groupBox3.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.groupBox3.Location = new System.Drawing.Point(6, 78);\r
-            this.groupBox3.Name = "groupBox3";\r
-            this.groupBox3.Size = new System.Drawing.Size(155, 90);\r
-            this.groupBox3.TabIndex = 105;\r
-            this.groupBox3.TabStop = false;\r
-            this.groupBox3.Text = "WARNING";\r
-            this.groupBox3.Visible = false;\r
-            // \r
-            // label48\r
-            // \r
-            this.label48.AutoSize = true;\r
-            this.label48.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label48.Location = new System.Drawing.Point(6, 19);\r
-            this.label48.Name = "label48";\r
-            this.label48.Size = new System.Drawing.Size(143, 56);\r
-            this.label48.TabIndex = 0;\r
-            this.label48.Text = "As long as the \r\nPreferred Language is \r\n\"Any\", the advanced \r\noptions are not av" +\r
-    "ailable.";\r
-            this.label48.TextAlign = System.Drawing.ContentAlignment.TopCenter;\r
+            // label45\r
+            // \r
+            this.label45.AutoSize = true;\r
+            this.label45.Font = new System.Drawing.Font("Tahoma", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label45.Location = new System.Drawing.Point(253, 37);\r
+            this.label45.Name = "label45";\r
+            this.label45.Size = new System.Drawing.Size(84, 11);\r
+            this.label45.TabIndex = 107;\r
+            this.label45.Text = "(Primary language)";\r
             // \r
             // groupBox2\r
             // \r
-            this.groupBox2.Controls.Add(this.tableLayoutPanel1);\r
-            this.groupBox2.Location = new System.Drawing.Point(0, 231);\r
+            this.groupBox2.Controls.Add(this.label44);\r
+            this.groupBox2.Controls.Add(this.label41);\r
+            this.groupBox2.Controls.Add(this.cb_subtitleMode);\r
+            this.groupBox2.Controls.Add(this.cb_audioMode);\r
+            this.groupBox2.Controls.Add(this.label42);\r
+            this.groupBox2.Controls.Add(this.check_AddOnlyOneAudioPerLanguage);\r
+            this.groupBox2.Controls.Add(this.check_AddCCTracks);\r
+            this.groupBox2.Controls.Add(this.label43);\r
+            this.groupBox2.Location = new System.Drawing.Point(19, 231);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(577, 120);\r
-            this.groupBox2.TabIndex = 104;\r
+            this.groupBox2.Size = new System.Drawing.Size(537, 106);\r
+            this.groupBox2.TabIndex = 106;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Add Automatically";\r
             // \r
-            // tableLayoutPanel1\r
-            // \r
-            this.tableLayoutPanel1.ColumnCount = 3;\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 51F));\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 324F));\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 239F));\r
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 1, 1);\r
-            this.tableLayoutPanel1.Controls.Add(this.label42, 0, 1);\r
-            this.tableLayoutPanel1.Controls.Add(this.label43, 0, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.check_AddCCTracks, 2, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel4, 1, 0);\r
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 1, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.check_AddOnlyOneAudioPerLanguage, 2, 1);\r
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 16);\r
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
-            this.tableLayoutPanel1.RowCount = 3;\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(574, 73);\r
-            this.tableLayoutPanel1.TabIndex = 102;\r
-            // \r
-            // tableLayoutPanel2\r
-            // \r
-            this.tableLayoutPanel2.ColumnCount = 10;\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 23F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 42F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 32F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 39F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel2.Controls.Add(this.radio_Audio_Selected, 3, 0);\r
-            this.tableLayoutPanel2.Controls.Add(this.radio_Audio_None, 9, 0);\r
-            this.tableLayoutPanel2.Controls.Add(this.radio_Audio_PrefOnly, 5, 0);\r
-            this.tableLayoutPanel2.Controls.Add(this.radio_Audio_All, 1, 0);\r
-            this.tableLayoutPanel2.Controls.Add(this.radio_Audio_First, 7, 0);\r
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(54, 23);\r
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";\r
-            this.tableLayoutPanel2.RowCount = 1;\r
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(318, 20);\r
-            this.tableLayoutPanel2.TabIndex = 6;\r
-            // \r
-            // radio_Audio_Selected\r
-            // \r
-            this.radio_Audio_Selected.AutoSize = true;\r
-            this.radio_Audio_Selected.Location = new System.Drawing.Point(80, 3);\r
-            this.radio_Audio_Selected.Name = "radio_Audio_Selected";\r
-            this.radio_Audio_Selected.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Audio_Selected.TabIndex = 7;\r
-            this.radio_Audio_Selected.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Audio_Selected, "Includes Prefered and Selected Languages");\r
-            this.radio_Audio_Selected.UseVisualStyleBackColor = true;\r
-            this.radio_Audio_Selected.CheckedChanged += new System.EventHandler(this.radio_Audio_Selected_CheckedChanged);\r
-            // \r
-            // radio_Audio_None\r
-            // \r
-            this.radio_Audio_None.AutoSize = true;\r
-            this.radio_Audio_None.Location = new System.Drawing.Point(285, 3);\r
-            this.radio_Audio_None.Name = "radio_Audio_None";\r
-            this.radio_Audio_None.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Audio_None.TabIndex = 10;\r
-            this.radio_Audio_None.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Audio_None, "Do not add anything.");\r
-            this.radio_Audio_None.UseVisualStyleBackColor = true;\r
-            this.radio_Audio_None.CheckedChanged += new System.EventHandler(this.radio_Audio_None_CheckedChanged);\r
-            // \r
-            // radio_Audio_PrefOnly\r
-            // \r
-            this.radio_Audio_PrefOnly.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
-            | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.radio_Audio_PrefOnly.AutoSize = true;\r
-            this.radio_Audio_PrefOnly.Checked = true;\r
-            this.radio_Audio_PrefOnly.Location = new System.Drawing.Point(158, 3);\r
-            this.radio_Audio_PrefOnly.Name = "radio_Audio_PrefOnly";\r
-            this.radio_Audio_PrefOnly.Size = new System.Drawing.Size(26, 14);\r
-            this.radio_Audio_PrefOnly.TabIndex = 6;\r
-            this.radio_Audio_PrefOnly.TabStop = true;\r
-            this.radio_Audio_PrefOnly.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.radio_Audio_PrefOnly, "Only the prefered language.");\r
-            this.radio_Audio_PrefOnly.UseVisualStyleBackColor = true;\r
-            this.radio_Audio_PrefOnly.CheckedChanged += new System.EventHandler(this.radio_Audio_PrefOnly_CheckedChanged);\r
-            // \r
-            // radio_Audio_All\r
-            // \r
-            this.radio_Audio_All.AutoSize = true;\r
-            this.radio_Audio_All.Location = new System.Drawing.Point(21, 3);\r
-            this.radio_Audio_All.Name = "radio_Audio_All";\r
-            this.radio_Audio_All.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Audio_All.TabIndex = 9;\r
-            this.radio_Audio_All.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Audio_All, "All available languages.");\r
-            this.radio_Audio_All.UseVisualStyleBackColor = true;\r
-            this.radio_Audio_All.CheckedChanged += new System.EventHandler(this.radio_Audio_All_CheckedChanged);\r
-            // \r
-            // radio_Audio_First\r
-            // \r
-            this.radio_Audio_First.AutoSize = true;\r
-            this.radio_Audio_First.Location = new System.Drawing.Point(229, 3);\r
-            this.radio_Audio_First.Name = "radio_Audio_First";\r
-            this.radio_Audio_First.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Audio_First.TabIndex = 8;\r
-            this.radio_Audio_First.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Audio_First, "Take the first language on the source.");\r
-            this.radio_Audio_First.UseVisualStyleBackColor = true;\r
-            this.radio_Audio_First.CheckedChanged += new System.EventHandler(this.radio_Audio_First_CheckedChanged);\r
+            // label44\r
+            // \r
+            this.label44.AutoSize = true;\r
+            this.label44.Location = new System.Drawing.Point(10, 28);\r
+            this.label44.Name = "label44";\r
+            this.label44.Size = new System.Drawing.Size(38, 13);\r
+            this.label44.TabIndex = 109;\r
+            this.label44.Text = "Audio:";\r
+            // \r
+            // label41\r
+            // \r
+            this.label41.AutoSize = true;\r
+            this.label41.Location = new System.Drawing.Point(10, 55);\r
+            this.label41.Name = "label41";\r
+            this.label41.Size = new System.Drawing.Size(47, 13);\r
+            this.label41.TabIndex = 108;\r
+            this.label41.Text = "Subtitle:";\r
+            // \r
+            // cb_subtitleMode\r
+            // \r
+            this.cb_subtitleMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.cb_subtitleMode.FormattingEnabled = true;\r
+            this.cb_subtitleMode.Items.AddRange(new object[] {\r
+            "None",\r
+            "All",\r
+            "First",\r
+            "Selected",\r
+            "Prefered Only"});\r
+            this.cb_subtitleMode.Location = new System.Drawing.Point(79, 52);\r
+            this.cb_subtitleMode.Name = "cb_subtitleMode";\r
+            this.cb_subtitleMode.Size = new System.Drawing.Size(132, 21);\r
+            this.cb_subtitleMode.TabIndex = 107;\r
+            this.ToolTip.SetToolTip(this.cb_subtitleMode, resources.GetString("cb_subtitleMode.ToolTip"));\r
+            this.cb_subtitleMode.SelectedIndexChanged += new System.EventHandler(this.cb_subtitleMode_SelectedIndexChanged);\r
+            // \r
+            // cb_audioMode\r
+            // \r
+            this.cb_audioMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.cb_audioMode.FormattingEnabled = true;\r
+            this.cb_audioMode.Items.AddRange(new object[] {\r
+            "None",\r
+            "All",\r
+            "First",\r
+            "Selected",\r
+            "Prefered Only"});\r
+            this.cb_audioMode.Location = new System.Drawing.Point(79, 25);\r
+            this.cb_audioMode.Name = "cb_audioMode";\r
+            this.cb_audioMode.Size = new System.Drawing.Size(132, 21);\r
+            this.cb_audioMode.TabIndex = 106;\r
+            this.ToolTip.SetToolTip(this.cb_audioMode, resources.GetString("cb_audioMode.ToolTip"));\r
+            this.cb_audioMode.SelectedIndexChanged += new System.EventHandler(this.cb_audioMode_SelectedIndexChanged);\r
             // \r
             // label42\r
             // \r
             this.label42.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
             | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label42.AutoSize = true;\r
-            this.label42.Location = new System.Drawing.Point(14, 20);\r
+            this.label42.Location = new System.Drawing.Point(142, 28);\r
             this.label42.Name = "label42";\r
-            this.label42.Size = new System.Drawing.Size(34, 26);\r
+            this.label42.Size = new System.Drawing.Size(34, 13);\r
             this.label42.TabIndex = 0;\r
             this.label42.Text = "Audio";\r
             this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
             // \r
-            // label43\r
+            // check_AddOnlyOneAudioPerLanguage\r
             // \r
-            this.label43.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label43.AutoSize = true;\r
-            this.label43.Location = new System.Drawing.Point(5, 46);\r
-            this.label43.Name = "label43";\r
-            this.label43.Size = new System.Drawing.Size(43, 27);\r
-            this.label43.TabIndex = 1;\r
-            this.label43.Text = "Subtitle";\r
-            this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
+            this.check_AddOnlyOneAudioPerLanguage.AutoSize = true;\r
+            this.check_AddOnlyOneAudioPerLanguage.Location = new System.Drawing.Point(221, 27);\r
+            this.check_AddOnlyOneAudioPerLanguage.Name = "check_AddOnlyOneAudioPerLanguage";\r
+            this.check_AddOnlyOneAudioPerLanguage.Size = new System.Drawing.Size(192, 17);\r
+            this.check_AddOnlyOneAudioPerLanguage.TabIndex = 93;\r
+            this.check_AddOnlyOneAudioPerLanguage.Text = "Add Only One Audio Per Language";\r
+            this.ToolTip.SetToolTip(this.check_AddOnlyOneAudioPerLanguage, "Only add one audiotrack for each selected language.");\r
+            this.check_AddOnlyOneAudioPerLanguage.UseVisualStyleBackColor = true;\r
+            this.check_AddOnlyOneAudioPerLanguage.CheckedChanged += new System.EventHandler(this.check_AddOnlyOneAudioPerLanguage_CheckedChanged);\r
             // \r
             // check_AddCCTracks\r
             // \r
             this.check_AddCCTracks.AutoSize = true;\r
-            this.check_AddCCTracks.Location = new System.Drawing.Point(378, 49);\r
+            this.check_AddCCTracks.Location = new System.Drawing.Point(79, 79);\r
             this.check_AddCCTracks.Name = "check_AddCCTracks";\r
             this.check_AddCCTracks.Size = new System.Drawing.Size(199, 17);\r
             this.check_AddCCTracks.TabIndex = 92;\r
             this.check_AddCCTracks.Text = "Add Closed Captions when available";\r
-            this.ToolTip.SetToolTip(this.check_AddCCTracks, "Add any CC tracks if they exist");\r
+            this.ToolTip.SetToolTip(this.check_AddCCTracks, "Add any CC tracks if they exist regardless of language settings");\r
             this.check_AddCCTracks.UseVisualStyleBackColor = true;\r
             this.check_AddCCTracks.CheckedChanged += new System.EventHandler(this.check_AddCCTracks_CheckedChanged);\r
             // \r
-            // tableLayoutPanel4\r
-            // \r
-            this.tableLayoutPanel4.ColumnCount = 9;\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.98113F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 1.702191F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.55346F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 1.702191F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.41509F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 1.702191F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.72405F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 1.702191F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.31972F));\r
-            this.tableLayoutPanel4.Controls.Add(this.label45, 2, 0);\r
-            this.tableLayoutPanel4.Controls.Add(this.label41, 8, 0);\r
-            this.tableLayoutPanel4.Controls.Add(this.label47, 0, 0);\r
-            this.tableLayoutPanel4.Controls.Add(this.label46, 6, 0);\r
-            this.tableLayoutPanel4.Controls.Add(this.label44, 4, 0);\r
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(54, 3);\r
-            this.tableLayoutPanel4.Name = "tableLayoutPanel4";\r
-            this.tableLayoutPanel4.RowCount = 1;\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(318, 14);\r
-            this.tableLayoutPanel4.TabIndex = 4;\r
-            // \r
-            // label45\r
-            // \r
-            this.label45.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label45.AutoSize = true;\r
-            this.label45.Location = new System.Drawing.Point(62, 1);\r
-            this.label45.Name = "label45";\r
-            this.label45.Size = new System.Drawing.Size(53, 13);\r
-            this.label45.TabIndex = 3;\r
-            this.label45.Text = "Selected";\r
-            this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.label45, "Includes Prefered and Selected Languages");\r
-            // \r
-            // label41\r
-            // \r
-            this.label41.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label41.AutoSize = true;\r
-            this.label41.Location = new System.Drawing.Point(270, 1);\r
-            this.label41.Name = "label41";\r
-            this.label41.Size = new System.Drawing.Size(45, 13);\r
-            this.label41.TabIndex = 6;\r
-            this.label41.Text = "None";\r
-            this.label41.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.label41, "Do not add anything.");\r
-            // \r
-            // label47\r
-            // \r
-            this.label47.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label47.AutoSize = true;\r
-            this.label47.Location = new System.Drawing.Point(3, 1);\r
-            this.label47.Name = "label47";\r
-            this.label47.Size = new System.Drawing.Size(48, 13);\r
-            this.label47.TabIndex = 5;\r
-            this.label47.Text = "All";\r
-            this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.label47, "All available languages.");\r
-            // \r
-            // label46\r
-            // \r
-            this.label46.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label46.AutoSize = true;\r
-            this.label46.Location = new System.Drawing.Point(215, 1);\r
-            this.label46.Name = "label46";\r
-            this.label46.Size = new System.Drawing.Size(44, 13);\r
-            this.label46.TabIndex = 4;\r
-            this.label46.Text = "First";\r
-            this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.label46, "Take the first language on the source.");\r
-            // \r
-            // label44\r
+            // label43\r
             // \r
-            this.label44.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label44.AutoSize = true;\r
-            this.label44.Location = new System.Drawing.Point(126, 1);\r
-            this.label44.Name = "label44";\r
-            this.label44.Size = new System.Drawing.Size(78, 13);\r
-            this.label44.TabIndex = 2;\r
-            this.label44.Text = "Only Prefered";\r
-            this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.label44, "Only the prefered language.");\r
-            // \r
-            // tableLayoutPanel3\r
-            // \r
-            this.tableLayoutPanel3.ColumnCount = 10;\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 22F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 43F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 22F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F));\r
-            this.tableLayoutPanel3.Controls.Add(this.radio_Subtitle_Selected, 3, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.radio_Subtitle_None, 9, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.radio_Subtitle_PrefOnly, 5, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.radio_Subtitle_All, 1, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.radio_Subtitle_First, 7, 0);\r
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(54, 49);\r
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";\r
-            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(318, 20);\r
-            this.tableLayoutPanel3.TabIndex = 7;\r
-            // \r
-            // radio_Subtitle_Selected\r
-            // \r
-            this.radio_Subtitle_Selected.AutoSize = true;\r
-            this.radio_Subtitle_Selected.Location = new System.Drawing.Point(79, 3);\r
-            this.radio_Subtitle_Selected.Name = "radio_Subtitle_Selected";\r
-            this.radio_Subtitle_Selected.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Subtitle_Selected.TabIndex = 7;\r
-            this.radio_Subtitle_Selected.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Subtitle_Selected, "Includes Prefered and Selected Languages");\r
-            this.radio_Subtitle_Selected.UseVisualStyleBackColor = true;\r
-            this.radio_Subtitle_Selected.CheckedChanged += new System.EventHandler(this.radio_Subtitle_Selected_CheckedChanged);\r
-            // \r
-            // radio_Subtitle_None\r
-            // \r
-            this.radio_Subtitle_None.AutoSize = true;\r
-            this.radio_Subtitle_None.Location = new System.Drawing.Point(285, 3);\r
-            this.radio_Subtitle_None.Name = "radio_Subtitle_None";\r
-            this.radio_Subtitle_None.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Subtitle_None.TabIndex = 10;\r
-            this.radio_Subtitle_None.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Subtitle_None, "Do not add anything.");\r
-            this.radio_Subtitle_None.UseVisualStyleBackColor = true;\r
-            this.radio_Subtitle_None.CheckedChanged += new System.EventHandler(this.radio_Subtitle_None_CheckedChanged);\r
-            // \r
-            // radio_Subtitle_PrefOnly\r
-            // \r
-            this.radio_Subtitle_PrefOnly.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
-            | System.Windows.Forms.AnchorStyles.Left) \r
+            this.label43.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
             | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.radio_Subtitle_PrefOnly.AutoSize = true;\r
-            this.radio_Subtitle_PrefOnly.Checked = true;\r
-            this.radio_Subtitle_PrefOnly.Location = new System.Drawing.Point(158, 3);\r
-            this.radio_Subtitle_PrefOnly.Name = "radio_Subtitle_PrefOnly";\r
-            this.radio_Subtitle_PrefOnly.Size = new System.Drawing.Size(27, 14);\r
-            this.radio_Subtitle_PrefOnly.TabIndex = 6;\r
-            this.radio_Subtitle_PrefOnly.TabStop = true;\r
-            this.radio_Subtitle_PrefOnly.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
-            this.ToolTip.SetToolTip(this.radio_Subtitle_PrefOnly, "Only the prefered language.");\r
-            this.radio_Subtitle_PrefOnly.UseVisualStyleBackColor = true;\r
-            this.radio_Subtitle_PrefOnly.CheckedChanged += new System.EventHandler(this.radio_Subtitle_PrefOnly_CheckedChanged);\r
-            // \r
-            // radio_Subtitle_All\r
-            // \r
-            this.radio_Subtitle_All.AutoSize = true;\r
-            this.radio_Subtitle_All.Location = new System.Drawing.Point(21, 3);\r
-            this.radio_Subtitle_All.Name = "radio_Subtitle_All";\r
-            this.radio_Subtitle_All.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Subtitle_All.TabIndex = 9;\r
-            this.radio_Subtitle_All.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Subtitle_All, "All available languages.");\r
-            this.radio_Subtitle_All.UseVisualStyleBackColor = true;\r
-            this.radio_Subtitle_All.CheckedChanged += new System.EventHandler(this.radio_Subtitle_All_CheckedChanged);\r
-            // \r
-            // radio_Subtitle_First\r
-            // \r
-            this.radio_Subtitle_First.AutoSize = true;\r
-            this.radio_Subtitle_First.Location = new System.Drawing.Point(229, 3);\r
-            this.radio_Subtitle_First.Name = "radio_Subtitle_First";\r
-            this.radio_Subtitle_First.Size = new System.Drawing.Size(14, 13);\r
-            this.radio_Subtitle_First.TabIndex = 8;\r
-            this.radio_Subtitle_First.TabStop = true;\r
-            this.ToolTip.SetToolTip(this.radio_Subtitle_First, "Take the first language on the source.");\r
-            this.radio_Subtitle_First.UseVisualStyleBackColor = true;\r
-            this.radio_Subtitle_First.CheckedChanged += new System.EventHandler(this.radio_Subtitle_First_CheckedChanged);\r
-            // \r
-            // check_AddOnlyOneAudioPerLanguage\r
-            // \r
-            this.check_AddOnlyOneAudioPerLanguage.AutoSize = true;\r
-            this.check_AddOnlyOneAudioPerLanguage.Location = new System.Drawing.Point(378, 23);\r
-            this.check_AddOnlyOneAudioPerLanguage.Name = "check_AddOnlyOneAudioPerLanguage";\r
-            this.check_AddOnlyOneAudioPerLanguage.Size = new System.Drawing.Size(192, 17);\r
-            this.check_AddOnlyOneAudioPerLanguage.TabIndex = 93;\r
-            this.check_AddOnlyOneAudioPerLanguage.Text = "Add Only One Audio Per Language";\r
-            this.ToolTip.SetToolTip(this.check_AddOnlyOneAudioPerLanguage, "Only add one audiotrack of each selected language.");\r
-            this.check_AddOnlyOneAudioPerLanguage.UseVisualStyleBackColor = true;\r
-            this.check_AddOnlyOneAudioPerLanguage.CheckedChanged += new System.EventHandler(this.check_AddOnlyOneAudioPerLanguage_CheckedChanged);\r
-            // \r
-            // groupBox1\r
-            // \r
-            this.groupBox1.Controls.Add(this.panel3);\r
-            this.groupBox1.Location = new System.Drawing.Point(167, 15);\r
-            this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(389, 210);\r
-            this.groupBox1.TabIndex = 103;\r
-            this.groupBox1.TabStop = false;\r
-            this.groupBox1.Text = "Additional Languages";\r
-            // \r
-            // panel3\r
-            // \r
-            this.panel3.Controls.Add(this.button_moveLanguageDown);\r
-            this.panel3.Controls.Add(this.button_moveLanguageUp);\r
-            this.panel3.Controls.Add(this.label40);\r
-            this.panel3.Controls.Add(this.label39);\r
-            this.panel3.Controls.Add(this.button_clearLanguage);\r
-            this.panel3.Controls.Add(this.button_removeLanguage);\r
-            this.panel3.Controls.Add(this.button_addLanguage);\r
-            this.panel3.Controls.Add(this.listBox_selectedLanguages);\r
-            this.panel3.Controls.Add(this.listBox_availableLanguages);\r
-            this.panel3.Location = new System.Drawing.Point(6, 15);\r
-            this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(377, 189);\r
-            this.panel3.TabIndex = 101;\r
-            // \r
-            // button_moveLanguageDown\r
-            // \r
-            this.button_moveLanguageDown.Image = global::Handbrake.Properties.Resources.arrow_down;\r
-            this.button_moveLanguageDown.Location = new System.Drawing.Point(348, 98);\r
-            this.button_moveLanguageDown.Name = "button_moveLanguageDown";\r
-            this.button_moveLanguageDown.Size = new System.Drawing.Size(25, 27);\r
-            this.button_moveLanguageDown.TabIndex = 102;\r
-            this.ToolTip.SetToolTip(this.button_moveLanguageDown, "Move selected languages down in the order.");\r
-            this.button_moveLanguageDown.UseVisualStyleBackColor = true;\r
-            this.button_moveLanguageDown.Click += new System.EventHandler(this.button_moveLanguageDown_Click);\r
-            // \r
-            // button_moveLanguageUp\r
-            // \r
-            this.button_moveLanguageUp.Image = global::Handbrake.Properties.Resources.arrow_up;\r
-            this.button_moveLanguageUp.Location = new System.Drawing.Point(348, 65);\r
-            this.button_moveLanguageUp.Name = "button_moveLanguageUp";\r
-            this.button_moveLanguageUp.Size = new System.Drawing.Size(25, 27);\r
-            this.button_moveLanguageUp.TabIndex = 101;\r
-            this.ToolTip.SetToolTip(this.button_moveLanguageUp, "Move selected languages up in the order.");\r
-            this.button_moveLanguageUp.UseVisualStyleBackColor = true;\r
-            this.button_moveLanguageUp.Click += new System.EventHandler(this.button_moveLanguageUp_Click);\r
-            // \r
-            // label40\r
-            // \r
-            this.label40.AutoSize = true;\r
-            this.label40.Location = new System.Drawing.Point(205, 7);\r
-            this.label40.Name = "label40";\r
-            this.label40.Size = new System.Drawing.Size(103, 13);\r
-            this.label40.TabIndex = 100;\r
-            this.label40.Text = "Selected Languages";\r
+            this.label43.AutoSize = true;\r
+            this.label43.Location = new System.Drawing.Point(133, 55);\r
+            this.label43.Name = "label43";\r
+            this.label43.Size = new System.Drawing.Size(43, 13);\r
+            this.label43.TabIndex = 1;\r
+            this.label43.Text = "Subtitle";\r
+            this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
             // \r
-            // label39\r
+            // label31\r
             // \r
-            this.label39.AutoSize = true;\r
-            this.label39.Location = new System.Drawing.Point(7, 7);\r
-            this.label39.Name = "label39";\r
-            this.label39.Size = new System.Drawing.Size(105, 13);\r
-            this.label39.TabIndex = 99;\r
-            this.label39.Text = "Available Languages";\r
+            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.label31.AutoSize = true;\r
+            this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label31.Location = new System.Drawing.Point(6, 8);\r
+            this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
+            this.label31.Name = "label31";\r
+            this.label31.Size = new System.Drawing.Size(230, 13);\r
+            this.label31.TabIndex = 91;\r
+            this.label31.Text = "Automatic Audio and Subtitle Selection:";\r
             // \r
             // button_clearLanguage\r
             // \r
-            this.button_clearLanguage.Location = new System.Drawing.Point(153, 155);\r
+            this.button_clearLanguage.Location = new System.Drawing.Point(147, 102);\r
             this.button_clearLanguage.Name = "button_clearLanguage";\r
             this.button_clearLanguage.Size = new System.Drawing.Size(49, 28);\r
             this.button_clearLanguage.TabIndex = 98;\r
@@ -1109,10 +788,19 @@ namespace Handbrake
             this.button_clearLanguage.UseVisualStyleBackColor = true;\r
             this.button_clearLanguage.Click += new System.EventHandler(this.button_clearLanguage_Click);\r
             // \r
+            // label15\r
+            // \r
+            this.label15.AutoSize = true;\r
+            this.label15.Location = new System.Drawing.Point(16, 35);\r
+            this.label15.Name = "label15";\r
+            this.label15.Size = new System.Drawing.Size(107, 13);\r
+            this.label15.TabIndex = 88;\r
+            this.label15.Text = "Preferred Language:";\r
+            // \r
             // button_removeLanguage\r
             // \r
             this.button_removeLanguage.Image = global::Handbrake.Properties.Resources.arrow_left;\r
-            this.button_removeLanguage.Location = new System.Drawing.Point(153, 99);\r
+            this.button_removeLanguage.Location = new System.Drawing.Point(147, 68);\r
             this.button_removeLanguage.Name = "button_removeLanguage";\r
             this.button_removeLanguage.Size = new System.Drawing.Size(49, 28);\r
             this.button_removeLanguage.TabIndex = 97;\r
@@ -1120,64 +808,11 @@ namespace Handbrake
             this.button_removeLanguage.UseVisualStyleBackColor = true;\r
             this.button_removeLanguage.Click += new System.EventHandler(this.button_removeLanguage_Click);\r
             // \r
-            // button_addLanguage\r
-            // \r
-            this.button_addLanguage.Image = global::Handbrake.Properties.Resources.arrow_right;\r
-            this.button_addLanguage.Location = new System.Drawing.Point(153, 65);\r
-            this.button_addLanguage.Name = "button_addLanguage";\r
-            this.button_addLanguage.Size = new System.Drawing.Size(49, 28);\r
-            this.button_addLanguage.TabIndex = 96;\r
-            this.ToolTip.SetToolTip(this.button_addLanguage, "Add Language to selected languages.");\r
-            this.button_addLanguage.UseVisualStyleBackColor = true;\r
-            this.button_addLanguage.Click += new System.EventHandler(this.button_addLanguage_Click);\r
-            // \r
-            // listBox_selectedLanguages\r
-            // \r
-            this.listBox_selectedLanguages.FormattingEnabled = true;\r
-            this.listBox_selectedLanguages.Location = new System.Drawing.Point(208, 23);\r
-            this.listBox_selectedLanguages.Name = "listBox_selectedLanguages";\r
-            this.listBox_selectedLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;\r
-            this.listBox_selectedLanguages.Size = new System.Drawing.Size(137, 160);\r
-            this.listBox_selectedLanguages.TabIndex = 95;\r
-            this.listBox_selectedLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_selectedLanguages_MouseDoubleClick);\r
-            // \r
-            // listBox_availableLanguages\r
-            // \r
-            this.listBox_availableLanguages.FormattingEnabled = true;\r
-            this.listBox_availableLanguages.Location = new System.Drawing.Point(10, 23);\r
-            this.listBox_availableLanguages.Name = "listBox_availableLanguages";\r
-            this.listBox_availableLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;\r
-            this.listBox_availableLanguages.Size = new System.Drawing.Size(137, 160);\r
-            this.listBox_availableLanguages.Sorted = true;\r
-            this.listBox_availableLanguages.TabIndex = 94;\r
-            this.listBox_availableLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_availableLanguages_MouseDoubleClick);\r
-            // \r
-            // label31\r
-            // \r
-            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label31.AutoSize = true;\r
-            this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label31.Location = new System.Drawing.Point(16, 8);\r
-            this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
-            this.label31.Name = "label31";\r
-            this.label31.Size = new System.Drawing.Size(52, 13);\r
-            this.label31.TabIndex = 91;\r
-            this.label31.Text = "Actions:";\r
-            // \r
-            // label15\r
-            // \r
-            this.label15.AutoSize = true;\r
-            this.label15.Location = new System.Drawing.Point(16, 35);\r
-            this.label15.Name = "label15";\r
-            this.label15.Size = new System.Drawing.Size(107, 13);\r
-            this.label15.TabIndex = 88;\r
-            this.label15.Text = "Preferred Language:";\r
-            // \r
             // drop_preferredLang\r
             // \r
             this.drop_preferredLang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_preferredLang.FormattingEnabled = true;\r
-            this.drop_preferredLang.Location = new System.Drawing.Point(19, 51);\r
+            this.drop_preferredLang.Location = new System.Drawing.Point(129, 32);\r
             this.drop_preferredLang.Name = "drop_preferredLang";\r
             this.drop_preferredLang.Size = new System.Drawing.Size(118, 21);\r
             this.drop_preferredLang.TabIndex = 87;\r
@@ -1185,6 +820,17 @@ namespace Handbrake
         "n Automatic.");\r
             this.drop_preferredLang.SelectedIndexChanged += new System.EventHandler(this.drop_preferredLang_SelectedIndexChanged);\r
             // \r
+            // button_addLanguage\r
+            // \r
+            this.button_addLanguage.Image = global::Handbrake.Properties.Resources.arrow_right;\r
+            this.button_addLanguage.Location = new System.Drawing.Point(147, 34);\r
+            this.button_addLanguage.Name = "button_addLanguage";\r
+            this.button_addLanguage.Size = new System.Drawing.Size(49, 28);\r
+            this.button_addLanguage.TabIndex = 96;\r
+            this.ToolTip.SetToolTip(this.button_addLanguage, "Add Language to selected languages.");\r
+            this.button_addLanguage.UseVisualStyleBackColor = true;\r
+            this.button_addLanguage.Click += new System.EventHandler(this.button_addLanguage_Click);\r
+            // \r
             // tab_cli\r
             // \r
             this.tab_cli.Controls.Add(this.label11);\r
@@ -1229,7 +875,7 @@ namespace Handbrake
             this.check_preventSleep.AutoSize = true;\r
             this.check_preventSleep.Location = new System.Drawing.Point(73, 45);\r
             this.check_preventSleep.Name = "check_preventSleep";\r
-            this.check_preventSleep.Size = new System.Drawing.Size(260, 17);\r
+            this.check_preventSleep.Size = new System.Drawing.Size(266, 17);\r
             this.check_preventSleep.TabIndex = 91;\r
             this.check_preventSleep.Text = "Prevent the system from sleeping when encoding.";\r
             this.ToolTip.SetToolTip(this.check_preventSleep, "Prevent system from sleeping during encoding.");\r
@@ -1242,7 +888,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;\r
             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 234);\r
             this.check_clearOldLogs.Name = "check_clearOldLogs";\r
-            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);\r
+            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);\r
             this.check_clearOldLogs.TabIndex = 90;\r
             this.check_clearOldLogs.Text = "Clear logs older than 30 days";\r
             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +\r
@@ -1337,7 +983,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;\r
             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 139);\r
             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";\r
-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);\r
+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);\r
             this.check_logsInSpecifiedLocation.TabIndex = 87;\r
             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";\r
             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");\r
@@ -1449,7 +1095,7 @@ namespace Handbrake
             this.check_showCliForInGUIEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_showCliForInGUIEncode.Location = new System.Drawing.Point(81, 129);\r
             this.check_showCliForInGUIEncode.Name = "check_showCliForInGUIEncode";\r
-            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(324, 17);\r
+            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(330, 17);\r
             this.check_showCliForInGUIEncode.TabIndex = 96;\r
             this.check_showCliForInGUIEncode.Text = "Show CLI window (Allows you to cleanly exit encode with ctrl-c)";\r
             this.ToolTip.SetToolTip(this.check_showCliForInGUIEncode, resources.GetString("check_showCliForInGUIEncode.ToolTip"));\r
@@ -1503,7 +1149,7 @@ namespace Handbrake
             this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;\r
             this.check_trayStatusAlerts.Location = new System.Drawing.Point(81, 37);\r
             this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";\r
-            this.check_trayStatusAlerts.Size = new System.Drawing.Size(288, 17);\r
+            this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);\r
             this.check_trayStatusAlerts.TabIndex = 93;\r
             this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";\r
             this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
@@ -1519,7 +1165,7 @@ namespace Handbrake
             this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
             this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);\r
             this.check_mainMinimize.Name = "check_mainMinimize";\r
-            this.check_mainMinimize.Size = new System.Drawing.Size(221, 17);\r
+            this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);\r
             this.check_mainMinimize.TabIndex = 82;\r
             this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";\r
             this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
@@ -1533,7 +1179,7 @@ namespace Handbrake
             this.check_promptOnUnmatchingQueries.AutoSize = true;\r
             this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(100, 83);\r
             this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";\r
-            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(300, 17);\r
+            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);\r
             this.check_promptOnUnmatchingQueries.TabIndex = 63;\r
             this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";\r
             this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;\r
@@ -1546,7 +1192,7 @@ namespace Handbrake
             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;\r
             this.check_dvdnav.Location = new System.Drawing.Point(82, 247);\r
             this.check_dvdnav.Name = "check_dvdnav";\r
-            this.check_dvdnav.Size = new System.Drawing.Size(277, 17);\r
+            this.check_dvdnav.Size = new System.Drawing.Size(276, 17);\r
             this.check_dvdnav.TabIndex = 90;\r
             this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";\r
             this.check_dvdnav.UseVisualStyleBackColor = false;\r
@@ -1559,7 +1205,7 @@ namespace Handbrake
             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;\r
             this.check_queryEditorTab.Location = new System.Drawing.Point(81, 60);\r
             this.check_queryEditorTab.Name = "check_queryEditorTab";\r
-            this.check_queryEditorTab.Size = new System.Drawing.Size(236, 17);\r
+            this.check_queryEditorTab.Size = new System.Drawing.Size(241, 17);\r
             this.check_queryEditorTab.TabIndex = 84;\r
             this.check_queryEditorTab.Text = "Enable \"Query Editor\" tab (Requires Restart)";\r
             this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +\r
@@ -1611,7 +1257,7 @@ namespace Handbrake
             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;\r
             this.check_disablePresetNotification.Location = new System.Drawing.Point(81, 106);\r
             this.check_disablePresetNotification.Name = "check_disablePresetNotification";\r
-            this.check_disablePresetNotification.Size = new System.Drawing.Size(216, 17);\r
+            this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);\r
             this.check_disablePresetNotification.TabIndex = 91;\r
             this.check_disablePresetNotification.Text = "Disable built-in preset update notification";\r
             this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +\r
@@ -2024,6 +1670,90 @@ namespace Handbrake
             this.pictureBox2.TabIndex = 60;\r
             this.pictureBox2.TabStop = false;\r
             // \r
+            // label46\r
+            // \r
+            this.label46.AutoSize = true;\r
+            this.label46.Location = new System.Drawing.Point(1, 3);\r
+            this.label46.Name = "label46";\r
+            this.label46.Size = new System.Drawing.Size(105, 13);\r
+            this.label46.TabIndex = 99;\r
+            this.label46.Text = "Available Languages";\r
+            // \r
+            // label47\r
+            // \r
+            this.label47.AutoSize = true;\r
+            this.label47.Location = new System.Drawing.Point(199, 3);\r
+            this.label47.Name = "label47";\r
+            this.label47.Size = new System.Drawing.Size(103, 13);\r
+            this.label47.TabIndex = 100;\r
+            this.label47.Text = "Selected Languages";\r
+            // \r
+            // audioSelectionPanel\r
+            // \r
+            this.audioSelectionPanel.Controls.Add(this.label46);\r
+            this.audioSelectionPanel.Controls.Add(this.listBox_selectedLanguages);\r
+            this.audioSelectionPanel.Controls.Add(this.button_moveLanguageDown);\r
+            this.audioSelectionPanel.Controls.Add(this.listBox_availableLanguages);\r
+            this.audioSelectionPanel.Controls.Add(this.button_addLanguage);\r
+            this.audioSelectionPanel.Controls.Add(this.button_moveLanguageUp);\r
+            this.audioSelectionPanel.Controls.Add(this.label47);\r
+            this.audioSelectionPanel.Controls.Add(this.button_removeLanguage);\r
+            this.audioSelectionPanel.Controls.Add(this.button_clearLanguage);\r
+            this.audioSelectionPanel.Location = new System.Drawing.Point(125, 59);\r
+            this.audioSelectionPanel.Name = "audioSelectionPanel";\r
+            this.audioSelectionPanel.Size = new System.Drawing.Size(381, 166);\r
+            this.audioSelectionPanel.TabIndex = 108;\r
+            // \r
+            // listBox_availableLanguages\r
+            // \r
+            this.listBox_availableLanguages.Location = new System.Drawing.Point(4, 19);\r
+            this.listBox_availableLanguages.Name = "listBox_availableLanguages";\r
+            this.listBox_availableLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;\r
+            this.listBox_availableLanguages.Size = new System.Drawing.Size(137, 134);\r
+            this.listBox_availableLanguages.Sorted = true;\r
+            this.listBox_availableLanguages.TabIndex = 94;\r
+            this.listBox_availableLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_availableLanguages_MouseDoubleClick);\r
+            // \r
+            // listBox_selectedLanguages\r
+            // \r
+            this.listBox_selectedLanguages.Location = new System.Drawing.Point(202, 19);\r
+            this.listBox_selectedLanguages.Name = "listBox_selectedLanguages";\r
+            this.listBox_selectedLanguages.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;\r
+            this.listBox_selectedLanguages.Size = new System.Drawing.Size(137, 134);\r
+            this.listBox_selectedLanguages.TabIndex = 95;\r
+            this.listBox_selectedLanguages.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox_selectedLanguages_MouseDoubleClick);\r
+            // \r
+            // button_moveLanguageDown\r
+            // \r
+            this.button_moveLanguageDown.Image = global::Handbrake.Properties.Resources.arrow_down;\r
+            this.button_moveLanguageDown.Location = new System.Drawing.Point(345, 90);\r
+            this.button_moveLanguageDown.Name = "button_moveLanguageDown";\r
+            this.button_moveLanguageDown.Size = new System.Drawing.Size(25, 27);\r
+            this.button_moveLanguageDown.TabIndex = 102;\r
+            this.ToolTip.SetToolTip(this.button_moveLanguageDown, "Move selected languages down in the order.");\r
+            this.button_moveLanguageDown.UseVisualStyleBackColor = true;\r
+            this.button_moveLanguageDown.Click += new System.EventHandler(this.button_moveLanguageDown_Click);\r
+            // \r
+            // button_moveLanguageUp\r
+            // \r
+            this.button_moveLanguageUp.Image = global::Handbrake.Properties.Resources.arrow_up;\r
+            this.button_moveLanguageUp.Location = new System.Drawing.Point(345, 57);\r
+            this.button_moveLanguageUp.Name = "button_moveLanguageUp";\r
+            this.button_moveLanguageUp.Size = new System.Drawing.Size(25, 27);\r
+            this.button_moveLanguageUp.TabIndex = 101;\r
+            this.ToolTip.SetToolTip(this.button_moveLanguageUp, "Move selected languages up in the order.");\r
+            this.button_moveLanguageUp.UseVisualStyleBackColor = true;\r
+            this.button_moveLanguageUp.Click += new System.EventHandler(this.button_moveLanguageUp_Click);\r
+            // \r
+            // label39\r
+            // \r
+            this.label39.AutoSize = true;\r
+            this.label39.Location = new System.Drawing.Point(16, 62);\r
+            this.label39.Name = "label39";\r
+            this.label39.Size = new System.Drawing.Size(92, 13);\r
+            this.label39.TabIndex = 109;\r
+            this.label39.Text = "Additional Tracks:";\r
+            // \r
             // frmOptions\r
             // \r
             this.AcceptButton = this.btn_close;\r
@@ -2054,20 +1784,8 @@ namespace Handbrake
             this.tab_picture.PerformLayout();\r
             this.tab_audio_sub.ResumeLayout(false);\r
             this.tab_audio_sub.PerformLayout();\r
-            this.groupBox3.ResumeLayout(false);\r
-            this.groupBox3.PerformLayout();\r
             this.groupBox2.ResumeLayout(false);\r
-            this.tableLayoutPanel1.ResumeLayout(false);\r
-            this.tableLayoutPanel1.PerformLayout();\r
-            this.tableLayoutPanel2.ResumeLayout(false);\r
-            this.tableLayoutPanel2.PerformLayout();\r
-            this.tableLayoutPanel4.ResumeLayout(false);\r
-            this.tableLayoutPanel4.PerformLayout();\r
-            this.tableLayoutPanel3.ResumeLayout(false);\r
-            this.tableLayoutPanel3.PerformLayout();\r
-            this.groupBox1.ResumeLayout(false);\r
-            this.panel3.ResumeLayout(false);\r
-            this.panel3.PerformLayout();\r
+            this.groupBox2.PerformLayout();\r
             this.tab_cli.ResumeLayout(false);\r
             this.tab_cli.PerformLayout();\r
             this.tab_advanced.ResumeLayout(false);\r
@@ -2075,6 +1793,8 @@ namespace Handbrake
             this.panel1.ResumeLayout(false);\r
             this.panel1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
+            this.audioSelectionPanel.ResumeLayout(false);\r
+            this.audioSelectionPanel.PerformLayout();\r
             this.ResumeLayout(false);\r
 \r
         }\r
@@ -2177,7 +1897,6 @@ namespace Handbrake
         private System.Windows.Forms.Label label11;\r
         private System.Windows.Forms.Panel panel1;\r
         private System.Windows.Forms.Panel panel2;\r
-        private System.Windows.Forms.CheckBox check_AddCCTracks;\r
         private System.Windows.Forms.Label label34;\r
         internal System.Windows.Forms.Label label35;\r
         internal System.Windows.Forms.ComboBox cb_mp4FileMode;\r
@@ -2189,41 +1908,26 @@ namespace Handbrake
         private System.Windows.Forms.TabPage tab_outputFiles;\r
         private System.Windows.Forms.Label label38;\r
         private System.Windows.Forms.TextBox txt_SendFileArgs;\r
-        private System.Windows.Forms.Panel panel3;\r
-        private System.Windows.Forms.Label label40;\r
-        private System.Windows.Forms.Label label39;\r
         private System.Windows.Forms.Button button_clearLanguage;\r
         private System.Windows.Forms.Button button_removeLanguage;\r
         private System.Windows.Forms.Button button_addLanguage;\r
-        private System.Windows.Forms.ListBox listBox_selectedLanguages;\r
-        private System.Windows.Forms.ListBox listBox_availableLanguages;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
+        private System.Windows.Forms.GroupBox groupBox2;\r
+        private System.Windows.Forms.ComboBox cb_subtitleMode;\r
+        private System.Windows.Forms.ComboBox cb_audioMode;\r
         private System.Windows.Forms.Label label42;\r
+        private System.Windows.Forms.CheckBox check_AddOnlyOneAudioPerLanguage;\r
+        private System.Windows.Forms.CheckBox check_AddCCTracks;\r
         private System.Windows.Forms.Label label43;\r
         private System.Windows.Forms.Label label44;\r
+        private System.Windows.Forms.Label label41;\r
         private System.Windows.Forms.Label label45;\r
+        private System.Windows.Forms.Panel audioSelectionPanel;\r
         private System.Windows.Forms.Label label46;\r
         private System.Windows.Forms.Label label47;\r
-        private System.Windows.Forms.RadioButton radio_Audio_PrefOnly;\r
-        private System.Windows.Forms.GroupBox groupBox1;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
-        private System.Windows.Forms.RadioButton radio_Audio_Selected;\r
-        private System.Windows.Forms.RadioButton radio_Audio_First;\r
-        private System.Windows.Forms.RadioButton radio_Audio_All;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;\r
-        private System.Windows.Forms.RadioButton radio_Subtitle_PrefOnly;\r
-        private System.Windows.Forms.RadioButton radio_Subtitle_Selected;\r
-        private System.Windows.Forms.RadioButton radio_Subtitle_First;\r
-        private System.Windows.Forms.RadioButton radio_Subtitle_All;\r
-        private System.Windows.Forms.CheckBox check_AddOnlyOneAudioPerLanguage;\r
-        private System.Windows.Forms.GroupBox groupBox2;\r
-        private System.Windows.Forms.RadioButton radio_Audio_None;\r
-        private System.Windows.Forms.Label label41;\r
-        private System.Windows.Forms.RadioButton radio_Subtitle_None;\r
-        private System.Windows.Forms.Button button_moveLanguageUp;\r
+        private System.Windows.Forms.ListBox listBox_selectedLanguages;\r
         private System.Windows.Forms.Button button_moveLanguageDown;\r
-        private System.Windows.Forms.GroupBox groupBox3;\r
-        private System.Windows.Forms.Label label48;\r
+        private System.Windows.Forms.ListBox listBox_availableLanguages;\r
+        private System.Windows.Forms.Button button_moveLanguageUp;\r
+        private System.Windows.Forms.Label label39;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/CS/frmOptions.cs b/win/CS/frmOptions.cs
index b216b9d2eaf395273c7edf74075f9effae062dae..2a3be77ba5be6723ac4dd9b8e83c2daa0951ca81 100644 (file)
--- a/win/CS/frmOptions.cs
+++ b/win/CS/frmOptions.cs
@@ -39,7 +39,7 @@ namespace Handbrake
             foreach (string selectedItem in Properties.Settings.Default.SelectedLanguages)\r
             {\r
                 // removing wrong keys when a new Language list comes out.\r
-                if(langList.ContainsKey(selectedItem))\r
+                if (langList.ContainsKey(selectedItem))\r
                     listBox_selectedLanguages.Items.Add(selectedItem);\r
             }\r
 \r
@@ -50,7 +50,7 @@ namespace Handbrake
                 // In the available languages should be no "Any" and no selected language.\r
                 if ((item != "Any") && (!Properties.Settings.Default.SelectedLanguages.Contains(item)))\r
                 {\r
-                        listBox_availableLanguages.Items.Add(item);\r
+                    listBox_availableLanguages.Items.Add(item);\r
                 }\r
             }\r
 \r
@@ -165,52 +165,11 @@ namespace Handbrake
                 }\r
             }\r
 \r
-            switch (Settings.Default.DubModeAudio)\r
-            {\r
-                case 0:\r
-                    radio_Audio_None.Checked = true;\r
-                    break;\r
-                case 1:\r
-                    radio_Audio_All.Checked = true;\r
-                    break;\r
-                case 2:\r
-                    radio_Audio_First.Checked = true;\r
-                    break;\r
-                case 3:\r
-                    radio_Audio_Selected.Checked = true;\r
-                    break;\r
-                case 4:\r
-                    radio_Audio_PrefOnly.Checked = true;\r
-                    break;\r
-                default:\r
-                    radio_Audio_None.Checked = true;\r
-                    break;\r
-            }\r
-\r
-            switch (Settings.Default.DubModeSubtitle)\r
-            {\r
-                case 0:\r
-                    radio_Subtitle_None.Checked = true;\r
-                    break;\r
-                case 1:\r
-                    radio_Subtitle_All.Checked = true;\r
-                    break;\r
-                case 2:\r
-                    radio_Subtitle_First.Checked = true;\r
-                    break;\r
-                case 3:\r
-                    radio_Subtitle_Selected.Checked = true;\r
-                    break;\r
-                case 4:\r
-                    radio_Subtitle_PrefOnly.Checked = true;\r
-                    break;\r
-                default:\r
-                    radio_Subtitle_None.Checked = true;\r
-                    break;\r
-            }\r
+            cb_audioMode.SelectedIndex = Settings.Default.DubModeAudio;\r
+            cb_subtitleMode.SelectedIndex = Settings.Default.DubModeSubtitle;\r
 \r
             check_AddOnlyOneAudioPerLanguage.Checked = Properties.Settings.Default.addOnlyOneAudioPerLanguage;\r
-            \r
+\r
             check_AddCCTracks.Checked = Properties.Settings.Default.useClosedCaption;\r
 \r
             // #############################\r
@@ -435,19 +394,23 @@ namespace Handbrake
 \r
         private void drop_preferredLang_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.NativeLanguage = drop_preferredLang.SelectedItem.ToString();\r
+            Settings.Default.NativeLanguage = drop_preferredLang.SelectedItem.ToString();\r
 \r
-            if (Properties.Settings.Default.NativeLanguage == "Any")\r
+            if (Settings.Default.NativeLanguage == "Any")\r
             {\r
-                this.groupBox1.Enabled = false;\r
-                this.groupBox2.Enabled = false;\r
-                this.groupBox3.Visible = true;\r
+                cb_audioMode.Enabled = false;\r
+                cb_subtitleMode.Enabled = false;\r
+                check_AddOnlyOneAudioPerLanguage.Enabled = false;\r
+\r
+                audioSelectionPanel.Enabled = false;\r
             }\r
             else\r
-            {   \r
-                this.groupBox1.Enabled = true;\r
-                this.groupBox2.Enabled = true;\r
-                this.groupBox3.Visible = false;\r
+            {\r
+                cb_audioMode.Enabled = true;\r
+                cb_subtitleMode.Enabled = true;\r
+                check_AddOnlyOneAudioPerLanguage.Enabled = true;\r
+\r
+                audioSelectionPanel.Enabled = true;\r
             }\r
         }\r
 \r
@@ -538,7 +501,7 @@ namespace Handbrake
                         Properties.Settings.Default.SelectedLanguages.Insert(ilevel - 1, lvitem);\r
                     }\r
                 }\r
-            }         \r
+            }\r
         }\r
 \r
         private void button_moveLanguageDown_Click(object sender, EventArgs e)\r
@@ -552,7 +515,7 @@ namespace Handbrake
                 for (int i = 0; i < selectedItems.Count; i++)\r
                     index_selectedItems[i] = selectedItems[i];\r
 \r
-                for (int i = index_selectedItems.Length - 1; i >= 0 ; i--)\r
+                for (int i = index_selectedItems.Length - 1; i >= 0; i--)\r
                 {\r
                     ilevel = index_selectedItems[i];\r
 \r
@@ -568,7 +531,7 @@ namespace Handbrake
                         Properties.Settings.Default.SelectedLanguages.Insert(ilevel + 1, lvitem);\r
                     }\r
                 }\r
-            }          \r
+            }\r
         }\r
 \r
         private void listBox_selectedLanguages_MouseDoubleClick(object sender, MouseEventArgs e)\r
@@ -581,74 +544,24 @@ namespace Handbrake
             this.button_addLanguage_Click(this, new EventArgs());\r
         }\r
 \r
-        private void radio_Audio_None_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Audio_None.Checked)\r
-                Properties.Settings.Default.DubModeAudio = 0;\r
-        }\r
-\r
-        private void radio_Audio_All_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Audio_All.Checked)\r
-                Properties.Settings.Default.DubModeAudio = 1;\r
-        }\r
-\r
-        private void radio_Audio_First_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Audio_First.Checked)\r
-                Properties.Settings.Default.DubModeAudio = 2;\r
-        }\r
-\r
-        private void radio_Audio_Selected_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Audio_Selected.Checked)\r
-                Properties.Settings.Default.DubModeAudio = 3;\r
-        }\r
-\r
-        private void radio_Audio_PrefOnly_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Audio_PrefOnly.Checked)\r
-                Properties.Settings.Default.DubModeAudio = 4;\r
-        }\r
-\r
-        private void radio_Subtitle_None_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Subtitle_None.Checked)\r
-                Properties.Settings.Default.DubModeSubtitle = 0;\r
-        }\r
-\r
-        private void radio_Subtitle_All_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Subtitle_All.Checked)\r
-                Properties.Settings.Default.DubModeSubtitle = 1;\r
-        }\r
-\r
-        private void radio_Subtitle_First_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (radio_Subtitle_First.Checked)\r
-                Properties.Settings.Default.DubModeSubtitle = 2;\r
-        }\r
-\r
-        private void radio_Subtitle_Selected_CheckedChanged(object sender, EventArgs e)\r
+        private void check_AddOnlyOneAudioPerLanguage_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (radio_Subtitle_Selected.Checked)\r
-                Properties.Settings.Default.DubModeSubtitle = 3;\r
+            Settings.Default.addOnlyOneAudioPerLanguage = check_AddOnlyOneAudioPerLanguage.Checked;\r
         }\r
 \r
-        private void radio_Subtitle_PrefOnly_CheckedChanged(object sender, EventArgs e)\r
+        private void check_AddCCTracks_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (radio_Subtitle_PrefOnly.Checked)\r
-                Properties.Settings.Default.DubModeSubtitle = 4;\r
+            Settings.Default.useClosedCaption = check_AddCCTracks.Checked;\r
         }\r
 \r
-        private void check_AddOnlyOneAudioPerLanguage_CheckedChanged(object sender, EventArgs e)\r
+        private void cb_audioMode_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            Settings.Default.addOnlyOneAudioPerLanguage = check_AddOnlyOneAudioPerLanguage.Checked;\r
+            Settings.Default.DubModeAudio = cb_audioMode.SelectedIndex;\r
         }\r
 \r
-        private void check_AddCCTracks_CheckedChanged(object sender, EventArgs e)\r
+        private void cb_subtitleMode_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            Settings.Default.useClosedCaption = check_AddCCTracks.Checked;\r
+            Settings.Default.DubModeSubtitle = cb_subtitleMode.SelectedIndex;\r
         }\r
 \r
         #endregion\r

diff --git a/win/CS/frmOptions.resx b/win/CS/frmOptions.resx
index ce774a25a1a9c404dfc82ec520d44ebda8016a2d..fe821ebd247460ce26a723a66548a852d0bb19d1 100644 (file)
--- a/win/CS/frmOptions.resx
+++ b/win/CS/frmOptions.resx
@@ -120,6 +120,23 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
+  <data name="cb_subtitleMode.ToolTip" xml:space="preserve">\r
+    <value>"All" - all languages available in original order; \r
+"Selected" - The Preferred and the extra selected languages; \r
+"Only Preferred" - Only the Preferred language; \r
+"First" - The first available;\r
+"None" - No language selected;</value>\r
+  </data>\r
+  <data name="cb_audioMode.ToolTip" xml:space="preserve">\r
+    <value>"All" - all languages available in original order; \r
+"Selected" - The Preferred and the extra selected languages; \r
+"Only Preferred" - Only the Preferred language; \r
+"First" - The first available;\r
+"None" - No language selected;</value>\r
+  </data>\r
   <data name="cb_mp4FileMode.ToolTip" xml:space="preserve">\r
     <value>The default file extension for MP4 Files.\r
 Automatic   - This will use M4v when AC3 Audio, SRT Subtitles or Chapters are present, otherwise MP4.\r
@@ -142,6 +159,9 @@ You can insert this anywhere in your path. e.g.  c:\movies\{source_folder_name}
 It will substitute the name of the folder where the source is located.\r
 Note, this can't be used with the {source_path} option!</value>\r
   </data>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
   <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">\r
     <value>Shows the CLI window when encoding.\r
 You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c\r