OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs
index 7e673f1..59ae27b 100644 (file)
@@ -21,18 +21,26 @@ namespace Handbrake
 {\r
     public partial class frmMain : Form\r
     {\r
-\r
         // Declarations *******************************************************\r
-        Functions.Common hb_common_func = new Functions.Common();\r
-        Functions.x264Panel x264PanelFunctions = new Functions.x264Panel();\r
+        // Objects which may be used by one or more other objects\r
+        Functions.Main hb_common_func = new Functions.Main();\r
         Functions.Encode cliObj = new Functions.Encode();\r
-        Functions.Queue encodeQueue = new Functions.Queue();\r
+        Queue.Queue encodeQueue = new Queue.Queue();\r
+        Presets.PresetsHandler presetHandler = new Presets.PresetsHandler();\r
         Parsing.Title selectedTitle;\r
-        Functions.Presets presetHandler = new Functions.Presets();\r
+\r
+        // Objects belonging to this window only\r
+        PresetLoader presetLoader = new PresetLoader();\r
+        x264Panel x264PanelFunctions = new x264Panel();\r
+        QueryGenerator queryGen = new QueryGenerator();\r
+\r
         internal Process hbProc;\r
         private Parsing.DVD thisDVD;\r
-        private frmQueue queueWindow = new frmQueue();\r
+        private frmQueue queueWindow;\r
         private delegate void updateStatusChanger();\r
+        private string lastAction = null;\r
+        public int maxWidth = 0;\r
+        public int maxHeight = 0;\r
 \r
         // Applicaiton Startup ************************************************\r
 \r
@@ -44,6 +52,8 @@ namespace Handbrake
             Form splash = new frmSplashScreen();\r
             splash.Show();\r
 \r
+            // Initialize the queue window.\r
+            queueWindow = new frmQueue(this);\r
             //Create a label that can be updated from the parent thread.\r
             Label lblStatus = new Label();\r
             lblStatus.Size = new Size(250, 20);\r
@@ -69,7 +79,6 @@ namespace Handbrake
                     Properties.Settings.Default.hb_version = "0";\r
                 }\r
             }\r
-            Thread.Sleep(100);\r
 \r
             // show the form, but leave disabled until preloading is complete then show the main form\r
             this.Enabled = false;\r
@@ -83,7 +92,6 @@ namespace Handbrake
                 Application.DoEvents();\r
                 Thread updateCheckThread = new Thread(startupUpdateCheck);\r
                 updateCheckThread.Start();\r
-                Thread.Sleep(100);\r
             }\r
 \r
             // Setup the GUI components\r
@@ -96,16 +104,16 @@ namespace Handbrake
                 loadUserDefaults();\r
             else\r
                 loadNormalPreset();\r
+            // Expand the preset Nodes\r
+            treeView_presets.ExpandAll();\r
             // Enabled GUI tooltip's if Required\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
                 ToolTip.Active = true;\r
             lbl_encode.Text = "";\r
-            Thread.Sleep(100);\r
 \r
             //Finished Loading\r
             lblStatus.Text = "Loading Complete!";\r
             Application.DoEvents();\r
-            Thread.Sleep(100);\r
 \r
             //Close the splash screen\r
             splash.Close();\r
@@ -161,22 +169,26 @@ namespace Handbrake
             // Try to load the users default settings.\r
             string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
 \r
-            Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
-            hb_common_func.presetLoader(this, presetQuery, "User Defaults ");\r
+            if (userDefaults == "")\r
+                loadNormalPreset();\r
+            else\r
+            {\r
+                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
+                presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
+            }\r
         }\r
         private void queueRecovery()\r
         {\r
             if (hb_common_func.check_queue_recovery() == true)\r
             {\r
-                DialogResult result;\r
-                result = MessageBox.Show("HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                DialogResult result = MessageBox.Show("HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
 \r
                 if (result == DialogResult.Yes)\r
-                    encodeQueue.recoverQueue(); // Start Recovery\r
+                    encodeQueue.recoverQueue("hb_queue_recovery.xml"); // Start Recovery\r
                 else\r
                 {\r
                     // Remove the Queue recovery file if the user doesn't want to recovery the last queue.\r
-                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.dat");\r
+                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");\r
                     if (File.Exists(queuePath))\r
                         File.Delete(queuePath);\r
                 }\r
@@ -185,39 +197,9 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        // The Applications Main Menu *****************************************\r
+        // The Applications Main Menu and Menus *******************************\r
 \r
         #region File Menu\r
-        private void mnu_open_Click(object sender, EventArgs e)\r
-        {\r
-            string filename;\r
-            File_Open.ShowDialog();\r
-            filename = File_Open.FileName;\r
-\r
-            if (filename != "")\r
-            {\r
-                try\r
-                {\r
-                    // Create StreamReader & open file\r
-                    StreamReader line = new StreamReader(filename);\r
-\r
-                    // Send the query from the file to the Query Parser class then load the preset\r
-                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(line.ReadLine());\r
-                    hb_common_func.presetLoader(this, presetQuery, filename);\r
-\r
-                    // Close the stream\r
-                    line.Close();\r
-\r
-                    Form preset = new frmAddPreset(this, presetHandler);\r
-                    preset.ShowDialog();\r
-\r
-                }\r
-                catch (Exception exc)\r
-                {\r
-                    MessageBox.Show("Unable to load profile. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
-                }\r
-            }\r
-        }\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
         {\r
             Application.Exit();\r
@@ -232,7 +214,13 @@ namespace Handbrake
         }\r
         private void mnu_encodeLog_Click(object sender, EventArgs e)\r
         {\r
-            frmActivityWindow dvdInfoWindow = new frmActivityWindow("hb_encode_log.dat", this, queueWindow);\r
+            String file = String.Empty;\r
+            if (lastAction == "scan")\r
+                file = "dvdinfo.dat";\r
+            else\r
+                file = "hb_encode_log.dat";\r
+\r
+            frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, this, queueWindow);\r
             dvdInfoWindow.Show();\r
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
@@ -245,21 +233,32 @@ namespace Handbrake
         #region Presets Menu\r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
-            hb_common_func.grabCLIPresets();\r
+            presetHandler.updateBuiltInPresets();\r
             loadPresetPanel();\r
             if (treeView_presets.Nodes.Count == 0)\r
                 MessageBox.Show("Unable to load the presets.dat file. Please select \"Update Built-in Presets\" from the Presets Menu \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             else\r
                 MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+\r
+            treeView_presets.ExpandAll();\r
         }\r
         private void mnu_delete_preset_Click(object sender, EventArgs e)\r
         {\r
             // Empty the preset file\r
             string presetsFile = Application.StartupPath.ToString() + "\\presets.dat";\r
-            StreamWriter line = new StreamWriter(presetsFile);\r
-            line.WriteLine("");\r
-            line.Close();\r
-            line.Dispose();\r
+            if (File.Exists(presetsFile))\r
+                File.Delete(presetsFile);\r
+\r
+            try\r
+            {\r
+                FileStream strm = new FileStream(presetsFile, FileMode.Create, FileAccess.Write);\r
+                strm.Close();\r
+                strm.Dispose();\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show("An error has occured during the preset removal process.\n If you are using Windows Vista, you may need to run under Administrator Mode to complete this task. \n" + exc.ToString());\r
+            }\r
 \r
             // Reload the preset panel\r
             loadPresetPanel();\r
@@ -270,8 +269,15 @@ namespace Handbrake
         }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this, presetHandler);\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = saveTreeViewState();\r
+            nodeStatus.Add(true);\r
+\r
+            Form preset = new frmAddPreset(this, queryGen.GenerateTheQuery(this), presetHandler);\r
             preset.ShowDialog();\r
+\r
+            // Now reload the TreeView states\r
+            loadTreeViewStates(nodeStatus);\r
         }\r
         #endregion\r
 \r
@@ -306,8 +312,41 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-        // MainWindow Components, Actions and Functions ***********************\r
+        #region Preset Menu\r
+        private void pmnu_expandAll_Click(object sender, EventArgs e)\r
+        {\r
+            treeView_presets.ExpandAll();\r
+        }\r
+        private void pmnu_collapse_Click(object sender, EventArgs e)\r
+        {\r
+            treeView_presets.CollapseAll();\r
+        }\r
+        private void treeview_presets_mouseUp(object sender, MouseEventArgs e)\r
+        {\r
+            if (e.Button == MouseButtons.Right)\r
+                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);\r
+            treeView_presets.Select();\r
+        }\r
+        private void pmnu_delete_click(object sender, EventArgs e)\r
+        {\r
+            if (treeView_presets.SelectedNode != null)\r
+            {\r
+                presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+\r
+                // Remember each nodes expanded status so we can reload it\r
+                List<Boolean> nodeStatus = saveTreeViewState();\r
+\r
+                // Now reload the preset panel\r
+                loadPresetPanel();\r
+\r
+                // Now reload the TreeView states\r
+                loadTreeViewStates(nodeStatus);\r
+            }\r
+            treeView_presets.Select();\r
+        }\r
+        #endregion\r
 \r
+        // MainWindow Components, Actions and Functions ***********************\r
         #region Actions\r
 \r
         // ToolBar\r
@@ -328,21 +367,24 @@ namespace Handbrake
                 MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
+                // Set the last action to encode. \r
+                // This is used for tracking which file to load in the activity window\r
+                lastAction = "encode";\r
+\r
                 String query;\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
                 else\r
-                    query = hb_common_func.GenerateTheQuery(this);\r
+                    query = queryGen.GenerateTheQuery(this);\r
 \r
                 ThreadPool.QueueUserWorkItem(procMonitor, query);\r
                 lbl_encode.Visible = true;\r
                 lbl_encode.Text = "Encoding in Progress";\r
 \r
                 btn_start.Text = "Stop";\r
+                btn_start.ToolTipText = "Stop the encoding process. \nWarning: This may break your file. Press ctrl-c in the CLI window if you wish it to exit cleanly.";\r
                 btn_start.Image = Properties.Resources.stop;\r
             }\r
-\r
-\r
         }\r
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
         {\r
@@ -351,12 +393,12 @@ namespace Handbrake
             else\r
             {\r
 \r
-                String query = hb_common_func.GenerateTheQuery(this);\r
+                String query = queryGen.GenerateTheQuery(this);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
 \r
-                encodeQueue.add(query);\r
-                encodeQueue.write2disk(); // Writes the queue to the recovery file, just incase the GUI crashes.\r
+                encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                encodeQueue.write2disk("hb_queue_recovery.xml"); // Writes the queue to the recovery file, just incase the GUI crashes.\r
 \r
                 queueWindow.setQueue(encodeQueue);\r
                 queueWindow.Show();\r
@@ -369,13 +411,26 @@ namespace Handbrake
         }\r
         private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
         {\r
-            frmActivityWindow ActivityWindow = new frmActivityWindow("hb_encode_log.dat", this, queueWindow);\r
+            String file = String.Empty;\r
+            if (lastAction == "scan")\r
+                file = "dvdinfo.dat";\r
+            else\r
+                file = "hb_encode_log.dat";\r
+\r
+            frmActivityWindow ActivityWindow = new frmActivityWindow(file, this, queueWindow);\r
             ActivityWindow.Show();\r
         }\r
 \r
         //Source\r
         private void btn_dvd_source_Click(object sender, EventArgs e)\r
         {\r
+            // Enable the creation of chapter markers.\r
+            Check_ChapterMarkers.Enabled = true;\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
+\r
             String filename = "";\r
             text_source.Text = "";\r
 \r
@@ -398,13 +453,17 @@ namespace Handbrake
 \r
                 // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.\r
                 if (drp_dvdtitle.Items.Count == 0)\r
-                    MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                    MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
                 lbl_encode.Text = "";\r
             }\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
+\r
             String filename = "";\r
             text_source.Text = "";\r
 \r
@@ -427,13 +486,30 @@ namespace Handbrake
 \r
                 // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.\r
                 if (drp_dvdtitle.Items.Count == 0)\r
-                    MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                    MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
                 lbl_encode.Text = "";\r
+\r
+                // Enable the creation of chapter markers if the file is an image of a dvd.\r
+                if (filename.ToLower().Contains(".iso"))\r
+                    Check_ChapterMarkers.Enabled = true;\r
+                else\r
+                {\r
+                    Check_ChapterMarkers.Enabled = false;\r
+                    Check_ChapterMarkers.Checked = false;\r
+                    data_chpt.Rows.Clear();\r
+                }\r
             }\r
         }\r
         private void mnu_dvd_drive_Click(object sender, EventArgs e)\r
         {\r
+            // Enable the creation of chapter markers.\r
+            Check_ChapterMarkers.Enabled = true;\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
+\r
             String filename = "";\r
             if (mnu_dvd_drive.Text.Contains("VIDEO_TS"))\r
             {\r
@@ -447,7 +523,7 @@ namespace Handbrake
 \r
             // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.\r
             if (drp_dvdtitle.Items.Count == 0)\r
-                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
             lbl_encode.Text = "";\r
         }\r
@@ -455,7 +531,7 @@ namespace Handbrake
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
         {\r
             if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Automatic"))\r
-                MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'Source' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                MessageBox.Show("There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
         }\r
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -477,7 +553,10 @@ namespace Handbrake
                 lbl_duration.Text = selectedTitle.Duration.ToString();\r
 \r
                 // Set the Recommended Cropping values\r
-                //lbl_RecomendedCrop.Text = string.Format("{0}/{1}/{2}/{3}", selectedTitle.AutoCropDimensions[0], selectedTitle.AutoCropDimensions[1], selectedTitle.AutoCropDimensions[2], selectedTitle.AutoCropDimensions[3]);\r
+                text_top.Text = selectedTitle.AutoCropDimensions[0].ToString();\r
+                text_bottom.Text = selectedTitle.AutoCropDimensions[1].ToString();\r
+                text_left.Text = selectedTitle.AutoCropDimensions[2].ToString();\r
+                text_right.Text = selectedTitle.AutoCropDimensions[3].ToString();\r
 \r
                 // Populate the Start chapter Dropdown\r
                 drop_chapterStart.Items.Clear();\r
@@ -524,43 +603,57 @@ namespace Handbrake
             }\r
 \r
             // Run the autoName & chapterNaming functions\r
-            hb_common_func.autoName(this);\r
-            hb_common_func.chapterNaming(this);\r
+            if (Properties.Settings.Default.autoNaming == "Checked")\r
+                text_destination.Text = hb_common_func.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
+\r
+            data_chpt.Rows.Clear();\r
+            DataGridView chapterGridView = hb_common_func.chapterNaming(data_chpt, drop_chapterStart.Text, drop_chapterFinish.Text);\r
+            if (chapterGridView != null)\r
+                data_chpt = chapterGridView;\r
         }\r
         private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            calculateDuration();\r
+            int c_start, c_end = 1;\r
 \r
-            drop_chapterStart.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                int chapterFinish, chapterStart = 0;\r
-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);\r
-                int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+            if (drop_chapterFinish.Text == "Auto" && drop_chapterFinish.Items.Count != 0)\r
+                drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;\r
+\r
+            int.TryParse(drop_chapterStart.Text, out c_start);\r
+            int.TryParse(drop_chapterFinish.Text, out c_end);\r
 \r
-                if (chapterFinish < chapterStart)\r
-                    drop_chapterStart.BackColor = Color.LightCoral;\r
+            if (c_end != 0)\r
+            {\r
+                if (c_start > c_end)\r
+                    drop_chapterFinish.Text = c_start.ToString();\r
             }\r
+\r
+            lbl_duration.Text = hb_common_func.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+\r
             // Run the Autonaming function\r
-            hb_common_func.autoName(this);\r
+            if (Properties.Settings.Default.autoNaming == "Checked")\r
+                text_destination.Text = hb_common_func.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
         }\r
         private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            calculateDuration();\r
+            int c_start, c_end = 1;\r
 \r
-            drop_chapterFinish.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                int chapterFinish, chapterStart = 0;\r
-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);\r
-                int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+            if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1)\r
+                drop_chapterStart.SelectedIndex = 1;\r
+\r
+            int.TryParse(drop_chapterStart.Text, out c_start);\r
+            int.TryParse(drop_chapterFinish.Text, out c_end);\r
 \r
-                if (chapterFinish < chapterStart)\r
-                    drop_chapterFinish.BackColor = Color.LightCoral;\r
+            if (c_start != 0)\r
+            {\r
+                if (c_end < c_start)\r
+                    drop_chapterFinish.Text = c_start.ToString();\r
             }\r
 \r
+            lbl_duration.Text = hb_common_func.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+\r
             // Run the Autonaming function\r
-            hb_common_func.autoName(this);\r
+            if (Properties.Settings.Default.autoNaming == "Checked")\r
+                text_destination.Text = hb_common_func.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
         }\r
 \r
         //Destination\r
@@ -571,18 +664,31 @@ namespace Handbrake
             DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");\r
 \r
             // Show the dialog and set the main form file path\r
-            DVD_Save.ShowDialog();\r
-            if (DVD_Save.FileName.StartsWith("\\"))\r
-                MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            else\r
-            {\r
-                setAudioByContainer(DVD_Save.FileName);\r
 \r
-                text_destination.Text = DVD_Save.FileName;\r
+            if (text_destination.Text.EndsWith(".mp4"))\r
+                DVD_Save.FilterIndex = 1;\r
+            else if (text_destination.Text.EndsWith(".m4v"))\r
+                DVD_Save.FilterIndex = 2;\r
+            else if (text_destination.Text.EndsWith(".avi"))\r
+                DVD_Save.FilterIndex = 3;\r
+            else if (text_destination.Text.EndsWith(".ogm"))\r
+                DVD_Save.FilterIndex = 4;\r
+            else if (text_destination.Text.EndsWith(".mkv"))\r
+                DVD_Save.FilterIndex = 5;\r
+\r
+            if (DVD_Save.ShowDialog() == DialogResult.OK)\r
+            {\r
+                if (DVD_Save.FileName.StartsWith("\\"))\r
+                    MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                else\r
+                {\r
+                    setAudioByContainer(DVD_Save.FileName);\r
+                    text_destination.Text = DVD_Save.FileName;\r
 \r
-                // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
-                if (Check_ChapterMarkers.Checked)\r
-                    text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\r
+                    // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
+                    if (Check_ChapterMarkers.Checked)\r
+                        text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\r
+                }\r
             }\r
         }\r
         private void text_destination_TextChanged(object sender, EventArgs e)\r
@@ -606,7 +712,6 @@ namespace Handbrake
         // Output Settings\r
         private void drop_format_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-\r
             if (drop_format.SelectedIndex == 0)\r
                 setExtension(".mp4");\r
             else if (drop_format.SelectedIndex == 1)\r
@@ -617,6 +722,7 @@ namespace Handbrake
                 setExtension(".avi");\r
             else if (drop_format.SelectedIndex == 4)\r
                 setExtension(".ogm");\r
+\r
         }\r
 \r
         //Video Tab\r
@@ -705,6 +811,8 @@ namespace Handbrake
         //Picture Tab\r
         private void text_width_TextChanged(object sender, EventArgs e)\r
         {\r
+            maxWidth = 0;  // Reset max width so that it's not using the MaxWidth -X. Quick hack to allow -X for preset usage.\r
+\r
             int width;\r
             Boolean parsed = int.TryParse(text_width.Text, out width);\r
             if (parsed != false)\r
@@ -715,11 +823,11 @@ namespace Handbrake
                     text_width.BackColor = Color.LightGreen;\r
 \r
 \r
-                if (lbl_Aspect.Text != "Select a Title")\r
+                if (lbl_Aspect.Text != "Select a Title" && maxWidth != 0 && maxHeight != 0)\r
                 {\r
                     if (drp_anamorphic.Text == "None")\r
                     {\r
-                        int height = cacluateNonAnamorphicHeight(width);\r
+                        int height = hb_common_func.cacluateNonAnamorphicHeight(width, text_top.Value, text_bottom.Value, text_left.Value, text_right.Value, selectedTitle);\r
                         text_height.Text = height.ToString();\r
                     }\r
                 }\r
@@ -727,6 +835,8 @@ namespace Handbrake
         }\r
         private void text_height_TextChanged(object sender, EventArgs e)\r
         {\r
+            maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.\r
+\r
             int height;\r
             Boolean parsed = int.TryParse(text_height.Text, out height);\r
             if (parsed != false)\r
@@ -765,24 +875,6 @@ namespace Handbrake
             text_top.Enabled = false;\r
             text_bottom.Enabled = false;\r
         }\r
-        private void check_vfr_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            if (check_vfr.CheckState == CheckState.Checked)\r
-            {\r
-                check_detelecine.Enabled = false;\r
-                check_detelecine.CheckState = CheckState.Checked;\r
-                drp_videoFramerate.Enabled = false;\r
-                drp_videoFramerate.SelectedItem = "29.97";\r
-                lbl_vfr.Visible = true;\r
-            }\r
-            else\r
-            {\r
-                check_detelecine.Enabled = true;\r
-                drp_videoFramerate.Enabled = true;\r
-                drp_videoFramerate.SelectedItem = "Automatic";\r
-                lbl_vfr.Visible = false;\r
-            }\r
-        }\r
         private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_anamorphic.SelectedIndex == 1)\r
@@ -813,6 +905,13 @@ namespace Handbrake
                 text_width.Enabled = true;\r
             }\r
         }\r
+        private void slider_deblock_Scroll(object sender, EventArgs e)\r
+        {\r
+            if (slider_deblock.Value == 4)\r
+                lbl_deblockVal.Text = "Off";\r
+            else\r
+                lbl_deblockVal.Text = slider_deblock.Value.ToString();\r
+        }\r
 \r
         // Audio Tab\r
         private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -945,9 +1044,6 @@ namespace Handbrake
         }\r
         private void drp_audmix_2_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audmix_1.Text == "Automatic")\r
-                MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-\r
             if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_2);\r
             else if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text != "6 Channel Discrete"))\r
@@ -958,9 +1054,6 @@ namespace Handbrake
         }\r
         private void drp_audmix_3_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audmix_2.Text == "Automatic")\r
-                MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-\r
             if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_3);\r
             else if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text != "6 Channel Discrete"))\r
@@ -971,9 +1064,6 @@ namespace Handbrake
         }\r
         private void drp_audmix_4_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audmix_3.Text == "Automatic")\r
-                MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-\r
             if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_4);\r
             else if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text != "6 Channel Discrete"))\r
@@ -1221,7 +1311,9 @@ namespace Handbrake
                 text_destination.Text = destination;\r
                 data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = true;\r
-                hb_common_func.chapterNaming(this);\r
+                DataGridView chapterGridView = hb_common_func.chapterNaming(data_chpt, drop_chapterStart.Text, drop_chapterFinish.Text);\r
+                if (chapterGridView != null)\r
+                    data_chpt = chapterGridView;\r
             }\r
             else\r
             {\r
@@ -1336,7 +1428,7 @@ namespace Handbrake
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
-            rtf_query.Text = hb_common_func.GenerateTheQuery(this);\r
+            rtf_query.Text = queryGen.GenerateTheQuery(this);\r
         }\r
         private void btn_clear_Click(object sender, EventArgs e)\r
         {\r
@@ -1346,19 +1438,39 @@ namespace Handbrake
         // Presets\r
         private void btn_addPreset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this, presetHandler);\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = saveTreeViewState();\r
+            nodeStatus.Add(true);\r
+\r
+            // Now add the new preset\r
+            Form preset = new frmAddPreset(this, queryGen.GenerateTheQuery(this), presetHandler);\r
             preset.ShowDialog();\r
+\r
+            // Now reload the TreeView states\r
+            loadTreeViewStates(nodeStatus);\r
         }\r
         private void btn_removePreset_Click(object sender, EventArgs e)\r
         {\r
-            if (treeView_presets.SelectedNode != null)\r
-                presetHandler.remove(treeView_presets.SelectedNode.Text);\r
-            // Now reload the preset panel\r
-            loadPresetPanel();\r
+            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+            {\r
+                if (treeView_presets.SelectedNode != null)\r
+                    presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+\r
+                // Remember each nodes expanded status so we can reload it\r
+                List<Boolean> nodeStatus = saveTreeViewState();\r
+\r
+                // Now reload the preset panel\r
+                loadPresetPanel();\r
+\r
+                // Now reload the TreeView states\r
+                loadTreeViewStates(nodeStatus);\r
+            }\r
+            treeView_presets.Select();\r
         }\r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
-            String query = hb_common_func.GenerateTheQuery(this);\r
+            String query = queryGen.GenerateTheQuery(this);\r
             Properties.Settings.Default.defaultUserSettings = query;\r
             // Save the new default Settings\r
             Properties.Settings.Default.Save();\r
@@ -1370,108 +1482,163 @@ namespace Handbrake
             string presetName = treeView_presets.SelectedNode.Text;\r
             string query = presetHandler.getCliForPreset(presetName);\r
 \r
-            //Ok, Reset all the H264 widgets before changing the preset\r
-            x264PanelFunctions.reset2Defaults(this);\r
+            if (query != null)\r
+            {\r
+                //Ok, Reset all the H264 widgets before changing the preset\r
+                x264PanelFunctions.reset2Defaults(this);\r
 \r
-            // Send the query from the file to the Query Parser class\r
-            Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
+                // Send the query from the file to the Query Parser class\r
+                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
 \r
-            // Now load the preset\r
-            hb_common_func.presetLoader(this, presetQuery, presetName);\r
+                // Now load the preset\r
+                presetLoader.presetLoader(this, presetQuery, presetName);\r
 \r
-            // The x264 widgets will need updated, so do this now:\r
-            x264PanelFunctions.X264_StandardizeOptString(this);\r
-            x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                // The x264 widgets will need updated, so do this now:\r
+                x264PanelFunctions.X264_StandardizeOptString(this);\r
+                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+            }\r
         }\r
+        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)\r
+        {\r
+            if (e.KeyCode == Keys.Delete)\r
+            {\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    if (treeView_presets.SelectedNode != null)\r
+                        presetHandler.remove(treeView_presets.SelectedNode.Text);\r
 \r
-        #endregion\r
+                    // Remember each nodes expanded status so we can reload it\r
+                    List<Boolean> nodeStatus = new List<Boolean>();\r
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                        nodeStatus.Add(node.IsExpanded);\r
 \r
-        #region Functions\r
-        // Replace File extenstion.\r
-        public void setExtension(string newExtension)\r
-        {\r
-            text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".avi", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".ogm", newExtension);\r
+                    // Now reload the preset panel\r
+                    loadPresetPanel();\r
+\r
+                    // And finally, re-expand any of the nodes if required\r
+                    int i = 0;\r
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                    {\r
+                        if (nodeStatus[i] == true)\r
+                            node.Expand();\r
+\r
+                        i++;\r
+                    }\r
+                }\r
+            }\r
         }\r
 \r
-        // DVD Parsing\r
-        public void setStreamReader(Parsing.DVD dvd)\r
+        #endregion\r
+\r
+        #region Preset Expand / Collaspe\r
+        private List<Boolean> saveTreeViewState()\r
         {\r
-            this.thisDVD = dvd;\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = new List<Boolean>();\r
+            foreach (TreeNode node in treeView_presets.Nodes)\r
+            {\r
+                nodeStatus.Add(node.IsExpanded);\r
+                foreach (TreeNode subNode in node.Nodes)\r
+                    nodeStatus.Add(node.IsExpanded);\r
+            }\r
+            return nodeStatus;\r
         }\r
 \r
-        // Chapter Selection Duration calculation\r
-        public void calculateDuration()\r
+        private void loadTreeViewStates(List<Boolean> nodeStatus)\r
         {\r
-            TimeSpan Duration = TimeSpan.FromSeconds(0.0);\r
-\r
-            // Get the durations between the 2 chapter points and add them together.\r
-            if (drop_chapterStart.Text != "Auto" && drop_chapterFinish.Text != "Auto")\r
+            // And finally, re-expand any of the nodes if required\r
+            int i = 0;\r
+            foreach (TreeNode node in treeView_presets.Nodes)\r
             {\r
-                int start_chapter, end_chapter = 0;\r
-                int.TryParse(drop_chapterStart.Text, out start_chapter);\r
-                int.TryParse(drop_chapterFinish.Text, out end_chapter);\r
+                if (nodeStatus[i] == true)\r
+                    node.Expand();\r
 \r
-                int position = start_chapter - 1;\r
-\r
-                while (position != end_chapter)\r
+                foreach (TreeNode subNode in node.Nodes)\r
                 {\r
-                    TimeSpan dur = selectedTitle.Chapters[position].Duration;\r
-                    Duration = Duration + dur;\r
-                    position++;\r
+                    if (nodeStatus[i] == true)\r
+                        subNode.Expand();\r
                 }\r
-            }\r
 \r
-            // Set the Duration\r
-            lbl_duration.Text = Duration.ToString();\r
+                i++;\r
+            }\r
         }\r
-        public int cacluateNonAnamorphicHeight(int width)\r
+        #endregion\r
+\r
+        #region Functions\r
+        private void loadNormalPreset()\r
         {\r
-            float aspect = selectedTitle.AspectRatio;\r
-            int aw;\r
-            int ah;\r
-            if (aspect.ToString() == "1.78")\r
-            {\r
-                aw = 16;\r
-                ah = 9;\r
-            }\r
-            else\r
+            treeView_presets.Nodes.Find("Normal", true);\r
+\r
+            foreach (TreeNode treenode in treeView_presets.Nodes)\r
             {\r
-                aw = 4;\r
-                ah = 3;\r
+                foreach (TreeNode node in treenode.Nodes)\r
+                {\r
+                    if (node.Text.ToString().Equals("Normal"))\r
+                        treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];\r
+                }\r
             }\r
+        }\r
+        /// <summary>\r
+        /// Take in a File destination and change it's file extension to a new Extension\r
+        /// </summary>\r
+        /// <param name="destination"></param>\r
+        /// <param name="newExtension"></param>\r
+        /// <returns>String of the new file path and extension</returns>\r
+        public void setExtension(string newExtension)\r
+        {\r
+            text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
+            text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
+            text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
+            text_destination.Text = text_destination.Text.Replace(".avi", newExtension);\r
+            text_destination.Text = text_destination.Text.Replace(".ogm", newExtension);\r
+        }\r
+        #endregion\r
 \r
-            double a = width * selectedTitle.Resolution.Width * ah * (selectedTitle.Resolution.Height - (double)text_top.Value - (double)text_bottom.Value);\r
-            double b = selectedTitle.Resolution.Height * aw * (selectedTitle.Resolution.Width - (double)text_left.Value - (double)text_right.Value);\r
-\r
-            double y = a / b;\r
-\r
-            // If it's not Mod 16, make it mod 16\r
-            if ((y % 16) != 0)\r
+        #region Drive Detection\r
+        // Source Button Drive Detection\r
+        private delegate void ProgressUpdateHandler();\r
+        private void getDriveInfoThread()\r
+        {\r
+            try\r
             {\r
-                double mod16 = y % 16;\r
-                if (mod16 >= 8)\r
+                if (this.InvokeRequired)\r
                 {\r
-                    mod16 = 16 - mod16;\r
-                    y = y + mod16;\r
+                    this.BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread));\r
+                    return;\r
                 }\r
-                else\r
+\r
+                Boolean foundDrive = false;\r
+                DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();\r
+                foreach (DriveInfo curDrive in theCollectionOfDrives)\r
                 {\r
-                    y = y - mod16;\r
+                    if (curDrive.DriveType == DriveType.CDRom)\r
+                    {\r
+                        if (curDrive.IsReady)\r
+                        {\r
+                            if (File.Exists(curDrive.RootDirectory.ToString() + "VIDEO_TS\\VIDEO_TS.IFO"))\r
+                                mnu_dvd_drive.Text = curDrive.RootDirectory.ToString() + "VIDEO_TS (" + curDrive.VolumeLabel + ")";\r
+                            else\r
+                                mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
+\r
+                            foundDrive = true;\r
+\r
+                        }\r
+                    }\r
                 }\r
-            }\r
 \r
-            //16 * (421 / 16)\r
-            //double z = ( 16 * (( y + 8 ) / 16 ) );\r
-            int x = int.Parse(y.ToString());\r
-            return x;\r
+                if (foundDrive == false)\r
+                    mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
+            }\r
+            catch (Exception)\r
+            {\r
+                mnu_dvd_drive.Text = "[No DVD Drive Ready / Found]";\r
+            }\r
         }\r
+        #endregion\r
 \r
-        // Audio system functions\r
-        private void setAudioByContainer(String path)\r
+        #region Audio Panel Stuff\r
+        public void setAudioByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1620,7 +1787,7 @@ namespace Handbrake
                 }\r
             }\r
         }\r
-        private void setVideoByContainer(String path)\r
+        public void setVideoByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1672,7 +1839,7 @@ namespace Handbrake
                 drp_videoEncoder.Text = oldval;\r
             }\r
         }\r
-        private void setBitrateSelections384(ComboBox dropDown)\r
+        public void setBitrateSelections384(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1691,7 +1858,7 @@ namespace Handbrake
             dropDown.Items.Add("320");\r
             dropDown.Items.Add("384");\r
         }\r
-        private void setBitrateSelections320(ComboBox dropDown)\r
+        public void setBitrateSelections320(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1709,7 +1876,7 @@ namespace Handbrake
             dropDown.Items.Add("256");\r
             dropDown.Items.Add("320");\r
         }\r
-        private void setBitrateSelections160(ComboBox dropDown)\r
+        public void setBitrateSelections160(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1723,75 +1890,6 @@ namespace Handbrake
             dropDown.Items.Add("128");\r
             dropDown.Items.Add("160");\r
         }\r
-\r
-        // Preset system functions\r
-        private void loadNormalPreset()\r
-        {\r
-            foreach (TreeNode treenode in treeView_presets.Nodes)\r
-            {\r
-                if (treenode.Text.ToString().Equals("Normal"))\r
-                    treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index];\r
-            }\r
-        }\r
-        public void loadPresetPanel()\r
-        {\r
-            presetHandler.loadPresetFiles();\r
-\r
-            treeView_presets.Nodes.Clear();\r
-            List<string> presetNameList = new List<string>();\r
-            presetNameList = presetHandler.getPresetNames();\r
-\r
-            // Adds a new preset name to the preset list.\r
-            TreeNode preset_treeview = new TreeNode();\r
-            foreach (string preset in presetNameList)\r
-            {\r
-                preset_treeview = new TreeNode(preset);\r
-\r
-                // Now Fill Out List View with Items\r
-                treeView_presets.Nodes.Add(preset_treeview);\r
-            }\r
-        }\r
-\r
-        // Source Button Drive Detection\r
-        private delegate void ProgressUpdateHandler();\r
-        private void getDriveInfoThread()\r
-        {\r
-            try\r
-            {\r
-                if (this.InvokeRequired)\r
-                {\r
-                    this.BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread));\r
-                    return;\r
-                }\r
-\r
-                Boolean foundDrive = false;\r
-                DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();\r
-                foreach (DriveInfo curDrive in theCollectionOfDrives)\r
-                {\r
-                    if (curDrive.DriveType == DriveType.CDRom)\r
-                    {\r
-                        if (curDrive.IsReady)\r
-                        {\r
-                            if (File.Exists(curDrive.RootDirectory.ToString() + "VIDEO_TS\\VIDEO_TS.IFO"))\r
-                                mnu_dvd_drive.Text = curDrive.RootDirectory.ToString() + "VIDEO_TS (" + curDrive.VolumeLabel + ")";\r
-                            else\r
-                                mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
-\r
-                            foundDrive = true;\r
-\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (foundDrive == false)\r
-                    mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
-            }\r
-            catch (Exception exc)\r
-            {\r
-                MessageBox.Show("Drive Detection Error. \n Error Information: \n\n " + exc.ToString());\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
         #region Encoding\r
@@ -1820,6 +1918,8 @@ namespace Handbrake
                 }\r
 \r
                 // After the encode is done, we may want to shutdown, suspend etc.\r
+                cliObj.addCLIQueryToLog((string)state);\r
+                cliObj.copyLog((string)state, text_destination.Text); // Make a copy of the log in the users desired location if necessary\r
                 cliObj.afterEncodeAction();\r
             }\r
         }\r
@@ -1832,8 +1932,18 @@ namespace Handbrake
             }\r
             lbl_encode.Text = "Encoding Finished";\r
             btn_start.Text = "Start";\r
+            btn_start.ToolTipText = "Start the encoding process";\r
             btn_start.Image = Properties.Resources.Play;\r
         }\r
+\r
+        #endregion\r
+\r
+        #region Public Methods\r
+\r
+        /// <summary>\r
+        /// Is the mainWindow currently monitoring an encoding session\r
+        /// </summary>\r
+        /// <returns>boolean</returns>\r
         public Boolean isEncoding()\r
         {\r
             if (hbProc == null)\r
@@ -1842,6 +1952,122 @@ namespace Handbrake
                 return true;\r
         }\r
 \r
+        /// <summary>\r
+        /// Action can be "encode" or "scan"\r
+        /// Set the last action varible in the main window.\r
+        /// This is used to control which log file is displayed when the Activity window is displayed.\r
+        /// </summary>\r
+        /// <param name="last">String</param>\r
+        public void setLastAction(string last)\r
+        {\r
+            this.lastAction = last;\r
+        }\r
+\r
+        /// <summary>\r
+        /// DVD parseing. Pass in a parsed DVD.\r
+        /// </summary>\r
+        /// <param name="dvd"></param>\r
+        public void setStreamReader(Parsing.DVD dvd)\r
+        {\r
+            this.thisDVD = dvd;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Reload the preset panel display\r
+        /// </summary>\r
+        public void loadPresetPanel()\r
+        {\r
+            presetHandler.loadPresetData();\r
+\r
+            treeView_presets.Nodes.Clear();\r
+\r
+            List<Presets.Preset> presetNameList = new List<Presets.Preset>();\r
+            List<string> presetNames = new List<string>();\r
+            TreeNode preset_treeview = new TreeNode();\r
+\r
+            TreeNode rootNode = new TreeNode();\r
+            TreeNode rootNodeTwo = new TreeNode();\r
+            TreeNode childNode = new TreeNode();\r
+            int workingLevel = 0;\r
+            string previousCategory = String.Empty;\r
+            string currentCategory = String.Empty;\r
+\r
+            presetNameList = presetHandler.getBuildInPresets();\r
+            if (presetNameList.Count != 0)\r
+            {\r
+                foreach (Presets.Preset preset in presetNameList)\r
+                {\r
+                    // Handle Root Nodes\r
+\r
+                    // First Case - No presets have been read yet so setup the root category\r
+                    if (preset.Level == 1 && currentCategory == String.Empty)\r
+                    {\r
+                        rootNode = new TreeNode(preset.Category);\r
+                        workingLevel = preset.Level;\r
+                        currentCategory = preset.Category;\r
+                        previousCategory = preset.Category;\r
+                    }\r
+\r
+                    // Second Case - This is the first sub child node.\r
+                    if (preset.Level == 2 && workingLevel == 1 && currentCategory != preset.Category)\r
+                    {\r
+                        rootNodeTwo = new TreeNode(preset.Category);\r
+                        workingLevel = preset.Level;\r
+                        currentCategory = preset.Category;\r
+                        rootNode.Nodes.Add(rootNodeTwo);\r
+                    }\r
+\r
+                    // Third Case - Any presets the sub presets detected in the above if statment.\r
+                    if (preset.Level == 1 && workingLevel == 2)\r
+                    {\r
+                        workingLevel = preset.Level;\r
+                        currentCategory = preset.Category;\r
+                    }\r
+\r
+                    // Fourth Case - We've finished this root node and are onto the next root node.\r
+                    if (preset.Level == 1 && workingLevel == 1 && previousCategory != preset.Category)\r
+                    {\r
+                        treeView_presets.Nodes.Add(rootNode); // Add the finished node\r
+\r
+                        rootNode = new TreeNode(preset.Category);\r
+                        workingLevel = preset.Level;\r
+                        currentCategory = preset.Category;\r
+                        previousCategory = preset.Category;\r
+                    }\r
+\r
+                    // Handle Child Nodes\r
+                    // Add First level child nodes to the current root node\r
+                    if (preset.Level == 1 && workingLevel == 1 && currentCategory == preset.Category)\r
+                    {\r
+                        childNode = new TreeNode(preset.Name);\r
+                        rootNode.Nodes.Add(childNode);\r
+                    }\r
+\r
+                    // Add Second level child nodes to the current sub root node\r
+                    if (preset.Level == 2 && workingLevel == 2 && currentCategory == preset.Category)\r
+                    {\r
+                        childNode = new TreeNode(preset.Name);\r
+                        rootNodeTwo.Nodes.Add(childNode);\r
+                    }\r
+                }\r
+\r
+                // Add the final root node which does not get added above.\r
+                treeView_presets.Nodes.Add(rootNode);\r
+            }\r
+\r
+\r
+            // User Presets\r
+            presetNames = presetHandler.getUserPresetNames();\r
+            foreach (string preset in presetNames)\r
+            {\r
+                preset_treeview = new TreeNode(preset);\r
+                preset_treeview.ForeColor = Color.Black;\r
+\r
+                // Now Fill Out List View with Items\r
+                treeView_presets.Nodes.Add(preset_treeview);\r
+            }\r
+        }\r
+\r
         #endregion\r
 \r
         #region Taskbar Tray Icon\r
@@ -1880,7 +2106,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file