OSDN Git Service

merge 0.9.4 to jp
[handbrake-jp/handbrake-jp.git] / win / C# / frmMain.cs
index 59d9fe2..8330e57 100644 (file)
@@ -5,59 +5,52 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
-using System.Collections;\r
 using System.Collections.Generic;\r
 using System.Drawing;\r
-using System.Text;\r
+using System.Globalization;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Diagnostics;\r
 using System.Threading;\r
-using System.Runtime.InteropServices;\r
-using System.Globalization;\r
-using System.Text.RegularExpressions;\r
+using Handbrake.EncodeQueue;\r
+using Handbrake.Functions;\r
+using Handbrake.Presets;\r
+using Handbrake.Parsing;\r
 \r
 namespace Handbrake\r
 {\r
     public partial class frmMain : Form\r
     {\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
-        Functions.Queue encodeQueue = new Functions.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
+        // Objects which may be used by one or more other objects *************\r
+        EncodeAndQueueHandler encodeQueue = new EncodeAndQueueHandler();\r
+        PresetsHandler presetHandler = new PresetsHandler();\r
         QueryGenerator queryGen = new QueryGenerator();\r
 \r
-        internal Process hbProc;\r
-        private Parsing.DVD thisDVD;\r
+        // Globals: Mainly used for tracking. *********************************\r
+        public Title selectedTitle;\r
+        private DVD thisDVD;\r
         private frmQueue queueWindow;\r
-        private delegate void updateStatusChanger();\r
-        private string lastAction = null;\r
-        public int maxWidth = 0;\r
-        public int maxHeight = 0;\r
+        private frmPreview qtpreview;\r
+        private frmActivityWindow ActivityWindow;\r
+        private Form splash;\r
+        public string sourcePath;\r
+        private string lastAction;\r
+        private SourceType selectedSourceType;\r
+        private string dvdDrivePath;\r
+        private string dvdDriveLabel;\r
+\r
+        // Delegates **********************************************************\r
+        private delegate void UpdateWindowHandler();\r
 \r
         // Applicaiton Startup ************************************************\r
 \r
         #region Application Startup\r
-\r
         public frmMain()\r
         {\r
-            // Load the splash screen in this thread\r
-            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
+            // Load and setup the splash screen in this thread\r
+            splash = new frmSplashScreen();\r
+            splash.Show(this);\r
+            Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };\r
             splash.Controls.Add(lblStatus);\r
 \r
             InitializeComponent();\r
@@ -65,141 +58,289 @@ namespace Handbrake
             // Update the users config file with the CLI version data.\r
             lblStatus.Text = "\83o\81[\83W\83\87\83\93\8fî\95ñ\82Ì\8eæ\93¾\92\86...";\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
+            Main.setCliVersionData();\r
 \r
-            // show the form, but leave disabled until preloading is complete then show the main form\r
+            // Show the form, but leave disabled until preloading is complete then show the main form\r
             this.Enabled = false;\r
             this.Show();\r
             Application.DoEvents(); // Forces frmMain to draw\r
 \r
-            // update the status\r
-            if (Properties.Settings.Default.updateStatus == "Checked")\r
+            // Check for new versions, if update checking is enabled\r
+            if (Properties.Settings.Default.updateStatus)\r
             {\r
-                lblStatus.Text = "\83A\83b\83v\83f\81[\83g\82Ì\8am\94F\92\86...";\r
-                Application.DoEvents();\r
-                Thread updateCheckThread = new Thread(startupUpdateCheck);\r
-                updateCheckThread.Start();\r
+                DateTime now = DateTime.Now;\r
+                DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate;\r
+                TimeSpan elapsed = now.Subtract(lastCheck);\r
+                if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)\r
+                {\r
+                    lblStatus.Text = "\83A\83b\83v\83f\81[\83g\82Ì\8am\94F\92\86...";\r
+                    Application.DoEvents();\r
+\r
+                    Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);\r
+                }\r
             }\r
 \r
             // Setup the GUI components\r
             lblStatus.Text = "GUI\82Ì\90Ý\92è\92\86...";\r
             Application.DoEvents();\r
-            setupH264Panel();               // Initalize the H.264 Panel\r
-            loadPresetPanel();              // Load the Preset Panel\r
+            loadPresetPanel();                       // Load the Preset Panel\r
+            treeView_presets.ExpandAll();\r
+            lbl_encode.Text = "";\r
+            queueWindow = new frmQueue(encodeQueue);        // Prepare the Queue\r
+            if (!Properties.Settings.Default.QueryEditorTab)\r
+                tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.\r
+\r
             // Load the user's default settings or Normal Preset\r
-            if (Properties.Settings.Default.defaultSettings == "Checked")\r
-                loadUserDefaults();\r
+            if (Properties.Settings.Default.defaultPreset != "")\r
+            {\r
+                if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)\r
+                {\r
+                    string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;\r
+                    Boolean loadPictureSettings = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings;\r
+\r
+                    if (query != null)\r
+                    {\r
+                        //Ok, Reset all the H264 widgets before changing the preset\r
+                        x264Panel.reset2Defaults();\r
+\r
+                        // Send the query from the file to the Query Parser class, then load the preset\r
+                        QueryParser presetQuery = QueryParser.Parse(query);\r
+                        PresetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
+\r
+                        // The x264 widgets will need updated, so do this now:\r
+                        x264Panel.X264_StandardizeOptString();\r
+                        x264Panel.X264_SetCurrentSettingsInPanel();\r
+                    }\r
+                }\r
+                else\r
+                    loadNormalPreset();\r
+            }\r
             else\r
                 loadNormalPreset();\r
-            // Expand the preset Nodes\r
-            treeView_presets.ExpandAll();\r
+\r
             // Enabled GUI tooltip's if Required\r
-            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
+            if (Properties.Settings.Default.tooltipEnable)\r
                 ToolTip.Active = true;\r
-            lbl_encode.Text = "";\r
+\r
+            // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)\r
+            GrowlCommunicator.Register();\r
 \r
             //Finished Loading\r
             lblStatus.Text = "\83\8d\81[\83h\8a®\97¹\81I";\r
             Application.DoEvents();\r
-\r
-            //Close the splash screen\r
             splash.Close();\r
             splash.Dispose();\r
-\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
+            // Event Handlers and Queue Recovery\r
+            events();\r
             queueRecovery();\r
         }\r
 \r
-        // Startup Functions\r
-        private void startupUpdateCheck()\r
+        private void UpdateCheckDone(IAsyncResult result)\r
         {\r
+            if (InvokeRequired)\r
+            {\r
+                Invoke(new MethodInvoker(() => UpdateCheckDone(result)));\r
+                return;\r
+            }\r
+\r
+            UpdateCheckInformation info;\r
+\r
             try\r
             {\r
-                if (this.InvokeRequired)\r
-                {\r
-                    this.BeginInvoke(new updateStatusChanger(startupUpdateCheck));\r
-                    return;\r
-                }\r
+                info = Main.EndCheckForUpdates(result);\r
 \r
-                Boolean update = hb_common_func.updateCheck(false);\r
-                if (update == true)\r
+                if (info.NewVersionAvailable)\r
                 {\r
-                    frmUpdater updateWindow = new frmUpdater();\r
-                    updateWindow.Show();\r
+                    frmUpdater updateWindow = new frmUpdater(info.BuildInformation);\r
+                    updateWindow.ShowDialog();\r
                 }\r
             }\r
-            catch (Exception) { /* Do Nothing*/ }\r
-        }\r
-        private void setupH264Panel()\r
-        {\r
-            // Set the default settings of the x264 panel\r
-            drop_bFrames.Text = "Default (0)";\r
-            drop_refFrames.Text = "Default (1)";\r
-            drop_subpixelMotionEstimation.Text = "Default (4)";\r
-            drop_trellis.Text = "Default (0)";\r
-            drop_MotionEstimationMethod.Text = "Default (Hexagon)";\r
-            drop_MotionEstimationRange.Text = "Default (16)";\r
-            drop_directPrediction.Text = "Default (Spatial)";\r
-            drop_deblockAlpha.Text = "Default (0)";\r
-            drop_deblockBeta.Text = "Default (0)";\r
-            drop_analysis.Text = "Default (some)";\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
-\r
-            if (userDefaults == "")\r
-                loadNormalPreset();\r
-            else\r
+            catch (Exception ex)\r
             {\r
-                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
-                presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
+                if ((bool)result.AsyncState)\r
+                    MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
+\r
+        // Startup Functions   \r
         private void queueRecovery()\r
         {\r
-            if (hb_common_func.check_queue_recovery() == true)\r
+            if (Main.checkQueueRecovery())\r
             {\r
                 DialogResult result = MessageBox.Show("\83L\83\85\81[\82É\96¢\8a®\97¹\82Ì\83A\83C\83e\83\80\82ª\8ec\82³\82ê\82Ä\82¢\82Ü\82·\81B\82±\82ê\82ç\82ð\95\9c\8c³\82µ\82Ü\82·\82©\81H", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
 \r
                 if (result == DialogResult.Yes)\r
-                    encodeQueue.recoverQueue("hb_queue_recovery.dat"); // Start Recovery\r
+                    encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery\r
                 else\r
                 {\r
                     // Remove the Queue recovery file if the user doesn't want to recovery the last queue.\r
-                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.dat");\r
+                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");\r
                     if (File.Exists(queuePath))\r
                         File.Delete(queuePath);\r
                 }\r
             }\r
         }\r
+        #endregion\r
+\r
+        #region Properties\r
+        public string SourceName\r
+        {\r
+            get\r
+            {\r
+                if (this.selectedSourceType == SourceType.DvdDrive)\r
+                {\r
+                    return this.dvdDriveLabel;\r
+                }\r
+\r
+                return Path.GetFileNameWithoutExtension(this.sourcePath);\r
+            }\r
+        }\r
+        #endregion\r
+\r
+        #region Events\r
+        // Encoding Events for setting up the GUI\r
+        private void events()\r
+        {\r
+            // Handle Widget changes when preset is selected.\r
+            RegisterPresetEventHandler();\r
+\r
+            // Handle Window Resize\r
+            if (Properties.Settings.Default.MainWindowMinimize)\r
+                this.Resize += new EventHandler(frmMain_Resize);\r
+\r
+            // Handle Encode Start / Finish / Pause\r
+            encodeQueue.CurrentJobCompleted += new EventHandler(encodeEnded);\r
+            encodeQueue.QueuePauseRequested += new EventHandler(encodePaused);\r
+            encodeQueue.NewJobStarted += new EventHandler(encodeStarted);\r
+\r
+            // Handle a file being draged onto the GUI.\r
+            this.DragEnter += new DragEventHandler(frmMain_DragEnter);\r
+            this.DragDrop += new DragEventHandler(frmMain_DragDrop);\r
+        }\r
+\r
+        // Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset\r
+        private void RegisterPresetEventHandler()\r
+        {\r
+            // Output Settings\r
+            drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel);\r
+            check_largeFile.CheckedChanged += new EventHandler(changePresetLabel);\r
+            check_iPodAtom.CheckedChanged += new EventHandler(changePresetLabel);\r
+            check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel);\r
+\r
+            // Picture Settings\r
+            //PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);\r
+\r
+            // Filter Settings\r
+            Filters.FilterSettingsChanged += new EventHandler(changePresetLabel);\r
+\r
+            // Video Tab\r
+            drp_videoEncoder.SelectedIndexChanged += new EventHandler(changePresetLabel);\r
+            check_2PassEncode.CheckedChanged += new EventHandler(changePresetLabel);\r
+            check_turbo.CheckedChanged += new EventHandler(changePresetLabel);\r
+            text_filesize.TextChanged += new EventHandler(changePresetLabel);\r
+            text_bitrate.TextChanged += new EventHandler(changePresetLabel);\r
+            slider_videoQuality.ValueChanged += new EventHandler(changePresetLabel);\r
+\r
+            // Audio Panel\r
+            AudioSettings.AudioListChanged += new EventHandler(changePresetLabel);\r
+\r
+            // Advanced Tab\r
+            x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel);\r
+        }\r
+        private void UnRegisterPresetEventHandler()\r
+        {\r
+            // Output Settings \r
+            drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
+            check_largeFile.CheckedChanged -= new EventHandler(changePresetLabel);\r
+            check_iPodAtom.CheckedChanged -= new EventHandler(changePresetLabel);\r
+            check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel);\r
+\r
+            // Picture Settings\r
+            //PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);\r
+\r
+            // Filter Settings\r
+            Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel);\r
+\r
+            // Video Tab\r
+            drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
+            check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel);\r
+            check_turbo.CheckedChanged -= new EventHandler(changePresetLabel);\r
+            text_filesize.TextChanged -= new EventHandler(changePresetLabel);\r
+            text_bitrate.TextChanged -= new EventHandler(changePresetLabel);\r
+            slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel);\r
+\r
+            // Audio Panel\r
+            AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel);\r
+\r
+            // Advanced Tab\r
+            x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel);\r
+        }\r
+        private void changePresetLabel(object sender, EventArgs e)\r
+        {\r
+            labelPreset.Text = "Output Settings (Preset: Custom)";\r
+        }\r
+\r
+        private static void frmMain_DragEnter(object sender, DragEventArgs e)\r
+        {\r
+            if (e.Data.GetDataPresent(DataFormats.FileDrop, false))\r
+                e.Effect = DragDropEffects.All;\r
+        }\r
+        private void frmMain_DragDrop(object sender, DragEventArgs e)\r
+        {\r
+            string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[];\r
+            sourcePath = string.Empty;\r
+\r
+            if (fileList != null)\r
+            {\r
+                if (fileList[0].StartsWith("\\"))\r
+                {\r
+                    MessageBox.Show(\r
+                        "Sorry, HandBrake does not support UNC file paths. \nTry mounting the network share as a network drive in My Computer",\r
+                        "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                    UpdateSourceLabel();\r
+                }\r
+                else\r
+                {\r
+                    if (fileList[0] != "")\r
+                        startScan(fileList[0]);\r
+                    else\r
+                        UpdateSourceLabel();\r
+                }\r
+            }\r
+            else\r
+                UpdateSourceLabel();\r
+        }\r
+        private void encodeStarted(object sender, EventArgs e)\r
+        {\r
+            lastAction = "encode";\r
+            setEncodeStarted();\r
 \r
+            // Experimental HBProc Process Monitoring.\r
+            if (Properties.Settings.Default.enocdeStatusInGui)\r
+            {\r
+                Thread encodeMon = new Thread(encodeMonitorThread);\r
+                encodeMon.Start();\r
+            }\r
+        }\r
+        private void encodeEnded(object sender, EventArgs e)\r
+        {\r
+            setEncodeFinished();\r
+        }\r
+        private void encodePaused(object sender, EventArgs e)\r
+        {\r
+            setEncodeFinished();\r
+        }\r
         #endregion\r
 \r
-        // The Applications Main Menu and Menus *******************************\r
+        // User Interface Menus / Tool Strips *********************************\r
 \r
         #region File Menu\r
+        private void mnu_killCLI_Click(object sender, EventArgs e)\r
+        {\r
+            killScan();\r
+        }\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
         {\r
             Application.Exit();\r
@@ -209,34 +350,29 @@ namespace Handbrake
         #region Tools Menu\r
         private void mnu_encode_Click(object sender, EventArgs e)\r
         {\r
-            queueWindow.setQueue(encodeQueue);\r
             queueWindow.Show();\r
         }\r
         private void mnu_encodeLog_Click(object sender, EventArgs e)\r
         {\r
-            String file = String.Empty;\r
-            if (lastAction == "scan")\r
-                file = "dvdinfo.dat";\r
-            else\r
-                file = "hb_encode_log.dat";\r
+            String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt";\r
 \r
-            frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, this, queueWindow);\r
+            frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, encodeQueue, this);\r
             dvdInfoWindow.Show();\r
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
         {\r
-            Form Options = new frmOptions(this);\r
-            Options.ShowDialog();\r
+            Form options = new frmOptions(this);\r
+            options.ShowDialog();\r
         }\r
         #endregion\r
 \r
         #region Presets Menu\r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
-            presetHandler.updateBuiltInPresets();\r
+            presetHandler.UpdateBuiltInPresets();\r
             loadPresetPanel();\r
             if (treeView_presets.Nodes.Count == 0)\r
-                MessageBox.Show("presets.dat\82Ì\83\8d\81[\83h\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B\81u\83v\83\8a\83Z\83b\83g\81v\83\81\83j\83\85\81[\82©\82ç\81u\91g\82Ý\8d\9e\82Ý\83v\83\8a\83Z\83b\83g\82Ì\83A\83b\83v\83f\81[\83g\81v\82ð\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B\n\82Ü\82½\81AVista\82Ì\8fê\8d\87\8aÇ\97\9d\8eÒ\83\82\81[\83h\82Å\8eÀ\8ds\82µ\82Ä\82¢\82é\82©\82Ç\82¤\82©\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                MessageBox.Show("presets.xml\83t\83@\83C\83\8b\82ð\83\8d\81[\83h\82Å\82«\82Ü\82¹\82ñ\81\81u\83v\83\8a\83Z\83b\83g\81v\83\81\83j\83\85\81[\82©\82ç\81u\91g\82Ý\8d\9e\82Ý\83v\83\8a\83Z\83b\83g\82Ì\83A\83b\83v\83f\81[\83g\81v\82ð\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B\n\82Ü\82½\81AVista\82Ì\8fê\8d\87\8aÇ\97\9d\8eÒ\83\82\81[\83h\82Å\8eÀ\8ds\82µ\82Ä\82¢\82é\82©\82Ç\82¤\82©\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B\8fÚ\82µ\82­\82ÍFAQ\82ð\8eQ\8fÆ\82µ\82Ä\82­\82¾\82³\82¢\81I", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             else\r
                 MessageBox.Show("\91g\82Ý\8d\9e\82Ý\83v\83\8a\83Z\83b\83g\82ð\83A\83b\83v\83f\81[\83g\82µ\82Ü\82µ\82½\81I", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
 \r
@@ -244,6 +380,7 @@ namespace Handbrake
         }\r
         private void mnu_delete_preset_Click(object sender, EventArgs e)\r
         {\r
+/* HEAD\r
             // Empty the preset file\r
             string presetsFile = Application.StartupPath.ToString() + "\\presets.dat";\r
             if (File.Exists(presetsFile))\r
@@ -262,22 +399,22 @@ namespace Handbrake
 \r
             // Reload the preset panel\r
             loadPresetPanel();\r
+*/\r
+            presetHandler.RemoveBuiltInPresets();\r
+            loadPresetPanel(); // Reload the preset panel\r
         }\r
         private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
         {\r
             loadNormalPreset();\r
         }\r
+        private void mnu_importMacPreset_Click(object sender, EventArgs e)\r
+        {\r
+            importPreset();\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
+            Form preset = new frmAddPreset(this, queryGen.GenerateCLIQuery(this, 0, null), presetHandler);\r
             preset.ShowDialog();\r
-\r
-            // Now reload the TreeView states\r
-            loadTreeViewStates(nodeStatus);\r
         }\r
         #endregion\r
 \r
@@ -299,23 +436,54 @@ namespace Handbrake
         }\r
         private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
         {\r
-            Boolean update = hb_common_func.updateCheck(true);\r
-            if (update == true)\r
+            lbl_updateCheck.Visible = true;\r
+            Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false);\r
+        }\r
+        private void updateCheckDoneMenu(IAsyncResult result)\r
+        {\r
+            // Make sure it's running on the calling thread\r
+            if (InvokeRequired)\r
+            {\r
+                Invoke(new MethodInvoker(() => updateCheckDoneMenu(result)));\r
+                return;\r
+            }\r
+            UpdateCheckInformation info;\r
+            try\r
+            {\r
+                // Get the information about the new build, if any, and close the window\r
+                info = Main.EndCheckForUpdates(result);\r
+\r
+                if (info.NewVersionAvailable && info.BuildInformation != null)\r
+                {\r
+                    frmUpdater updateWindow = new frmUpdater(info.BuildInformation);\r
+                    updateWindow.ShowDialog();\r
+                }\r
+                else\r
+                    MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+                lbl_updateCheck.Visible = false;\r
+                return;\r
+            }\r
+            catch (Exception ex)\r
             {\r
-                frmUpdater updateWindow = new frmUpdater();\r
-                updateWindow.Show();\r
+                if ((bool)result.AsyncState)\r
+                    MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
+/* HEAD\r
             else\r
                 MessageBox.Show("\8c»\8dÝ\97\98\97p\89Â\94\\82È\83A\83b\83v\83f\81[\83g\82Í\82 \82è\82Ü\82¹\82ñ", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+*/\r
         }\r
         private void mnu_about_Click(object sender, EventArgs e)\r
         {\r
-            Form About = new frmAbout();\r
-            About.ShowDialog();\r
+            using (frmAbout About = new frmAbout())\r
+            {\r
+                About.ShowDialog();\r
+            }\r
         }\r
         #endregion\r
 \r
-        #region Preset Menu\r
+        #region Preset Bar\r
+        // Right Click Menu Code\r
         private void pmnu_expandAll_Click(object sender, EventArgs e)\r
         {\r
             treeView_presets.ExpandAll();\r
@@ -324,48 +492,49 @@ namespace Handbrake
         {\r
             treeView_presets.CollapseAll();\r
         }\r
-        private void treeview_presets_mouseUp(object sender, MouseEventArgs e)\r
+        private void pmnu_import_Click(object sender, EventArgs e)\r
         {\r
-            if (e.Button == MouseButtons.Right)\r
-                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);\r
-            treeView_presets.Select();\r
+            importPreset();\r
+        }\r
+        private void pmnu_saveChanges_Click(object sender, EventArgs e)\r
+        {\r
+            DialogResult result = MessageBox.Show("Do you wish to include picture settings when updating the preset: " + treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+                presetHandler.Update(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), true);\r
+            else if (result == DialogResult.No)\r
+                presetHandler.Update(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), false);\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
+                presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+                treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
             }\r
             treeView_presets.Select();\r
         }\r
-        #endregion\r
+        private void presets_menu_Opening(object sender, System.ComponentModel.CancelEventArgs e)\r
+        {\r
+            // Make sure that the save menu is always disabled by default\r
+            pmnu_saveChanges.Enabled = false;\r
 \r
-        // MainWindow Components, Actions and Functions ***********************\r
-        #region Actions\r
+            // Now enable the save menu if the selected preset is a user preset\r
+            if (treeView_presets.SelectedNode != null)\r
+                if (presetHandler.CheckIfUserPresetExists(treeView_presets.SelectedNode.Text))\r
+                    pmnu_saveChanges.Enabled = true;\r
 \r
-        // ToolBar\r
-        private void btn_source_Click(object sender, EventArgs e)\r
+            treeView_presets.Select();\r
+        }\r
+\r
+        // Presets Management\r
+        private void btn_addPreset_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
+            Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);\r
+            preset.ShowDialog();\r
         }\r
-        private void btn_start_Click(object sender, EventArgs e)\r
+        private void btn_removePreset_Click(object sender, EventArgs e)\r
         {\r
+/* HEAD\r
             if (text_source.Text == string.Empty || text_source.Text == "\81u\95Ï\8a·\8c³\81v\83{\83^\83\93\82ð\83N\83\8a\83b\83N\82µ\82Ä\91I\91ð..." || text_destination.Text == string.Empty)\r
                 MessageBox.Show("\95Ï\8a·\8c³\82à\82µ\82­\82Í\95Û\91\90æ\82ª\91I\91ð\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
@@ -387,59 +556,83 @@ namespace Handbrake
                 btn_start.Text = "\95Ï\8a·\92â\8e~";\r
                 btn_start.ToolTipText = "\83G\83\93\83R\81[\83h\8f\88\97\9d\82ð\92\86\8e~\82µ\82Ü\82·\81B\nWarning: \82±\82ê\82É\82æ\82è\81A\83t\83@\83C\83\8b\82ª\94j\89ó\82³\82ê\82é\89Â\94\\90«\82ª\82 \82è\82Ü\82·\81B\88À\91S\82É\83G\83\93\83R\81[\83h\82ð\92\86\8e~\82·\82é\82É\82Í\81A\83R\83}\83\93\83h\83E\83B\83\93\83h\83E\82Åctrl-C\82ð\93ü\97Í\82µ\82Ä\82­\82¾\82³\82¢\81B";\r
                 btn_start.Image = Properties.Resources.stop;\r
+*/\r
+            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+            {\r
+                if (treeView_presets.SelectedNode != null)\r
+                {\r
+                    presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+                    treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
+                }\r
             }\r
+            treeView_presets.Select();\r
         }\r
-        private void btn_add2Queue_Click(object sender, EventArgs e)\r
+        private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
+/* HEAD\r
             if (text_source.Text == string.Empty || text_source.Text == "\81u\95Ï\8a·\8c³\81v\83{\83^\83\93\82ð\83N\83\8a\83b\83N\82µ\82Ä\91I\91ð..." || text_destination.Text == string.Empty)\r
                 MessageBox.Show("\95Ï\8a·\8c³\82à\82µ\82­\82Í\95Û\91\90æ\82ª\91I\91ð\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
+*/\r
+            if (treeView_presets.SelectedNode != null)\r
             {\r
-\r
-                String query = queryGen.GenerateTheQuery(this);\r
-                if (rtf_query.Text != "")\r
-                    query = rtf_query.Text;\r
-\r
-                encodeQueue.add(query);\r
-                encodeQueue.write2disk("hb_queue_recovery.dat"); // Writes the queue to the recovery file, just incase the GUI crashes.\r
-\r
-                queueWindow.setQueue(encodeQueue);\r
-                queueWindow.Show();\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;\r
+                    Properties.Settings.Default.Save();\r
+                    MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+                }\r
             }\r
+            else\r
+                MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
         }\r
-        private void btn_showQueue_Click(object sender, EventArgs e)\r
+        private void treeview_presets_mouseUp(object sender, MouseEventArgs e)\r
         {\r
-            queueWindow.setQueue(encodeQueue);\r
-            queueWindow.Show();\r
+            if (e.Button == MouseButtons.Right)\r
+                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);\r
+            else if (e.Button == MouseButtons.Left)\r
+            {\r
+                if (treeView_presets.GetNodeAt(e.Location) != null)\r
+                {\r
+                    if (labelPreset.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text))\r
+                        selectPreset();\r
+                }\r
+            }\r
+\r
+            treeView_presets.Select();\r
         }\r
-        private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
+        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
         {\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
+            selectPreset();\r
         }\r
-\r
-        //Source\r
-        private void btn_dvd_source_Click(object sender, EventArgs e)\r
+        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)\r
         {\r
-            // Enable the creation of chapter markers.\r
-            Check_ChapterMarkers.Enabled = true;\r
+            if (e.KeyCode == Keys.Delete)\r
+            {\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    if (treeView_presets.SelectedNode != null)\r
+                        presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
 \r
-            // Set the last action to scan. \r
-            // This is used for tracking which file to load in the activity window\r
-            lastAction = "scan";\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
-            String filename = "";\r
-            text_source.Text = "";\r
+                    // Now reload the preset panel\r
+                    loadPresetPanel();\r
 \r
-            DVD_Open.ShowDialog();\r
-            filename = DVD_Open.SelectedPath;\r
+                    // And finally, re-expand any of the nodes if required\r
+                    int i = 0;\r
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                    {\r
+                        if (nodeStatus[i])\r
+                            node.Expand();\r
 \r
+/* HEAD\r
             if (filename.StartsWith("\\"))\r
                 MessageBox.Show("HandBrake\82ÍUNC\83p\83X\82É\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B\n\8b¤\97L\83t\83H\83\8b\83_\82ð\83}\83E\83\93\83g\82µ\82Ä\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
@@ -459,63 +652,319 @@ namespace Handbrake
                     MessageBox.Show("\83^\83C\83g\83\8b\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\81B\90³\82µ\82¢\95Ï\8a·\8c³\82ð\91I\91ð\82µ\82Ä\82¢\82é\82©\82²\8am\94F\82­\82¾\82³\82¢\81B\82Ü\82½\81A\83R\83s\81[\83v\83\8d\83e\83N\83g\82³\82ê\82½\83f\83B\83X\83N\82É\82Í\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
                 lbl_encode.Text = "";\r
+*/\r
+                        i++;\r
+                    }\r
+                }\r
             }\r
         }\r
-        private void btn_file_source_Click(object sender, EventArgs e)\r
+        private void selectPreset()\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
+            if (treeView_presets.SelectedNode != null)\r
+            {\r
+                // Ok, so, we've selected a preset. Now we want to load it.\r
+                string presetName = treeView_presets.SelectedNode.Text;\r
+                if (presetHandler.GetPreset(presetName) != null)\r
+                {\r
+                    string query = presetHandler.GetPreset(presetName).Query;\r
+                    Boolean loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings;\r
 \r
-            String filename = "";\r
-            text_source.Text = "";\r
+                    if (query != null)\r
+                    {\r
+                        //Ok, Reset all the H264 widgets before changing the preset\r
+                        x264Panel.reset2Defaults();\r
 \r
-            ISO_Open.ShowDialog();\r
-            filename = ISO_Open.FileName;\r
+                        // Send the query from the file to the Query Parser class\r
+                        QueryParser presetQuery = QueryParser.Parse(query);\r
 \r
+/*\r
             if (filename.StartsWith("\\"))\r
                 MessageBox.Show("HandBrake\82ÍUNC\83p\83X\82É\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B\n\8b¤\97L\83t\83H\83\8b\83_\82ð\83}\83E\83\93\83g\82µ\82Ä\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
+*/\r
+                        // Now load the preset\r
+                        PresetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
+\r
+                        // The x264 widgets will need updated, so do this now:\r
+                        x264Panel.X264_StandardizeOptString();\r
+                        x264Panel.X264_SetCurrentSettingsInPanel();\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        private void loadNormalPreset()\r
+        {\r
+            foreach (TreeNode treenode in treeView_presets.Nodes)\r
             {\r
-                if (filename != "")\r
+                foreach (TreeNode node in treenode.Nodes)\r
                 {\r
-                    Form frmRD = new frmReadDVD(filename, this);\r
-                    text_source.Text = filename;\r
-                    lbl_encode.Text = "Scanning ...";\r
-                    frmRD.ShowDialog();\r
+                    if (node.Text.Equals("Normal"))\r
+                        treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];\r
+                }\r
+            }\r
+        }\r
+        private void importPreset()\r
+        {\r
+            Import imp = new Import();\r
+            if (openPreset.ShowDialog() == DialogResult.OK)\r
+            {\r
+                QueryParser parsed = imp.importMacPreset(openPreset.FileName);\r
+                if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)"))\r
+                {\r
+                    DialogResult result = MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", "Overwrite preset?",\r
+                                                           MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
+                    if (result == DialogResult.Yes)\r
+                    {\r
+                        PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+                        presetHandler.Update(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null),\r
+                                                   parsed.UsesPictureSettings);\r
+                    }\r
                 }\r
                 else\r
+/* HEAD\r
                     text_source.Text = "\81u\95Ï\8a·\8c³\81v\83{\83^\83\93\82ð\83N\83\8a\83b\83N\82µ\82Ä\91I\91ð...";\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("\83^\83C\83g\83\8b\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\81B\90³\82µ\82¢\95Ï\8a·\8c³\82ð\91I\91ð\82µ\82Ä\82¢\82é\82©\82²\8am\94F\82­\82¾\82³\82¢\81B\82Ü\82½\81A\83R\83s\81[\83v\83\8d\83e\83N\83g\82³\82ê\82½\83f\83B\83X\83N\82É\82Í\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B", "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
                 {\r
-                    Check_ChapterMarkers.Enabled = false;\r
-                    Check_ChapterMarkers.Checked = false;\r
-                    data_chpt.Rows.Clear();\r
+                    PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+                    presetHandler.Add(parsed.PresetName, queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
+\r
+                    if (presetHandler.Add(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
+                    {\r
+                        TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
+                        treeView_presets.Nodes.Add(preset_treeview);\r
+                    }\r
                 }\r
             }\r
         }\r
+        #endregion\r
+\r
+        #region ToolStrip\r
+        private void btn_source_Click(object sender, EventArgs e)\r
+        {\r
+            mnu_dvd_drive.Visible = true;\r
+            Thread driveInfoThread = new Thread(getDriveInfoThread);\r
+            driveInfoThread.Start();\r
+        }\r
+        private void btn_start_Click(object sender, EventArgs e)\r
+        {\r
+            if (btn_start.Text == "Stop")\r
+            {\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to cancel the encode?", "Cancel Encode?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    // Pause The Queue\r
+                    encodeQueue.RequestPause();\r
+\r
+                    // Allow the CLI to exit cleanly\r
+                    Win32.SetForegroundWindow((int)encodeQueue.processHandle);\r
+                    SendKeys.Send("^C");\r
+\r
+                    // Update the GUI\r
+                    setEncodeFinished();\r
+                }\r
+            }\r
+            else\r
+            {\r
+                if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
+                {\r
+                    string generatedQuery = queryGen.GenerateCLIQuery(this, 0, null);\r
+                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.GenerateCLIQuery(this, 0, null);\r
+                    string query = string.Empty;\r
+\r
+                    // Check to make sure the generated query matches the GUI settings\r
+                    if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery)\r
+                    {\r
+                        DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +\r
+                            "does not match the current GUI settings.\n\nBecause the manual query takes " +\r
+                            "priority over the GUI, your recently updated settings will not be taken " +\r
+                            "into account when encoding this job." + Environment.NewLine + Environment.NewLine +\r
+                            "Do you want to replace the manual query with the updated GUI-generated query?",\r
+                            "Manual Query does not Match GUI",\r
+                            MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,\r
+                            MessageBoxDefaultButton.Button3);\r
+\r
+                        switch (result)\r
+                        {\r
+                            case DialogResult.Yes:\r
+                                // Replace the manual query with the generated one\r
+                                query = generatedQuery;\r
+                                rtf_query.Text = generatedQuery;\r
+                                break;\r
+                            case DialogResult.No:\r
+                                // Use the manual query\r
+                                query = specifiedQuery;\r
+                                break;\r
+                            case DialogResult.Cancel:\r
+                                // Don't start the encode\r
+                                return;\r
+                        }\r
+                    }\r
+                    else\r
+                    {\r
+                        query = specifiedQuery;\r
+                    }\r
+\r
+                    DialogResult overwrite = DialogResult.Yes;\r
+                    if (text_destination.Text != "")\r
+                        if (File.Exists(text_destination.Text))\r
+                            overwrite = MessageBox.Show("The destination file already exists. Are you sure you want to overwrite it?", "Overwrite File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+\r
+                    if (overwrite == DialogResult.Yes)\r
+                    {\r
+                        if (encodeQueue.Count == 0)\r
+                            encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
+\r
+                        queueWindow.setQueue();\r
+                        if (encodeQueue.Count > 1)\r
+                            queueWindow.Show(false);\r
+\r
+                        setEncodeStarted(); // Encode is running, so setup the GUI appropriately\r
+                        encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process\r
+                        lastAction = "encode";   // Set the last action to encode - Used for activity window.\r
+\r
+                        if (ActivityWindow != null)\r
+                            ActivityWindow.SetLogView(false);\r
+\r
+                    }\r
+                    this.Focus();\r
+                }\r
+                else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+                    MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\r
+        }\r
+        private void btn_add2Queue_Click(object sender, EventArgs e)\r
+        {\r
+            if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+                MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
+            {\r
+                String query = queryGen.GenerateCLIQuery(this, 0, null);\r
+                if (rtf_query.Text != "")\r
+                    query = rtf_query.Text;\r
+\r
+                if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text))\r
+                {\r
+                    DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",\r
+                  "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
+                    if (result == DialogResult.Yes)\r
+                        encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
+\r
+                }\r
+                else\r
+                    encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
+\r
+                lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";\r
+\r
+                queueWindow.Show();\r
+            }\r
+        }\r
+        private void btn_showQueue_Click(object sender, EventArgs e)\r
+        {\r
+            queueWindow.Show();\r
+            queueWindow.Activate();\r
+        }\r
+        private void tb_preview_Click(object sender, EventArgs e)\r
+        {\r
+            if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+                MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
+            {\r
+                if (qtpreview == null)\r
+                {\r
+                    qtpreview = new frmPreview(this);\r
+                    qtpreview.Show();\r
+                }\r
+                else if (qtpreview.IsDisposed)\r
+                {\r
+                    qtpreview = new frmPreview(this);\r
+                    qtpreview.Show();\r
+                }\r
+                else\r
+                    MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\r
+        }\r
+        private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
+        {\r
+            String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt";\r
+            if (ActivityWindow == null)\r
+                ActivityWindow = new frmActivityWindow(file, encodeQueue, this);\r
+\r
+            ActivityWindow.SetLogView(!encodeQueue.isEncoding);\r
+\r
+            ActivityWindow.Show();\r
+        }\r
+        #endregion\r
+\r
+        #region System Tray Icon\r
+        private void frmMain_Resize(object sender, EventArgs e)\r
+        {\r
+            if (FormWindowState.Minimized == this.WindowState)\r
+            {\r
+                notifyIcon.Visible = true;\r
+                this.Hide();\r
+            }\r
+            else if (FormWindowState.Normal == this.WindowState)\r
+                notifyIcon.Visible = false;\r
+        }\r
+        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)\r
+        {\r
+            this.Visible = true;\r
+            this.Activate();\r
+            this.WindowState = FormWindowState.Normal;\r
+            notifyIcon.Visible = false;\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
+        #endregion\r
+\r
+        #region Tab Control\r
+\r
+        //Source\r
+        private void btn_dvd_source_Click(object sender, EventArgs e)\r
+        {\r
+            if (DVD_Open.ShowDialog() == DialogResult.OK)\r
+            {\r
+                this.selectedSourceType = SourceType.Folder;\r
+                selectSource(DVD_Open.SelectedPath);\r
+            }\r
+            else\r
+                UpdateSourceLabel();\r
+        }\r
+        private void btn_file_source_Click(object sender, EventArgs e)\r
+        {\r
+            if (ISO_Open.ShowDialog() == DialogResult.OK)\r
+            {\r
+                this.selectedSourceType = SourceType.VideoFile;\r
+                selectSource(ISO_Open.FileName);\r
+            }\r
+            else\r
+                UpdateSourceLabel();\r
+        }\r
         private void mnu_dvd_drive_Click(object sender, EventArgs e)\r
         {\r
-            // Enable the creation of chapter markers.\r
+            if (this.dvdDrivePath == null) return;\r
+            this.selectedSourceType = SourceType.DvdDrive;\r
+            selectSource(this.dvdDrivePath);\r
+        }\r
+        private void selectSource(string file)\r
+        {\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
+            sourcePath = string.Empty;\r
 \r
-            String filename = "";\r
-            if (mnu_dvd_drive.Text.Contains("VIDEO_TS"))\r
+            if (file == string.Empty) // Must have a file or path\r
             {\r
+/* HEAD\r
                 string[] path = mnu_dvd_drive.Text.Split(' ');\r
                 filename = path[0];\r
                 lbl_encode.Text = "\83X\83L\83\83\83\93\92\86...";\r
@@ -527,10 +976,23 @@ namespace Handbrake
             // 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("\83^\83C\83g\83\8b\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\81B\90³\82µ\82¢\95Ï\8a·\8c³\82ð\91I\91ð\82µ\82Ä\82¢\82é\82©\82²\8am\94F\82­\82¾\82³\82¢\81B\82Ü\82½\81A\83R\83s\81[\83v\83\8d\83e\83N\83g\82³\82ê\82½\83f\83B\83X\83N\82É\82Í\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+*/\r
+                UpdateSourceLabel();\r
+                return;\r
+            }\r
 \r
-            lbl_encode.Text = "";\r
-        }\r
+            if (file.StartsWith("\\")) // NO UNC Paths\r
+            {\r
+                MessageBox.Show(\r
+                    "HandBrake\82ÍUNC\83p\83X\82É\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B\n\8b¤\97L\83t\83H\83\8b\83_\82ð\83}\83E\83\93\83g\82µ\82Ä\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B",\r
+                    "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                UpdateSourceLabel();\r
+                return;\r
+            }\r
 \r
+            sourcePath = Path.GetFileName(file);\r
+            startScan(file);\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
@@ -538,9 +1000,9 @@ namespace Handbrake
         }\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
+            UnRegisterPresetEventHandler();\r
+\r
+            PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form\r
             drop_chapterStart.Items.Clear();\r
             drop_chapterFinish.Items.Clear();\r
 \r
@@ -548,18 +1010,25 @@ namespace Handbrake
             // Otheriwse if its not, title data has to be loased from parsing.\r
             if (drp_dvdtitle.Text != "Automatic")\r
             {\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
+                selectedTitle = drp_dvdtitle.SelectedItem as Title;\r
                 lbl_duration.Text = selectedTitle.Duration.ToString();\r
+                PictureSettings.Source = selectedTitle;  // Setup Picture Settings Tab Control\r
 \r
-                // Set the Recommended Cropping values\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
+                // Populate the Angles dropdown\r
+                drop_angle.Items.Clear();\r
+                if (!Properties.Settings.Default.noDvdNav)\r
+                {\r
+                    drop_angle.Visible = true;\r
+                    lbl_angle.Visible = true;\r
+                    drop_angle.Items.AddRange(selectedTitle.Angles.ToArray());\r
+                    if (drop_angle.Items.Count != 0)\r
+                        drop_angle.SelectedIndex = 0;\r
+                }\r
+                else\r
+                {\r
+                    drop_angle.Visible = false;\r
+                    lbl_angle.Visible = false;\r
+                }\r
 \r
                 // Populate the Start chapter Dropdown\r
                 drop_chapterStart.Items.Clear();\r
@@ -574,89 +1043,113 @@ namespace Handbrake
                     drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
 \r
                 // Populate the Audio Channels Dropdown\r
-                drp_track1Audio.Items.Clear();\r
-                drp_track1Audio.Items.Add("Automatic");\r
-                drp_track1Audio.Items.Add("None");\r
-                drp_track1Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track1Audio.SelectedIndex = 0;\r
-\r
-                drp_track2Audio.Items.Clear();\r
-                drp_track2Audio.Items.Add("None");\r
-                drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track2Audio.SelectedIndex = 0;\r
-\r
-                drp_track3Audio.Items.Clear();\r
-                drp_track3Audio.Items.Add("None");\r
-                drp_track3Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track3Audio.SelectedIndex = 0;\r
-\r
-                drp_track4Audio.Items.Clear();\r
-                drp_track4Audio.Items.Add("None");\r
-                drp_track4Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track4Audio.SelectedIndex = 0;\r
+                AudioSettings.SetTrackList(selectedTitle);\r
 \r
                 // Populate the Subtitles dropdown\r
-                drp_subtitle.Items.Clear();\r
-                drp_subtitle.Items.Add("None");\r
-                drp_subtitle.Items.Add("Autoselect");\r
-                drp_subtitle.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
-                if (drp_subtitle.Items.Count > 0)\r
-                    drp_subtitle.Text = drp_subtitle.Items[0].ToString();\r
-\r
+                Subtitles.drp_subtitleTracks.Items.Clear();\r
+                Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");\r
+                Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
+                Subtitles.drp_subtitleTracks.SelectedIndex = 0;\r
+                Subtitles.Clear();\r
+                Subtitles.SetSubtitleTrackAuto();\r
             }\r
 \r
             // Run the autoName & chapterNaming functions\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
+            if (Properties.Settings.Default.autoNaming)\r
+            {\r
+                string autoPath = Main.autoName(this);\r
+                if (autoPath != null)\r
+                    text_destination.Text = autoPath;\r
+                else\r
+                    MessageBox.Show("You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\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
-            int c_start, c_end = 1;\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
+            if (selectedTitle.Chapters.Count != 1)\r
             {\r
-                if (c_start > c_end)\r
-                    drop_chapterFinish.Text = c_start.ToString();\r
+                DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
+                if (chapterGridView != null)\r
+                    data_chpt = chapterGridView;\r
+            }\r
+            else\r
+            {\r
+                Check_ChapterMarkers.Checked = false;\r
+                Check_ChapterMarkers.Enabled = false;\r
             }\r
 \r
-            lbl_duration.Text = hb_common_func.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+            // Hack to force the redraw of the scrollbars which don't resize properly when the control is disabled.\r
+            data_chpt.Columns[0].Width = 166;\r
+            data_chpt.Columns[0].Width = 165;\r
 \r
-            // Run the Autonaming function\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
+            RegisterPresetEventHandler();\r
         }\r
-        private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void chapersChanged(object sender, EventArgs e)\r
         {\r
-            int c_start, c_end = 1;\r
+            Control ctl = (Control)sender;\r
+            int chapterStart, chapterEnd;\r
+            int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+            int.TryParse(drop_chapterFinish.Text, out chapterEnd);\r
+\r
+            switch (ctl.Name)\r
+            {\r
+                case "drop_chapterStart":\r
+                    if (drop_chapterFinish.SelectedIndex == -1 && drop_chapterFinish.Items.Count != 0)\r
+                        drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;\r
 \r
-            if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1)\r
-                drop_chapterStart.SelectedIndex = 1;\r
+                    if (chapterEnd != 0)\r
+                        if (chapterStart > chapterEnd)\r
+                            drop_chapterFinish.Text = chapterStart.ToString();\r
+                    break;\r
+                case "drop_chapterFinish":\r
+                    if (drop_chapterStart.Items.Count >= 1 && drop_chapterStart.SelectedIndex == -1)\r
+                        drop_chapterStart.SelectedIndex = 0;\r
 \r
-            int.TryParse(drop_chapterStart.Text, out c_start);\r
-            int.TryParse(drop_chapterFinish.Text, out c_end);\r
+                    if (chapterStart != 0)\r
+                        if (chapterEnd < chapterStart)\r
+                            drop_chapterFinish.Text = chapterStart.ToString();\r
 \r
-            if (c_start != 0)\r
-            {\r
-                if (c_end < c_start)\r
-                    drop_chapterFinish.Text = c_start.ToString();\r
+                    // Add more rows to the Chapter menu if needed.\r
+                    if (Check_ChapterMarkers.Checked)\r
+                    {\r
+                        int i = data_chpt.Rows.Count, finish = 0;\r
+                        int.TryParse(drop_chapterFinish.Text, out finish);\r
+\r
+                        while (i < finish)\r
+                        {\r
+                            int n = data_chpt.Rows.Add();\r
+                            data_chpt.Rows[n].Cells[0].Value = (i + 1);\r
+                            data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1);\r
+                            data_chpt.Rows[n].Cells[0].ValueType = typeof(int);\r
+                            data_chpt.Rows[n].Cells[1].ValueType = typeof(string);\r
+                            i++;\r
+                        }\r
+                    }\r
+                    break;\r
             }\r
 \r
-            lbl_duration.Text = hb_common_func.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+            // Update the Duration\r
+            lbl_duration.Text = Main.calculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex, selectedTitle).ToString();\r
 \r
             // Run the Autonaming function\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
+            if (Properties.Settings.Default.autoNaming)\r
+                text_destination.Text = Main.autoName(this);\r
+\r
+            // Disable chapter markers if only 1 chapter is selected.\r
+            if (chapterStart == chapterEnd)\r
+            {\r
+                Check_ChapterMarkers.Enabled = false;\r
+                btn_importChapters.Enabled = false;\r
+                data_chpt.Enabled = false;\r
+            }\r
+            else\r
+            {\r
+                Check_ChapterMarkers.Enabled = true;\r
+                if (Check_ChapterMarkers.Checked)\r
+                {\r
+                    btn_importChapters.Enabled = true;\r
+                    data_chpt.Enabled = true;\r
+                }\r
+            }\r
         }\r
 \r
         //Destination\r
@@ -664,20 +1157,16 @@ namespace Handbrake
         {\r
             // This removes the file extension from the filename box on the save file dialog.\r
             // It's daft but some users don't realise that typing an extension overrides the dropdown extension selected.\r
-            DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");\r
+            DVD_Save.FileName = Path.GetFileNameWithoutExtension(text_destination.Text);\r
 \r
-            // Show the dialog and set the main form file path\r
+            if (Path.IsPathRooted(text_destination.Text))\r
+                DVD_Save.InitialDirectory = Path.GetDirectoryName(text_destination.Text);\r
 \r
-            if (text_destination.Text.EndsWith(".mp4"))\r
+            // Show the dialog and set the main form file path\r
+            if (drop_format.SelectedIndex.Equals(0))\r
                 DVD_Save.FilterIndex = 1;\r
-            else if (text_destination.Text.EndsWith(".m4v"))\r
+            else if (drop_format.SelectedIndex.Equals(1))\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
@@ -685,68 +1174,87 @@ namespace Handbrake
                     MessageBox.Show("HandBrake\82ÍUNC\83p\83X\82É\91Î\89\9e\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B\n\8b¤\97L\83t\83H\83\8b\83_\82ð\83}\83E\83\93\83g\82µ\82Ä\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81B","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                 else\r
                 {\r
-                    setAudioByContainer(DVD_Save.FileName);\r
+                    // Add a file extension manually, as FileDialog.AddExtension has issues with dots in filenames\r
+                    switch (DVD_Save.FilterIndex)\r
+                    {\r
+                        case 1:\r
+                            if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
+                                if (Properties.Settings.Default.useM4v)\r
+                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");\r
+                                else\r
+                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");\r
+                            break;\r
+                        case 2:\r
+                            if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\r
+                                DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");\r
+                            break;\r
+                        default:\r
+                            //do nothing  \r
+                            break;\r
+                    }\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
+                    if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2)\r
+                        SetExtension(".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
+            if (path.EndsWith(".mp4") || path.EndsWith(".m4v"))\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
+                drop_format.SelectedIndex = 1;\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
+            switch (drop_format.SelectedIndex)\r
+            {\r
+                case 0:\r
+                    if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+                        SetExtension(".m4v");\r
+                    else\r
+                        SetExtension(".mp4");\r
+                    break;\r
+                case 1:\r
+                    SetExtension(".mkv");\r
+                    break;\r
+            }\r
+\r
+            AudioSettings.SetContainer(drop_format.Text);\r
+            Subtitles.SetContainer(drop_format.SelectedIndex);\r
 \r
+            if (drop_format.Text.Contains("MP4"))\r
+            {\r
+                if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))\r
+                {\r
+                    drp_videoEncoder.Items.Remove("VP3 (Theora)");\r
+                    drp_videoEncoder.SelectedIndex = 1;\r
+                }\r
+            }\r
+            else if (drop_format.Text.Contains("MKV"))\r
+                drp_videoEncoder.Items.Add("VP3 (Theora)");\r
+        }\r
+        public void SetExtension(string newExtension)\r
+        {\r
+            if (newExtension == ".mp4" || newExtension == ".m4v")\r
+                if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+                    newExtension = ".m4v";\r
+                else\r
+                    newExtension = ".mp4";\r
+\r
+            if (Path.HasExtension(newExtension))\r
+                text_destination.Text = Path.ChangeExtension(text_destination.Text, newExtension);\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
+            setContainerOpts();\r
 \r
             //Turn off some options which are H.264 only when the user selects a non h.264 encoder\r
             if (drp_videoEncoder.Text.Contains("H.264"))\r
@@ -754,554 +1262,200 @@ namespace Handbrake
                 if (check_2PassEncode.CheckState == CheckState.Checked)\r
                     check_turbo.Enabled = true;\r
 \r
-                h264Tab.Enabled = true;\r
-                if ((text_destination.Text.Contains(".mp4")) || (text_destination.Text.Contains(".m4v")))\r
+                tab_advanced.Enabled = true;\r
+                if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
                     check_iPodAtom.Enabled = true;\r
                 else\r
                     check_iPodAtom.Enabled = false;\r
-                if (!drp_anamorphic.Items.Contains("Loose"))\r
-                    drp_anamorphic.Items.Add("Loose");\r
             }\r
             else\r
             {\r
                 check_turbo.CheckState = CheckState.Unchecked;\r
                 check_turbo.Enabled = false;\r
-                h264Tab.Enabled = false;\r
-                rtf_x264Query.Text = "";\r
+                tab_advanced.Enabled = false;\r
+                x264Panel.x264Query = "";\r
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
-                if (drp_anamorphic.Items.Count == 3)\r
-                    drp_anamorphic.Items.RemoveAt(2);\r
-            }\r
-\r
-        }\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
-            if (check_2PassEncode.CheckState.ToString() == "Checked")\r
-            {\r
-                if (drp_videoEncoder.Text.Contains("H.264"))\r
-                    check_turbo.Enabled = true;\r
-            }\r
-            else\r
-            {\r
-                check_turbo.Enabled = false;\r
-                check_turbo.CheckState = CheckState.Unchecked;\r
             }\r
-        }\r
 \r
-        //Picture Tab\r
-        private void text_width_TextChanged(object sender, EventArgs e)\r
-        {\r
-            maxWidth = 0;  // Reset max width so that it's not using the MaxWidth -X. Quick hack to allow -X for preset usage.\r
-\r
-            int width;\r
-            Boolean parsed = int.TryParse(text_width.Text, out width);\r
-            if (parsed != false)\r
+            // Setup the CQ Slider\r
+            switch (drp_videoEncoder.Text)\r
             {\r
-                if ((width % 16) != 0)\r
-                    text_width.BackColor = Color.LightCoral;\r
-                else\r
-                    text_width.BackColor = Color.LightGreen;\r
+                case "MPEG-4 (FFmpeg)":\r
+                    if (slider_videoQuality.Value > 31)\r
+                        slider_videoQuality.Value = 20;   // Just reset to 70% QP 10 on encode change.\r
+                    slider_videoQuality.Minimum = 1;\r
+                    slider_videoQuality.Maximum = 31;\r
+                    break;\r
+                case "H.264 (x264)":\r
+                    slider_videoQuality.Minimum = 0;\r
+                    slider_videoQuality.TickFrequency = 1;\r
 \r
+                    CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
+                    double cqStep = Properties.Settings.Default.x264cqstep;\r
+                    double multiplier = 1.0 / cqStep;\r
+                    double value = slider_videoQuality.Value * multiplier;\r
 \r
-                if (lbl_Aspect.Text != "Select a Title" && maxWidth != 0 && maxHeight != 0)\r
-                {\r
-                    if (drp_anamorphic.Text == "None")\r
+                    switch (Properties.Settings.Default.x264cqstep.ToString(culture))\r
                     {\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
+                        case "0.2":\r
+                            slider_videoQuality.Maximum = 255;\r
+                            break;\r
+                        case "0.25":\r
+                            slider_videoQuality.Maximum = 204;\r
+                            break;\r
+                        case "0.5":\r
+                            slider_videoQuality.Maximum = 102;\r
+                            break;\r
+                        case "1":\r
+                            slider_videoQuality.Maximum = 51;\r
+                            break;\r
+                        default:\r
+                            slider_videoQuality.Maximum = 51;\r
+                            break;\r
                     }\r
-                }\r
-            }\r
-        }\r
-        private void text_height_TextChanged(object sender, EventArgs e)\r
-        {\r
-            maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.\r
-\r
-            int height;\r
-            Boolean parsed = int.TryParse(text_height.Text, out height);\r
-            if (parsed != false)\r
-            {\r
-                if ((height % 16) != 0)\r
-                    text_height.BackColor = Color.LightCoral;\r
-                else\r
-                    text_height.BackColor = Color.LightGreen;\r
-            }\r
-        }\r
-        private void check_customCrop_CheckedChanged(object sender, EventArgs e)\r
-        {\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_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
-            else\r
-            {\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_autoCrop_CheckedChanged(object sender, EventArgs e)\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
-            if (drp_anamorphic.SelectedIndex == 1)\r
-            {\r
-                text_height.BackColor = Color.LightGray;\r
-                text_width.BackColor = Color.LightGray;\r
-                text_height.Text = "";\r
-                text_width.Text = "";\r
-                text_height.Enabled = false;\r
-                text_width.Enabled = false;\r
-            }\r
-\r
-            if (drp_anamorphic.SelectedIndex == 2)\r
-            {\r
-                text_height.Text = "";\r
-                text_height.Enabled = false;\r
-                text_height.BackColor = Color.LightGray;\r
-\r
-                text_width.Enabled = true;\r
-                text_width.BackColor = Color.White;\r
-            }\r
-\r
-            if (drp_anamorphic.SelectedIndex == 0)\r
-            {\r
-                text_height.BackColor = Color.White;\r
-                text_width.BackColor = Color.White;\r
-                text_height.Enabled = true;\r
-                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
-        {\r
-            if (drp_track2Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_2.Enabled = false;\r
-                drp_audenc_2.Enabled = false;\r
-                drp_audsr_2.Enabled = false;\r
-                drp_audmix_2.Enabled = false;\r
-                trackBar2.Enabled = false;\r
-                drp_audbit_2.Text = "";\r
-                drp_audenc_2.Text = "";\r
-                drp_audsr_2.Text = "";\r
-                drp_audmix_2.Text = "Automatic";\r
-                trackBar2.Value = 0;\r
-\r
-                // Disable the 3rd Track.\r
-                drp_track3Audio.Enabled = false;\r
-                drp_track3Audio.Text = "None";\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-                trackBar3.Value = 0;\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_2.Enabled = true;\r
-                drp_audenc_2.Enabled = true;\r
-                drp_audsr_2.Enabled = true;\r
-                drp_audmix_2.Enabled = true;\r
-                trackBar2.Enabled = true;\r
-                drp_audbit_2.Text = "160";\r
-                drp_audenc_2.Text = "AAC";\r
-                drp_audsr_2.Text = "Auto";\r
-                drp_audmix_2.Text = "Automatic";\r
-\r
-                // Enable the 3rd Track.\r
-                drp_track3Audio.Enabled = true;\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-            }\r
-        }\r
-        private void drp_track3Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track3Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_3.Enabled = false;\r
-                drp_audenc_3.Enabled = false;\r
-                drp_audsr_3.Enabled = false;\r
-                drp_audmix_3.Enabled = false;\r
-                trackBar3.Enabled = false;\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-                trackBar3.Value = 0;\r
-\r
-                // Disable the 4th Track.\r
-                drp_track4Audio.Enabled = false;\r
-                drp_track4Audio.Text = "None";\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_3.Enabled = true;\r
-                drp_audenc_3.Enabled = true;\r
-                drp_audsr_3.Enabled = true;\r
-                drp_audmix_3.Enabled = true;\r
-                trackBar3.Enabled = true;\r
-                drp_audbit_3.Text = "160";\r
-                drp_audenc_3.Text = "AAC";\r
-                drp_audsr_3.Text = "Auto";\r
-                drp_audmix_3.Text = "Automatic";\r
-\r
-                // Enable the 4th Track.\r
-                drp_track4Audio.Enabled = true;\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-            }\r
-\r
-        }\r
-        private void drp_track4Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track4Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_4.Enabled = false;\r
-                drp_audenc_4.Enabled = false;\r
-                drp_audsr_4.Enabled = false;\r
-                drp_audmix_4.Enabled = false;\r
-                trackBar4.Enabled = false;\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-                trackBar4.Value = 0;\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_4.Enabled = true;\r
-                drp_audenc_4.Enabled = true;\r
-                drp_audsr_4.Enabled = true;\r
-                drp_audmix_4.Enabled = true;\r
-                trackBar4.Enabled = true;\r
-                drp_audbit_4.Text = "160";\r
-                drp_audenc_4.Text = "AAC";\r
-                drp_audsr_4.Text = "Auto";\r
-                drp_audmix_4.Text = "Automatic";\r
-            }\r
-        }\r
+                    if (value < slider_videoQuality.Maximum)\r
+                        slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value;\r
 \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
-            else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_1);\r
-                drp_audbit_1.Text = "160";\r
+                    break;\r
+                case "VP3 (Theora)":\r
+                    if (slider_videoQuality.Value > 63)\r
+                        slider_videoQuality.Value = 45;  // Just reset to 70% QP 45 on encode change.\r
+                    slider_videoQuality.Minimum = 0;\r
+                    slider_videoQuality.Maximum = 63;\r
+                    break;\r
             }\r
         }\r
-        private void drp_audmix_2_SelectedIndexChanged(object sender, EventArgs e)\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
-            {\r
-                setBitrateSelections160(drp_audbit_2);\r
-                drp_audbit_2.Text = "160";\r
-            }\r
-        }\r
-        private void drp_audmix_3_SelectedIndexChanged(object sender, EventArgs e)\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
-            {\r
-                setBitrateSelections160(drp_audbit_3);\r
-                drp_audbit_3.Text = "160";\r
-            }\r
-        }\r
-        private void drp_audmix_4_SelectedIndexChanged(object sender, EventArgs e)\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
-            {\r
-                setBitrateSelections160(drp_audbit_4);\r
-                drp_audbit_4.Text = "160";\r
-            }\r
-        }\r
-\r
-        private void drp_audenc_1_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_audenc_1.Text == "AC3")\r
-            {\r
-                drp_audmix_1.Enabled = false;\r
-                drp_audbit_1.Enabled = false;\r
-                drp_audsr_1.Enabled = false;\r
-            }\r
-            else\r
-            {\r
-                drp_audmix_1.Enabled = true;\r
-                drp_audbit_1.Enabled = true;\r
-                drp_audsr_1.Enabled = true;\r
-\r
-                drp_audmix_1.Text = "Automatic";\r
-                drp_audbit_1.Text = "160";\r
-                drp_audsr_1.Text = "Auto";\r
-            }\r
-\r
-\r
-            if (drp_audenc_1.Text == "AAC")\r
-            {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Mono");\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_1.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_1);\r
-            }\r
-            else\r
-            {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-\r
-                setBitrateSelections320(drp_audbit_1);\r
-            }\r
-        }\r
-        private void drp_audenc_2_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_audenc_2.Text == "AC3")\r
-            {\r
-                drp_audmix_2.Enabled = false;\r
-                drp_audbit_2.Enabled = false;\r
-                drp_audsr_2.Enabled = false;\r
-\r
-                drp_audmix_2.Text = "Automatic";\r
-                drp_audbit_2.Text = "160";\r
-                drp_audsr_2.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track2 is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_2.Enabled = true;\r
-                    drp_audbit_2.Enabled = true;\r
-                    drp_audsr_2.Enabled = true;\r
-\r
-                    drp_audmix_2.Text = "Automatic";\r
-                    drp_audbit_2.Text = "160";\r
-                    drp_audsr_2.Text = "Auto";\r
-                }\r
-            }\r
-\r
-            if (drp_audenc_2.Text == "AAC")\r
-            {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Mono");\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_2.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_2);\r
-            }\r
-            else\r
-            {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-\r
-                setBitrateSelections320(drp_audbit_2);\r
-            }\r
-        }\r
-        private void drp_audenc_3_SelectedIndexChanged(object sender, EventArgs e)\r
+        /// <summary>\r
+        /// Set the container format options\r
+        /// </summary>\r
+        public void setContainerOpts()\r
         {\r
-            if (drp_audenc_3.Text == "AC3")\r
-            {\r
-                drp_audmix_3.Enabled = false;\r
-                drp_audbit_3.Enabled = false;\r
-                drp_audsr_3.Enabled = false;\r
-\r
-                drp_audmix_3.Text = "Automatic";\r
-                drp_audbit_3.Text = "160";\r
-                drp_audsr_3.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_3.Enabled = true;\r
-                    drp_audbit_3.Enabled = true;\r
-                    drp_audsr_3.Enabled = true;\r
-\r
-                    drp_audmix_3.Text = "Automatic";\r
-                    drp_audbit_3.Text = "160";\r
-                    drp_audsr_3.Text = "Auto";\r
-                }\r
-            }\r
-\r
-\r
-            if (drp_audenc_3.Text == "AAC")\r
+            if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Mono");\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_3.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_3);\r
+                check_largeFile.Enabled = true;\r
+                check_optimiseMP4.Enabled = true;\r
+                check_iPodAtom.Enabled = true;\r
             }\r
             else\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-\r
-                setBitrateSelections320(drp_audbit_3);\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
-        private void drp_audenc_4_SelectedIndexChanged(object sender, EventArgs e)\r
+        private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+        /// <summary>\r
+        /// Update the CQ slider for x264 for a new CQ step. This is set from option\r
+        /// </summary>\r
+        public void setQualityFromSlider()\r
         {\r
-            if (drp_audenc_4.Text == "AC3")\r
-            {\r
-                drp_audmix_4.Enabled = false;\r
-                drp_audbit_4.Enabled = false;\r
-                drp_audsr_4.Enabled = false;\r
+            // Work out the current RF value.\r
+            double cqStep = _cachedCqStep;\r
+            double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
 \r
-                drp_audmix_4.Text = "Automatic";\r
-                drp_audbit_4.Text = "160";\r
-                drp_audsr_4.Text = "Auto";\r
-            }\r
-            else\r
+            // Change the maximum value for the slider\r
+            switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US")))\r
             {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_4.Enabled = true;\r
-                    drp_audbit_4.Enabled = true;\r
-                    drp_audsr_4.Enabled = true;\r
-\r
-                    drp_audmix_4.Text = "Automatic";\r
-                    drp_audbit_4.Text = "160";\r
-                    drp_audsr_4.Text = "Auto";\r
-                }\r
+                case "0.2":\r
+                    slider_videoQuality.Maximum = 255;\r
+                    break;\r
+                case "0.25":\r
+                    slider_videoQuality.Maximum = 204;\r
+                    break;\r
+                case "0.5":\r
+                    slider_videoQuality.Maximum = 102;\r
+                    break;\r
+                case "1":\r
+                    slider_videoQuality.Maximum = 51;\r
+                    break;\r
+                default:\r
+                    slider_videoQuality.Maximum = 51;\r
+                    break;\r
             }\r
 \r
+            // Reset the CQ slider to RF0\r
+            slider_videoQuality.Value = slider_videoQuality.Maximum;\r
 \r
-            if (drp_audenc_4.Text == "AAC")\r
+            // Reset the CQ slider back to the previous value as close as possible\r
+            double cqStepNew = Properties.Settings.Default.x264cqstep;\r
+            double rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;\r
+            while (rfValueCurrent < rfValue)\r
             {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Mono");\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_4.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_4);\r
+                slider_videoQuality.Value--;\r
+                rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;\r
             }\r
-            else\r
-            {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
 \r
-                setBitrateSelections320(drp_audbit_4);\r
-            }\r
+            // Cache the CQ step for the next calculation\r
+            _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
         }\r
-\r
-        private void trackBar1_Scroll(object sender, EventArgs e)\r
-        {\r
-            double value = trackBar1.Value / 10.0;\r
-            value++;\r
-\r
-            lbl_drc1.Text = value.ToString();\r
-        }\r
-        private void trackBar2_Scroll(object sender, EventArgs e)\r
+        private void slider_videoQuality_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = trackBar2.Value / 10.0;\r
-            value++;\r
+            double cqStep = Properties.Settings.Default.x264cqstep;\r
+            switch (drp_videoEncoder.Text)\r
+            {\r
+                case "MPEG-4 (FFmpeg)":\r
+                    double rfValue = 31 - (slider_videoQuality.Value - 1);\r
+                    double max = slider_videoQuality.Maximum;\r
+                    double min = slider_videoQuality.Minimum;\r
+                    double val = ((max - min) - (rfValue - min)) / (max - min);\r
+                    SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + (32 - slider_videoQuality.Value);\r
+                    break;\r
+                case "H.264 (x264)":\r
+                    rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
+                    max = slider_videoQuality.Maximum * cqStep;\r
+                    min = slider_videoQuality.Minimum;\r
+                    val = ((max - min) - (rfValue - min)) / (max - min);\r
+                    rfValue = Math.Round(rfValue, 2);\r
+                    SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
+                    break;\r
+                case "VP3 (Theora)":\r
+                    rfValue = slider_videoQuality.Value;\r
+                    double value = rfValue / 63;\r
+                    SliderValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + slider_videoQuality.Value;\r
+                    break;\r
+            }\r
+        }\r
+        private void radio_targetFilesize_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            text_bitrate.Enabled = false;\r
+            text_filesize.Enabled = true;\r
+            slider_videoQuality.Enabled = false;\r
 \r
-            lbl_drc2.Text = value.ToString();\r
+            check_2PassEncode.Enabled = true;\r
         }\r
-        private void trackBar3_Scroll(object sender, EventArgs e)\r
+        private void radio_avgBitrate_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            double value = trackBar3.Value / 10.0;\r
-            value++;\r
+            text_bitrate.Enabled = true;\r
+            text_filesize.Enabled = false;\r
+            slider_videoQuality.Enabled = false;\r
 \r
-            lbl_drc3.Text = value.ToString();\r
+            check_2PassEncode.Enabled = true;\r
         }\r
-        private void trackBar4_Scroll(object sender, EventArgs e)\r
+        private void radio_cq_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            double value = trackBar4.Value / 10.0;\r
-            value++;\r
+            text_bitrate.Enabled = false;\r
+            text_filesize.Enabled = false;\r
+            slider_videoQuality.Enabled = true;\r
 \r
-            lbl_drc4.Text = value.ToString();\r
+            check_2PassEncode.Enabled = false;\r
+            check_2PassEncode.CheckState = CheckState.Unchecked;\r
         }\r
-\r
-        private void drp_subtitle_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_subtitle.Text.Contains("None"))\r
+            if (check_2PassEncode.CheckState.ToString() == "Checked")\r
             {\r
-                check_forced.Enabled = false;\r
-                check_forced.Checked = false;\r
+                if (drp_videoEncoder.Text.Contains("H.264"))\r
+                    check_turbo.Enabled = true;\r
             }\r
             else\r
-                check_forced.Enabled = true;\r
+            {\r
+                check_turbo.Enabled = false;\r
+                check_turbo.CheckState = CheckState.Unchecked;\r
+            }\r
         }\r
 \r
         // Chapter Marker Tab\r
@@ -1309,118 +1463,226 @@ namespace Handbrake
         {\r
             if (Check_ChapterMarkers.Checked)\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".mp4", ".m4v");\r
-                text_destination.Text = destination;\r
-                data_chpt.Rows.Clear();\r
+                if (drop_format.SelectedIndex != 1)\r
+                    SetExtension(".m4v");\r
                 data_chpt.Enabled = true;\r
-                DataGridView chapterGridView = hb_common_func.chapterNaming(data_chpt, drop_chapterStart.Text, drop_chapterFinish.Text);\r
-                if (chapterGridView != null)\r
-                    data_chpt = chapterGridView;\r
+                btn_importChapters.Enabled = true;\r
             }\r
             else\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".m4v", ".mp4");\r
-                text_destination.Text = destination;\r
-                data_chpt.Rows.Clear();\r
+                if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
+                    SetExtension(".mp4");\r
                 data_chpt.Enabled = false;\r
+                btn_importChapters.Enabled = false;\r
             }\r
         }\r
-\r
-        // Advanced Tab\r
-        private void drop_refFrames_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("ref", this);\r
-        }\r
-        private void check_mixedReferences_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("mixed-refs", this);\r
-        }\r
-        private void drop_bFrames_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("bframes", this);\r
-        }\r
-        private void drop_directPrediction_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("direct", this);\r
-        }\r
-        private void check_weightedBFrames_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("weightb", this);\r
-        }\r
-        private void check_bFrameDistortion_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("brdo", this);\r
-        }\r
-        private void check_BidirectionalRefinement_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("bime", this);\r
-        }\r
-        private void check_pyrmidalBFrames_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("b-pyramid", this);\r
-        }\r
-        private void drop_MotionEstimationMethod_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("me", this);\r
-        }\r
-        private void drop_MotionEstimationRange_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void btn_importChapters_Click(object sender, EventArgs e)\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("merange", this);\r
+            if (File_ChapterImport.ShowDialog() == DialogResult.OK)\r
+            {\r
+                String filename = File_ChapterImport.FileName;\r
+                DataGridView imported = Main.importChapterNames(data_chpt, filename);\r
+                if (imported != null)\r
+                    data_chpt = imported;\r
+            }\r
         }\r
-        private void drop_subpixelMotionEstimation_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void mnu_resetChapters_Click(object sender, EventArgs e)\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("subq", this);\r
+            data_chpt.Rows.Clear();\r
+            DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
+            if (chapterGridView != null)\r
+            {\r
+                data_chpt = chapterGridView;\r
+            }\r
         }\r
-        private void drop_analysis_SelectedIndexChanged(object sender, EventArgs e)\r
+\r
+        // Query Editor Tab\r
+        private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("analyse", this);\r
+            rtf_query.Text = queryGen.GenerateCLIQuery(this, 0, null);\r
         }\r
-        private void check_8x8DCT_CheckedChanged(object sender, EventArgs e)\r
+        private void btn_clear_Click(object sender, EventArgs e)\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("8x8dct", this);\r
+            rtf_query.Clear();\r
         }\r
-        private void drop_deblockAlpha_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("deblock", this);\r
+        #endregion\r
 \r
-        }\r
-        private void drop_deblockBeta_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("deblock", this);\r
+        // MainWindow Components, Actions and Functions ***********************\r
 \r
+        #region Source Scan\r
+        public Boolean isScanning { get; set; }\r
+        private static int scanProcessID { get; set; }\r
+        private void startScan(String filename)\r
+        {\r
+            // Setup the GUI components for the scan.\r
+            sourcePath = filename;\r
+            foreach (Control ctrl in Controls)\r
+                if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
+                    ctrl.Enabled = false;\r
+\r
+            lbl_encode.Visible = true;\r
+            lbl_encode.Text = "Scanning ...";\r
+            btn_source.Enabled = false;\r
+            btn_start.Enabled = false;\r
+            btn_showQueue.Enabled = false;\r
+            btn_add2Queue.Enabled = false;\r
+            tb_preview.Enabled = false;\r
+            mnu_killCLI.Visible = true;\r
+\r
+            // Start hte Scan Thread\r
+            try\r
+            {\r
+                if (ActivityWindow != null)\r
+                    ActivityWindow.SetLogView(true);\r
+                isScanning = true;\r
+                ThreadPool.QueueUserWorkItem(scanProcess);\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show("frmMain.cs - startScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+            }\r
         }\r
-        private void drop_trellis_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("trellis", this);\r
-        }\r
-        private void check_noFastPSkip_CheckedChanged(object sender, EventArgs e)\r
+        private void scanProcess(object state)\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("no-fast-pskip", this);\r
+            try\r
+            {\r
+                string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");\r
+                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";\r
+                string dvdInfoPath = Path.Combine(logDir, "last_scan_log.txt");\r
+\r
+                // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file)\r
+                if (File.Exists(dvdInfoPath))\r
+                    File.Delete(dvdInfoPath);\r
+\r
+                String dvdnav = string.Empty;\r
+                if (Properties.Settings.Default.noDvdNav)\r
+                    dvdnav = " --no-dvdnav";\r
+                string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, sourcePath, dvdnav, dvdInfoPath);\r
+\r
+                ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden };\r
+\r
+                Boolean cleanExit = true;\r
+                using (hbproc = Process.Start(hbParseDvd))\r
+                {\r
+                    Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.\r
+                    scanProcessID = Main.getCliProcess(before);\r
+                    hbproc.WaitForExit();\r
+                    if (hbproc.ExitCode != 0)\r
+                        cleanExit = false;\r
+                }\r
+\r
+                if (cleanExit) // If 0 exit code, CLI exited cleanly.\r
+                {\r
+                    if (!File.Exists(dvdInfoPath))\r
+                        throw new Exception("Unable to retrieve the DVD Info. last_scan_log.txt is missing. \nExpected location of last_scan_log.txt: \n"\r
+                                            + dvdInfoPath);\r
+\r
+                    using (StreamReader sr = new StreamReader(dvdInfoPath))\r
+                    {\r
+                        thisDVD = DVD.Parse(sr);\r
+                        sr.Close();\r
+                        sr.Dispose();\r
+                    }\r
+\r
+                    updateUIafterScan();\r
+                }\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show("frmMain.cs - scanProcess() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                enableGUI();\r
+            }\r
         }\r
-        private void check_noDCTDecimate_CheckedChanged(object sender, EventArgs e)\r
+        private void updateUIafterScan()\r
         {\r
-            x264PanelFunctions.on_x264_WidgetChange("no-dct-decimate", this);\r
+            try\r
+            {\r
+                if (InvokeRequired)\r
+                {\r
+                    BeginInvoke(new UpdateWindowHandler(updateUIafterScan));\r
+                    return;\r
+                }\r
+\r
+                // Setup some GUI components\r
+                drp_dvdtitle.Items.Clear();\r
+                if (thisDVD.Titles.Count != 0)\r
+                    drp_dvdtitle.Items.AddRange(thisDVD.Titles.ToArray());\r
+\r
+                // Now select the longest title\r
+                if (thisDVD.Titles.Count != 0)\r
+                    drp_dvdtitle.SelectedItem = Main.selectLongestTitle(thisDVD);\r
+\r
+                // Enable the creation of chapter markers if the file is an image of a dvd.\r
+                if (sourcePath.ToLower().Contains(".iso") || sourcePath.Contains("VIDEO_TS"))\r
+                    Check_ChapterMarkers.Enabled = true;\r
+                else if (Directory.Exists(Path.Combine(sourcePath, "VIDEO_TS")))\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
+                // If no titles were found, Display an error message\r
+                if (drp_dvdtitle.Items.Count == 0)\r
+                {\r
+                    MessageBox.Show(\r
+                        "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or in a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).",\r
+                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                    sourcePath = string.Empty;\r
+                }\r
+                UpdateSourceLabel();\r
+\r
+                // Enable the GUI components and enable any disabled components\r
+                enableGUI();\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                enableGUI();\r
+            }\r
         }\r
-        private void check_Cabac_CheckedChanged(object sender, EventArgs e)\r
+        private void enableGUI()\r
         {\r
-\r
-            x264PanelFunctions.on_x264_WidgetChange("cabac", this);\r
+            try\r
+            {\r
+                if (InvokeRequired)\r
+                    BeginInvoke(new UpdateWindowHandler(enableGUI));\r
+                lbl_encode.Text = "Scan Completed";\r
+                foreach (Control ctrl in Controls)\r
+                    ctrl.Enabled = true;\r
+                btn_start.Enabled = true;\r
+                btn_showQueue.Enabled = true;\r
+                btn_add2Queue.Enabled = true;\r
+                tb_preview.Enabled = true;\r
+                btn_source.Enabled = true;\r
+                mnu_killCLI.Visible = false;\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show("frmMain.cs - enableGUI() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+            }\r
         }\r
-\r
-        private void rtf_x264Query_TextChanged(object sender, EventArgs e)\r
+        private void killScan()\r
         {\r
-            if (rtf_x264Query.Text.EndsWith("\n"))\r
+            try\r
             {\r
-                rtf_x264Query.Text = rtf_x264Query.Text.Replace("\n", "");\r
-                x264PanelFunctions.X264_StandardizeOptString(this);\r
-                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                enableGUI();\r
+                resetGUI();\r
 \r
-                if (rtf_x264Query.Text == string.Empty)\r
-                    x264PanelFunctions.reset2Defaults(this);\r
+                Process[] prs = Process.GetProcesses();\r
+                foreach (Process process in prs)\r
+                {\r
+                    if (process.Id == scanProcessID)\r
+                    {\r
+                        process.Refresh();\r
+                        if (!process.HasExited)\r
+                            process.Kill();\r
+                    }\r
+                }\r
             }\r
+/* HEAD\r
         }\r
         private void btn_reset_Click(object sender, EventArgs e)\r
         {\r
@@ -1456,158 +1718,110 @@ namespace Handbrake
         {\r
             DialogResult result = MessageBox.Show("\91I\91ð\82µ\82½\83v\83\8a\83Z\83b\83g\82ð\8dí\8f\9c\82µ\82Ü\82·\82©\81H", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
             if (result == DialogResult.Yes)\r
+*/\r
+            catch (Exception ex)\r
             {\r
-                if (treeView_presets.SelectedNode != null)\r
-                    presetHandler.remove(treeView_presets.SelectedNode.Text);\r
-\r
-                // Remember each nodes expanded status so we can reload it\r
-                List<Boolean> nodeStatus = saveTreeViewState();\r
-\r
-                // Now reload the preset panel\r
-                loadPresetPanel();\r
-\r
-                // Now reload the TreeView states\r
-                loadTreeViewStates(nodeStatus);\r
+                MessageBox.Show("Unable to kill HandBrakeCLI.exe \nYou may need to manually kill HandBrakeCLI.exe using the Windows Task Manager if it does not close automatically within the next few minutes. \n\nError Information: \n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
-            treeView_presets.Select();\r
         }\r
-        private void btn_setDefault_Click(object sender, EventArgs e)\r
+        private void resetGUI()\r
         {\r
+/* HEAD\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("\83f\83t\83H\83\8b\83g\90Ý\92è\82ª\95Û\91\82³\82ê\82Ü\82µ\82½", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+*/\r
+            drp_dvdtitle.Items.Clear();\r
+            drop_chapterStart.Items.Clear();\r
+            drop_chapterFinish.Items.Clear();\r
+            lbl_duration.Text = "Select a Title";\r
+            PictureSettings.lbl_src_res.Text = "Select a Title";\r
+            PictureSettings.lbl_Aspect.Text = "Select a Title";\r
+            sourcePath = String.Empty;\r
+            text_destination.Text = String.Empty;\r
+            thisDVD = null;\r
+            selectedTitle = null;\r
+            isScanning = false;\r
         }\r
-        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
+        private void UpdateSourceLabel()\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
-            if (query != null)\r
-            {\r
-                //Ok, Reset all the H264 widgets before changing the preset\r
-                x264PanelFunctions.reset2Defaults(this);\r
-\r
-                // Send the query from the file to the Query Parser class\r
-                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
-\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
+            labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;\r
         }\r
-        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)\r
+        #endregion\r
+\r
+        #region GUI\r
+        /// <summary>\r
+        /// Set the GUI to it's finished encoding state.\r
+        /// </summary>\r
+        private void setEncodeFinished()\r
         {\r
-            if (e.KeyCode == Keys.Delete)\r
+            try\r
             {\r
+/* HEAD\r
                 DialogResult result = MessageBox.Show("\91I\91ð\82µ\82½\83v\83\8a\83Z\83b\83g\82ð\8dí\8f\9c\82µ\82Ü\82·\82©\81H", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
                 if (result == DialogResult.Yes)\r
+*/\r
+                if (InvokeRequired)\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 = new List<Boolean>();\r
-                    foreach (TreeNode node in treeView_presets.Nodes)\r
-                        nodeStatus.Add(node.IsExpanded);\r
+                    BeginInvoke(new UpdateWindowHandler(setEncodeFinished));\r
+                    return;\r
+                }\r
 \r
-                    // Now reload the preset panel\r
-                    loadPresetPanel();\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
-                    // And finally, re-expand any of the nodes if required\r
-                    int i = 0;\r
-                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                // If the window is minimized, display the notification in a popup.\r
+                if (Properties.Settings.Default.trayIconAlerts)\r
+                    if (FormWindowState.Minimized == this.WindowState)\r
                     {\r
-                        if (nodeStatus[i] == true)\r
-                            node.Expand();\r
-\r
-                        i++;\r
+                        notifyIcon.BalloonTipText = lbl_encode.Text;\r
+                        notifyIcon.ShowBalloonTip(500);\r
                     }\r
-                }\r
             }\r
-        }\r
-\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
+            catch (Exception exc)\r
             {\r
-                nodeStatus.Add(node.IsExpanded);\r
-                foreach (TreeNode subNode in node.Nodes)\r
-                    nodeStatus.Add(node.IsExpanded);\r
+                MessageBox.Show(exc.ToString());\r
             }\r
-            return nodeStatus;\r
         }\r
 \r
-        private void loadTreeViewStates(List<Boolean> nodeStatus)\r
+        /// <summary>\r
+        /// Set the GUI to it's started encoding state.\r
+        /// </summary>\r
+        private void setEncodeStarted()\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
+            try\r
             {\r
-                if (nodeStatus[i] == true)\r
-                    node.Expand();\r
-\r
-                foreach (TreeNode subNode in node.Nodes)\r
+                if (InvokeRequired)\r
                 {\r
-                    if (nodeStatus[i] == true)\r
-                        subNode.Expand();\r
+                    BeginInvoke(new UpdateWindowHandler(setEncodeStarted));\r
+                    return;\r
                 }\r
 \r
-                i++;\r
+                lbl_encode.Visible = true;\r
+                lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending";\r
+                btn_start.Text = "Stop";\r
+                btn_start.ToolTipText = "Stop the encoding process.";\r
+                btn_start.Image = Properties.Resources.stop;\r
             }\r
-        }\r
-        #endregion\r
-\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
+            catch (Exception exc)\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
+                MessageBox.Show(exc.ToString());\r
             }\r
         }\r
-        /// <summary>\r
-        /// Take in a File destination and change it's file extension to a new Extension\r
-        /// </summary>\r
-        /// <param name="destination"></param>\r
-        /// <param name="newExtension"></param>\r
-        /// <returns>String of the new file path and extension</returns>\r
-        public void setExtension(string newExtension)\r
-        {\r
-            text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".avi", newExtension);\r
-            text_destination.Text = text_destination.Text.Replace(".ogm", newExtension);\r
-        }\r
         #endregion\r
 \r
-        #region Drive Detection\r
-        // Source Button Drive Detection\r
-        private delegate void ProgressUpdateHandler();\r
+        #region DVD Drive Detection\r
         private void getDriveInfoThread()\r
         {\r
             try\r
             {\r
-                if (this.InvokeRequired)\r
+                if (InvokeRequired)\r
                 {\r
-                    this.BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread));\r
+                    BeginInvoke(new UpdateWindowHandler(getDriveInfoThread));\r
                     return;\r
                 }\r
 \r
@@ -1615,17 +1829,22 @@ namespace Handbrake
                 DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives();\r
                 foreach (DriveInfo curDrive in theCollectionOfDrives)\r
                 {\r
-                    if (curDrive.DriveType == DriveType.CDRom)\r
+                    if (curDrive.DriveType == DriveType.CDRom && curDrive.IsReady)\r
                     {\r
-                        if (curDrive.IsReady)\r
+                        if (File.Exists(curDrive.RootDirectory + "VIDEO_TS\\VIDEO_TS.IFO"))\r
                         {\r
+/* HEAD\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 = "[DVD\83h\83\89\83C\83u\82É\83f\83B\83X\83N\82ª\82 \82è\82Ü\82¹\82ñ]";\r
 \r
+*/\r
+                            this.dvdDrivePath = curDrive.RootDirectory + "VIDEO_TS";\r
+                            this.dvdDriveLabel = curDrive.VolumeLabel;\r
+                            mnu_dvd_drive.Text = this.dvdDrivePath + " (" + this.dvdDriveLabel + ")";\r
                             foundDrive = true;\r
-\r
+                            break;\r
                         }\r
                     }\r
                 }\r
@@ -1640,6 +1859,7 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
+/* HEAD\r
         #region Audio Panel Stuff\r
         public void setAudioByContainer(String path)\r
         {\r
@@ -1941,176 +2161,80 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+*/\r
         #region Public Methods\r
-\r
         /// <summary>\r
-        /// Is the mainWindow currently monitoring an encoding session\r
+        /// Access the preset Handler and setup the preset panel.\r
         /// </summary>\r
-        /// <returns>boolean</returns>\r
-        public Boolean isEncoding()\r
+        public void loadPresetPanel()\r
         {\r
-            if (hbProc == null)\r
-                return false;\r
-            else\r
-                return true;\r
-        }\r
+            if (presetHandler.CheckIfPresetsAreOutOfDate())\r
+                if (!Properties.Settings.Default.presetNotification)\r
+                    MessageBox.Show(splash,\r
+                    "HandBrake has determined your built-in presets are out of date... These presets will now be updated.",\r
+                    "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);\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
+            presetHandler.GetPresetPanel(ref treeView_presets);\r
+            treeView_presets.Update();\r
         }\r
+        #endregion\r
 \r
+        #region Overrides\r
         /// <summary>\r
-        /// DVD parseing. Pass in a parsed DVD.\r
+        /// If the queue is being processed, prompt the user to confirm application close.\r
         /// </summary>\r
-        /// <param name="dvd"></param>\r
-        public void setStreamReader(Parsing.DVD dvd)\r
+        /// <param name="e"></param>\r
+        protected override void OnFormClosing(FormClosingEventArgs e)\r
         {\r
-            this.thisDVD = dvd;\r
+            // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.\r
+            if ((encodeQueue.isEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0))\r
+            {\r
+                DialogResult result = MessageBox.Show("HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?",\r
+                    "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.No)\r
+                    e.Cancel = true;\r
+            }\r
+            base.OnFormClosing(e);\r
         }\r
+        #endregion\r
 \r
-        /// <summary>\r
-        /// Reload the preset panel display\r
-        /// </summary>\r
-        public void loadPresetPanel()\r
+        #region In-GUI Encode Status (Experimental)\r
+        private void encodeMonitorThread()\r
         {\r
-            presetHandler.loadPresetData();\r
-\r
-            treeView_presets.Nodes.Clear();\r
-\r
-            List<Presets.Preset> presetNameList = new List<Presets.Preset>();\r
-            List<string> presetNames = new List<string>();\r
-            TreeNode preset_treeview = new TreeNode();\r
-\r
-            TreeNode rootNode = new TreeNode();\r
-            TreeNode rootNodeTwo = new TreeNode();\r
-            TreeNode childNode = new TreeNode();\r
-            int workingLevel = 0;\r
-            string previousCategory = String.Empty;\r
-            string currentCategory = String.Empty;\r
-\r
-            presetNameList = presetHandler.getBuildInPresets();\r
-            if (presetNameList.Count != 0)\r
+            try\r
             {\r
-                foreach (Presets.Preset preset in presetNameList)\r
-                {\r
-                    // Handle Root Nodes\r
-\r
-                    // First Case - No presets have been read yet so setup the root category\r
-                    if (preset.Level == 1 && currentCategory == String.Empty)\r
-                    {\r
-                        rootNode = new TreeNode(preset.Category);\r
-                        workingLevel = preset.Level;\r
-                        currentCategory = preset.Category;\r
-                        previousCategory = preset.Category;\r
-                    }\r
-\r
-                    // Second Case - This is the first sub child node.\r
-                    if (preset.Level == 2 && workingLevel == 1 && currentCategory != preset.Category)\r
-                    {\r
-                        rootNodeTwo = new TreeNode(preset.Category);\r
-                        workingLevel = preset.Level;\r
-                        currentCategory = preset.Category;\r
-                        rootNode.Nodes.Add(rootNodeTwo);\r
-                    }\r
-\r
-                    // Third Case - Any presets the sub presets detected in the above if statment.\r
-                    if (preset.Level == 1 && workingLevel == 2)\r
-                    {\r
-                        workingLevel = preset.Level;\r
-                        currentCategory = preset.Category;\r
-                    }\r
-\r
-                    // Fourth Case - We've finished this root node and are onto the next root node.\r
-                    if (preset.Level == 1 && workingLevel == 1 && previousCategory != preset.Category)\r
-                    {\r
-                        treeView_presets.Nodes.Add(rootNode); // Add the finished node\r
-\r
-                        rootNode = new TreeNode(preset.Category);\r
-                        workingLevel = preset.Level;\r
-                        currentCategory = preset.Category;\r
-                        previousCategory = preset.Category;\r
-                    }\r
-\r
-                    // Handle Child Nodes\r
-                    // Add First level child nodes to the current root node\r
-                    if (preset.Level == 1 && workingLevel == 1 && currentCategory == preset.Category)\r
-                    {\r
-                        childNode = new TreeNode(preset.Name);\r
-                        rootNode.Nodes.Add(childNode);\r
-                    }\r
-\r
-                    // Add Second level child nodes to the current sub root node\r
-                    if (preset.Level == 2 && workingLevel == 2 && currentCategory == preset.Category)\r
-                    {\r
-                        childNode = new TreeNode(preset.Name);\r
-                        rootNodeTwo.Nodes.Add(childNode);\r
-                    }\r
-                }\r
-\r
-                // Add the final root node which does not get added above.\r
-                treeView_presets.Nodes.Add(rootNode);\r
+                Parser encode = new Parser(encodeQueue.hbProcess.StandardOutput.BaseStream);\r
+                encode.OnEncodeProgress += encodeOnEncodeProgress;\r
+                while (!encode.EndOfStream)\r
+                    encode.readEncodeStatus();\r
             }\r
-\r
-\r
-            // User Presets\r
-            presetNames = presetHandler.getUserPresetNames();\r
-            foreach (string preset in presetNames)\r
+            catch (Exception exc)\r
             {\r
-                preset_treeview = new TreeNode(preset);\r
-                preset_treeview.ForeColor = Color.Black;\r
-\r
-                // Now Fill Out List View with Items\r
-                treeView_presets.Nodes.Add(preset_treeview);\r
+                MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
-\r
-        #endregion\r
-\r
-        #region Taskbar Tray Icon\r
-        private void frmMain_Resize(object sender, EventArgs e)\r
+        private void encodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
         {\r
-            if (FormWindowState.Minimized == this.WindowState)\r
+            if (this.InvokeRequired)\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
+                this.BeginInvoke(new EncodeProgressEventHandler(encodeOnEncodeProgress),\r
+                    new object[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining });\r
+                return;\r
             }\r
-            else if (FormWindowState.Normal == this.WindowState)\r
-                notifyIcon.Visible = false;\r
-        }\r
-        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)\r
-        {\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
+            lbl_encode.Text = string.Format("Encode Progress: {0}%,       FPS: {1},       Avg FPS: {2},       Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining);\r
         }\r
-        private void btn_restore_Click(object sender, EventArgs e)\r
+        #endregion\r
+\r
+        #region enum\r
+        private enum SourceType\r
         {\r
-            this.Visible = true;\r
-            this.Activate();\r
-            this.WindowState = FormWindowState.Normal;\r
-            notifyIcon.Visible = false;\r
+            None = 0,\r
+            Folder,\r
+            DvdDrive,\r
+            VideoFile\r
         }\r
         #endregion\r
 \r
-\r
-\r
-        // This is the END of the road ------------------------------------------------------------------------------\r
+        // This is the END of the road ****************************************\r
     }\r
 }
\ No newline at end of file