WinGui:

- Removed the group boxes on the main window to save a bit of space.
- Main Window source display is the source filename or folder only. The text box is no longer used.
- Added two new options: "Clear Log History" and "View Log Directory"
- Changed log file format to "DateTime DestFileName.txt" to "DestFileName DateTime.txt"

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

diff --git a/win/C#/EncodeQueue/Encode.cs b/win/C#/EncodeQueue/Encode.cs
index 29d8bf87499a629e0cf0c35d3ac458faad8d32df..24862406446a0db35d811843fee6ebbcb405febb 100644 (file)
--- a/win/C#/EncodeQueue/Encode.cs
+++ b/win/C#/EncodeQueue/Encode.cs
@@ -162,9 +162,8 @@ namespace Handbrake.EncodeQueue
                 string tempLogFile = Path.Combine(logDir, "last_encode_log.txt");\r
 \r
                 string encodeDestinationPath = Path.GetDirectoryName(destination);\r
-                String[] destName = destination.Split('\\');\r
-                string destinationFile = destName[destName.Length - 1];\r
-                string encodeLogFile = DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + " " + destinationFile + ".txt";\r
+                String destinationFile = Path.GetFileName(destination);\r
+                string encodeLogFile = destinationFile + " " + DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + ".txt";\r
 \r
                 // Make sure the log directory exists.\r
                 if (!Directory.Exists(logDir))\r

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 95a17cfb3295c7f121576aba9da9a40e1caeee2b..04d4d16b420d2ddf55b36254a1fa9ebb4f9fb7d2 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -350,5 +350,25 @@ namespace Handbrake.Functions
             return -1;\r
         }\r
 \r
+        /// <summary>\r
+        ///  Clear all the encode log files.\r
+        /// </summary>\r
+        public static void clearLogs()\r
+        {\r
+            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";\r
+            if (Directory.Exists(logDir))\r
+            {\r
+                DirectoryInfo info = new DirectoryInfo(logDir);\r
+                FileInfo[] logFiles = info.GetFiles("*.txt");\r
+                foreach (FileInfo file in logFiles)\r
+                {\r
+                    if (!file.Name.Contains("last_scan_log") && !file.Name.Contains("last_encode_log") && !file.Name.Contains("tmp_appReadable_log.txt"))\r
+                    {\r
+                        File.Delete(file.FullName);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+\r
     }\r
 }\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 373041107f302ce36ab5d8b209dfa3e42b0c4ce8..0394df6cf94e2a1cb2880a0a5f30c8b71ac5ff33 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -24,8 +24,8 @@ namespace Handbrake.Functions
             // Source tab\r
             string query = "";\r
 \r
-            if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))\r
-                query = " -i " + '"' + mainWindow.text_source.Text + '"';\r
+            if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))\r
+                query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
             if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
             {\r
@@ -68,8 +68,8 @@ namespace Handbrake.Functions
             // Source tab\r
             string query = "";\r
 \r
-            if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))\r
-                query = " -i " + '"' + mainWindow.text_source.Text + '"';\r
+            if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))\r
+                query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
             if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
             {\r

diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs
index 2e1401fbdf66c2237b37ba354ce39ca9dbb83a3c..bd756c08dcfb71dc86a2ee68793ce75206eb89e6 100644 (file)
--- a/win/C#/Presets/PresetsHandler.cs
+++ b/win/C#/Presets/PresetsHandler.cs
@@ -19,7 +19,7 @@ namespace Handbrake.Presets
         List<Preset> presets = new List<Preset>();\r
         List<Preset> user_presets = new List<Preset>();\r
         private static readonly XmlSerializer ser = new XmlSerializer(typeof(List<Preset>));\r
-        String userPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml";\r
+        string userPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml";\r
         string hbPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\presets.xml";\r
 \r
         /// <summary>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b500e364806ab7b2ed66716316ca7651a70b0186..b201b475c7dc26ecb1b26b7b4669269b13e78d46 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -65,7 +65,6 @@ namespace Handbrake
             this.btn_addPreset = new System.Windows.Forms.Button();\r
             this.btn_removePreset = new System.Windows.Forms.Button();\r
             this.drop_format = new System.Windows.Forms.ComboBox();\r
-            this.text_source = new System.Windows.Forms.TextBox();\r
             this.drop_angle = new System.Windows.Forms.ComboBox();\r
             this.lbl_duration = new System.Windows.Forms.Label();\r
             this.label_duration = new System.Windows.Forms.Label();\r
@@ -96,18 +95,14 @@ namespace Handbrake
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
-            this.gb_source = new System.Windows.Forms.GroupBox();\r
             this.lbl_angle = new System.Windows.Forms.Label();\r
             this.Label13 = new System.Windows.Forms.Label();\r
-            this.Label17 = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label10 = new System.Windows.Forms.Label();\r
-            this.groupBox_output = new System.Windows.Forms.GroupBox();\r
             this.label5 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
@@ -119,23 +114,19 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
             this.btn_generate_Query = new System.Windows.Forms.Button();\r
             this.label33 = new System.Windows.Forms.Label();\r
             this.rtf_query = new System.Windows.Forms.RichTextBox();\r
-            this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.btn_destBrowse = new System.Windows.Forms.Button();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
@@ -163,14 +154,20 @@ namespace Handbrake
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.hbproc = new System.Diagnostics.Process();\r
+            this.label1 = new System.Windows.Forms.Label();\r
+            this.lbl_source = new System.Windows.Forms.Label();\r
+            this.label4 = new System.Windows.Forms.Label();\r
+            this.groupBox_output = new System.Windows.Forms.Label();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Filters = new Handbrake.Controls.Filters();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
-            this.gb_source.SuspendLayout();\r
-            this.groupBox_output.SuspendLayout();\r
             this.tab_audio.SuspendLayout();\r
             this.tab_video.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -180,7 +177,6 @@ namespace Handbrake
             this.tab_chapters.SuspendLayout();\r
             this.tab_advanced.SuspendLayout();\r
             this.tab_query.SuspendLayout();\r
-            this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
             this.splitContainer1.Panel1.SuspendLayout();\r
             this.splitContainer1.Panel2.SuspendLayout();\r
@@ -226,7 +222,7 @@ namespace Handbrake
             // \r
             this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterFinish.FormattingEnabled = true;\r
-            this.drop_chapterFinish.Location = new System.Drawing.Point(503, 52);\r
+            this.drop_chapterFinish.Location = new System.Drawing.Point(506, 96);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 10;\r
@@ -238,7 +234,7 @@ namespace Handbrake
             // \r
             this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterStart.FormattingEnabled = true;\r
-            this.drop_chapterStart.Location = new System.Drawing.Point(371, 52);\r
+            this.drop_chapterStart.Location = new System.Drawing.Point(374, 96);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 9;\r
@@ -252,7 +248,7 @@ namespace Handbrake
             this.drp_dvdtitle.FormattingEnabled = true;\r
             this.drp_dvdtitle.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_dvdtitle.Location = new System.Drawing.Point(75, 52);\r
+            this.drp_dvdtitle.Location = new System.Drawing.Point(78, 96);\r
             this.drp_dvdtitle.Name = "drp_dvdtitle";\r
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 7;\r
@@ -265,7 +261,7 @@ namespace Handbrake
             // text_destination\r
             // \r
             this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_destination.Location = new System.Drawing.Point(75, 19);\r
+            this.text_destination.Location = new System.Drawing.Point(78, 153);\r
             this.text_destination.Name = "text_destination";\r
             this.text_destination.Size = new System.Drawing.Size(549, 21);\r
             this.text_destination.TabIndex = 1;\r
@@ -293,7 +289,7 @@ namespace Handbrake
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.BackColor = System.Drawing.Color.Transparent;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(193, 22);\r
+            this.check_largeFile.Location = new System.Drawing.Point(196, 218);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(105, 17);\r
             this.check_largeFile.TabIndex = 4;\r
@@ -391,7 +387,7 @@ namespace Handbrake
             this.check_optimiseMP4.AutoSize = true;\r
             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(304, 22);\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(307, 218);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
             this.check_optimiseMP4.Size = new System.Drawing.Size(110, 17);\r
             this.check_optimiseMP4.TabIndex = 25;\r
@@ -406,7 +402,7 @@ namespace Handbrake
             this.check_iPodAtom.AutoSize = true;\r
             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
             this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(420, 22);\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(423, 218);\r
             this.check_iPodAtom.Name = "check_iPodAtom";\r
             this.check_iPodAtom.Size = new System.Drawing.Size(117, 17);\r
             this.check_iPodAtom.TabIndex = 26;\r
@@ -428,15 +424,15 @@ namespace Handbrake
             this.data_chpt.MultiSelect = false;\r
             this.data_chpt.Name = "data_chpt";\r
             this.data_chpt.RowHeadersVisible = false;\r
-            this.data_chpt.Size = new System.Drawing.Size(684, 234);\r
+            this.data_chpt.Size = new System.Drawing.Size(684, 236);\r
             this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -489,30 +485,19 @@ namespace Handbrake
             "MP4 File",\r
             "M4V File",\r
             "MKV File"});\r
-            this.drop_format.Location = new System.Drawing.Point(75, 19);\r
+            this.drop_format.Location = new System.Drawing.Point(78, 215);\r
             this.drop_format.Name = "drop_format";\r
             this.drop_format.Size = new System.Drawing.Size(106, 21);\r
             this.drop_format.TabIndex = 28;\r
             this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.");\r
             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
             // \r
-            // text_source\r
-            // \r
-            this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_source.Location = new System.Drawing.Point(75, 19);\r
-            this.text_source.Name = "text_source";\r
-            this.text_source.ReadOnly = true;\r
-            this.text_source.Size = new System.Drawing.Size(642, 21);\r
-            this.text_source.TabIndex = 1;\r
-            this.text_source.Text = "Click \'Source\' to continue";\r
-            this.ToolTip.SetToolTip(this.text_source, "Location of the source input file, folder or dvd.");\r
-            // \r
             // drop_angle\r
             // \r
             this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_angle.FormattingEnabled = true;\r
-            this.drop_angle.Location = new System.Drawing.Point(250, 52);\r
+            this.drop_angle.Location = new System.Drawing.Point(253, 96);\r
             this.drop_angle.Name = "drop_angle";\r
             this.drop_angle.Size = new System.Drawing.Size(45, 21);\r
             this.drop_angle.TabIndex = 45;\r
@@ -523,7 +508,7 @@ namespace Handbrake
             this.lbl_duration.AutoSize = true;\r
             this.lbl_duration.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_duration.Location = new System.Drawing.Point(645, 56);\r
+            this.lbl_duration.Location = new System.Drawing.Point(648, 100);\r
             this.lbl_duration.Name = "lbl_duration";\r
             this.lbl_duration.Size = new System.Drawing.Size(72, 12);\r
             this.lbl_duration.TabIndex = 43;\r
@@ -534,7 +519,7 @@ namespace Handbrake
             this.label_duration.AutoSize = true;\r
             this.label_duration.BackColor = System.Drawing.Color.Transparent;\r
             this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label_duration.Location = new System.Drawing.Point(578, 55);\r
+            this.label_duration.Location = new System.Drawing.Point(581, 99);\r
             this.label_duration.Name = "label_duration";\r
             this.label_duration.Size = new System.Drawing.Size(61, 13);\r
             this.label_duration.TabIndex = 42;\r
@@ -751,35 +736,12 @@ namespace Handbrake
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip";\r
             // \r
-            // gb_source\r
-            // \r
-            this.gb_source.Controls.Add(this.drop_angle);\r
-            this.gb_source.Controls.Add(this.lbl_angle);\r
-            this.gb_source.Controls.Add(this.lbl_duration);\r
-            this.gb_source.Controls.Add(this.label_duration);\r
-            this.gb_source.Controls.Add(this.Label13);\r
-            this.gb_source.Controls.Add(this.drop_chapterFinish);\r
-            this.gb_source.Controls.Add(this.drop_chapterStart);\r
-            this.gb_source.Controls.Add(this.drp_dvdtitle);\r
-            this.gb_source.Controls.Add(this.Label17);\r
-            this.gb_source.Controls.Add(this.text_source);\r
-            this.gb_source.Controls.Add(this.Label9);\r
-            this.gb_source.Controls.Add(this.Label10);\r
-            this.gb_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.gb_source.ForeColor = System.Drawing.Color.Black;\r
-            this.gb_source.Location = new System.Drawing.Point(9, 70);\r
-            this.gb_source.Name = "gb_source";\r
-            this.gb_source.Size = new System.Drawing.Size(732, 87);\r
-            this.gb_source.TabIndex = 2;\r
-            this.gb_source.TabStop = false;\r
-            this.gb_source.Text = "Source";\r
-            // \r
             // lbl_angle\r
             // \r
             this.lbl_angle.AutoSize = true;\r
             this.lbl_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_angle.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_angle.Location = new System.Drawing.Point(200, 55);\r
+            this.lbl_angle.Location = new System.Drawing.Point(203, 99);\r
             this.lbl_angle.Name = "lbl_angle";\r
             this.lbl_angle.Size = new System.Drawing.Size(44, 13);\r
             this.lbl_angle.TabIndex = 44;\r
@@ -789,29 +751,18 @@ namespace Handbrake
             // \r
             this.Label13.AutoSize = true;\r
             this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label13.Location = new System.Drawing.Point(446, 55);\r
+            this.Label13.Location = new System.Drawing.Point(449, 99);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(51, 13);\r
             this.Label13.TabIndex = 10;\r
             this.Label13.Text = "through";\r
             // \r
-            // Label17\r
-            // \r
-            this.Label17.AutoSize = true;\r
-            this.Label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label17.ForeColor = System.Drawing.Color.Black;\r
-            this.Label17.Location = new System.Drawing.Point(17, 22);\r
-            this.Label17.Name = "Label17";\r
-            this.Label17.Size = new System.Drawing.Size(52, 13);\r
-            this.Label17.TabIndex = 0;\r
-            this.Label17.Text = "Source:";\r
-            // \r
             // Label9\r
             // \r
             this.Label9.AutoSize = true;\r
             this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label9.ForeColor = System.Drawing.Color.Black;\r
-            this.Label9.Location = new System.Drawing.Point(301, 55);\r
+            this.Label9.Location = new System.Drawing.Point(304, 99);\r
             this.Label9.Name = "Label9";\r
             this.Label9.Size = new System.Drawing.Size(64, 13);\r
             this.Label9.TabIndex = 8;\r
@@ -822,34 +773,18 @@ namespace Handbrake
             this.Label10.AutoSize = true;\r
             this.Label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label10.ForeColor = System.Drawing.Color.Black;\r
-            this.Label10.Location = new System.Drawing.Point(17, 55);\r
+            this.Label10.Location = new System.Drawing.Point(20, 99);\r
             this.Label10.Name = "Label10";\r
             this.Label10.Size = new System.Drawing.Size(36, 13);\r
             this.Label10.TabIndex = 6;\r
             this.Label10.Text = "Title:";\r
             // \r
-            // groupBox_output\r
-            // \r
-            this.groupBox_output.Controls.Add(this.drop_format);\r
-            this.groupBox_output.Controls.Add(this.label5);\r
-            this.groupBox_output.Controls.Add(this.check_largeFile);\r
-            this.groupBox_output.Controls.Add(this.check_iPodAtom);\r
-            this.groupBox_output.Controls.Add(this.check_optimiseMP4);\r
-            this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_output.Location = new System.Drawing.Point(9, 214);\r
-            this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(732, 50);\r
-            this.groupBox_output.TabIndex = 4;\r
-            this.groupBox_output.TabStop = false;\r
-            this.groupBox_output.Text = "Output Settings (Preset: None)";\r
-            // \r
             // label5\r
             // \r
             this.label5.AutoSize = true;\r
             this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.label5.ForeColor = System.Drawing.Color.Black;\r
-            this.label5.Location = new System.Drawing.Point(17, 23);\r
+            this.label5.Location = new System.Drawing.Point(20, 219);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(52, 13);\r
             this.label5.TabIndex = 27;\r
@@ -871,7 +806,7 @@ namespace Handbrake
             this.Label3.AutoSize = true;\r
             this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label3.ForeColor = System.Drawing.Color.Black;\r
-            this.Label3.Location = new System.Drawing.Point(17, 21);\r
+            this.Label3.Location = new System.Drawing.Point(20, 155);\r
             this.Label3.Name = "Label3";\r
             this.Label3.Size = new System.Drawing.Size(31, 13);\r
             this.Label3.TabIndex = 0;\r
@@ -884,19 +819,11 @@ namespace Handbrake
             this.tab_audio.Location = new System.Drawing.Point(4, 22);\r
             this.tab_audio.Name = "tab_audio";\r
             this.tab_audio.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_audio.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_audio.Size = new System.Drawing.Size(724, 308);\r
             this.tab_audio.TabIndex = 3;\r
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -924,7 +851,7 @@ namespace Handbrake
             this.tab_video.Location = new System.Drawing.Point(4, 22);\r
             this.tab_video.Name = "tab_video";\r
             this.tab_video.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_video.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_video.Size = new System.Drawing.Size(724, 308);\r
             this.tab_video.TabIndex = 2;\r
             this.tab_video.Text = "Video";\r
             this.tab_video.UseVisualStyleBackColor = true;\r
@@ -1028,18 +955,11 @@ namespace Handbrake
             this.tab_picture.Location = new System.Drawing.Point(4, 22);\r
             this.tab_picture.Name = "tab_picture";\r
             this.tab_picture.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_picture.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_picture.Size = new System.Drawing.Size(724, 308);\r
             this.tab_picture.TabIndex = 0;\r
             this.tab_picture.Text = "Picture Settings";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -1064,10 +984,10 @@ namespace Handbrake
             this.tabs_panel.Controls.Add(this.tab_advanced);\r
             this.tabs_panel.Controls.Add(this.tab_query);\r
             this.tabs_panel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.tabs_panel.Location = new System.Drawing.Point(9, 274);\r
+            this.tabs_panel.Location = new System.Drawing.Point(9, 251);\r
             this.tabs_panel.Name = "tabs_panel";\r
             this.tabs_panel.SelectedIndex = 0;\r
-            this.tabs_panel.Size = new System.Drawing.Size(732, 342);\r
+            this.tabs_panel.Size = new System.Drawing.Size(732, 334);\r
             this.tabs_panel.TabIndex = 5;\r
             this.tabs_panel.TabStop = false;\r
             // \r
@@ -1076,7 +996,7 @@ namespace Handbrake
             this.tab_filters.Controls.Add(this.Filters);\r
             this.tab_filters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_filters.Name = "tab_filters";\r
-            this.tab_filters.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_filters.Size = new System.Drawing.Size(724, 308);\r
             this.tab_filters.TabIndex = 9;\r
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
@@ -1087,19 +1007,11 @@ namespace Handbrake
             this.tab_subtitles.Location = new System.Drawing.Point(4, 22);\r
             this.tab_subtitles.Name = "tab_subtitles";\r
             this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_subtitles.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_subtitles.Size = new System.Drawing.Size(724, 308);\r
             this.tab_subtitles.TabIndex = 10;\r
             this.tab_subtitles.Text = "Subtitles";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1108,7 +1020,7 @@ namespace Handbrake
             this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);\r
             this.tab_chapters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_chapters.Name = "tab_chapters";\r
-            this.tab_chapters.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_chapters.Size = new System.Drawing.Size(724, 308);\r
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
             this.tab_chapters.UseVisualStyleBackColor = true;\r
@@ -1132,19 +1044,11 @@ namespace Handbrake
             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(3);\r
-            this.tab_advanced.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_advanced.Size = new System.Drawing.Size(724, 308);\r
             this.tab_advanced.TabIndex = 8;\r
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.x264Query = "";\r
-            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1154,7 +1058,7 @@ namespace Handbrake
             this.tab_query.Controls.Add(this.rtf_query);\r
             this.tab_query.Location = new System.Drawing.Point(4, 22);\r
             this.tab_query.Name = "tab_query";\r
-            this.tab_query.Size = new System.Drawing.Size(724, 316);\r
+            this.tab_query.Size = new System.Drawing.Size(724, 308);\r
             this.tab_query.TabIndex = 7;\r
             this.tab_query.Text = "Query Editor";\r
             this.tab_query.UseVisualStyleBackColor = true;\r
@@ -1211,28 +1115,15 @@ namespace Handbrake
             this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.rtf_query.Location = new System.Drawing.Point(16, 103);\r
             this.rtf_query.Name = "rtf_query";\r
-            this.rtf_query.Size = new System.Drawing.Size(693, 194);\r
+            this.rtf_query.Size = new System.Drawing.Size(693, 190);\r
             this.rtf_query.TabIndex = 5;\r
             this.rtf_query.Text = "";\r
             // \r
-            // groupBox_dest\r
-            // \r
-            this.groupBox_dest.Controls.Add(this.btn_destBrowse);\r
-            this.groupBox_dest.Controls.Add(this.Label3);\r
-            this.groupBox_dest.Controls.Add(this.text_destination);\r
-            this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.groupBox_dest.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_dest.Location = new System.Drawing.Point(9, 160);\r
-            this.groupBox_dest.Name = "groupBox_dest";\r
-            this.groupBox_dest.Size = new System.Drawing.Size(732, 50);\r
-            this.groupBox_dest.TabIndex = 3;\r
-            this.groupBox_dest.TabStop = false;\r
-            this.groupBox_dest.Text = "Destination";\r
-            // \r
             // btn_destBrowse\r
             // \r
+            this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_destBrowse.Location = new System.Drawing.Point(642, 18);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(645, 152);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);\r
             this.btn_destBrowse.TabIndex = 13;\r
@@ -1247,7 +1138,7 @@ namespace Handbrake
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox2.Location = new System.Drawing.Point(751, 70);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(245, 546);\r
+            this.groupBox2.Size = new System.Drawing.Size(245, 515);\r
             this.groupBox2.TabIndex = 6;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
@@ -1268,8 +1159,8 @@ namespace Handbrake
             this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset);\r
             this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset);\r
             this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault);\r
-            this.splitContainer1.Size = new System.Drawing.Size(239, 526);\r
-            this.splitContainer1.SplitterDistance = 485;\r
+            this.splitContainer1.Size = new System.Drawing.Size(239, 495);\r
+            this.splitContainer1.SplitterDistance = 456;\r
             this.splitContainer1.TabIndex = 1;\r
             // \r
             // treeView_presets\r
@@ -1283,7 +1174,7 @@ namespace Handbrake
             this.treeView_presets.Location = new System.Drawing.Point(0, 0);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
-            this.treeView_presets.Size = new System.Drawing.Size(239, 485);\r
+            this.treeView_presets.Size = new System.Drawing.Size(239, 456);\r
             this.treeView_presets.TabIndex = 0;\r
             this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
@@ -1481,7 +1372,7 @@ namespace Handbrake
             // \r
             this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.lbl_encode});\r
-            this.StatusStrip.Location = new System.Drawing.Point(0, 623);\r
+            this.StatusStrip.Location = new System.Drawing.Point(0, 599);\r
             this.StatusStrip.Name = "StatusStrip";\r
             this.StatusStrip.Size = new System.Drawing.Size(1000, 22);\r
             this.StatusStrip.TabIndex = 7;\r
@@ -1504,26 +1395,117 @@ namespace Handbrake
             this.hbproc.StartInfo.UserName = "";\r
             this.hbproc.SynchronizingObject = this;\r
             // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label1.Location = new System.Drawing.Point(13, 74);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(56, 13);\r
+            this.label1.TabIndex = 8;\r
+            this.label1.Text = "Source:";\r
+            // \r
+            // lbl_source\r
+            // \r
+            this.lbl_source.AutoSize = true;\r
+            this.lbl_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_source.Location = new System.Drawing.Point(75, 74);\r
+            this.lbl_source.Name = "lbl_source";\r
+            this.lbl_source.Size = new System.Drawing.Size(152, 13);\r
+            this.lbl_source.TabIndex = 9;\r
+            this.lbl_source.Text = "Click \'Source\' to continue";\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label4.Location = new System.Drawing.Point(13, 130);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(81, 13);\r
+            this.label4.TabIndex = 46;\r
+            this.label4.Text = "Destination";\r
+            // \r
+            // groupBox_output\r
+            // \r
+            this.groupBox_output.AutoSize = true;\r
+            this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.groupBox_output.Location = new System.Drawing.Point(13, 189);\r
+            this.groupBox_output.Name = "groupBox_output";\r
+            this.groupBox_output.Size = new System.Drawing.Size(210, 13);\r
+            this.groupBox_output.TabIndex = 47;\r
+            this.groupBox_output.Text = "Output Settings: (Preset: None)";\r
+            // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
             // Filters\r
             // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
             this.Filters.Location = new System.Drawing.Point(0, 0);\r
             this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(519, 275);\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
             this.Filters.TabIndex = 0;\r
             // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.AutoScroll = true;\r
-            this.ClientSize = new System.Drawing.Size(1000, 645);\r
-            this.Controls.Add(this.gb_source);\r
-            this.Controls.Add(this.groupBox_dest);\r
+            this.ClientSize = new System.Drawing.Size(1000, 621);\r
             this.Controls.Add(this.groupBox_output);\r
+            this.Controls.Add(this.drop_format);\r
+            this.Controls.Add(this.label5);\r
+            this.Controls.Add(this.btn_destBrowse);\r
+            this.Controls.Add(this.check_largeFile);\r
+            this.Controls.Add(this.label4);\r
+            this.Controls.Add(this.check_iPodAtom);\r
+            this.Controls.Add(this.Label3);\r
+            this.Controls.Add(this.check_optimiseMP4);\r
+            this.Controls.Add(this.drop_angle);\r
+            this.Controls.Add(this.text_destination);\r
+            this.Controls.Add(this.lbl_source);\r
+            this.Controls.Add(this.lbl_angle);\r
+            this.Controls.Add(this.lbl_duration);\r
+            this.Controls.Add(this.label_duration);\r
+            this.Controls.Add(this.label1);\r
+            this.Controls.Add(this.Label13);\r
+            this.Controls.Add(this.drop_chapterFinish);\r
             this.Controls.Add(this.groupBox2);\r
+            this.Controls.Add(this.drop_chapterStart);\r
             this.Controls.Add(this.toolStrip1);\r
+            this.Controls.Add(this.drp_dvdtitle);\r
+            this.Controls.Add(this.Label9);\r
             this.Controls.Add(this.tabs_panel);\r
+            this.Controls.Add(this.Label10);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Controls.Add(this.StatusStrip);\r
             this.DoubleBuffered = true;\r
@@ -1536,10 +1518,6 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();\r
             this.frmMainMenu.ResumeLayout(false);\r
             this.frmMainMenu.PerformLayout();\r
-            this.gb_source.ResumeLayout(false);\r
-            this.gb_source.PerformLayout();\r
-            this.groupBox_output.ResumeLayout(false);\r
-            this.groupBox_output.PerformLayout();\r
             this.tab_audio.ResumeLayout(false);\r
             this.tab_video.ResumeLayout(false);\r
             this.tab_video.PerformLayout();\r
@@ -1552,8 +1530,6 @@ namespace Handbrake
             this.tab_advanced.ResumeLayout(false);\r
             this.tab_query.ResumeLayout(false);\r
             this.tab_query.PerformLayout();\r
-            this.groupBox_dest.ResumeLayout(false);\r
-            this.groupBox_dest.PerformLayout();\r
             this.groupBox2.ResumeLayout(false);\r
             this.splitContainer1.Panel1.ResumeLayout(false);\r
             this.splitContainer1.Panel2.ResumeLayout(false);\r
@@ -1585,15 +1561,12 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_about;\r
         internal System.Windows.Forms.MenuStrip frmMainMenu;\r
-        internal System.Windows.Forms.GroupBox gb_source;\r
         internal System.Windows.Forms.Label Label13;\r
         internal System.Windows.Forms.ComboBox drop_chapterFinish;\r
         internal System.Windows.Forms.ComboBox drop_chapterStart;\r
         internal System.Windows.Forms.ComboBox drp_dvdtitle;\r
-        internal System.Windows.Forms.Label Label17;\r
         internal System.Windows.Forms.Label Label9;\r
         internal System.Windows.Forms.Label Label10;\r
-        internal System.Windows.Forms.GroupBox groupBox_output;\r
         internal System.Windows.Forms.Label Label3;\r
         internal System.Windows.Forms.ComboBox drp_videoEncoder;\r
         internal System.Windows.Forms.Label Label47;\r
@@ -1613,7 +1586,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
         internal System.Windows.Forms.TabControl tabs_panel;\r
         internal System.Windows.Forms.Label Label46;\r
-        private System.Windows.Forms.GroupBox groupBox_dest;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
         internal System.Windows.Forms.Button btn_setDefault;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;\r
@@ -1684,7 +1656,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripButton tb_preview;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn number;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
-        internal TextBox text_source;\r
         private System.Diagnostics.Process hbproc;\r
         internal ComboBox drop_angle;\r
         internal Label lbl_angle;\r
@@ -1693,6 +1664,10 @@ namespace Handbrake
         internal Handbrake.Controls.PictureSettings PictureSettings;\r
         internal Handbrake.Controls.Subtitles Subtitles;\r
         internal Handbrake.Controls.Filters Filters;\r
+        private Label label1;\r
+        internal Label lbl_source;\r
+        private Label label4;\r
+        internal Label groupBox_output;\r
 \r
  \r
     }\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index d9789b5db6ef5bd523374999c413bca04e3a16b8..69e429c4b8d83ee211b17feca946148b32bb9ac6 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -31,6 +31,7 @@ namespace Handbrake
         private frmQueue queueWindow;\r
         private frmPreview qtpreview;\r
         private Form splash;\r
+        public string sourcePath;\r
 \r
         // Delegates **********************************************************\r
         private delegate void UpdateWindowHandler();\r
@@ -209,7 +210,7 @@ namespace Handbrake
                         startScan(fileList[0]);\r
                     }\r
                     else\r
-                        text_source.Text = "Click 'Source' to continue";\r
+                        lbl_source.Text = "Click 'Source' to continue";\r
                 }\r
             }\r
         }\r
@@ -540,7 +541,7 @@ namespace Handbrake
             }\r
             else\r
             {\r
-                if (encodeQueue.count() != 0 || (text_source.Text != string.Empty && text_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))\r
+                if (encodeQueue.count() != 0 || (lbl_source.Text != string.Empty && lbl_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))\r
                 {\r
                     String query = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this);\r
 \r
@@ -552,7 +553,7 @@ namespace Handbrake
                     if (overwrite == DialogResult.Yes)\r
                     {\r
                         if (encodeQueue.count() == 0)\r
-                            encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                            encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
 \r
                         queueWindow.setQueue();\r
                         if (encodeQueue.count() > 1)\r
@@ -564,14 +565,14 @@ namespace Handbrake
                     }\r
                     this.Focus();\r
                 }\r
-                else if (text_source.Text == string.Empty || text_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
+                else if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
                     MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             }\r
         }\r
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
         {\r
 \r
-            if (text_source.Text == string.Empty || text_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
+            if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
                 MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
@@ -584,11 +585,11 @@ namespace Handbrake
                     DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",\r
                   "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
                     if (result == DialogResult.Yes)\r
-                        encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                        encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
 \r
                 }\r
                 else\r
-                    encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                    encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
 \r
                 queueWindow.Show();\r
             }\r
@@ -599,7 +600,7 @@ namespace Handbrake
         }\r
         private void tb_preview_Click(object sender, EventArgs e)\r
         {\r
-            if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")\r
+            if (lbl_source.Text == "" || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == "")\r
                 MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
@@ -664,7 +665,7 @@ namespace Handbrake
             // Set the last action to scan. \r
             // This is used for tracking which file to load in the activity window\r
             lastAction = "scan";\r
-            text_source.Text = "";\r
+            lbl_source.Text = "";\r
 \r
             if (DVD_Open.ShowDialog() == DialogResult.OK)\r
             {\r
@@ -676,22 +677,23 @@ namespace Handbrake
                 {\r
                     if (filename != "")\r
                     {\r
+                        lbl_source.Text = Path.GetFullPath(filename);\r
                         setupGUIforScan(filename);\r
                         startScan(filename);\r
                     }\r
                     else\r
-                        text_source.Text = "Click 'Source' to continue";\r
+                        lbl_source.Text = "Click 'Source' to continue";\r
                 }\r
             }\r
             else\r
-                text_source.Text = "Click 'Source' to continue";\r
+                lbl_source.Text = "Click 'Source' to continue";\r
         }\r
         private void btn_file_source_Click(object sender, EventArgs e)\r
         {\r
             // Set the last action to scan. \r
             // This is used for tracking which file to load in the activity window\r
             lastAction = "scan";\r
-            text_source.Text = "";\r
+            lbl_source.Text = "";\r
 \r
             if (ISO_Open.ShowDialog() == DialogResult.OK)\r
             {\r
@@ -704,15 +706,16 @@ namespace Handbrake
                 {\r
                     if (filename != "")\r
                     {\r
+                        lbl_source.Text = Path.GetFileName(filename);\r
                         setupGUIforScan(filename);\r
                         startScan(filename);\r
                     }\r
                     else\r
-                        text_source.Text = "Click 'Source' to continue";\r
+                        lbl_source.Text = "Click 'Source' to continue";\r
                 }\r
             }\r
             else\r
-                text_source.Text = "Click 'Source' to continue";\r
+                lbl_source.Text = "Click 'Source' to continue";\r
         }\r
         private void mnu_dvd_drive_Click(object sender, EventArgs e)\r
         {\r
@@ -727,6 +730,7 @@ namespace Handbrake
             {\r
                 string[] path = mnu_dvd_drive.Text.Split(' ');\r
                 String filename = path[0];\r
+                lbl_source.Text = Path.GetFullPath(filename);\r
                 setupGUIforScan(filename);\r
                 startScan(filename);\r
             }\r
@@ -799,7 +803,7 @@ namespace Handbrake
             // Run the autoName & chapterNaming functions\r
             if (Properties.Settings.Default.autoNaming)\r
             {\r
-                string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
+                string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
                 if (autoPath != null)\r
                     text_destination.Text = autoPath;\r
                 else\r
@@ -843,7 +847,7 @@ namespace Handbrake
 \r
             // Run the Autonaming function\r
             if (Properties.Settings.Default.autoNaming)\r
-                text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
+                text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
 \r
             // Disable chapter markers if only 1 chapter is selected.\r
             if (c_start == c_end)\r
@@ -874,7 +878,7 @@ namespace Handbrake
 \r
             // Run the Autonaming function\r
             if (Properties.Settings.Default.autoNaming)\r
-                text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
+                text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
 \r
             // Add more rows to the Chapter menu if needed.\r
             if (Check_ChapterMarkers.Checked)\r
@@ -1211,8 +1215,7 @@ namespace Handbrake
         private static int scanProcessID { get; set; }\r
         private void setupGUIforScan(String filename)\r
         {\r
-            text_source.Text = filename;\r
-\r
+            sourcePath = filename;\r
             foreach (Control ctrl in Controls)\r
             {\r
                 if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
@@ -1220,7 +1223,7 @@ namespace Handbrake
             }\r
             lbl_encode.Visible = true;\r
             lbl_encode.Text = "Scanning ...";\r
-            gb_source.Text = "Source: Scanning ...";\r
+            //gb_source.Text = "Source: Scanning ...";\r
             btn_source.Enabled = false;\r
             btn_start.Enabled = false;\r
             btn_showQueue.Enabled = false;\r
@@ -1320,7 +1323,7 @@ namespace Handbrake
                     drp_dvdtitle.SelectedItem = Main.selectLongestTitle(drp_dvdtitle);\r
 \r
                 // Enable the creation of chapter markers if the file is an image of a dvd.\r
-                if (text_source.Text.ToLower().Contains(".iso") || text_source.Text.ToLower().Contains("VIDEO_TS"))\r
+                if (lbl_source.Text.ToLower().Contains(".iso") || lbl_source.Text.ToLower().Contains("VIDEO_TS"))\r
                     Check_ChapterMarkers.Enabled = true;\r
                 else\r
                 {\r
@@ -1349,7 +1352,7 @@ namespace Handbrake
                 if (InvokeRequired)\r
                     BeginInvoke(new UpdateWindowHandler(enableGUI));\r
                 lbl_encode.Text = "Scan Completed";\r
-                gb_source.Text = "Source";\r
+                //gb_source.Text = "Source";\r
                 foreach (Control ctrl in Controls)\r
                     ctrl.Enabled = true;\r
                 btn_start.Enabled = true;\r
@@ -1398,7 +1401,7 @@ namespace Handbrake
             lbl_duration.Text = "Select a Title";\r
             PictureSettings.lbl_src_res.Text = "Select a Title";\r
             PictureSettings.lbl_Aspect.Text = "Select a Title";\r
-            text_source.Text = "Click 'Source' to continue";\r
+            lbl_source.Text = "Click 'Source' to continue";\r
             text_destination.Text = "";\r
             thisDVD = null;\r
             selectedTitle = null;\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index dfe1350b6a328c4ba787ea3049b30e9a29e46945..edb2fe5ef02b25a5996b20bceba40b6671333a8d 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -58,6 +58,8 @@ namespace Handbrake
             this.txt_vlcPath = new System.Windows.Forms.TextBox();\r
             this.label29 = new System.Windows.Forms.Label();\r
             this.tab_cli = new System.Windows.Forms.TabPage();\r
+            this.btn_viewLogs = new System.Windows.Forms.Button();\r
+            this.btn_clearLogs = new System.Windows.Forms.Button();\r
             this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();\r
             this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();\r
             this.label3 = new System.Windows.Forms.Label();\r
@@ -73,6 +75,8 @@ namespace Handbrake
             this.drp_processors = new System.Windows.Forms.ComboBox();\r
             this.Label4 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
+            this.label31 = new System.Windows.Forms.Label();\r
+            this.label15 = new System.Windows.Forms.Label();\r
             this.numeric_updateCheckDays = new System.Windows.Forms.NumericUpDown();\r
             this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();\r
             this.check_inGuiStatus = new System.Windows.Forms.CheckBox();\r
@@ -119,8 +123,6 @@ namespace Handbrake
             this.label26 = new System.Windows.Forms.Label();\r
             this.label27 = new System.Windows.Forms.Label();\r
             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();\r
-            this.label15 = new System.Windows.Forms.Label();\r
-            this.label31 = new System.Windows.Forms.Label();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -136,7 +138,7 @@ namespace Handbrake
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(430, 382);\r
+            this.btn_close.Location = new System.Drawing.Point(437, 382);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(72, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -173,7 +175,7 @@ namespace Handbrake
             this.tab_options.Location = new System.Drawing.Point(12, 55);\r
             this.tab_options.Name = "tab_options";\r
             this.tab_options.SelectedIndex = 0;\r
-            this.tab_options.Size = new System.Drawing.Size(490, 321);\r
+            this.tab_options.Size = new System.Drawing.Size(497, 321);\r
             this.tab_options.TabIndex = 58;\r
             // \r
             // tab_general\r
@@ -194,7 +196,7 @@ namespace Handbrake
             this.tab_general.Controls.Add(this.drp_completeOption);\r
             this.tab_general.Location = new System.Drawing.Point(4, 22);\r
             this.tab_general.Name = "tab_general";\r
-            this.tab_general.Size = new System.Drawing.Size(482, 295);\r
+            this.tab_general.Size = new System.Drawing.Size(489, 295);\r
             this.tab_general.TabIndex = 3;\r
             this.tab_general.Text = "General";\r
             this.tab_general.UseVisualStyleBackColor = true;\r
@@ -356,7 +358,7 @@ namespace Handbrake
             this.tab_picture.Controls.Add(this.label29);\r
             this.tab_picture.Location = new System.Drawing.Point(4, 22);\r
             this.tab_picture.Name = "tab_picture";\r
-            this.tab_picture.Size = new System.Drawing.Size(482, 295);\r
+            this.tab_picture.Size = new System.Drawing.Size(489, 295);\r
             this.tab_picture.TabIndex = 5;\r
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
@@ -396,6 +398,8 @@ namespace Handbrake
             // \r
             // tab_cli\r
             // \r
+            this.tab_cli.Controls.Add(this.btn_viewLogs);\r
+            this.tab_cli.Controls.Add(this.btn_clearLogs);\r
             this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);\r
             this.tab_cli.Controls.Add(this.cb_logVerboseLvl);\r
             this.tab_cli.Controls.Add(this.label3);\r
@@ -412,20 +416,44 @@ namespace Handbrake
             this.tab_cli.Controls.Add(this.Label4);\r
             this.tab_cli.Location = new System.Drawing.Point(4, 22);\r
             this.tab_cli.Name = "tab_cli";\r
-            this.tab_cli.Size = new System.Drawing.Size(482, 295);\r
+            this.tab_cli.Size = new System.Drawing.Size(489, 295);\r
             this.tab_cli.TabIndex = 2;\r
             this.tab_cli.Text = "CLI";\r
             this.tab_cli.UseVisualStyleBackColor = true;\r
             // \r
+            // btn_viewLogs\r
+            // \r
+            this.btn_viewLogs.Font = new System.Drawing.Font("Verdana", 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(71, 238);\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
+            // \r
+            this.btn_clearLogs.Font = new System.Drawing.Font("Verdana", 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(216, 238);\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
             // check_logsInSpecifiedLocation\r
             // \r
             this.check_logsInSpecifiedLocation.AutoSize = true;\r
             this.check_logsInSpecifiedLocation.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 201);\r
+            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 187);\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(363, 17);\r
             this.check_logsInSpecifiedLocation.TabIndex = 87;\r
-            this.check_logsInSpecifiedLocation.Text = "Put individual encode logs in a specified location:";\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
@@ -439,7 +467,7 @@ namespace Handbrake
             "0",\r
             "1",\r
             "2"});\r
-            this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 133);\r
+            this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 119);\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
@@ -451,7 +479,7 @@ namespace Handbrake
             this.label3.AutoSize = true;\r
             this.label3.BackColor = System.Drawing.Color.Transparent;\r
             this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(68, 136);\r
+            this.label3.Location = new System.Drawing.Point(68, 122);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(124, 13);\r
             this.label3.TabIndex = 85;\r
@@ -461,11 +489,11 @@ namespace Handbrake
             // \r
             this.check_saveLogWithVideo.AutoSize = true;\r
             this.check_saveLogWithVideo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 178);\r
+            this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 164);\r
             this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";\r
-            this.check_saveLogWithVideo.Size = new System.Drawing.Size(349, 17);\r
+            this.check_saveLogWithVideo.Size = new System.Drawing.Size(406, 17);\r
             this.check_saveLogWithVideo.TabIndex = 83;\r
-            this.check_saveLogWithVideo.Text = "Put individual encode logs in the same location as movie";\r
+            this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as movie";\r
             this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "Place a copy of the encode log in the same folder as the encoded movie.");\r
             this.check_saveLogWithVideo.UseVisualStyleBackColor = true;\r
             this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);\r
@@ -475,7 +503,7 @@ namespace Handbrake
             this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_saveLog.Font = new System.Drawing.Font("Verdana", 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(343, 225);\r
+            this.btn_saveLog.Location = new System.Drawing.Point(343, 211);\r
             this.btn_saveLog.Name = "btn_saveLog";\r
             this.btn_saveLog.Size = new System.Drawing.Size(68, 22);\r
             this.btn_saveLog.TabIndex = 82;\r
@@ -487,7 +515,7 @@ namespace Handbrake
             // \r
             this.label14.AutoSize = true;\r
             this.label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label14.Location = new System.Drawing.Point(68, 228);\r
+            this.label14.Location = new System.Drawing.Point(68, 214);\r
             this.label14.Name = "label14";\r
             this.label14.Size = new System.Drawing.Size(61, 13);\r
             this.label14.TabIndex = 81;\r
@@ -495,7 +523,7 @@ namespace Handbrake
             // \r
             // text_logPath\r
             // \r
-            this.text_logPath.Location = new System.Drawing.Point(135, 225);\r
+            this.text_logPath.Location = new System.Drawing.Point(135, 211);\r
             this.text_logPath.Name = "text_logPath";\r
             this.text_logPath.Size = new System.Drawing.Size(202, 21);\r
             this.text_logPath.TabIndex = 80;\r
@@ -506,7 +534,7 @@ namespace Handbrake
             // \r
             this.label9.AutoSize = true;\r
             this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label9.Location = new System.Drawing.Point(12, 136);\r
+            this.label9.Location = new System.Drawing.Point(12, 122);\r
             this.label9.Name = "label9";\r
             this.label9.Size = new System.Drawing.Size(41, 13);\r
             this.label9.TabIndex = 77;\r
@@ -620,11 +648,30 @@ namespace Handbrake
             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(3);\r
-            this.tab_advanced.Size = new System.Drawing.Size(482, 295);\r
+            this.tab_advanced.Size = new System.Drawing.Size(489, 295);\r
             this.tab_advanced.TabIndex = 4;\r
             this.tab_advanced.Text = "Advanced / Other";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
+            // label31\r
+            // \r
+            this.label31.AutoSize = true;\r
+            this.label31.Location = new System.Drawing.Point(73, 168);\r
+            this.label31.Name = "label31";\r
+            this.label31.Size = new System.Drawing.Size(241, 13);\r
+            this.label31.TabIndex = 96;\r
+            this.label31.Text = "Number of days between update checks:";\r
+            // \r
+            // label15\r
+            // \r
+            this.label15.AutoSize = true;\r
+            this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label15.Location = new System.Drawing.Point(6, 168);\r
+            this.label15.Name = "label15";\r
+            this.label15.Size = new System.Drawing.Size(64, 13);\r
+            this.label15.TabIndex = 95;\r
+            this.label15.Text = "Updates:";\r
+            // \r
             // numeric_updateCheckDays\r
             // \r
             this.numeric_updateCheckDays.Location = new System.Drawing.Point(323, 166);\r
@@ -710,11 +757,11 @@ namespace Handbrake
             // \r
             this.label32.AutoSize = true;\r
             this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label32.Location = new System.Drawing.Point(38, 247);\r
+            this.label32.Location = new System.Drawing.Point(34, 248);\r
             this.label32.Name = "label32";\r
-            this.label32.Size = new System.Drawing.Size(32, 13);\r
+            this.label32.Size = new System.Drawing.Size(36, 13);\r
             this.label32.TabIndex = 89;\r
-            this.label32.Text = "CLI:";\r
+            this.label32.Text = "Dvd:";\r
             // \r
             // label30\r
             // \r
@@ -1163,28 +1210,9 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";\r
             this.openFile_vlc.Filter = "exe|*.exe";\r
             // \r
-            // label15\r
-            // \r
-            this.label15.AutoSize = true;\r
-            this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label15.Location = new System.Drawing.Point(6, 168);\r
-            this.label15.Name = "label15";\r
-            this.label15.Size = new System.Drawing.Size(64, 13);\r
-            this.label15.TabIndex = 95;\r
-            this.label15.Text = "Updates:";\r
-            // \r
-            // label31\r
-            // \r
-            this.label31.AutoSize = true;\r
-            this.label31.Location = new System.Drawing.Point(73, 168);\r
-            this.label31.Name = "label31";\r
-            this.label31.Size = new System.Drawing.Size(241, 13);\r
-            this.label31.TabIndex = 96;\r
-            this.label31.Text = "Number of days between update checks:";\r
-            // \r
             // frmOptions\r
             // \r
-            this.ClientSize = new System.Drawing.Size(514, 413);\r
+            this.ClientSize = new System.Drawing.Size(521, 413);\r
             this.Controls.Add(this.label8);\r
             this.Controls.Add(this.pictureBox2);\r
             this.Controls.Add(this.tab_options);\r
@@ -1300,5 +1328,7 @@ namespace Handbrake
         private System.Windows.Forms.NumericUpDown numeric_updateCheckDays;\r
         private System.Windows.Forms.Label label15;\r
         private System.Windows.Forms.Label label31;\r
+        private System.Windows.Forms.Button btn_viewLogs;\r
+        private System.Windows.Forms.Button btn_clearLogs;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 2f4496a1e3f7efe5e19f988c9b2ad01c140362f1..de739781b419ff9011b063bfea676fd4159808af 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -6,6 +6,7 @@
 \r
 using System;\r
 using System.Windows.Forms;\r
+using Handbrake.Functions;\r
 \r
 namespace Handbrake\r
 {\r
@@ -229,6 +230,22 @@ namespace Handbrake
             Properties.Settings.Default.saveLogPath = text_logPath.Text;\r
         }\r
 \r
+        private void btn_viewLogs_Click(object sender, EventArgs e)\r
+        {\r
+            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";\r
+            string windir = Environment.GetEnvironmentVariable("WINDIR");\r
+            System.Diagnostics.Process prc = new System.Diagnostics.Process();\r
+            prc.StartInfo.FileName = windir + @"\explorer.exe";\r
+            prc.StartInfo.Arguments = logDir;\r
+            prc.Start();\r
+        }\r
+\r
+        private void btn_clearLogs_Click(object sender, EventArgs e)\r
+        {\r
+            Main.clearLogs();\r
+            MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,\r
+                            MessageBoxIcon.Information);\r
+        }\r
         #endregion\r
 \r
         #region Advanced\r