MacGUI: make the help menu documentation item point to the initial do…

…cs page again.
RPagels · Apr 24, 2022 · 25df9c5 · 25df9c5
1 parent 94c0a86
commit 25df9c5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m
@@ -281,7 +281,7 @@ - (IBAction)cancel:(id)sender
 
 - (IBAction)openUserGuide:(id)sender
 {
-    [[NSWorkspace sharedWorkspace] openURL:[HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/custom-presets.html"]];
+    [[NSWorkspace sharedWorkspace] openURL:[HBUtilities.documentationBaseURL URLByAppendingPathComponent:@"advanced/custom-presets.html"]];
 }
 
 @end

diff --git a/macosx/HBAudioDefaultsController.m b/macosx/HBAudioDefaultsController.m
@@ -66,7 +66,7 @@ - (IBAction)cancel:(id)sender
 
 - (IBAction)openUserGuide:(id)sender
 {
-    [NSWorkspace.sharedWorkspace openURL:[HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html"]];
+    [NSWorkspace.sharedWorkspace openURL:[HBUtilities.documentationBaseURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html"]];
 }
 
 @end
diff --git a/macosx/HBSubtitlesDefaultsController.m b/macosx/HBSubtitlesDefaultsController.m
@@ -47,7 +47,7 @@ - (IBAction)cancel:(id)sender
 
 - (IBAction)openUserGuide:(id)sender
 {
-    [NSWorkspace.sharedWorkspace openURL:[HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html"]];
+    [NSWorkspace.sharedWorkspace openURL:[HBUtilities.documentationBaseURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html"]];
 }
 
 @end
diff --git a/macosx/HBUtilities.h b/macosx/HBUtilities.h
@@ -31,10 +31,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 /**
- * Returns the url of the current version documentation.
+ * Returns the url of the documentation.
  */
 @property (nonatomic, readonly, class) NSURL *documentationURL;
 
+
+/**
+ * Returns the url of the current English version documentation.
+ */
+@property (nonatomic, readonly, class) NSURL *documentationBaseURL;
+
 /**
  *  Writes a message to standard error.
  *  The message will show up in the output panel and in the activity log.

diff --git a/macosx/HBUtilities.m b/macosx/HBUtilities.m
@@ -41,6 +41,11 @@ + (NSURL *)defaultDestinationFolderURL
 }
 
 + (NSURL *)documentationURL
+{
+    return [NSURL URLWithString:@"https://handbrake.fr/docs/"];
+}
+
++ (NSURL *)documentationBaseURL
 {
     return [NSURL URLWithString:@"https://handbrake.fr/docs/en/latest/"];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -281,7 +281,7 @@ - (IBAction)cancel:(id)sender @@
     - (IBAction)openUserGuide:(id)sender
     {
-        [[NSWorkspace sharedWorkspace] openURL:[HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/custom-presets.html"]];
+        [[NSWorkspace sharedWorkspace] openURL:[HBUtilities.documentationBaseURL URLByAppendingPathComponent:@"advanced/custom-presets.html"]];
     }
     @end
@@ Expand Down @@