From 66ef22d55504951c43f1641145431651bfab78f7 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 21 Apr 2019 00:28:32 +0100
Subject: MACOSX: Improve opening files from the Help menu

Now in addition to rtf extension and no extension, it also looks
for the html and md extensions. Also unless the extension is RTF or
HTML, which are widely recognized, it explicitely indicate that the
file should be open with TextEdit.

This fixes bug #10938, with opening the README and NEWS file from
the Help menu failing when the bundle was compiled without using
pandoc and thus the only files available are the markdown ones.

Support for the html extension is to prepare for a future change
to have a nicer README than the plain text one.
---
 backends/platform/sdl/macosx/appmenu_osx.mm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'backends/platform/sdl')

diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 466356b06d..1d5ab12792 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -62,11 +62,22 @@ typedef unsigned long NSUInteger;
 static void openFromBundle(NSString *file) {
 	NSString *path = [[NSBundle mainBundle] pathForResource:file ofType:@"rtf"];
 	if (!path) {
-		path = [[NSBundle mainBundle] pathForResource:file ofType:@""];
+		path = [[NSBundle mainBundle] pathForResource:file ofType:@"html"];
+		if (!path) {
+			path = [[NSBundle mainBundle] pathForResource:file ofType:@""];
+			if (!path)
+				path = [[NSBundle mainBundle] pathForResource:file ofType:@"md"];
+		}
 	}
 
 	if (path) {
-		[[NSWorkspace sharedWorkspace] openFile:path];
+		// RTF and HTML files are widely recognized and we can rely on the default
+		// file association working for those. For the other ones this might not be
+		// the case so we explicitely indicate they should be open with TextEdit.
+		if ([path hasSuffix:@".html"] || [path hasSuffix:@".rtf"])
+			[[NSWorkspace sharedWorkspace] openFile:path];
+		else
+			[[NSWorkspace sharedWorkspace] openFile:path withApplication:@"TextEdit"];
 	}
 }
 
-- 
cgit v1.2.3