WinGui: Improve Error message for the help menu item.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6509 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 7f787b97f6092449430fd6133307940a72fc3c06..3759f9eaec39bbba0cf4169ba85980055b60e554 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -671,6 +671,24 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Your system prevented HandBrake from launching a web browser..\r
+        /// </summary>\r
+        public static string Main_UnableToLoadHelpMessage {\r
+            get {\r
+                return ResourceManager.GetString("Main_UnableToLoadHelpMessage", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to You can still access the help pages by visiting the website directly at: https://handbrake.fr.\r
+        /// </summary>\r
+        public static string Main_UnableToLoadHelpSolution {\r
+            get {\r
+                return ResourceManager.GetString("Main_UnableToLoadHelpSolution", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to {0} Encodes Pending.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 9a406c92c25c617f44c9e98e29dead534b701d7c..8e4c82d29b258a258181518f48421f79111a45c7 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -530,4 +530,10 @@ Not both at the same time!</value>
   <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">\r
     <value>You cannot encode to a file with the same path and name as the source file. Please update the destination filename so that it does not match the source file.</value>\r
   </data>\r
+  <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">\r
+    <value>Your system prevented HandBrake from launching a web browser.</value>\r
+  </data>\r
+  <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">\r
+    <value>You can still access the help pages by visiting the website directly at: https://handbrake.fr</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 81558c78d005e10c61cbbd13c2a76730a6ef5d95..cf57289d2c84fba2a7f9832572a3a74561025b6b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1172,7 +1172,14 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void LaunchHelp()\r
         {\r
-            Process.Start("https://trac.handbrake.fr/wiki/HandBrakeGuide");\r
+            try\r
+            {\r
+                Process.Start("https://trac.handbrake.fr/wiki/HandBrakeGuide");\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                this.errorService.ShowError(Resources.Main_UnableToLoadHelpMessage, Resources.Main_UnableToLoadHelpSolution, exc);\r
+            }\r
         }\r
 \r
         /// <summary>\r