OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs
index 76bb5f2..59ae27b 100644 (file)
@@ -6,6 +6,7 @@
 \r
 using System;\r
 using System.Collections;\r
+using System.Collections.Generic;\r
 using System.Drawing;\r
 using System.Text;\r
 using System.Windows.Forms;\r
@@ -20,19 +21,30 @@ namespace Handbrake
 {\r
     public partial class frmMain : Form\r
     {\r
-        // -------------------------------------------------------------- \r
-        // Applicaiton Startup\r
-        // --------------------------------------------------------------\r
-\r
-        #region Application Startup\r
-\r
-        // Declarations\r
-        private Process hbProc;\r
+        // Declarations *******************************************************\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
+        Queue.Queue encodeQueue = new Queue.Queue();\r
+        Presets.PresetsHandler presetHandler = new Presets.PresetsHandler();\r
+        Parsing.Title selectedTitle;\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
-        Functions.Common hb_common_func = new Functions.Common();\r
-        Functions.x264Panel x264PanelFunctions = new Functions.x264Panel();\r
+        private string lastAction = null;\r
+        public int maxWidth = 0;\r
+        public int maxHeight = 0;\r
+\r
+        // Applicaiton Startup ************************************************\r
+\r
+        #region Application Startup\r
 \r
         public frmMain()\r
         {\r
@@ -40,23 +52,38 @@ 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
             lblStatus.Location = new Point(10, 280);\r
             splash.Controls.Add(lblStatus);\r
 \r
-            //Fire a thread to wait for 2 seconds.  The splash screen will exit when the time expires\r
-            Thread timer = new Thread(splashTimer);\r
-            timer.Start();\r
-\r
             InitializeComponent();\r
 \r
+            // Update the users config file with the CLI version data.\r
+            lblStatus.Text = "Setting Version Data ...";\r
+            Application.DoEvents();\r
+            ArrayList x = hb_common_func.getCliVersionData();\r
+            if (x != null)\r
+            {\r
+                try\r
+                {\r
+                    Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());\r
+                    Properties.Settings.Default.hb_version = x[0].ToString();\r
+                }\r
+                catch (Exception)\r
+                {\r
+                    Properties.Settings.Default.hb_build = 0;\r
+                    Properties.Settings.Default.hb_version = "0";\r
+                }\r
+            }\r
+\r
             // show the form, but leave disabled until preloading is complete then show the main form\r
             this.Enabled = false;\r
             this.Show();\r
-            // Forces frmMain to draw\r
-            Application.DoEvents();\r
+            Application.DoEvents(); // Forces frmMain to draw\r
 \r
             // update the status\r
             if (Properties.Settings.Default.updateStatus == "Checked")\r
@@ -65,49 +92,28 @@ namespace Handbrake
                 Application.DoEvents();\r
                 Thread updateCheckThread = new Thread(startupUpdateCheck);\r
                 updateCheckThread.Start();\r
-                Thread.Sleep(100);\r
             }\r
 \r
-            //H264 Panel Loading\r
-            lblStatus.Text = "Loading H264 Panel ...";\r
-            Application.DoEvents();\r
-            setupH264Panel();\r
-            Thread.Sleep(100);\r
-\r
-            // Load the presets\r
-            // Set some defaults for the dropdown menus. Just incase the normal or user presets dont load.\r
-            lblStatus.Text = "Loading Presets Bar ...";\r
-            Application.DoEvents();\r
-            drp_crop.SelectedIndex = 0;\r
-            loadPresetPanel();\r
-            Thread.Sleep(200);\r
-\r
-            // Now load the users default if required. (Will overide the above setting)\r
-            lblStatus.Text = "Loading Preset Settings ...";\r
+            // Setup the GUI components\r
+            lblStatus.Text = "Setting up the GUI ...";\r
             Application.DoEvents();\r
+            setupH264Panel();               // Initalize the H.264 Panel\r
+            loadPresetPanel();              // Load the Preset Panel\r
+            // Load the user's default settings or Normal Preset\r
             if (Properties.Settings.Default.defaultSettings == "Checked")\r
                 loadUserDefaults();\r
             else\r
                 loadNormalPreset();\r
-            Thread.Sleep(100);\r
-\r
-            // Enable or disable tooltips\r
+            // Expand the preset Nodes\r
+            treeView_presets.ExpandAll();\r
+            // Enabled GUI tooltip's if Required\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
-            {\r
-                lblStatus.Text = "Loading Tooltips ...";\r
-                Application.DoEvents();\r
                 ToolTip.Active = true;\r
-                Thread.Sleep(100);\r
-            }\r
+            lbl_encode.Text = "";\r
 \r
             //Finished Loading\r
             lblStatus.Text = "Loading Complete!";\r
             Application.DoEvents();\r
-            Thread.Sleep(200);\r
-\r
-            // Wait until splash screen is done\r
-            while (timer.IsAlive)\r
-            { Thread.Sleep(100); }\r
 \r
             //Close the splash screen\r
             splash.Close();\r
@@ -115,6 +121,12 @@ namespace Handbrake
 \r
             // Turn the interface back to the user\r
             this.Enabled = true;\r
+\r
+            // Some event Handlers. Used for minimize to taskbar\r
+            this.Resize += new EventHandler(frmMain_Resize);\r
+\r
+            // Queue Recovery\r
+            queueRecovery();\r
         }\r
 \r
         // Startup Functions\r
@@ -135,257 +147,148 @@ namespace Handbrake
                     updateWindow.Show();\r
                 }\r
             }\r
-            catch (Exception)\r
-            {\r
-                // Don't want to have an exception messagebox displayed behind the splash screen,\r
-                // So, exception is ignored. Lets hope there are no bugs here :)\r
-            }\r
-        }\r
-        private void splashTimer(object sender)\r
-        {\r
-            Thread.Sleep(1000);  //sit for 1 seconds then exit\r
-        }\r
-        private void showSplash(object sender)\r
-        {\r
-            Form splash = new frmSplashScreen();\r
-            splash.Show();\r
+            catch (Exception) { /* Do Nothing*/ }\r
         }\r
         private void setupH264Panel()\r
         {\r
-            /*Set opt widget values here*/\r
-\r
-            /*B-Frames fX264optBframesPopUp*/\r
-            int i;\r
-            drop_bFrames.Items.Clear();\r
-            drop_bFrames.Items.Add("Default (0)");\r
+            // Set the default settings of the x264 panel\r
             drop_bFrames.Text = "Default (0)";\r
-\r
-            for (i = 0; i < 17; i++)\r
-            {\r
-                drop_bFrames.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*Reference Frames fX264optRefPopUp*/\r
-            drop_refFrames.Items.Clear();\r
-            drop_refFrames.Items.Add("Default (1)");\r
             drop_refFrames.Text = "Default (1)";\r
-            for (i = 0; i < 17; i++)\r
-            {\r
-                drop_refFrames.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*No Fast P-Skip fX264optNfpskipSwitch BOOLEAN*/\r
-            check_noFastPSkip.CheckState = CheckState.Unchecked;\r
-\r
-            /*No Dict Decimate fX264optNodctdcmtSwitch BOOLEAN*/\r
-            check_noDCTDecimate.CheckState = CheckState.Unchecked;\r
-\r
-\r
-            /*Sub Me fX264optSubmePopUp*/\r
-            drop_subpixelMotionEstimation.Items.Clear();\r
-            drop_subpixelMotionEstimation.Items.Add("Default (4)");\r
             drop_subpixelMotionEstimation.Text = "Default (4)";\r
-            for (i = 0; i < 8; i++)\r
-            {\r
-                drop_subpixelMotionEstimation.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*Trellis fX264optTrellisPopUp*/\r
-            drop_trellis.Items.Clear();\r
-            drop_trellis.Items.Add("Default (0)");\r
             drop_trellis.Text = "Default (0)";\r
-            for (i = 0; i < 3; i++)\r
-            {\r
-                drop_trellis.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*Mixed-references fX264optMixedRefsSwitch BOOLEAN*/\r
-            check_mixedReferences.CheckState = CheckState.Unchecked;\r
-\r
-            /*Motion Estimation fX264optMotionEstPopUp*/\r
-            drop_MotionEstimationMethod.Items.Clear();\r
-            drop_MotionEstimationMethod.Items.Add("Default (Hexagon)");\r
-            drop_MotionEstimationMethod.Items.Add("Diamond");\r
-            drop_MotionEstimationMethod.Items.Add("Hexagon");\r
-            drop_MotionEstimationMethod.Items.Add("Uneven Multi-Hexagon");\r
-            drop_MotionEstimationMethod.Items.Add("Exhaustive");\r
             drop_MotionEstimationMethod.Text = "Default (Hexagon)";\r
-\r
-            /*Motion Estimation range fX264optMERangePopUp*/\r
-            drop_MotionEstimationRange.Items.Clear();\r
-            drop_MotionEstimationRange.Items.Add("Default (16)");\r
             drop_MotionEstimationRange.Text = "Default (16)";\r
-            for (i = 4; i < 65; i++)\r
-            {\r
-                drop_MotionEstimationRange.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*Weighted B-Frame Prediction fX264optWeightBSwitch BOOLEAN*/\r
-            check_weightedBFrames.CheckState = CheckState.Unchecked;\r
-\r
-            /*B-Frame Rate Distortion Optimization fX264optBRDOSwitch BOOLEAN*/\r
-            check_bFrameDistortion.CheckState = CheckState.Unchecked;\r
-\r
-            /*B-frame Pyramids fX264optBPyramidSwitch BOOLEAN*/\r
-            check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-\r
-            /*Bidirectional Motion Estimation Refinement fX264optBiMESwitch BOOLEAN*/\r
-            check_BidirectionalRefinement.CheckState = CheckState.Unchecked;\r
-\r
-            /*Direct B-Frame Prediction Mode fX264optDirectPredPopUp*/\r
-            drop_directPrediction.Items.Clear();\r
-            drop_directPrediction.Items.Add("Default (Spatial)");\r
-            drop_directPrediction.Items.Add("None");\r
-            drop_directPrediction.Items.Add("Spatial");\r
-            drop_directPrediction.Items.Add("Temporal");\r
-            drop_directPrediction.Items.Add("Automatic");\r
             drop_directPrediction.Text = "Default (Spatial)";\r
-\r
-            /*Alpha Deblock*/\r
-            drop_deblockAlpha.Items.Clear();\r
-            drop_deblockAlpha.Items.Add("Default (0)");\r
             drop_deblockAlpha.Text = "Default (0)";\r
-            for (i = -6; i < 7; i++)\r
-            {\r
-                drop_deblockAlpha.Items.Add(i.ToString());\r
-            }\r
-\r
-            /*Beta Deblock*/\r
-            drop_deblockBeta.Items.Clear();\r
-            drop_deblockBeta.Items.Add("Default (0)");\r
             drop_deblockBeta.Text = "Default (0)";\r
-            for (i = -6; i < 7; i++)\r
-            {\r
-                drop_deblockBeta.Items.Add(i.ToString());\r
-            }\r
-\r
-            /* Analysis fX264optAnalysePopUp */\r
-            drop_analysis.Items.Clear();\r
-            drop_analysis.Items.Add("Default (some)"); /* 0=default */\r
-            drop_analysis.Items.Add("None");  /* 1=none */\r
-            drop_analysis.Items.Add("All"); /* 2=all */\r
             drop_analysis.Text = "Default (some)";\r
-\r
-            /* 8x8 DCT fX264op8x8dctSwitch */\r
-            check_8x8DCT.CheckState = CheckState.Unchecked;\r
-\r
-            /* CABAC fX264opCabacSwitch */\r
-            check_Cabac.CheckState = CheckState.Checked;\r
-\r
-            /* Standardize the option string */\r
             rtf_x264Query.Text = "";\r
         }\r
         private void loadUserDefaults()\r
         {\r
+            // Try to load the users default settings.\r
             string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
-            try\r
+\r
+            if (userDefaults == "")\r
+                loadNormalPreset();\r
+            else\r
             {\r
-                // Send the query from the file to the Query Parser class Then load the preset\r
                 Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
-                hb_common_func.presetLoader(this, presetQuery, "User Defaults ");\r
-            }\r
-            catch (Exception)\r
-            {\r
-                // Do Nothing. We don't want an error appearing behind the splash screen.\r
+                presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
             }\r
         }\r
-\r
-        #endregion\r
-\r
-        // -------------------------------------------------------------- \r
-        // The Applications Main Menu\r
-        // -------------------------------------------------------------- \r
-\r
-        #region File Menu\r
-\r
-        private void mnu_open_Click(object sender, EventArgs e)\r
+        private void queueRecovery()\r
         {\r
-            string filename;\r
-            File_Open.ShowDialog();\r
-            filename = File_Open.FileName;\r
-\r
-            if (filename != "")\r
+            if (hb_common_func.check_queue_recovery() == true)\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);\r
-                    preset.ShowDialog();\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
-                }\r
-                catch (Exception exc)\r
+                if (result == DialogResult.Yes)\r
+                    encodeQueue.recoverQueue("hb_queue_recovery.xml"); // Start Recovery\r
+                else\r
                 {\r
-                    MessageBox.Show("Unable to load profile. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\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.xml");\r
+                    if (File.Exists(queuePath))\r
+                        File.Delete(queuePath);\r
                 }\r
             }\r
         }\r
+\r
+        #endregion\r
+\r
+        // The Applications Main Menu and Menus *******************************\r
+\r
+        #region File Menu\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
         {\r
             Application.Exit();\r
         }\r
-\r
         #endregion\r
 \r
         #region Tools Menu\r
-\r
         private void mnu_encode_Click(object sender, EventArgs e)\r
         {\r
-            showQueue();\r
+            queueWindow.setQueue(encodeQueue);\r
+            queueWindow.Show();\r
         }\r
-        private void mnu_viewDVDdata_Click(object sender, EventArgs e)\r
+        private void mnu_encodeLog_Click(object sender, EventArgs e)\r
         {\r
-            frmActivityWindow dvdInfoWindow = new frmActivityWindow("dvdinfo.dat");\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
         {\r
-            Form Options = new frmOptions();\r
+            Form Options = new frmOptions(this);\r
             Options.ShowDialog();\r
         }\r
-\r
         #endregion\r
 \r
         #region Presets Menu\r
-\r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
-            treeView_presets.Nodes.Clear();\r
-            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
+            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
         }\r
         private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
         {\r
             loadNormalPreset();\r
         }\r
+        private void btn_new_preset_Click(object sender, EventArgs e)\r
+        {\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
         #region Help Menu\r
-\r
-        private void mnu_wiki_Click(object sender, EventArgs e)\r
-        {\r
-            Process.Start("http://handbrake.fr/trac");\r
-        }\r
-        private void mnu_faq_Click(object sender, EventArgs e)\r
+        private void mnu_handbrake_forums_Click(object sender, EventArgs e)\r
         {\r
-            Process.Start("http://handbrake.fr/trac/wiki/SupportFAQ");\r
+            Process.Start("http://forum.handbrake.fr/");\r
         }\r
-        private void mnu_onlineDocs_Click(object sender, EventArgs e)\r
+        private void mnu_user_guide_Click(object sender, EventArgs e)\r
         {\r
-            Process.Start("http://handbrake.fr/?article=documentation");\r
+            Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");\r
         }\r
         private void mnu_handbrake_home_Click(object sender, EventArgs e)\r
         {\r
@@ -407,75 +310,165 @@ namespace Handbrake
             Form About = new frmAbout();\r
             About.ShowDialog();\r
         }\r
-\r
         #endregion\r
 \r
-        // -------------------------------------------------------------- \r
-        // MainWindow Components, Actions and Functions\r
-        // --------------------------------------------------------------\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
+        private void btn_source_Click(object sender, EventArgs e)\r
+        {\r
+            if (Properties.Settings.Default.drive_detection == "Checked")\r
+            {\r
+                mnu_dvd_drive.Visible = true;\r
+                Thread driveInfoThread = new Thread(getDriveInfoThread);\r
+                driveInfoThread.Start();\r
+            }\r
+            else\r
+                mnu_dvd_drive.Visible = false;\r
+        }\r
         private void btn_start_Click(object sender, EventArgs e)\r
         {\r
-            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
+            if (text_source.Text == string.Empty || text_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
+                // 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
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
         {\r
-            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
+            if (text_source.Text == string.Empty || text_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
-                String query;\r
+\r
+                String query = queryGen.GenerateTheQuery(this);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
-                else\r
-                    query = hb_common_func.GenerateTheQuery(this);\r
 \r
-                queueWindow.list_queue.Items.Add(query);\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
             }\r
         }\r
         private void btn_showQueue_Click(object sender, EventArgs e)\r
         {\r
-            showQueue();\r
+            queueWindow.setQueue(encodeQueue);\r
+            queueWindow.Show();\r
         }\r
         private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
         {\r
-            frmActivityWindow ActivityWindow = new frmActivityWindow("hb_encode_log.dat");\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_Browse_Click(object sender, EventArgs e)\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
-            if (check_fileMode.Checked)\r
-            {\r
-                ISO_Open.ShowDialog();\r
-                filename = ISO_Open.FileName;\r
-            }\r
+            DVD_Open.ShowDialog();\r
+            filename = DVD_Open.SelectedPath;\r
+\r
+            if (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
-                DVD_Open.ShowDialog();\r
-                filename = DVD_Open.SelectedPath;\r
+                if (filename != "")\r
+                {\r
+                    Form frmRD = new frmReadDVD(filename, this);\r
+                    text_source.Text = filename;\r
+                    lbl_encode.Text = "Scanning ...";\r
+                    frmRD.ShowDialog();\r
+                }\r
+                else\r
+                    text_source.Text = "Click 'Source' to continue";\r
+\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.\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
+            ISO_Open.ShowDialog();\r
+            filename = ISO_Open.FileName;\r
 \r
             if (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
@@ -485,27 +478,66 @@ namespace Handbrake
                 {\r
                     Form frmRD = new frmReadDVD(filename, this);\r
                     text_source.Text = filename;\r
+                    lbl_encode.Text = "Scanning ...";\r
                     frmRD.ShowDialog();\r
                 }\r
                 else\r
-                    text_source.Text = "Click 'Browse' to continue";\r
+                    text_source.Text = "Click 'Source' to continue";\r
 \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
+                string[] path = mnu_dvd_drive.Text.Split(' ');\r
+                filename = path[0];\r
+                lbl_encode.Text = "Scanning ...";\r
+                Form frmRD = new frmReadDVD(filename, this);\r
+                text_source.Text = filename;\r
+                frmRD.ShowDialog();\r
+            }\r
+\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.\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 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 'browse' 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
             // Reset some values on the form\r
             lbl_Aspect.Text = "Select a Title";\r
-            lbl_RecomendedCrop.Text = "Select a Title";\r
+            //lbl_RecomendedCrop.Text = "Select a Title";\r
             drop_chapterStart.Items.Clear();\r
             drop_chapterFinish.Items.Clear();\r
 \r
@@ -513,13 +545,18 @@ namespace Handbrake
             // Otheriwse if its not, title data has to be loased from parsing.\r
             if (drp_dvdtitle.Text != "Automatic")\r
             {\r
-                Parsing.Title selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;\r
+                selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;\r
 \r
                 // Set the Aspect Ratio\r
                 lbl_Aspect.Text = selectedTitle.AspectRatio.ToString();\r
+                lbl_src_res.Text = selectedTitle.Resolution.Width + " x " + selectedTitle.Resolution.Height;\r
+                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
@@ -566,51 +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
-            drop_chapterStart.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                try\r
-                {\r
-                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
-                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
+            int c_start, c_end = 1;\r
 \r
-                    if (chapterFinish < chapterStart)\r
-                        drop_chapterStart.BackColor = Color.LightCoral;\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    drop_chapterStart.BackColor = Color.LightCoral;\r
-                }\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 (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
-            drop_chapterFinish.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                try\r
-                {\r
-                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
-                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
+            int c_start, c_end = 1;\r
 \r
-                    if (chapterFinish < chapterStart)\r
-                        drop_chapterFinish.BackColor = Color.LightCoral;\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    drop_chapterFinish.BackColor = Color.LightCoral;\r
-                }\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 (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
@@ -621,40 +664,84 @@ 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
         {\r
             setAudioByContainer(text_destination.Text);\r
             setVideoByContainer(text_destination.Text);\r
+            string path = text_destination.Text;\r
+            if (path.EndsWith(".mp4"))\r
+                drop_format.SelectedIndex = 0;\r
+            else if (path.EndsWith(".m4v"))\r
+                drop_format.SelectedIndex = 1;\r
+            else if (path.EndsWith(".mkv"))\r
+                drop_format.SelectedIndex = 2;\r
+            else if (path.EndsWith(".avi"))\r
+                drop_format.SelectedIndex = 3;\r
+            else if (path.EndsWith(".ogm"))\r
+                drop_format.SelectedIndex = 4;\r
+\r
         }\r
 \r
         // Output Settings\r
+        private void drop_format_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if (drop_format.SelectedIndex == 0)\r
+                setExtension(".mp4");\r
+            else if (drop_format.SelectedIndex == 1)\r
+                setExtension(".m4v");\r
+            else if (drop_format.SelectedIndex == 2)\r
+                setExtension(".mkv");\r
+            else if (drop_format.SelectedIndex == 3)\r
+                setExtension(".avi");\r
+            else if (drop_format.SelectedIndex == 4)\r
+                setExtension(".ogm");\r
+\r
+        }\r
+\r
+        //Video Tab\r
         private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((text_destination.Text.Contains(".mp4")) || (text_destination.Text.Contains(".m4v")))\r
             {\r
                 check_largeFile.Enabled = true;\r
                 check_optimiseMP4.Enabled = true;\r
+                check_iPodAtom.Enabled = true;\r
             }\r
             else\r
             {\r
                 check_largeFile.Enabled = false;\r
                 check_optimiseMP4.Enabled = false;\r
+                check_iPodAtom.Enabled = false;\r
                 check_largeFile.Checked = false;\r
                 check_optimiseMP4.Checked = false;\r
+                check_iPodAtom.Checked = false;\r
             }\r
 \r
 \r
@@ -685,25 +772,27 @@ namespace Handbrake
             }\r
 \r
         }\r
-\r
-        //Video Tab\r
         private void text_bitrate_TextChanged(object sender, EventArgs e)\r
         {\r
             text_filesize.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
+            check_2PassEncode.Enabled = true;\r
         }\r
         private void text_filesize_TextChanged(object sender, EventArgs e)\r
         {\r
             text_bitrate.Text = "";\r
             slider_videoQuality.Value = 0;\r
             SliderValue.Text = "0%";\r
+            check_2PassEncode.Enabled = true;\r
         }\r
         private void slider_videoQuality_Scroll(object sender, EventArgs e)\r
         {\r
             SliderValue.Text = slider_videoQuality.Value.ToString() + "%";\r
             text_bitrate.Text = "";\r
             text_filesize.Text = "";\r
+            check_2PassEncode.Enabled = false;\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
         }\r
         private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)\r
         {\r
@@ -722,116 +811,69 @@ namespace Handbrake
         //Picture Tab\r
         private void text_width_TextChanged(object sender, EventArgs e)\r
         {\r
-            try\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
             {\r
-                if ((int.Parse(text_width.Text) % 16) != 0)\r
+                if ((width % 16) != 0)\r
                     text_width.BackColor = Color.LightCoral;\r
                 else\r
                     text_width.BackColor = Color.LightGreen;\r
 \r
 \r
-                if ((lbl_Aspect.Text != "Select a Title") && (drp_crop.SelectedIndex == 2))\r
+                if (lbl_Aspect.Text != "Select a Title" && maxWidth != 0 && maxHeight != 0)\r
                 {\r
-                    double height = int.Parse(text_width.Text) / double.Parse(lbl_Aspect.Text);\r
-                    double mod16 = height % 16;\r
-                    height = height - mod16;\r
-\r
-                    if (text_width.Text == "")\r
+                    if (drp_anamorphic.Text == "None")\r
                     {\r
-                        text_height.Text = "";\r
-                        text_width.BackColor = Color.White;\r
-                    }\r
-                    else\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
             }\r
-            catch (Exception)\r
-            {\r
-                // No need to throw an error here.\r
-            }\r
         }\r
         private void text_height_TextChanged(object sender, EventArgs e)\r
         {\r
-            try\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
             {\r
-                if ((int.Parse(text_height.Text) % 16) != 0)\r
+                if ((height % 16) != 0)\r
                     text_height.BackColor = Color.LightCoral;\r
                 else\r
                     text_height.BackColor = Color.LightGreen;\r
             }\r
-            catch (Exception)\r
-            {\r
-                // No need to alert the user.\r
-            }\r
         }\r
-        private void drp_crop_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void check_customCrop_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if ((string)drp_crop.SelectedItem == "Custom")\r
+            text_left.Enabled = true;\r
+            text_right.Enabled = true;\r
+            text_top.Enabled = true;\r
+            text_bottom.Enabled = true;\r
+            if (selectedTitle != null)\r
             {\r
-                text_left.Enabled = true;\r
-                text_right.Enabled = true;\r
-                text_top.Enabled = true;\r
-                text_bottom.Enabled = true;\r
-                text_left.Text = "0";\r
-                text_right.Text = "0";\r
-                text_top.Text = "0";\r
-                text_bottom.Text = "0";\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
-\r
-            if ((string)drp_crop.SelectedItem == "Automatic")\r
-            {\r
-                text_left.Enabled = false;\r
-                text_right.Enabled = false;\r
-                text_top.Enabled = false;\r
-                text_bottom.Enabled = false;\r
-\r
-                if (lbl_RecomendedCrop.Text != "Select a Title")\r
-                {\r
-                    string[] temp = new string[4];\r
-                    temp = lbl_RecomendedCrop.Text.Split('/');\r
-                    text_left.Text = temp[2];\r
-                    text_right.Text = temp[3];\r
-                    text_top.Text = temp[0];\r
-                    text_bottom.Text = temp[1];\r
-                }\r
-                else\r
-                {\r
-                    text_left.Text = "";\r
-                    text_right.Text = "";\r
-                    text_top.Text = "";\r
-                    text_bottom.Text = "";\r
-                }\r
-            }\r
-\r
-            if ((string)drp_crop.SelectedItem == "No Crop")\r
+            else\r
             {\r
-                text_left.Enabled = false;\r
-                text_right.Enabled = false;\r
-                text_top.Enabled = false;\r
-                text_bottom.Enabled = false;\r
                 text_left.Text = "0";\r
                 text_right.Text = "0";\r
                 text_top.Text = "0";\r
                 text_bottom.Text = "0";\r
             }\r
         }\r
-        private void check_vfr_CheckedChanged(object sender, EventArgs e)\r
+        private void check_autoCrop_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
+            text_left.Enabled = false;\r
+            text_right.Enabled = false;\r
+            text_top.Enabled = false;\r
+            text_bottom.Enabled = false;\r
         }\r
         private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -863,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
@@ -898,7 +947,7 @@ namespace Handbrake
                 trackBar2.Enabled = true;\r
                 drp_audbit_2.Text = "160";\r
                 drp_audenc_2.Text = "AAC";\r
-                drp_audsr_2.Text = "48";\r
+                drp_audsr_2.Text = "Auto";\r
                 drp_audmix_2.Text = "Automatic";\r
 \r
                 // Enable the 3rd Track.\r
@@ -931,7 +980,7 @@ namespace Handbrake
                 drp_audenc_4.Text = "";\r
                 drp_audsr_4.Text = "";\r
                 drp_audmix_4.Text = "Automatic";\r
-                \r
+\r
             }\r
             else\r
             {\r
@@ -942,7 +991,7 @@ namespace Handbrake
                 trackBar3.Enabled = true;\r
                 drp_audbit_3.Text = "160";\r
                 drp_audenc_3.Text = "AAC";\r
-                drp_audsr_3.Text = "48";\r
+                drp_audsr_3.Text = "Auto";\r
                 drp_audmix_3.Text = "Automatic";\r
 \r
                 // Enable the 4th Track.\r
@@ -952,7 +1001,7 @@ namespace Handbrake
                 drp_audsr_4.Text = "";\r
                 drp_audmix_4.Text = "Automatic";\r
             }\r
-            \r
+\r
         }\r
         private void drp_track4Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -978,12 +1027,12 @@ namespace Handbrake
                 trackBar4.Enabled = true;\r
                 drp_audbit_4.Text = "160";\r
                 drp_audenc_4.Text = "AAC";\r
-                drp_audsr_4.Text = "48";\r
+                drp_audsr_4.Text = "Auto";\r
                 drp_audmix_4.Text = "Automatic";\r
             }\r
         }\r
 \r
-        private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void drp_audmix_1_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_1);\r
@@ -995,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
@@ -1008,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
@@ -1021,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
@@ -1049,7 +1089,7 @@ namespace Handbrake
 \r
                 drp_audmix_1.Text = "Automatic";\r
                 drp_audbit_1.Text = "160";\r
-                drp_audsr_1.Text = "48";\r
+                drp_audsr_1.Text = "Auto";\r
             }\r
 \r
 \r
@@ -1084,7 +1124,7 @@ namespace Handbrake
 \r
                 drp_audmix_2.Text = "Automatic";\r
                 drp_audbit_2.Text = "160";\r
-                drp_audsr_2.Text = "48";\r
+                drp_audsr_2.Text = "Auto";\r
             }\r
             else\r
             {\r
@@ -1097,7 +1137,7 @@ namespace Handbrake
 \r
                     drp_audmix_2.Text = "Automatic";\r
                     drp_audbit_2.Text = "160";\r
-                    drp_audsr_2.Text = "48";\r
+                    drp_audsr_2.Text = "Auto";\r
                 }\r
             }\r
 \r
@@ -1132,7 +1172,7 @@ namespace Handbrake
 \r
                 drp_audmix_3.Text = "Automatic";\r
                 drp_audbit_3.Text = "160";\r
-                drp_audsr_3.Text = "48";\r
+                drp_audsr_3.Text = "Auto";\r
             }\r
             else\r
             {\r
@@ -1145,7 +1185,7 @@ namespace Handbrake
 \r
                     drp_audmix_3.Text = "Automatic";\r
                     drp_audbit_3.Text = "160";\r
-                    drp_audsr_3.Text = "48";\r
+                    drp_audsr_3.Text = "Auto";\r
                 }\r
             }\r
 \r
@@ -1181,7 +1221,7 @@ namespace Handbrake
 \r
                 drp_audmix_4.Text = "Automatic";\r
                 drp_audbit_4.Text = "160";\r
-                drp_audsr_4.Text = "48";\r
+                drp_audsr_4.Text = "Auto";\r
             }\r
             else\r
             {\r
@@ -1194,7 +1234,7 @@ namespace Handbrake
 \r
                     drp_audmix_4.Text = "Automatic";\r
                     drp_audbit_4.Text = "160";\r
-                    drp_audsr_4.Text = "48";\r
+                    drp_audsr_4.Text = "Auto";\r
                 }\r
             }\r
 \r
@@ -1271,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
@@ -1361,6 +1403,7 @@ namespace Handbrake
         }\r
         private void check_Cabac_CheckedChanged(object sender, EventArgs e)\r
         {\r
+\r
             x264PanelFunctions.on_x264_WidgetChange("cabac", this);\r
         }\r
 \r
@@ -1372,7 +1415,7 @@ namespace Handbrake
                 x264PanelFunctions.X264_StandardizeOptString(this);\r
                 x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
 \r
-                if (rtf_x264Query.Text == "")\r
+                if (rtf_x264Query.Text == string.Empty)\r
                     x264PanelFunctions.reset2Defaults(this);\r
             }\r
         }\r
@@ -1385,148 +1428,217 @@ 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
             rtf_query.Clear();\r
         }\r
-        private void btn_copy2C_Click(object sender, EventArgs e)\r
-        {\r
-            if (rtf_query.Text != "")\r
-                Clipboard.SetText(rtf_query.Text, TextDataFormat.Text);\r
-        }\r
 \r
         // Presets\r
         private void btn_addPreset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this);\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
-            ArrayList user_presets = new ArrayList();\r
-            ArrayList modified_presets_list = new ArrayList();\r
-            string selectedPreset = null;\r
-            selectedPreset = treeView_presets.SelectedNode.Text;\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
-            if (!selectedPreset.StartsWith("--"))\r
-                MessageBox.Show("Sorry, You can not remove any of the built in presets.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\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 = queryGen.GenerateTheQuery(this);\r
+            Properties.Settings.Default.defaultUserSettings = query;\r
+            // Save the new default Settings\r
+            Properties.Settings.Default.Save();\r
+            MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+        }\r
+        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
+        {\r
+            // Ok, so, we've selected a preset. Now we want to load it.\r
+            string presetName = treeView_presets.SelectedNode.Text;\r
+            string query = presetHandler.getCliForPreset(presetName);\r
 \r
-            // Scan through the users presets and dump them all in an arraylist\r
-            string userPresets = Application.StartupPath.ToString() + "\\user_presets.dat";\r
-            if (File.Exists(userPresets))\r
+            if (query != null)\r
             {\r
-                StreamReader presetInput = new StreamReader(userPresets);\r
-                while (!presetInput.EndOfStream)\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
+\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
+            }\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 ((char)presetInput.Peek() == '+')\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 = new List<Boolean>();\r
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                        nodeStatus.Add(node.IsExpanded);\r
+\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
-                        string item = presetInput.ReadLine();\r
-                        user_presets.Add(item);\r
-                        modified_presets_list.Add(item);\r
+                        if (nodeStatus[i] == true)\r
+                            node.Expand();\r
+\r
+                        i++;\r
                     }\r
-                    else\r
-                        presetInput.ReadLine();\r
                 }\r
-\r
-                presetInput.Close();\r
-                presetInput.Dispose();\r
             }\r
+        }\r
 \r
-            // now lets scan through the arraylist and remove the preset with the\r
-            // same name as the one selected.\r
-            int c = 0;\r
-            foreach (string item in user_presets)\r
+        #endregion\r
+\r
+        #region Preset Expand / Collaspe\r
+        private List<Boolean> saveTreeViewState()\r
+        {\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
-                string preset_name = "+ " + selectedPreset.Replace("--", "").Trim() + ":";\r
-                if (item.Contains(preset_name))\r
-                    modified_presets_list.RemoveAt(c);\r
-                c++;\r
+                nodeStatus.Add(node.IsExpanded);\r
+                foreach (TreeNode subNode in node.Nodes)\r
+                    nodeStatus.Add(node.IsExpanded);\r
             }\r
+            return nodeStatus;\r
+        }\r
 \r
-            // Now we need to rebuilt the user presets file.\r
-            StreamWriter line = new StreamWriter(userPresets);\r
-            foreach (string item in modified_presets_list)\r
+        private void loadTreeViewStates(List<Boolean> nodeStatus)\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
-                line.WriteLine(item);\r
+                if (nodeStatus[i] == true)\r
+                    node.Expand();\r
+\r
+                foreach (TreeNode subNode in node.Nodes)\r
+                {\r
+                    if (nodeStatus[i] == true)\r
+                        subNode.Expand();\r
+                }\r
+\r
+                i++;\r
             }\r
-            line.Close();\r
-            line.Dispose();\r
+        }\r
+        #endregion\r
 \r
-            // Now reload the preset panel\r
-            loadPresetPanel();\r
+        #region Functions\r
+        private void loadNormalPreset()\r
+        {\r
+            treeView_presets.Nodes.Find("Normal", true);\r
+\r
+            foreach (TreeNode treenode in treeView_presets.Nodes)\r
+            {\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
-        private void btn_setDefault_Click(object sender, EventArgs e)\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
-            String query = hb_common_func.GenerateTheQuery(this);\r
-            Properties.Settings.Default.defaultUserSettings = query;\r
-            // Save the new default Settings\r
-            Properties.Settings.Default.Save();\r
-            MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\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
-        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
+        #endregion\r
+\r
+        #region Drive Detection\r
+        // Source Button Drive Detection\r
+        private delegate void ProgressUpdateHandler();\r
+        private void getDriveInfoThread()\r
         {\r
-            //When the user select a preset from the treeview, load it\r
             try\r
             {\r
-                // Scan through the built in presets\r
-                string builtInPresets = Application.StartupPath.ToString() + "\\presets.dat";\r
-                if (File.Exists(builtInPresets))\r
+                if (this.InvokeRequired)\r
                 {\r
-                    StreamReader presetInput = new StreamReader(builtInPresets);\r
-                    while (!presetInput.EndOfStream)\r
-                    {\r
-                        if ((char)presetInput.Peek() == '+')\r
-                        {\r
-                            string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                            checkSelectedPreset(preset);\r
-                        }\r
-                        else\r
-                            presetInput.ReadLine();\r
-                    }\r
-\r
-                    presetInput.Close();\r
+                    this.BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread));\r
+                    return;\r
                 }\r
 \r
-                // Scan through the users presets\r
-                string userPresets = Application.StartupPath.ToString() + "\\user_presets.dat";\r
-                if (File.Exists(userPresets))\r
+                Boolean foundDrive = false;\r
+                DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();\r
+                foreach (DriveInfo curDrive in theCollectionOfDrives)\r
                 {\r
-                    StreamReader presetInput = new StreamReader(userPresets);\r
-                    while (!presetInput.EndOfStream)\r
+                    if (curDrive.DriveType == DriveType.CDRom)\r
                     {\r
-                        if ((char)presetInput.Peek() == '+')\r
+                        if (curDrive.IsReady)\r
                         {\r
-                            string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                            checkSelectedPreset(preset);\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
-                        else\r
-                            presetInput.ReadLine();\r
                     }\r
-\r
-                    presetInput.Close();\r
-                    presetInput.Dispose();\r
                 }\r
+\r
+                if (foundDrive == false)\r
+                    mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
             }\r
-            catch (Exception exc)\r
+            catch (Exception)\r
             {\r
-                MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                mnu_dvd_drive.Text = "[No DVD Drive Ready / Found]";\r
             }\r
         }\r
-\r
         #endregion\r
 \r
-        #region Functions\r
-        // DVD Parsing\r
-        public void setStreamReader(Parsing.DVD dvd)\r
-        {\r
-            this.thisDVD = dvd;\r
-        }\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
@@ -1637,7 +1749,7 @@ namespace Handbrake
                 drp_audenc_1.Items.Add("MP3");\r
                 drp_audenc_1.Items.Add("AC3");\r
                 drp_audenc_1.Items.Add("Vorbis");\r
-                if (drp_audenc_1.Text == "")\r
+                if (drp_audenc_1.Text == string.Empty)\r
                     drp_audenc_1.SelectedIndex = 0;\r
 \r
 \r
@@ -1648,7 +1760,7 @@ namespace Handbrake
                 drp_audenc_2.Items.Add("Vorbis");\r
                 if (drp_audenc_2.Enabled)\r
                 {\r
-                    if (drp_audenc_2.Text == "")\r
+                    if (drp_audenc_2.Text == string.Empty)\r
                         drp_audenc_2.SelectedIndex = 0;\r
                 }\r
 \r
@@ -1659,7 +1771,7 @@ namespace Handbrake
                 drp_audenc_3.Items.Add("Vorbis");\r
                 if (drp_audenc_3.Enabled)\r
                 {\r
-                    if (drp_audenc_3.Text == "")\r
+                    if (drp_audenc_3.Text == string.Empty)\r
                         drp_audenc_3.SelectedIndex = 0;\r
                 }\r
 \r
@@ -1670,12 +1782,12 @@ namespace Handbrake
                 drp_audenc_4.Items.Add("Vorbis");\r
                 if (drp_audenc_4.Enabled)\r
                 {\r
-                    if (drp_audenc_4.Text == "")\r
+                    if (drp_audenc_4.Text == string.Empty)\r
                         drp_audenc_4.SelectedIndex = 0;\r
                 }\r
             }\r
         }\r
-        private void setVideoByContainer(String path)\r
+        public void setVideoByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1727,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
@@ -1746,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
@@ -1764,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
@@ -1778,203 +1890,222 @@ namespace Handbrake
             dropDown.Items.Add("128");\r
             dropDown.Items.Add("160");\r
         }\r
+        #endregion\r
+\r
+        #region Encoding\r
+\r
+        // Declarations\r
+        private delegate void UpdateUIHandler();\r
 \r
-        // Preset system functions\r
-        private void addPresetToList(ArrayList presetNameList)\r
+        // Encoding Functions\r
+        private void procMonitor(object state)\r
         {\r
-            // Adds a new preset name to the preset list.\r
-            TreeNode preset_treeview = new TreeNode();\r
-            foreach (string[] preset in presetNameList)\r
+            // Make sure we are not already encoding and if we are then display an error.\r
+            if (hbProc != null)\r
+                hbProc.CloseMainWindow();\r
+            else\r
             {\r
-                preset_treeview = new TreeNode(preset[0]);\r
+                hbProc = cliObj.runCli(this, (string)state);\r
+                hbProc.WaitForExit();\r
+                setEncodeLabelFinished();\r
+                hbProc = null;\r
 \r
-                // Now Fill Out List View with Items\r
-                treeView_presets.Nodes.Add(preset_treeview);\r
+                // If the window is minimized, display the notification in a popup.\r
+                if (FormWindowState.Minimized == this.WindowState)\r
+                {\r
+                    notifyIcon.BalloonTipText = lbl_encode.Text;\r
+                    notifyIcon.ShowBalloonTip(500);\r
+                }\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
-        private void grabCLIPresets()\r
-        {\r
-            // Gets the presets from the CLI and stores them in presets.dat\r
-            string appPath = Application.StartupPath.ToString() + "\\";\r
-            string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " --preset-list >" + '"' + appPath + "presets.dat" + '"' + " 2>&1" + '"';\r
-            Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
-            hbproc.WaitForExit();\r
-            hbproc.Dispose();\r
-            hbproc.Close();\r
-        }\r
-        private void loadNormalPreset()\r
+        private void setEncodeLabelFinished()\r
         {\r
-            //Loads the preset called "normal"\r
-            try\r
+            if (this.InvokeRequired)\r
             {\r
-                string appPath = Application.StartupPath.ToString() + "\\presets.dat";\r
-                if (File.Exists(appPath))\r
-                {\r
+                this.BeginInvoke(new UpdateUIHandler(setEncodeLabelFinished));\r
+                return;\r
+            }\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
-                    int normal = 0;\r
-                    foreach (TreeNode treenode in treeView_presets.Nodes)\r
-                    {\r
-                        if (treenode.ToString().Equals("TreeNode: Normal"))\r
-                            normal = treenode.Index;\r
-                    }\r
+        #endregion\r
 \r
-                    TreeNode np = treeView_presets.Nodes[normal];\r
+        #region Public Methods\r
 \r
-                    treeView_presets.SelectedNode = np;\r
-                }\r
-            }\r
-            catch (Exception)\r
-            {\r
-                // Do nothing\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
+                return false;\r
+            else\r
+                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
-            ArrayList presetNameList = new ArrayList();\r
 \r
-            // Load in the built in presets from presets.dat\r
-            string filePath = Application.StartupPath.ToString() + "\\presets.dat";\r
-            if (File.Exists(filePath))\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
-                StreamReader presetInput = new StreamReader(filePath);\r
-                while (!presetInput.EndOfStream)\r
+                foreach (Presets.Preset preset in presetNameList)\r
                 {\r
-                    if ((char)presetInput.Peek() == '+')\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
-                        string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
-                        presetNameList.Add(r.Split(preset));\r
+                        rootNode = new TreeNode(preset.Category);\r
+                        workingLevel = preset.Level;\r
+                        currentCategory = preset.Category;\r
+                        previousCategory = preset.Category;\r
                     }\r
-                    else\r
-                        presetInput.ReadLine();\r
-                }\r
 \r
-                presetInput.Close();\r
-                presetInput.Dispose();\r
-            }\r
-            addPresetToList(presetNameList);\r
-            presetNameList.Clear();\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
-            // Load in the users presets from user_presets.dat\r
-            filePath = Application.StartupPath.ToString() + "\\user_presets.dat";\r
-            if (File.Exists(filePath))\r
-            {\r
-                StreamReader presetInput = new StreamReader(filePath);\r
-                while (!presetInput.EndOfStream)\r
-                {\r
-                    if ((char)presetInput.Peek() == '+')\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
-                        string preset = "--" + presetInput.ReadLine().Replace("+ ", "");\r
-                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
-                        presetNameList.Add(r.Split(preset));\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
-                    else\r
-                        presetInput.ReadLine();\r
                 }\r
 \r
-                presetInput.Close();\r
-                presetInput.Dispose();\r
+                // Add the final root node which does not get added above.\r
+                treeView_presets.Nodes.Add(rootNode);\r
             }\r
-            addPresetToList(presetNameList);\r
-        }\r
-        private void checkSelectedPreset(string preset)\r
-        {\r
-            string selectedPreset = null;\r
-            selectedPreset = treeView_presets.SelectedNode.Text;\r
 \r
-            Regex r = new Regex("(:  )"); // Split on hyphens. \r
-            string[] presetName = r.Split(preset);\r
 \r
-            if ((selectedPreset == (presetName[0])) || (selectedPreset == ("--" + presetName[0])))\r
+            // User Presets\r
+            presetNames = presetHandler.getUserPresetNames();\r
+            foreach (string preset in presetNames)\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(preset);\r
+                preset_treeview = new TreeNode(preset);\r
+                preset_treeview.ForeColor = Color.Black;\r
 \r
-                // Now load the preset\r
-                hb_common_func.presetLoader(this, presetQuery, selectedPreset);\r
-\r
-                // The x264 widgets will need updated, so do this now:\r
-                x264PanelFunctions.X264_StandardizeOptString(this);\r
-                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                // Now Fill Out List View with Items\r
+                treeView_presets.Nodes.Add(preset_treeview);\r
             }\r
         }\r
 \r
-        // Queue system functions\r
-        private void showQueue()\r
-        {\r
-            queueWindow.Show();\r
-        }\r
         #endregion\r
 \r
-        #region Encoding and Queue\r
-\r
-        // Declarations\r
-        Functions.CLI process = new Functions.CLI();\r
-        private delegate void UpdateUIHandler();\r
-        [DllImport("user32.dll")]\r
-        public static extern void LockWorkStation();\r
-        [DllImport("user32.dll")]\r
-        public static extern int ExitWindowsEx(int uFlags, int dwReason);\r
-\r
-        // Encoding Functions\r
-        private void procMonitor(object state)\r
+        #region Taskbar Tray Icon\r
+        private void frmMain_Resize(object sender, EventArgs e)\r
         {\r
-            // Make sure we are not already encoding and if we are then display an error.\r
-            if (hbProc != null)\r
-                MessageBox.Show("Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            else\r
+            if (FormWindowState.Minimized == this.WindowState)\r
             {\r
-                hbProc = process.runCli(this, (string)state, false, false, false, false);\r
-                hbProc.WaitForExit();\r
-\r
-                setEncodeLabelFinished();\r
-                hbProc = null;\r
-\r
-                // Do something whent he encode ends.\r
-                switch (Properties.Settings.Default.CompletionOption)\r
-                {\r
-                    case "Shutdown":\r
-                        System.Diagnostics.Process.Start("Shutdown", "-s -t 60");\r
-                        break;\r
-                    case "Log Off":\r
-                        ExitWindowsEx(0, 0);\r
-                        break;\r
-                    case "Suspend":\r
-                        Application.SetSuspendState(PowerState.Suspend, true, true);\r
-                        break;\r
-                    case "Hibernate":\r
-                        Application.SetSuspendState(PowerState.Hibernate, true, true);\r
-                        break;\r
-                    case "Lock System":\r
-                        LockWorkStation();\r
-                        break;\r
-                    case "Quit HandBrake":\r
-                        Application.Exit();\r
-                        break;\r
-                    default:\r
-                        break;\r
-                }\r
+                notifyIcon.Visible = true;\r
+                if (lbl_encode.Text != "")\r
+                    notifyIcon.BalloonTipText = lbl_encode.Text;\r
+                else\r
+                    notifyIcon.BalloonTipText = "Not Encoding";\r
+                notifyIcon.ShowBalloonTip(500);\r
+                this.Hide();\r
             }\r
+            else if (FormWindowState.Normal == this.WindowState)\r
+                notifyIcon.Visible = false;\r
         }\r
-        private void setEncodeLabelFinished()\r
+        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)\r
         {\r
-            if (this.InvokeRequired)\r
-            {\r
-                this.BeginInvoke(new UpdateUIHandler(setEncodeLabelFinished));\r
-                return;\r
-            }\r
-            lbl_encode.Text = "Encoding Finished";\r
+            this.Visible = true;\r
+            this.Activate();\r
+            this.WindowState = FormWindowState.Normal;\r
+            notifyIcon.Visible = false;\r
+        }\r
+        private void btn_minimize_Click(object sender, EventArgs e)\r
+        {\r
+            this.WindowState = FormWindowState.Minimized;\r
+        }\r
+        private void btn_restore_Click(object sender, EventArgs e)\r
+        {\r
+            this.Visible = true;\r
+            this.Activate();\r
+            this.WindowState = FormWindowState.Normal;\r
+            notifyIcon.Visible = false;\r
         }\r
-\r
         #endregion\r
 \r
\r
-\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file