WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / Presets / Import.cs

diff --git a/win/C#/Presets/Import.cs b/win/C#/Presets/Import.cs
index ac5e15d..723cbb1 100644 (file)
--- a/win/C#/Presets/Import.cs
+++ b/win/C#/Presets/Import.cs
@@ -11,25 +11,35 @@ namespace Handbrake.Presets
     {\r
         public QueryParser importMacPreset(string filename)\r
         {\r
-            if (!File.Exists(filename))\r
-                return null;\r
+            XmlNode root = null;\r
+            try\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
+                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
+                XmlDocument doc = new XmlDocument();\r
+                doc.LoadXml(fromfile);\r
 \r
-            XmlNode root = doc;\r
-            if (!root.HasChildNodes)\r
+                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
+            catch (Exception)\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
+                "The Preset file you selected appears to be invlaid or from an older version of HandBrake.\n\n Please note, if you are exporting from the MacGui you may need to rebuild your preset so that it uses the current preset plist format.\n The MacGui does not currently update user presets automatically.", "Error",\r
+                       MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
 \r
             // We'll query a query parser object and use it's public var structures to store all the data.\r
@@ -71,7 +81,7 @@ namespace Handbrake.Presets
                             break;\r
                     }\r
                 }\r
-               AudioInfo.Add(track);\r
+                AudioInfo.Add(track);\r
             }\r
             queryParsed.AudioInformation = AudioInfo;\r
 \r
@@ -133,7 +143,7 @@ namespace Handbrake.Presets
                         break;\r
                     case "PictureDecomb":\r
                         queryParsed.Decomb = "Off";\r
-                        if (value == "1") queryParsed.Decomb = "Default";\r
+                        if (value == "2") queryParsed.Decomb = "Default";\r
                         break;\r
                     case "PictureDecombCustom":\r
                         if (value != "")\r
@@ -146,15 +156,15 @@ namespace Handbrake.Presets
                         switch (value)\r
                         {\r
                             case "0":\r
-                                queryParsed.DeInterlace = "None";\r
+                                queryParsed.DeInterlace = "Off";\r
                                 break;\r
-                            case "1":\r
+                            case "2":\r
                                 queryParsed.DeInterlace = "Fast";\r
                                 break;\r
-                            case "2":\r
+                            case "3":\r
                                 queryParsed.DeInterlace = "Slow";\r
                                 break;\r
-                            case "3":\r
+                            case "4":\r
                                 queryParsed.DeInterlace = "Slowest";\r
                                 break;\r
                         }\r
@@ -167,15 +177,15 @@ namespace Handbrake.Presets
                         switch (value)\r
                         {\r
                             case "0":\r
-                                queryParsed.DeNoise = "None";\r
+                                queryParsed.DeNoise = "Off";\r
                                 break;\r
-                            case "1":\r
+                            case "2":\r
                                 queryParsed.DeNoise = "Weak";\r
                                 break;\r
-                            case "2":\r
+                            case "3":\r
                                 queryParsed.DeNoise = "Medium";\r
                                 break;\r
-                            case "3":\r
+                            case "4":\r
                                 queryParsed.DeNoise = "Strong";\r
                                 break;\r
                         }\r