WinGui:

- Experimental MacGUI preset import. (Single preset export only)

git-svn-id: svn://localhost/HandBrake/trunk@2694 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 0b7c2a3..3d29440 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -18,70 +18,71 @@ namespace Handbrake.Functions
 \r
         #region Varibles\r
 \r
-        #region Source\r
-        public int DVDTitle { get; private set; }\r
-        public int DVDChapterStart { get; private set; }\r
-        public int DVDChapterFinish { get; private set; }\r
-        #endregion\r
-\r
-        #region Output Settings\r
-        public string Format { get; private set; }\r
-        public Boolean LargeMP4 { get; private set; }\r
-        public Boolean IpodAtom { get; private set; }\r
-        public Boolean OptimizeMP4 { get; private set; }\r
-        #endregion\r
-\r
-        #region Picture Settings\r
-        public int Width { get; private set; }\r
-        public int Height { get; private set; }\r
-        public int MaxWidth { get; private set; }\r
-        public int MaxHeight { get; private set; }\r
-        public string CropValues { get; private set; }\r
-        public string CropTop { get; private set; }\r
-        public string CropBottom { get; private set; }\r
-        public string CropLeft { get; private set; }\r
-        public string CropRight { get; private set; }\r
-        public int AnamorphicMode { get; private set; }\r
-        public Boolean keepDisplayAsect { get; private set; }\r
-        public double displayWidthValue { get; private set; }\r
-        public int pixelAspectWidth { get; private set; }\r
-        public int pixelAspectHeight { get; private set; }\r
-        public int AnamorphicModulus { get; private set; }\r
-        #endregion\r
-\r
-        #region Video Filters\r
-        public string DeTelecine { get; private set; }\r
-        public int DeBlock { get; private set; }\r
-        public string DeInterlace { get; private set; }\r
-        public string DeNoise { get; private set; }\r
-        public string Decomb { get; private set; }\r
-        #endregion\r
-\r
-        #region Video Settings\r
-        public string VideoEncoder { get; private set; }\r
-        public Boolean Grayscale { get; private set; }\r
-        public Boolean TwoPass { get; private set; }\r
-        public Boolean TurboFirstPass { get; private set; }\r
-        public string VideoFramerate { get; private set; }\r
-        public string AverageVideoBitrate { get; private set; }\r
-        public string VideoTargetSize { get; private set; }\r
-        public float VideoQuality { get; private set; }\r
-        #endregion\r
-\r
-        #region Audio Settings\r
-        public ArrayList AudioInformation { get; private set; }\r
-        public string Subtitles { get; private set; }\r
-        public Boolean ForcedSubtitles { get; private set; }\r
-        #endregion\r
-\r
-        #region Chapter Markers\r
-        public Boolean ChapterMarkers { get; private set; }\r
-        #endregion\r
-\r
-        #region Other\r
-        public string H264Query { get; private set; }\r
-        public Boolean Verbose { get; private set; }\r
-        #endregion\r
+        // Source\r
+        public int DVDTitle { get; set; }\r
+        public int DVDChapterStart { get; set; }\r
+        public int DVDChapterFinish { get; set; }\r
+\r
+        // Output Settings\r
+        public string Format { get; set; }\r
+        public Boolean LargeMP4 { get; set; }\r
+        public Boolean IpodAtom { get; set; }\r
+        public Boolean OptimizeMP4 { get; set; }\r
+\r
+        // Picture Settings\r
+        public int Width { get; set; }\r
+        public int Height { get; set; }\r
+        public int MaxWidth { get; set; }\r
+        public int MaxHeight { get; set; }\r
+        public string CropValues { get; set; }\r
+        public string CropTop { get; set; }\r
+        public string CropBottom { get; set; }\r
+        public string CropLeft { get; set; }\r
+        public string CropRight { get; set; }\r
+        public int AnamorphicMode { get; set; }\r
+        public Boolean keepDisplayAsect { get; set; }\r
+        public double displayWidthValue { get; set; }\r
+        public int pixelAspectWidth { get; set; }\r
+        public int pixelAspectHeight { get; set; }\r
+        public int AnamorphicModulus { get; set; }\r
+\r
+        // Video Filters\r
+        public string DeTelecine { get; set; }\r
+        public int DeBlock { get; set; }\r
+        public string DeInterlace { get; set; }\r
+        public string DeNoise { get; set; }\r
+        public string Decomb { get; set; }\r
+\r
+        // Video Settings\r
+        public string VideoEncoder { get; set; }\r
+        public Boolean Grayscale { get; set; }\r
+        public Boolean TwoPass { get; set; }\r
+        public Boolean TurboFirstPass { get; set; }\r
+        public string VideoFramerate { get; set; }\r
+        public string AverageVideoBitrate { get; set; }\r
+        public string VideoTargetSize { get; set; }\r
+        public float VideoQuality { get; set; }\r
+\r
+        // Audio Settings\r
+        public ArrayList AudioInformation { get; set; }\r
+        public string Subtitles { get; set; }\r
+        public Boolean ForcedSubtitles { get; set; }\r
+\r
+        // Chapter Markers\r
+        public Boolean ChapterMarkers { get; set; }\r
+\r
+        // Other\r
+        public string H264Query { get; set; }\r
+        public Boolean Verbose { get; set; }\r
+\r
+        // Preset Information\r
+        public int PresetBuildNumber { get; set; }\r
+        public string PresetDescription { get; set; }\r
+        public string PresetName { get; set; }\r
+        public string Type { get; set; }\r
+        public Boolean UsesMaxPictureSettings { get; set; }\r
+        public Boolean UsesPictureFilters { get; set; }\r
+        public Boolean UsesPictureSettings { get; set; }\r
 \r
         #endregion\r
 \r
@@ -204,7 +205,7 @@ namespace Handbrake.Functions
 \r
                 if (width.Success)\r
                     thisQuery.Width = int.Parse(width.Groups[0].Value.Replace("-w ", ""));\r
-                                                              \r
+\r
                 if (height.Success)\r
                     thisQuery.Height = int.Parse(height.Groups[0].Value.Replace("-l ", ""));\r
 \r
@@ -222,7 +223,7 @@ namespace Handbrake.Functions
                     thisQuery.CropBottom = actCropValues[1];\r
                     thisQuery.CropLeft = actCropValues[2];\r
                     thisQuery.CropRight = actCropValues[3];\r
-                } \r
+                }\r
 \r
                 if (strictAnamorphic.Success)\r
                     thisQuery.AnamorphicMode = 1;\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index ce9d2fd..fda90e5 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -195,6 +195,7 @@
     <Compile Include="Functions\Main.cs" />\r
     <Compile Include="Functions\UpdateCheckInformation.cs" />\r
     <Compile Include="Functions\Win32.cs" />\r
+    <Compile Include="Presets\Import.cs" />\r
     <Compile Include="Presets\preset.cs" />\r
     <Compile Include="Presets\PresetsHandler.cs" />\r
     <Compile Include="EncodeQueue\QueueHandler.cs" />\r

diff --git a/win/C#/Presets/Import.cs b/win/C#/Presets/Import.cs
new file mode 100644 (file)
index 0000000..ac5e15d
--- /dev/null
+++ b/win/C#/Presets/Import.cs
@@ -0,0 +1,264 @@
+using System;\r
+using System.IO;\r
+using System.Xml;\r
+using System.Windows.Forms;\r
+using System.Collections;\r
+using Handbrake.Functions;\r
+\r
+namespace Handbrake.Presets\r
+{\r
+    class Import\r
+    {\r
+        public QueryParser importMacPreset(string filename)\r
+        {\r
+            if (!File.Exists(filename))\r
+                return null;\r
+\r
+            StreamReader sr = File.OpenText(filename);\r
+            string fromfile = string.Empty;\r
+            int fileChar;\r
+            while ((fileChar = sr.Read()) != -1)\r
+                fromfile += Convert.ToChar(fileChar);\r
+\r
+            XmlDocument doc = new XmlDocument();\r
+            doc.LoadXml(fromfile);\r
+\r
+            XmlNode root = doc;\r
+            if (!root.HasChildNodes)\r
+            {\r
+                MessageBox.Show(\r
+                    "The Preset file you selected appears to be invlaid or from an older version of HandBrake", "Error",\r
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                return null;\r
+            }\r
+\r
+            // We'll query a query parser object and use it's public var structures to store all the data.\r
+            // This will allow the preset loader logic to be used instead of writing custom logic just for this file.\r
+            QueryParser queryParsed = new QueryParser();\r
+\r
+            /***** Get the Audio Tracks *****/\r
+            XmlNode audioListDict = root.ChildNodes[2].ChildNodes[0].FirstChild.ChildNodes[1];\r
+            ArrayList AudioInfo = new ArrayList();\r
+            for (int i = 0; i < audioListDict.ChildNodes.Count; i++)\r
+            {\r
+                XmlNode audioChannel = audioListDict.ChildNodes[i];\r
+                AudioTrack track = new AudioTrack();\r
+\r
+                for (int subi = 0; subi < audioChannel.ChildNodes.Count; subi += 2)\r
+                {\r
+                    // Audio Channel Information is here.\r
+                    string key = audioChannel.ChildNodes[subi].InnerText;\r
+                    string value = audioChannel.ChildNodes[subi + 1].InnerText;\r
+                    switch (key)\r
+                    {\r
+                        case "AudioBitrate":\r
+                            track.Bitrate = value;\r
+                            break;\r
+                        case "AudioEncoder":\r
+                            track.Encoder = value.Replace("AAC (CoreAudio)", "AAC (faac)");\r
+                            break;\r
+                        case "AudioMixdown":\r
+                            track.MixDown = value;\r
+                            break;\r
+                        case "AudioSamplerate":\r
+                            track.SampleRate = value;\r
+                            break;\r
+                        case "AudioTrack":\r
+                            track.Track = value;\r
+                            break;\r
+                        case "AudioTrackDRCSlider":\r
+                            track.DRC = value;\r
+                            break;\r
+                    }\r
+                }\r
+               AudioInfo.Add(track);\r
+            }\r
+            queryParsed.AudioInformation = AudioInfo;\r
+\r
+            /***** Get the rest of the settings. *****/\r
+            XmlNode presetSettings = root.ChildNodes[2].ChildNodes[0].FirstChild;\r
+            for (int i = 2; i < presetSettings.ChildNodes.Count; i += 2) // Start from 2 to avoid the audio settings which we don't need.\r
+            {\r
+                string key = presetSettings.ChildNodes[i].InnerText;\r
+                string value = presetSettings.ChildNodes[i + 1].InnerText;\r
+\r
+                switch (key)\r
+                {\r
+                    // Output Settings\r
+                    case "FileFormat":\r
+                        queryParsed.Format = value;\r
+                        break;\r
+                    case "Mp4HttpOptimize":\r
+                        queryParsed.OptimizeMP4 = value == "1";\r
+                        break;\r
+                    case "Mp4LargeFile":\r
+                        queryParsed.LargeMP4 = value == "1";\r
+                        break;\r
+                    case "Mp4iPodCompatible":\r
+                        queryParsed.IpodAtom = value == "1";\r
+                        break;\r
+\r
+                    // Picture Settings\r
+                    case "PictureAutoCrop":\r
+                        break;\r
+                    case "PictureTopCrop":\r
+                        queryParsed.CropTop = value;\r
+                        break;\r
+                    case "PictureBottomCrop":\r
+                        queryParsed.CropBottom = value;\r
+                        break;\r
+                    case "PictureLeftCrop":\r
+                        queryParsed.CropLeft = value;\r
+                        break;\r
+                    case "PictureRightCrop":\r
+                        queryParsed.CropRight = value;\r
+                        break;\r
+                    case "PictureHeight":\r
+                        queryParsed.Height = int.Parse(value);\r
+                        break;\r
+                    case "PictureWidth":\r
+                        queryParsed.Width = int.Parse(value);\r
+                        break;\r
+                    case "PictureKeepRatio":\r
+                        queryParsed.keepDisplayAsect = value == "1";\r
+                        break;\r
+                    case "PicturePAR":\r
+                        queryParsed.AnamorphicMode = int.Parse(value);\r
+                        break;\r
+\r
+\r
+                    // Filters\r
+                    case "PictureDeblock":\r
+                        queryParsed.DeBlock = int.Parse(value);\r
+                        break;\r
+                    case "PictureDecomb":\r
+                        queryParsed.Decomb = "Off";\r
+                        if (value == "1") queryParsed.Decomb = "Default";\r
+                        break;\r
+                    case "PictureDecombCustom":\r
+                        if (value != "")\r
+                            queryParsed.Decomb = value;\r
+                        break;\r
+                    case "PictureDecombDeinterlace":\r
+                        // Not Used\r
+                        break;\r
+                    case "PictureDeinterlace":\r
+                        switch (value)\r
+                        {\r
+                            case "0":\r
+                                queryParsed.DeInterlace = "None";\r
+                                break;\r
+                            case "1":\r
+                                queryParsed.DeInterlace = "Fast";\r
+                                break;\r
+                            case "2":\r
+                                queryParsed.DeInterlace = "Slow";\r
+                                break;\r
+                            case "3":\r
+                                queryParsed.DeInterlace = "Slowest";\r
+                                break;\r
+                        }\r
+                        break;\r
+                    case "PictureDeinterlaceCustom":\r
+                        if (value != "")\r
+                            queryParsed.DeInterlace = value;\r
+                        break;\r
+                    case "PictureDenoise":\r
+                        switch (value)\r
+                        {\r
+                            case "0":\r
+                                queryParsed.DeNoise = "None";\r
+                                break;\r
+                            case "1":\r
+                                queryParsed.DeNoise = "Weak";\r
+                                break;\r
+                            case "2":\r
+                                queryParsed.DeNoise = "Medium";\r
+                                break;\r
+                            case "3":\r
+                                queryParsed.DeNoise = "Strong";\r
+                                break;\r
+                        }\r
+\r
+                        break;\r
+                    case "PictureDenoiseCustom":\r
+                        if (value != "")\r
+                            queryParsed.DeNoise = value;\r
+                        break;\r
+                    case "PictureDetelecine":\r
+                        queryParsed.DeTelecine = "Off";\r
+                        if (value == "1") queryParsed.DeTelecine = "Default";\r
+                        break;\r
+                    case "PictureDetelecineCustom":\r
+                        if (value != "")\r
+                            queryParsed.DeTelecine = value;\r
+                        break;\r
+\r
+                    // Video Tab\r
+                    case "VideoAvgBitrate":\r
+                        queryParsed.Width = int.Parse(value);\r
+                        break;\r
+                    case "VideoEncoder":\r
+                        queryParsed.VideoEncoder = value;\r
+                        break;\r
+                    case "VideoFramerate":\r
+                        queryParsed.VideoFramerate = value;\r
+                        break;\r
+                    case "VideoGrayScale":\r
+                        queryParsed.Grayscale = value == "1";\r
+                        break;\r
+                    case "VideoQualitySlider":\r
+                        queryParsed.VideoQuality = float.Parse(value);\r
+                        break;\r
+                    case "VideoQualityType":\r
+                        break;\r
+                    case "VideoTargetSize":\r
+                        queryParsed.VideoTargetSize = value;\r
+                        break;\r
+                    case "VideoTurboTwoPass":\r
+                        queryParsed.TurboFirstPass = value == "1";\r
+                        break;\r
+                    case "VideoTwoPass":\r
+                        queryParsed.TwoPass = value == "1";\r
+                        break;\r
+\r
+                    // Chapter Markers Tab\r
+                    case "ChapterMarkers":\r
+                        queryParsed.ChapterMarkers = value == "1";\r
+                        break;\r
+\r
+                    // Advanced x264 tab\r
+                    case "x264Option":\r
+                        queryParsed.H264Query = value;\r
+                        break;\r
+\r
+                    // Preset Information\r
+                    case "PresetBuildNumber":\r
+                        queryParsed.PresetBuildNumber = int.Parse(value);\r
+                        break;\r
+                    case "PresetDescription":\r
+                        queryParsed.PresetDescription = value;\r
+                        break;\r
+                    case "PresetName":\r
+                        queryParsed.PresetName = value;\r
+                        break;\r
+                    case "Type":\r
+                        queryParsed.Type = value;\r
+                        break;\r
+                    case "UsesMaxPictureSettings":\r
+                        queryParsed.UsesMaxPictureSettings = value == "1";\r
+                        break;\r
+                    case "UsesPictureFilters":\r
+                        queryParsed.UsesPictureFilters = value == "1";\r
+                        break;\r
+                    case "UsesPictureSettings":\r
+                        queryParsed.UsesPictureSettings = value == "1";\r
+                        break;\r
+                }\r
+            }\r
+            return queryParsed;\r
+        }\r
+\r
+        // --- It's the end of the road\r
+    }\r
+}
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 3168859..c5d09ae 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -64,6 +64,7 @@ namespace Handbrake
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();\r
             this.drop_chapterStart = new System.Windows.Forms.ComboBox();\r
             this.drop_angle = new System.Windows.Forms.ComboBox();\r
+            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -151,6 +152,7 @@ namespace Handbrake
             this.btn_destBrowse = new System.Windows.Forms.Button();\r
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();\r
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.Label10 = new System.Windows.Forms.Label();\r
             this.lbl_angle = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label13 = new System.Windows.Forms.Label();\r
@@ -158,11 +160,11 @@ namespace Handbrake
             this.lbl_duration = new System.Windows.Forms.Label();\r
             this.labelStaticDestination = new System.Windows.Forms.Label();\r
             this.labelPreset = new System.Windows.Forms.Label();\r
-            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();\r
             this.labelSource = new System.Windows.Forms.Label();\r
-            this.Label10 = new System.Windows.Forms.Label();\r
             this.labelStaticSource = new System.Windows.Forms.Label();\r
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
+            this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Filters = new Handbrake.Controls.Filters();\r
             this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
@@ -201,12 +203,12 @@ namespace Handbrake
             this.btn_restore});\r
             notifyIconMenu.Name = "notifyIconMenu";\r
             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
-            notifyIconMenu.Size = new System.Drawing.Size(114, 26);\r
+            notifyIconMenu.Size = new System.Drawing.Size(124, 26);\r
             // \r
             // btn_restore\r
             // \r
             this.btn_restore.Name = "btn_restore";\r
-            this.btn_restore.Size = new System.Drawing.Size(113, 22);\r
+            this.btn_restore.Size = new System.Drawing.Size(123, 22);\r
             this.btn_restore.Text = "Restore";\r
             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);\r
             // \r
@@ -390,9 +392,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -482,6 +484,21 @@ namespace Handbrake
             this.drop_angle.TabIndex = 45;\r
             this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");\r
             // \r
+            // drp_dvdtitle\r
+            // \r
+            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_dvdtitle.FormattingEnabled = true;\r
+            this.drp_dvdtitle.Items.AddRange(new object[] {\r
+            "Automatic"});\r
+            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);\r
+            this.drp_dvdtitle.Name = "drp_dvdtitle";\r
+            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
+            this.drp_dvdtitle.TabIndex = 7;\r
+            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +\r
+                    "ter you have scanned a source.");\r
+            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
+            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
@@ -504,13 +521,13 @@ namespace Handbrake
             this.mnu_killCLI,\r
             this.mnu_exit});\r
             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";\r
-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);\r
+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);\r
             this.FileToolStripMenuItem.Text = "&File";\r
             // \r
             // mnu_killCLI\r
             // \r
             this.mnu_killCLI.Name = "mnu_killCLI";\r
-            this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);\r
+            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);\r
             this.mnu_killCLI.Text = "Cancel Scan";\r
             this.mnu_killCLI.Visible = false;\r
             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);\r
@@ -518,7 +535,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(138, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(143, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -535,7 +552,7 @@ namespace Handbrake
             this.ToolStripSeparator5,\r
             this.mnu_options});\r
             this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";\r
-            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);\r
+            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
             this.ToolsToolStripMenuItem.Text = "&Tools";\r
             // \r
             // mnu_encode\r
@@ -543,7 +560,7 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
             this.mnu_encode.Name = "mnu_encode";\r
             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));\r
-            this.mnu_encode.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_encode.Size = new System.Drawing.Size(186, 22);\r
             this.mnu_encode.Text = "Show Queue";\r
             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
             // \r
@@ -551,20 +568,20 @@ namespace Handbrake
             // \r
             this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
             this.mnu_encodeLog.Name = "mnu_encodeLog";\r
-            this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22);\r
             this.mnu_encodeLog.Text = "Activity Window";\r
             this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
             // \r
             // ToolStripSeparator5\r
             // \r
             this.ToolStripSeparator5.Name = "ToolStripSeparator5";\r
-            this.ToolStripSeparator5.Size = new System.Drawing.Size(181, 6);\r
+            this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6);\r
             // \r
             // mnu_options\r
             // \r
             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
             this.mnu_options.Name = "mnu_options";\r
-            this.mnu_options.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_options.Size = new System.Drawing.Size(186, 22);\r
             this.mnu_options.Text = "Options";\r
             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
             // \r
@@ -575,9 +592,10 @@ namespace Handbrake
             this.mnu_delete_preset,\r
             this.toolStripSeparator7,\r
             this.btn_new_preset,\r
+            this.mnu_importMacPreset,\r
             this.mnu_SelectDefault});\r
             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";\r
-            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);\r
+            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);\r
             this.PresetsToolStripMenuItem.Text = "&Presets";\r
             // \r
             // mnu_presetReset\r
@@ -626,14 +644,14 @@ namespace Handbrake
             this.toolStripSeparator6,\r
             this.mnu_about});\r
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";\r
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);\r
             this.HelpToolStripMenuItem.Text = "&Help";\r
             // \r
             // mnu_user_guide\r
             // \r
             this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
             this.mnu_user_guide.Name = "mnu_user_guide";\r
-            this.mnu_user_guide.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_user_guide.Text = "HandBrake User Guide";\r
             this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
             // \r
@@ -641,39 +659,39 @@ namespace Handbrake
             // \r
             this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;\r
             this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
-            this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
             this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);\r
             // \r
             // mnu_handbrake_forums\r
             // \r
             this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";\r
-            this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_handbrake_forums.Text = "HandBrake Forums";\r
             this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);\r
             // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
-            this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6);\r
+            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);\r
             // \r
             // mnu_UpdateCheck\r
             // \r
             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";\r
-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_UpdateCheck.Text = "Check for Updates";\r
             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);\r
             // \r
             // toolStripSeparator6\r
             // \r
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
-            this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6);\r
+            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);\r
             // \r
             // mnu_about\r
             // \r
             this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
             this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_about.Text = "About...";\r
             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
             // \r
@@ -872,7 +890,6 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
-            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -1087,40 +1104,40 @@ namespace Handbrake
             this.pmnu_saveChanges,\r
             this.pmnu_delete});\r
             this.presets_menu.Name = "presets_menu";\r
-            this.presets_menu.Size = new System.Drawing.Size(148, 98);\r
+            this.presets_menu.Size = new System.Drawing.Size(155, 98);\r
             this.presets_menu.Text = ";";\r
             this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);\r
             // \r
             // pmnu_expandAll\r
             // \r
             this.pmnu_expandAll.Name = "pmnu_expandAll";\r
-            this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22);\r
+            this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_expandAll.Text = "Expand All";\r
             this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);\r
             // \r
             // pmnu_collapse\r
             // \r
             this.pmnu_collapse.Name = "pmnu_collapse";\r
-            this.pmnu_collapse.Size = new System.Drawing.Size(147, 22);\r
+            this.pmnu_collapse.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_collapse.Text = "Collapse All";\r
             this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);\r
             // \r
             // sep1\r
             // \r
             this.sep1.Name = "sep1";\r
-            this.sep1.Size = new System.Drawing.Size(144, 6);\r
+            this.sep1.Size = new System.Drawing.Size(151, 6);\r
             // \r
             // pmnu_saveChanges\r
             // \r
             this.pmnu_saveChanges.Name = "pmnu_saveChanges";\r
-            this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22);\r
+            this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_saveChanges.Text = "Save Changes";\r
             this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);\r
             // \r
             // pmnu_delete\r
             // \r
             this.pmnu_delete.Name = "pmnu_delete";\r
-            this.pmnu_delete.Size = new System.Drawing.Size(147, 22);\r
+            this.pmnu_delete.Size = new System.Drawing.Size(154, 22);\r
             this.pmnu_delete.Text = "Delete";\r
             this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);\r
             // \r
@@ -1154,7 +1171,7 @@ namespace Handbrake
             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_source.Name = "btn_source";\r
-            this.btn_source.Size = new System.Drawing.Size(88, 36);\r
+            this.btn_source.Size = new System.Drawing.Size(85, 36);\r
             this.btn_source.Text = "Source";\r
             this.btn_source.ToolTipText = "Open a new source file or folder.";\r
             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
@@ -1163,7 +1180,7 @@ namespace Handbrake
             // \r
             this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
             this.btn_file_source.Name = "btn_file_source";\r
-            this.btn_file_source.Size = new System.Drawing.Size(192, 22);\r
+            this.btn_file_source.Size = new System.Drawing.Size(194, 22);\r
             this.btn_file_source.Text = "Video File";\r
             this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
             // \r
@@ -1172,20 +1189,20 @@ namespace Handbrake
             this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));\r
             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_dvd_source.Name = "btn_dvd_source";\r
-            this.btn_dvd_source.Size = new System.Drawing.Size(192, 22);\r
+            this.btn_dvd_source.Size = new System.Drawing.Size(194, 22);\r
             this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";\r
             this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
             // \r
             // toolStripSeparator1\r
             // \r
             this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6);\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);\r
             // \r
             // mnu_dvd_drive\r
             // \r
             this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;\r
             this.mnu_dvd_drive.Name = "mnu_dvd_drive";\r
-            this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22);\r
             this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
             this.mnu_dvd_drive.Visible = false;\r
             this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);\r
@@ -1212,7 +1229,7 @@ namespace Handbrake
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_add2Queue.Name = "btn_add2Queue";\r
-            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);\r
+            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);\r
             this.btn_add2Queue.Text = "Add to Queue";\r
             this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
@@ -1223,7 +1240,7 @@ namespace Handbrake
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_showQueue.Name = "btn_showQueue";\r
-            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);\r
+            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);\r
             this.btn_showQueue.Tag = "";\r
             this.btn_showQueue.Text = "Show Queue";\r
             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
@@ -1239,7 +1256,7 @@ namespace Handbrake
             this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tb_preview.Name = "tb_preview";\r
-            this.tb_preview.Size = new System.Drawing.Size(84, 36);\r
+            this.tb_preview.Size = new System.Drawing.Size(81, 36);\r
             this.tb_preview.Text = "Preview";\r
             this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
             // \r
@@ -1249,7 +1266,7 @@ namespace Handbrake
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);\r
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);\r
             this.btn_ActivityWindow.Text = "Activity Window";\r
             this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
                 "ently running encode.";\r
@@ -1391,6 +1408,17 @@ namespace Handbrake
             this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27);\r
             this.tableLayoutPanel1.TabIndex = 49;\r
             // \r
+            // Label10\r
+            // \r
+            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.Label10.AutoSize = true;\r
+            this.Label10.ForeColor = System.Drawing.Color.Black;\r
+            this.Label10.Location = new System.Drawing.Point(3, 7);\r
+            this.Label10.Name = "Label10";\r
+            this.Label10.Size = new System.Drawing.Size(31, 13);\r
+            this.Label10.TabIndex = 6;\r
+            this.Label10.Text = "Title:";\r
+            // \r
             // lbl_angle\r
             // \r
             this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
@@ -1465,21 +1493,6 @@ namespace Handbrake
             this.labelPreset.TabIndex = 54;\r
             this.labelPreset.Text = "Output Settings (Preset: None)";\r
             // \r
-            // drp_dvdtitle\r
-            // \r
-            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_dvdtitle.FormattingEnabled = true;\r
-            this.drp_dvdtitle.Items.AddRange(new object[] {\r
-            "Automatic"});\r
-            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);\r
-            this.drp_dvdtitle.Name = "drp_dvdtitle";\r
-            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
-            this.drp_dvdtitle.TabIndex = 7;\r
-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +\r
-                    "ter you have scanned a source.");\r
-            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
-            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
-            // \r
             // labelSource\r
             // \r
             this.labelSource.AutoSize = true;\r
@@ -1489,17 +1502,6 @@ namespace Handbrake
             this.labelSource.TabIndex = 52;\r
             this.labelSource.Text = "Select \"Source\" to continue";\r
             // \r
-            // Label10\r
-            // \r
-            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.Label10.AutoSize = true;\r
-            this.Label10.ForeColor = System.Drawing.Color.Black;\r
-            this.Label10.Location = new System.Drawing.Point(3, 7);\r
-            this.Label10.Name = "Label10";\r
-            this.Label10.Size = new System.Drawing.Size(31, 13);\r
-            this.Label10.TabIndex = 6;\r
-            this.Label10.Text = "Title:";\r
-            // \r
             // labelStaticSource\r
             // \r
             this.labelStaticSource.AutoSize = true;\r
@@ -1523,6 +1525,18 @@ namespace Handbrake
             this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13);\r
             this.flowLayoutPanel1.TabIndex = 55;\r
             // \r
+            // mnu_importMacPreset\r
+            // \r
+            this.mnu_importMacPreset.Name = "mnu_importMacPreset";\r
+            this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_importMacPreset.Text = "Import";\r
+            this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);\r
+            // \r
+            // openPreset\r
+            // \r
+            this.openPreset.DefaultExt = "plist";\r
+            this.openPreset.Filter = "Plist Files|*.plist";\r
+            // \r
             // PictureSettings\r
             // \r
             this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
@@ -1761,5 +1775,7 @@ namespace Handbrake
         internal Label Label10;\r
         private Label labelStaticSource;\r
         private FlowLayoutPanel flowLayoutPanel1;\r
+        private ToolStripMenuItem mnu_importMacPreset;\r
+        private OpenFileDialog openPreset;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index aa48932..3076ae6 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -367,6 +367,15 @@ namespace Handbrake
         {\r
             loadNormalPreset();\r
         }\r
+        private void mnu_importMacPreset_Click(object sender, EventArgs e)\r
+        {\r
+            Import imp = new Import();\r
+            if (openPreset.ShowDialog() == DialogResult.OK)\r
+            {\r
+                QueryParser parsed = imp.importMacPreset(openPreset.FileName);\r
+                PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+            }\r
+        }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
             Form preset = new frmAddPreset(this, queryGen.generateTheQuery(this), presetHandler);\r
@@ -1706,7 +1715,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-\r
         // This is the END of the road ****************************************\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 57ce99c..0a115b4 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -166,17 +166,18 @@ Note: Do not change any of the chapter numbers!</value>
   <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         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\r
-        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\r
+        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\r
+        AAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
@@ -570,6 +571,15 @@ Note: Do not change any of the chapter numbers!</value>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>98</value>\r
   </metadata>\r
+  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>664, 15</value>\r
+  </metadata>\r
+  <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>680, 54</value>\r
+  </metadata>\r
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>98</value>\r
+  </metadata>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
@@ -949,7 +959,4 @@ Note: Do not change any of the chapter numbers!</value>
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==\r
 </value>\r
   </data>\r
-  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>664, 15</value>\r
-  </metadata>\r
 </root>
\ No newline at end of file