MACOSX: Give every license file a menu item

We make a renamed copy of the three license files with non-standard suffixes, to make them open in TextEdit by default.
scummvm · Aug 28, 2018 · ebedc15 · ebedc15
1 parent d4eca67
commit ebedc15
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -69,7 +69,10 @@ static void openFromBundle(NSString *file) {
 @interface ScummVMMenuHandler : NSObject {
 }
 - (void) openReadme;
-- (void) openLicense;
+- (void) openLicenseGPL;
+- (void) openLicenseLGPL;
+- (void) openLicenseFreefont;
+- (void) openLicenseBSD;
 - (void) openNews;
 - (void) openUserManual;
 - (void) openCredits;
@@ -80,8 +83,20 @@ - (void)openReadme {
 	openFromBundle(@"README");
 }
 
-- (void)openLicense {
+- (void)openLicenseGPL {
-	openFromBundle(@"COPYING-COMBINED");
+	openFromBundle(@"COPYING");
+}
+
+- (void)openLicenseLGPL {
+	openFromBundle(@"COPYING-LGPL");
+}
+
+- (void)openLicenseFreefont {
+	openFromBundle(@"COPYING-FREEFONT");
+}
+
+- (void)openLicenseBSD {
+	openFromBundle(@"COPYING-BSD");
 }
 
 - (void)openNews {
@@ -183,7 +198,11 @@ void replaceApplicationMenuItems() {
 	addMenuItem(_("What's New in ScummVM"), stringEncoding, delegate, @selector(openNews), @"", helpMenu);
 	[helpMenu addItem:[NSMenuItem separatorItem]];
 	addMenuItem(_("Credits"), stringEncoding, delegate, @selector(openCredits), @"", helpMenu);
-	addMenuItem(_("Licensing Information"), stringEncoding, delegate, @selector(openLicense), @"", helpMenu);
+	addMenuItem(_("GPL License"), stringEncoding, delegate, @selector(openLicenseGPL), @"", helpMenu);
+	addMenuItem(_("LGPL License"), stringEncoding, delegate, @selector(openLicenseLGPL), @"", helpMenu);
+	addMenuItem(_("Freefont License"), stringEncoding, delegate, @selector(openLicenseFreefont), @"", helpMenu);
+	addMenuItem(_("BSD License"), stringEncoding, delegate, @selector(openLicenseBSD), @"", helpMenu);
+
 
 	[appleMenu release];
 	[windowMenu release];

diff --git a/ports.mk b/ports.mk
@@ -121,10 +121,9 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
-	cp $(bundle_name)/Contents/Resources/COPYING $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.LGPL >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	cp $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING-FREEFONT
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.FREEFONT >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.BSD >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm