OSDN Git Service

LinGui: make Help->Guide work on windows/mingw
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmOptions.Designer.cs
index 5e9e23f..1f22786 100644 (file)
@@ -1,8 +1,7 @@
 /*  frmOptions.Designer.cs \r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r
 {\r
@@ -40,6 +39,8 @@ namespace Handbrake
             this.drp_completeOption = new System.Windows.Forms.ComboBox();\r
             this.tab_options = new System.Windows.Forms.TabControl();\r
             this.tab_general = new System.Windows.Forms.TabPage();\r
+            this.check_TitleCase = new System.Windows.Forms.CheckBox();\r
+            this.check_removeUnderscores = new System.Windows.Forms.CheckBox();\r
             this.check_growlEncode = new System.Windows.Forms.CheckBox();\r
             this.check_GrowlQueue = new System.Windows.Forms.CheckBox();\r
             this.check_m4v = new System.Windows.Forms.CheckBox();\r
@@ -68,36 +69,36 @@ namespace Handbrake
             this.drop_preferredLang = new System.Windows.Forms.ComboBox();\r
             this.radio_dub = new System.Windows.Forms.RadioButton();\r
             this.tab_cli = new System.Windows.Forms.TabPage();\r
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.check_clearOldLogs = new System.Windows.Forms.CheckBox();\r
             this.label12 = new System.Windows.Forms.Label();\r
             this.check_cli_minimized = new System.Windows.Forms.CheckBox();\r
+            this.btn_viewLogs = new System.Windows.Forms.Button();\r
             this.label9 = new System.Windows.Forms.Label();\r
-            this.btn_saveLog = new System.Windows.Forms.Button();\r
+            this.Label4 = new System.Windows.Forms.Label();\r
+            this.btn_clearLogs = new System.Windows.Forms.Button();\r
+            this.drp_Priority = new System.Windows.Forms.ComboBox();\r
             this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();\r
-            this.Label11 = new System.Windows.Forms.Label();\r
             this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();\r
-            this.Label4 = new System.Windows.Forms.Label();\r
             this.label3 = new System.Windows.Forms.Label();\r
-            this.text_logPath = new System.Windows.Forms.TextBox();\r
+            this.btn_saveLog = new System.Windows.Forms.Button();\r
             this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();\r
-            this.drp_Priority = new System.Windows.Forms.ComboBox();\r
-            this.drp_processors = new System.Windows.Forms.ComboBox();\r
-            this.btn_viewLogs = new System.Windows.Forms.Button();\r
-            this.btn_clearLogs = new System.Windows.Forms.Button();\r
+            this.text_logPath = new System.Windows.Forms.TextBox();\r
             this.label14 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
-            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.check_showCliForInGUIEncode = new System.Windows.Forms.CheckBox();\r
+            this.drop_previewScanCount = new System.Windows.Forms.ComboBox();\r
+            this.label33 = new System.Windows.Forms.Label();\r
+            this.label6 = new System.Windows.Forms.Label();\r
+            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();\r
+            this.check_mainMinimize = new System.Windows.Forms.CheckBox();\r
             this.check_promptOnUnmatchingQueries = new System.Windows.Forms.CheckBox();\r
             this.check_dvdnav = new System.Windows.Forms.CheckBox();\r
-            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();\r
+            this.check_queryEditorTab = new System.Windows.Forms.CheckBox();\r
             this.label32 = new System.Windows.Forms.Label();\r
-            this.label6 = new System.Windows.Forms.Label();\r
             this.drop_x264step = new System.Windows.Forms.ComboBox();\r
             this.label30 = new System.Windows.Forms.Label();\r
-            this.check_mainMinimize = new System.Windows.Forms.CheckBox();\r
-            this.label28 = new System.Windows.Forms.Label();\r
-            this.check_queryEditorTab = new System.Windows.Forms.CheckBox();\r
             this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();\r
+            this.label28 = new System.Windows.Forms.Label();\r
             this.check_inGuiStatus = new System.Windows.Forms.CheckBox();\r
             this.tab_debug = new System.Windows.Forms.TabPage();\r
             this.check_disableResCalc = new System.Windows.Forms.CheckBox();\r
@@ -141,9 +142,7 @@ namespace Handbrake
             this.tableLayoutPanel2.SuspendLayout();\r
             this.tab_audio_sub.SuspendLayout();\r
             this.tab_cli.SuspendLayout();\r
-            this.tableLayoutPanel3.SuspendLayout();\r
             this.tab_advanced.SuspendLayout();\r
-            this.tableLayoutPanel4.SuspendLayout();\r
             this.tab_debug.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
             this.tableLayoutPanel5.SuspendLayout();\r
@@ -202,6 +201,8 @@ namespace Handbrake
             // \r
             // tab_general\r
             // \r
+            this.tab_general.Controls.Add(this.check_TitleCase);\r
+            this.tab_general.Controls.Add(this.check_removeUnderscores);\r
             this.tab_general.Controls.Add(this.check_growlEncode);\r
             this.tab_general.Controls.Add(this.check_GrowlQueue);\r
             this.tab_general.Controls.Add(this.check_m4v);\r
@@ -227,6 +228,33 @@ namespace Handbrake
             this.tab_general.Text = "General";\r
             this.tab_general.UseVisualStyleBackColor = true;\r
             // \r
+            // check_TitleCase\r
+            // \r
+            this.check_TitleCase.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_TitleCase.AutoSize = true;\r
+            this.check_TitleCase.Location = new System.Drawing.Point(297, 279);\r
+            this.check_TitleCase.Name = "check_TitleCase";\r
+            this.check_TitleCase.Size = new System.Drawing.Size(151, 17);\r
+            this.check_TitleCase.TabIndex = 101;\r
+            this.check_TitleCase.Text = "Change case to Title Case";\r
+            this.ToolTip.SetToolTip(this.check_TitleCase, "For the {source} option:.\r\nChange the source name to Title Case\r\ne.g \"MOVIE NAME\"" +\r
+                    " to \"Movie Name\"\r\n");\r
+            this.check_TitleCase.UseVisualStyleBackColor = true;\r
+            this.check_TitleCase.CheckedChanged += new System.EventHandler(this.check_TitleCase_CheckedChanged);\r
+            // \r
+            // check_removeUnderscores\r
+            // \r
+            this.check_removeUnderscores.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_removeUnderscores.AutoSize = true;\r
+            this.check_removeUnderscores.Location = new System.Drawing.Point(108, 279);\r
+            this.check_removeUnderscores.Name = "check_removeUnderscores";\r
+            this.check_removeUnderscores.Size = new System.Drawing.Size(183, 17);\r
+            this.check_removeUnderscores.TabIndex = 100;\r
+            this.check_removeUnderscores.Text = "Remove Underscores from Name";\r
+            this.ToolTip.SetToolTip(this.check_removeUnderscores, "For the {source} option:\r\nRemove any underscores from the source name.\r\n\r\n");\r
+            this.check_removeUnderscores.UseVisualStyleBackColor = true;\r
+            this.check_removeUnderscores.CheckedChanged += new System.EventHandler(this.check_removeUnderscores_CheckedChanged);\r
+            // \r
             // check_growlEncode\r
             // \r
             this.check_growlEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
@@ -261,12 +289,11 @@ namespace Handbrake
             // \r
             this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_m4v.AutoSize = true;\r
-            this.check_m4v.Location = new System.Drawing.Point(108, 279);\r
+            this.check_m4v.Location = new System.Drawing.Point(108, 303);\r
             this.check_m4v.Name = "check_m4v";\r
-            this.check_m4v.Size = new System.Drawing.Size(423, 17);\r
+            this.check_m4v.Size = new System.Drawing.Size(319, 17);\r
             this.check_m4v.TabIndex = 82;\r
-            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4 (See tooltip for more deta" +\r
-                "ils)";\r
+            this.check_m4v.Text = "Always use iPod/iTunes friendly file extension (.m4v) for MP4";\r
             this.ToolTip.SetToolTip(this.check_m4v, resources.GetString("check_m4v.ToolTip"));\r
             this.check_m4v.UseVisualStyleBackColor = true;\r
             this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);\r
@@ -543,7 +570,7 @@ namespace Handbrake
             this.radio_foreignAndSubs.AutoSize = true;\r
             this.radio_foreignAndSubs.Location = new System.Drawing.Point(200, 76);\r
             this.radio_foreignAndSubs.Name = "radio_foreignAndSubs";\r
-            this.radio_foreignAndSubs.Size = new System.Drawing.Size(358, 17);\r
+            this.radio_foreignAndSubs.Size = new System.Drawing.Size(347, 17);\r
             this.radio_foreignAndSubs.TabIndex = 90;\r
             this.radio_foreignAndSubs.TabStop = true;\r
             this.radio_foreignAndSubs.Text = "Use foreign language audio and add first preferred language subtitle.";\r
@@ -568,7 +595,7 @@ namespace Handbrake
             this.radio_dub.AutoSize = true;\r
             this.radio_dub.Location = new System.Drawing.Point(200, 53);\r
             this.radio_dub.Name = "radio_dub";\r
-            this.radio_dub.Size = new System.Drawing.Size(164, 17);\r
+            this.radio_dub.Size = new System.Drawing.Size(167, 17);\r
             this.radio_dub.TabIndex = 89;\r
             this.radio_dub.TabStop = true;\r
             this.radio_dub.Text = "DUB Foreign Language Audio";\r
@@ -579,7 +606,21 @@ namespace Handbrake
             // \r
             // tab_cli\r
             // \r
-            this.tab_cli.Controls.Add(this.tableLayoutPanel3);\r
+            this.tab_cli.Controls.Add(this.check_clearOldLogs);\r
+            this.tab_cli.Controls.Add(this.label12);\r
+            this.tab_cli.Controls.Add(this.check_cli_minimized);\r
+            this.tab_cli.Controls.Add(this.btn_viewLogs);\r
+            this.tab_cli.Controls.Add(this.label9);\r
+            this.tab_cli.Controls.Add(this.Label4);\r
+            this.tab_cli.Controls.Add(this.btn_clearLogs);\r
+            this.tab_cli.Controls.Add(this.drp_Priority);\r
+            this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);\r
+            this.tab_cli.Controls.Add(this.check_saveLogWithVideo);\r
+            this.tab_cli.Controls.Add(this.label3);\r
+            this.tab_cli.Controls.Add(this.btn_saveLog);\r
+            this.tab_cli.Controls.Add(this.cb_logVerboseLvl);\r
+            this.tab_cli.Controls.Add(this.text_logPath);\r
+            this.tab_cli.Controls.Add(this.label14);\r
             this.tab_cli.Location = new System.Drawing.Point(4, 22);\r
             this.tab_cli.Name = "tab_cli";\r
             this.tab_cli.Padding = new System.Windows.Forms.Padding(10);\r
@@ -588,59 +629,28 @@ namespace Handbrake
             this.tab_cli.Text = "CLI";\r
             this.tab_cli.UseVisualStyleBackColor = true;\r
             // \r
-            // tableLayoutPanel3\r
-            // \r
-            this.tableLayoutPanel3.AutoSize = true;\r
-            this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.tableLayoutPanel3.ColumnCount = 7;\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel3.Controls.Add(this.label12, 0, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.check_cli_minimized, 2, 0);\r
-            this.tableLayoutPanel3.Controls.Add(this.label9, 0, 4);\r
-            this.tableLayoutPanel3.Controls.Add(this.btn_saveLog, 6, 7);\r
-            this.tableLayoutPanel3.Controls.Add(this.check_logsInSpecifiedLocation, 2, 6);\r
-            this.tableLayoutPanel3.Controls.Add(this.Label11, 2, 1);\r
-            this.tableLayoutPanel3.Controls.Add(this.check_saveLogWithVideo, 2, 5);\r
-            this.tableLayoutPanel3.Controls.Add(this.Label4, 2, 2);\r
-            this.tableLayoutPanel3.Controls.Add(this.label3, 2, 4);\r
-            this.tableLayoutPanel3.Controls.Add(this.text_logPath, 3, 7);\r
-            this.tableLayoutPanel3.Controls.Add(this.cb_logVerboseLvl, 3, 4);\r
-            this.tableLayoutPanel3.Controls.Add(this.drp_Priority, 3, 2);\r
-            this.tableLayoutPanel3.Controls.Add(this.drp_processors, 3, 1);\r
-            this.tableLayoutPanel3.Controls.Add(this.btn_viewLogs, 2, 8);\r
-            this.tableLayoutPanel3.Controls.Add(this.btn_clearLogs, 4, 8);\r
-            this.tableLayoutPanel3.Controls.Add(this.label14, 2, 7);\r
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 10);\r
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";\r
-            this.tableLayoutPanel3.RowCount = 10;\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(560, 227);\r
-            this.tableLayoutPanel3.TabIndex = 62;\r
+            // check_clearOldLogs\r
+            // \r
+            this.check_clearOldLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_clearOldLogs.AutoSize = true;\r
+            this.check_clearOldLogs.Location = new System.Drawing.Point(73, 226);\r
+            this.check_clearOldLogs.Name = "check_clearOldLogs";\r
+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 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
+                    "tion Data Log folder.");\r
+            this.check_clearOldLogs.UseVisualStyleBackColor = true;\r
+            this.check_clearOldLogs.CheckedChanged += new System.EventHandler(this.check_clearOldLogs_CheckedChanged);\r
             // \r
             // label12\r
             // \r
             this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label12.AutoSize = true;\r
             this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label12.Location = new System.Drawing.Point(11, 5);\r
+            this.label12.Location = new System.Drawing.Point(15, 15);\r
             this.label12.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
             this.label12.Name = "label12";\r
-            this.tableLayoutPanel3.SetRowSpan(this.label12, 2);\r
             this.label12.Size = new System.Drawing.Size(28, 13);\r
             this.label12.TabIndex = 75;\r
             this.label12.Text = "CLI:";\r
@@ -649,74 +659,102 @@ namespace Handbrake
             // \r
             this.check_cli_minimized.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_cli_minimized.AutoSize = true;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.check_cli_minimized, 5);\r
-            this.check_cli_minimized.Location = new System.Drawing.Point(65, 3);\r
+            this.check_cli_minimized.Location = new System.Drawing.Point(73, 14);\r
             this.check_cli_minimized.Name = "check_cli_minimized";\r
-            this.check_cli_minimized.Size = new System.Drawing.Size(137, 17);\r
+            this.check_cli_minimized.Size = new System.Drawing.Size(135, 17);\r
             this.check_cli_minimized.TabIndex = 76;\r
             this.check_cli_minimized.Text = "Start window minimized";\r
             this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");\r
             this.check_cli_minimized.UseVisualStyleBackColor = true;\r
             this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);\r
             // \r
+            // btn_viewLogs\r
+            // \r
+            this.btn_viewLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.btn_viewLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;\r
+            this.btn_viewLogs.Location = new System.Drawing.Point(129, 188);\r
+            this.btn_viewLogs.Name = "btn_viewLogs";\r
+            this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);\r
+            this.btn_viewLogs.TabIndex = 89;\r
+            this.btn_viewLogs.Text = "View Log Directory";\r
+            this.btn_viewLogs.UseVisualStyleBackColor = true;\r
+            this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);\r
+            // \r
             // label9\r
             // \r
             this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label9.AutoSize = true;\r
             this.label9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label9.Location = new System.Drawing.Point(3, 102);\r
+            this.label9.Location = new System.Drawing.Point(7, 84);\r
             this.label9.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
             this.label9.Name = "label9";\r
-            this.tableLayoutPanel3.SetRowSpan(this.label9, 2);\r
             this.label9.Size = new System.Drawing.Size(36, 13);\r
             this.label9.TabIndex = 77;\r
             this.label9.Text = "Logs:";\r
             // \r
-            // btn_saveLog\r
+            // Label4\r
             // \r
-            this.btn_saveLog.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_saveLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_saveLog.Location = new System.Drawing.Point(480, 173);\r
-            this.btn_saveLog.Name = "btn_saveLog";\r
-            this.btn_saveLog.Size = new System.Drawing.Size(77, 22);\r
-            this.btn_saveLog.TabIndex = 82;\r
-            this.btn_saveLog.Text = "Browse";\r
-            this.btn_saveLog.UseVisualStyleBackColor = true;\r
-            this.btn_saveLog.Click += new System.EventHandler(this.btn_saveLog_Click);\r
+            this.Label4.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.Label4.AutoSize = true;\r
+            this.Label4.BackColor = System.Drawing.Color.Transparent;\r
+            this.Label4.Location = new System.Drawing.Point(70, 45);\r
+            this.Label4.Name = "Label4";\r
+            this.Label4.Size = new System.Drawing.Size(70, 13);\r
+            this.Label4.TabIndex = 42;\r
+            this.Label4.Text = "Priority level:";\r
+            // \r
+            // btn_clearLogs\r
+            // \r
+            this.btn_clearLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.btn_clearLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;\r
+            this.btn_clearLogs.Location = new System.Drawing.Point(274, 188);\r
+            this.btn_clearLogs.Name = "btn_clearLogs";\r
+            this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);\r
+            this.btn_clearLogs.TabIndex = 88;\r
+            this.btn_clearLogs.Text = "Clear Log History";\r
+            this.btn_clearLogs.UseVisualStyleBackColor = true;\r
+            this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);\r
+            // \r
+            // drp_Priority\r
+            // \r
+            this.drp_Priority.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.drp_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_Priority.FormattingEnabled = true;\r
+            this.drp_Priority.Items.AddRange(new object[] {\r
+            "Realtime",\r
+            "High",\r
+            "Above Normal",\r
+            "Normal",\r
+            "Below Normal",\r
+            "Low"});\r
+            this.drp_Priority.Location = new System.Drawing.Point(177, 42);\r
+            this.drp_Priority.Name = "drp_Priority";\r
+            this.drp_Priority.Size = new System.Drawing.Size(111, 21);\r
+            this.drp_Priority.TabIndex = 43;\r
+            this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" +\r
+                    "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");\r
+            this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);\r
             // \r
             // check_logsInSpecifiedLocation\r
             // \r
             this.check_logsInSpecifiedLocation.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_logsInSpecifiedLocation.AutoSize = true;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.check_logsInSpecifiedLocation, 5);\r
-            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(65, 150);\r
+            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 131);\r
             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";\r
-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);\r
+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 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
             this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;\r
             this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);\r
             // \r
-            // Label11\r
-            // \r
-            this.Label11.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.Label11.AutoSize = true;\r
-            this.Label11.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label11.Location = new System.Drawing.Point(65, 30);\r
-            this.Label11.Name = "Label11";\r
-            this.Label11.Size = new System.Drawing.Size(87, 13);\r
-            this.Label11.TabIndex = 40;\r
-            this.Label11.Text = "Processor cores:";\r
-            // \r
             // check_saveLogWithVideo\r
             // \r
             this.check_saveLogWithVideo.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_saveLogWithVideo.AutoSize = true;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.check_saveLogWithVideo, 5);\r
-            this.check_saveLogWithVideo.Location = new System.Drawing.Point(65, 127);\r
+            this.check_saveLogWithVideo.Location = new System.Drawing.Point(73, 108);\r
             this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";\r
             this.check_saveLogWithVideo.Size = new System.Drawing.Size(382, 17);\r
             this.check_saveLogWithVideo.TabIndex = 83;\r
@@ -725,133 +763,62 @@ namespace Handbrake
             this.check_saveLogWithVideo.UseVisualStyleBackColor = true;\r
             this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);\r
             // \r
-            // Label4\r
-            // \r
-            this.Label4.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.Label4.AutoSize = true;\r
-            this.Label4.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label4.Location = new System.Drawing.Point(65, 57);\r
-            this.Label4.Name = "Label4";\r
-            this.Label4.Size = new System.Drawing.Size(70, 13);\r
-            this.Label4.TabIndex = 42;\r
-            this.Label4.Text = "Priority level:";\r
-            // \r
             // label3\r
             // \r
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label3.AutoSize = true;\r
             this.label3.BackColor = System.Drawing.Color.Transparent;\r
-            this.label3.Location = new System.Drawing.Point(65, 104);\r
+            this.label3.Location = new System.Drawing.Point(70, 84);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(101, 13);\r
             this.label3.TabIndex = 85;\r
             this.label3.Text = "Log verbosity level:";\r
             // \r
-            // text_logPath\r
+            // btn_saveLog\r
             // \r
-            this.text_logPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.tableLayoutPanel3.SetColumnSpan(this.text_logPath, 3);\r
-            this.text_logPath.Location = new System.Drawing.Point(172, 173);\r
-            this.text_logPath.Name = "text_logPath";\r
-            this.text_logPath.Size = new System.Drawing.Size(302, 21);\r
-            this.text_logPath.TabIndex = 80;\r
-            this.ToolTip.SetToolTip(this.text_logPath, "The default location where auto named files are stored.");\r
-            this.text_logPath.TextChanged += new System.EventHandler(this.text_logPath_TextChanged);\r
+            this.btn_saveLog.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_saveLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_saveLog.Location = new System.Drawing.Point(437, 161);\r
+            this.btn_saveLog.Name = "btn_saveLog";\r
+            this.btn_saveLog.Size = new System.Drawing.Size(77, 22);\r
+            this.btn_saveLog.TabIndex = 82;\r
+            this.btn_saveLog.Text = "Browse";\r
+            this.btn_saveLog.UseVisualStyleBackColor = true;\r
+            this.btn_saveLog.Click += new System.EventHandler(this.btn_saveLog_Click);\r
             // \r
             // cb_logVerboseLvl\r
             // \r
             this.cb_logVerboseLvl.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.cb_logVerboseLvl, 4);\r
             this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.cb_logVerboseLvl.FormattingEnabled = true;\r
             this.cb_logVerboseLvl.Items.AddRange(new object[] {\r
             "0",\r
             "1",\r
             "2"});\r
-            this.cb_logVerboseLvl.Location = new System.Drawing.Point(172, 100);\r
+            this.cb_logVerboseLvl.Location = new System.Drawing.Point(177, 81);\r
             this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";\r
             this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);\r
             this.cb_logVerboseLvl.TabIndex = 86;\r
             this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level");\r
             this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged);\r
             // \r
-            // drp_Priority\r
-            // \r
-            this.drp_Priority.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.drp_Priority, 4);\r
-            this.drp_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_Priority.FormattingEnabled = true;\r
-            this.drp_Priority.Items.AddRange(new object[] {\r
-            "Realtime",\r
-            "High",\r
-            "Above Normal",\r
-            "Normal",\r
-            "Below Normal",\r
-            "Low"});\r
-            this.drp_Priority.Location = new System.Drawing.Point(172, 53);\r
-            this.drp_Priority.Name = "drp_Priority";\r
-            this.drp_Priority.Size = new System.Drawing.Size(111, 21);\r
-            this.drp_Priority.TabIndex = 43;\r
-            this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" +\r
-                    "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");\r
-            this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);\r
-            // \r
-            // drp_processors\r
-            // \r
-            this.drp_processors.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.drp_processors, 4);\r
-            this.drp_processors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_processors.FormattingEnabled = true;\r
-            this.drp_processors.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8"});\r
-            this.drp_processors.Location = new System.Drawing.Point(172, 26);\r
-            this.drp_processors.Name = "drp_processors";\r
-            this.drp_processors.Size = new System.Drawing.Size(111, 21);\r
-            this.drp_processors.TabIndex = 41;\r
-            this.ToolTip.SetToolTip(this.drp_processors, "The number of processor\'s / processor cores. Unless your having problems, leave o" +\r
-                    "n Automatic.");\r
-            this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged);\r
-            // \r
-            // btn_viewLogs\r
-            // \r
-            this.btn_viewLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.tableLayoutPanel3.SetColumnSpan(this.btn_viewLogs, 2);\r
-            this.btn_viewLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;\r
-            this.btn_viewLogs.Location = new System.Drawing.Point(65, 201);\r
-            this.btn_viewLogs.Name = "btn_viewLogs";\r
-            this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);\r
-            this.btn_viewLogs.TabIndex = 89;\r
-            this.btn_viewLogs.Text = "View Log Directory";\r
-            this.btn_viewLogs.UseVisualStyleBackColor = true;\r
-            this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);\r
-            // \r
-            // btn_clearLogs\r
+            // text_logPath\r
             // \r
-            this.btn_clearLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.btn_clearLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;\r
-            this.btn_clearLogs.Location = new System.Drawing.Point(210, 201);\r
-            this.btn_clearLogs.Name = "btn_clearLogs";\r
-            this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);\r
-            this.btn_clearLogs.TabIndex = 88;\r
-            this.btn_clearLogs.Text = "Clear Log History";\r
-            this.btn_clearLogs.UseVisualStyleBackColor = true;\r
-            this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);\r
+            this.text_logPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.text_logPath.Location = new System.Drawing.Point(129, 161);\r
+            this.text_logPath.Name = "text_logPath";\r
+            this.text_logPath.Size = new System.Drawing.Size(302, 21);\r
+            this.text_logPath.TabIndex = 80;\r
+            this.ToolTip.SetToolTip(this.text_logPath, "The default location where auto named files are stored.");\r
+            this.text_logPath.TextChanged += new System.EventHandler(this.text_logPath_TextChanged);\r
             // \r
             // label14\r
             // \r
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label14.AutoSize = true;\r
-            this.label14.Location = new System.Drawing.Point(65, 177);\r
+            this.label14.Location = new System.Drawing.Point(70, 164);\r
             this.label14.Name = "label14";\r
             this.label14.Size = new System.Drawing.Size(53, 13);\r
             this.label14.TabIndex = 81;\r
@@ -859,7 +826,21 @@ namespace Handbrake
             // \r
             // tab_advanced\r
             // \r
-            this.tab_advanced.Controls.Add(this.tableLayoutPanel4);\r
+            this.tab_advanced.Controls.Add(this.check_showCliForInGUIEncode);\r
+            this.tab_advanced.Controls.Add(this.drop_previewScanCount);\r
+            this.tab_advanced.Controls.Add(this.label33);\r
+            this.tab_advanced.Controls.Add(this.label6);\r
+            this.tab_advanced.Controls.Add(this.check_trayStatusAlerts);\r
+            this.tab_advanced.Controls.Add(this.check_mainMinimize);\r
+            this.tab_advanced.Controls.Add(this.check_promptOnUnmatchingQueries);\r
+            this.tab_advanced.Controls.Add(this.check_dvdnav);\r
+            this.tab_advanced.Controls.Add(this.check_queryEditorTab);\r
+            this.tab_advanced.Controls.Add(this.label32);\r
+            this.tab_advanced.Controls.Add(this.drop_x264step);\r
+            this.tab_advanced.Controls.Add(this.label30);\r
+            this.tab_advanced.Controls.Add(this.check_disablePresetNotification);\r
+            this.tab_advanced.Controls.Add(this.label28);\r
+            this.tab_advanced.Controls.Add(this.check_inGuiStatus);\r
             this.tab_advanced.Location = new System.Drawing.Point(4, 22);\r
             this.tab_advanced.Name = "tab_advanced";\r
             this.tab_advanced.Padding = new System.Windows.Forms.Padding(10);\r
@@ -868,54 +849,98 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced / Other";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
-            // tableLayoutPanel4\r
-            // \r
-            this.tableLayoutPanel4.AutoSize = true;\r
-            this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.tableLayoutPanel4.ColumnCount = 6;\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel4.Controls.Add(this.check_promptOnUnmatchingQueries, 3, 4);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_dvdnav, 2, 10);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_trayStatusAlerts, 3, 2);\r
-            this.tableLayoutPanel4.Controls.Add(this.label32, 0, 10);\r
-            this.tableLayoutPanel4.Controls.Add(this.label6, 0, 0);\r
-            this.tableLayoutPanel4.Controls.Add(this.drop_x264step, 4, 8);\r
-            this.tableLayoutPanel4.Controls.Add(this.label30, 2, 8);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_mainMinimize, 2, 1);\r
-            this.tableLayoutPanel4.Controls.Add(this.label28, 0, 8);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_queryEditorTab, 2, 3);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_disablePresetNotification, 2, 5);\r
-            this.tableLayoutPanel4.Controls.Add(this.check_inGuiStatus, 2, 6);\r
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(10, 10);\r
-            this.tableLayoutPanel4.Name = "tableLayoutPanel4";\r
-            this.tableLayoutPanel4.RowCount = 12;\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(395, 228);\r
-            this.tableLayoutPanel4.TabIndex = 62;\r
+            // check_showCliForInGUIEncode\r
+            // \r
+            this.check_showCliForInGUIEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_showCliForInGUIEncode.AutoSize = true;\r
+            this.check_showCliForInGUIEncode.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_showCliForInGUIEncode.Location = new System.Drawing.Point(100, 152);\r
+            this.check_showCliForInGUIEncode.Name = "check_showCliForInGUIEncode";\r
+            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(324, 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
+            this.check_showCliForInGUIEncode.UseVisualStyleBackColor = false;\r
+            this.check_showCliForInGUIEncode.CheckedChanged += new System.EventHandler(this.check_showCliForInGUIEncode_CheckedChanged);\r
+            // \r
+            // drop_previewScanCount\r
+            // \r
+            this.drop_previewScanCount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_previewScanCount.FormattingEnabled = true;\r
+            this.drop_previewScanCount.Items.AddRange(new object[] {\r
+            "10",\r
+            "15",\r
+            "20",\r
+            "25",\r
+            "30"});\r
+            this.drop_previewScanCount.Location = new System.Drawing.Point(273, 173);\r
+            this.drop_previewScanCount.Name = "drop_previewScanCount";\r
+            this.drop_previewScanCount.Size = new System.Drawing.Size(85, 21);\r
+            this.drop_previewScanCount.TabIndex = 95;\r
+            this.ToolTip.SetToolTip(this.drop_previewScanCount, "Allows a greater number of preview frames to be selectable on the \"Preview\" windo" +\r
+                    "w.");\r
+            this.drop_previewScanCount.SelectedIndexChanged += new System.EventHandler(this.drop_previewScanCount_SelectedIndexChanged);\r
+            // \r
+            // label33\r
+            // \r
+            this.label33.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.label33.AutoSize = true;\r
+            this.label33.Location = new System.Drawing.Point(79, 176);\r
+            this.label33.Name = "label33";\r
+            this.label33.Size = new System.Drawing.Size(181, 13);\r
+            this.label33.TabIndex = 94;\r
+            this.label33.Text = "Number of picture previews to scan:";\r
+            // \r
+            // label6\r
+            // \r
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.label6.AutoSize = true;\r
+            this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label6.Location = new System.Drawing.Point(15, 15);\r
+            this.label6.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
+            this.label6.Name = "label6";\r
+            this.label6.Size = new System.Drawing.Size(31, 13);\r
+            this.label6.TabIndex = 71;\r
+            this.label6.Text = "GUI:";\r
+            // \r
+            // check_trayStatusAlerts\r
+            // \r
+            this.check_trayStatusAlerts.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_trayStatusAlerts.AutoSize = true;\r
+            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.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
+                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
+                    "");\r
+            this.check_trayStatusAlerts.UseVisualStyleBackColor = false;\r
+            this.check_trayStatusAlerts.CheckedChanged += new System.EventHandler(this.check_trayStatusAlerts_CheckedChanged);\r
+            // \r
+            // check_mainMinimize\r
+            // \r
+            this.check_mainMinimize.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_mainMinimize.AutoSize = true;\r
+            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(133, 17);\r
+            this.check_mainMinimize.TabIndex = 82;\r
+            this.check_mainMinimize.Text = "Minimize to system tray";\r
+            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
+                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
+                    "");\r
+            this.check_mainMinimize.UseVisualStyleBackColor = false;\r
+            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);\r
             // \r
             // check_promptOnUnmatchingQueries\r
             // \r
             this.check_promptOnUnmatchingQueries.AutoSize = true;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_promptOnUnmatchingQueries, 3);\r
-            this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(87, 72);\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(305, 17);\r
+            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(300, 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
@@ -926,59 +951,42 @@ namespace Handbrake
             this.check_dvdnav.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_dvdnav.AutoSize = true;\r
             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_dvdnav, 4);\r
-            this.check_dvdnav.Location = new System.Drawing.Point(67, 208);\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(276, 17);\r
+            this.check_dvdnav.Size = new System.Drawing.Size(277, 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
             this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);\r
             // \r
-            // check_trayStatusAlerts\r
+            // check_queryEditorTab\r
             // \r
-            this.check_trayStatusAlerts.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_trayStatusAlerts.AutoSize = true;\r
-            this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_trayStatusAlerts, 3);\r
-            this.check_trayStatusAlerts.Location = new System.Drawing.Point(87, 26);\r
-            this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";\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
-                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
-                    "");\r
-            this.check_trayStatusAlerts.UseVisualStyleBackColor = false;\r
-            this.check_trayStatusAlerts.CheckedChanged += new System.EventHandler(this.check_trayStatusAlerts_CheckedChanged);\r
+            this.check_queryEditorTab.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_queryEditorTab.AutoSize = true;\r
+            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.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
+                    " effect.");\r
+            this.check_queryEditorTab.UseVisualStyleBackColor = false;\r
+            this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);\r
             // \r
             // label32\r
             // \r
             this.label32.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.label32.AutoSize = true;\r
             this.label32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label32.Location = new System.Drawing.Point(8, 210);\r
+            this.label32.Location = new System.Drawing.Point(13, 248);\r
             this.label32.Name = "label32";\r
             this.label32.Size = new System.Drawing.Size(33, 13);\r
             this.label32.TabIndex = 89;\r
             this.label32.Text = "DVD:";\r
             // \r
-            // label6\r
-            // \r
-            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.label6.AutoSize = true;\r
-            this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(10, 5);\r
-            this.label6.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
-            this.label6.Name = "label6";\r
-            this.tableLayoutPanel4.SetRowSpan(this.label6, 2);\r
-            this.label6.Size = new System.Drawing.Size(31, 13);\r
-            this.label6.TabIndex = 71;\r
-            this.label6.Text = "GUI:";\r
-            // \r
             // drop_x264step\r
             // \r
-            this.tableLayoutPanel4.SetColumnSpan(this.drop_x264step, 2);\r
             this.drop_x264step.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_x264step.FormattingEnabled = true;\r
             this.drop_x264step.Items.AddRange(new object[] {\r
@@ -986,78 +994,31 @@ namespace Handbrake
             "0.50",\r
             "0.25",\r
             "0.20"});\r
-            this.drop_x264step.Location = new System.Drawing.Point(262, 161);\r
+            this.drop_x264step.Location = new System.Drawing.Point(273, 210);\r
             this.drop_x264step.Name = "drop_x264step";\r
             this.drop_x264step.Size = new System.Drawing.Size(85, 21);\r
             this.drop_x264step.TabIndex = 86;\r
-            this.ToolTip.SetToolTip(this.drop_x264step, "The number of processor\'s / processor cores. Unless your having problems, leave o" +\r
-                    "n Automatic.");\r
+            this.ToolTip.SetToolTip(this.drop_x264step, "Quality Slider Control Granularity for x264 encoding only.");\r
             this.drop_x264step.SelectedIndexChanged += new System.EventHandler(this.x264step_SelectedIndexChanged);\r
             // \r
             // label30\r
             // \r
             this.label30.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label30.AutoSize = true;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.label30, 2);\r
-            this.label30.Location = new System.Drawing.Point(67, 165);\r
+            this.label30.Location = new System.Drawing.Point(78, 213);\r
             this.label30.Name = "label30";\r
             this.label30.Size = new System.Drawing.Size(189, 13);\r
             this.label30.TabIndex = 87;\r
             this.label30.Text = "Constant quality fractional granularity";\r
             // \r
-            // check_mainMinimize\r
-            // \r
-            this.check_mainMinimize.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_mainMinimize.AutoSize = true;\r
-            this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_mainMinimize, 4);\r
-            this.check_mainMinimize.Location = new System.Drawing.Point(67, 3);\r
-            this.check_mainMinimize.Name = "check_mainMinimize";\r
-            this.check_mainMinimize.Size = new System.Drawing.Size(138, 17);\r
-            this.check_mainMinimize.TabIndex = 82;\r
-            this.check_mainMinimize.Text = "Minimize to system tray";\r
-            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
-                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
-                    "");\r
-            this.check_mainMinimize.UseVisualStyleBackColor = false;\r
-            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);\r
-            // \r
-            // label28\r
-            // \r
-            this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.label28.AutoSize = true;\r
-            this.label28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label28.Location = new System.Drawing.Point(3, 165);\r
-            this.label28.Name = "label28";\r
-            this.label28.Size = new System.Drawing.Size(38, 13);\r
-            this.label28.TabIndex = 85;\r
-            this.label28.Text = "x264:";\r
-            // \r
-            // check_queryEditorTab\r
-            // \r
-            this.check_queryEditorTab.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_queryEditorTab.AutoSize = true;\r
-            this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_queryEditorTab, 4);\r
-            this.check_queryEditorTab.Location = new System.Drawing.Point(67, 49);\r
-            this.check_queryEditorTab.Name = "check_queryEditorTab";\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
-                    " effect.");\r
-            this.check_queryEditorTab.UseVisualStyleBackColor = false;\r
-            this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);\r
-            // \r
             // check_disablePresetNotification\r
             // \r
             this.check_disablePresetNotification.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_disablePresetNotification.AutoSize = true;\r
             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_disablePresetNotification, 4);\r
-            this.check_disablePresetNotification.Location = new System.Drawing.Point(67, 95);\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(222, 17);\r
+            this.check_disablePresetNotification.Size = new System.Drawing.Size(216, 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
@@ -1065,15 +1026,25 @@ namespace Handbrake
             this.check_disablePresetNotification.UseVisualStyleBackColor = false;\r
             this.check_disablePresetNotification.CheckedChanged += new System.EventHandler(this.check_disablePresetNotification_CheckedChanged);\r
             // \r
+            // label28\r
+            // \r
+            this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.label28.AutoSize = true;\r
+            this.label28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label28.Location = new System.Drawing.Point(8, 213);\r
+            this.label28.Name = "label28";\r
+            this.label28.Size = new System.Drawing.Size(38, 13);\r
+            this.label28.TabIndex = 85;\r
+            this.label28.Text = "x264:";\r
+            // \r
             // check_inGuiStatus\r
             // \r
             this.check_inGuiStatus.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_inGuiStatus.AutoSize = true;\r
             this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.check_inGuiStatus, 4);\r
-            this.check_inGuiStatus.Location = new System.Drawing.Point(67, 118);\r
+            this.check_inGuiStatus.Location = new System.Drawing.Point(81, 129);\r
             this.check_inGuiStatus.Name = "check_inGuiStatus";\r
-            this.check_inGuiStatus.Size = new System.Drawing.Size(235, 17);\r
+            this.check_inGuiStatus.Size = new System.Drawing.Size(230, 17);\r
             this.check_inGuiStatus.TabIndex = 92;\r
             this.check_inGuiStatus.Text = "Enable in-GUI encode status (experimental)";\r
             this.ToolTip.SetToolTip(this.check_inGuiStatus, "Displays the CLI status in the GUI windows instead of the CLI window.");\r
@@ -1096,7 +1067,7 @@ namespace Handbrake
             this.check_disableResCalc.AutoSize = true;\r
             this.check_disableResCalc.Location = new System.Drawing.Point(13, 15);\r
             this.check_disableResCalc.Name = "check_disableResCalc";\r
-            this.check_disableResCalc.Size = new System.Drawing.Size(327, 17);\r
+            this.check_disableResCalc.Size = new System.Drawing.Size(329, 17);\r
             this.check_disableResCalc.TabIndex = 0;\r
             this.check_disableResCalc.Text = "Disable Resolution Calculation for \"None\" and \"Custom\" modes.";\r
             this.ToolTip.SetToolTip(this.check_disableResCalc, resources.GetString("check_disableResCalc.ToolTip"));\r
@@ -1513,12 +1484,8 @@ namespace Handbrake
             this.tab_audio_sub.PerformLayout();\r
             this.tab_cli.ResumeLayout(false);\r
             this.tab_cli.PerformLayout();\r
-            this.tableLayoutPanel3.ResumeLayout(false);\r
-            this.tableLayoutPanel3.PerformLayout();\r
             this.tab_advanced.ResumeLayout(false);\r
             this.tab_advanced.PerformLayout();\r
-            this.tableLayoutPanel4.ResumeLayout(false);\r
-            this.tableLayoutPanel4.PerformLayout();\r
             this.tab_debug.ResumeLayout(false);\r
             this.tab_debug.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
@@ -1540,7 +1507,6 @@ namespace Handbrake
         private System.Windows.Forms.PictureBox pictureBox2;\r
         private System.Windows.Forms.TabPage tab_general;\r
         private System.Windows.Forms.FolderBrowserDialog pathFinder;\r
-        internal System.Windows.Forms.Label Label11;\r
         internal System.Windows.Forms.Label Label4;\r
         internal System.Windows.Forms.CheckBox check_tooltip;\r
         internal System.Windows.Forms.CheckBox check_updateCheck;\r
@@ -1613,10 +1579,7 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_m4v;\r
         internal System.Windows.Forms.ComboBox drop_updateCheckDays;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;\r
-        internal System.Windows.Forms.ComboBox drp_processors;\r
         internal System.Windows.Forms.ComboBox drp_Priority;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;\r
         private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;\r
         private System.Windows.Forms.TabPage tab_audio_sub;\r
@@ -1630,5 +1593,11 @@ namespace Handbrake
         private System.Windows.Forms.CheckBox check_disableResCalc;\r
         internal System.Windows.Forms.CheckBox check_growlEncode;\r
         internal System.Windows.Forms.CheckBox check_GrowlQueue;\r
+        internal System.Windows.Forms.ComboBox drop_previewScanCount;\r
+        private System.Windows.Forms.Label label33;\r
+        internal System.Windows.Forms.CheckBox check_clearOldLogs;\r
+        internal System.Windows.Forms.CheckBox check_showCliForInGUIEncode;\r
+        internal System.Windows.Forms.CheckBox check_TitleCase;\r
+        internal System.Windows.Forms.CheckBox check_removeUnderscores;\r
     }\r
 }
\ No newline at end of file