puae 2.3.1

configure.in

@@ -1968,6 +1968,7 @@ AC_CONFIG_FILES([Makefile
 		 src/od-beos/Makefile
 		 src/od-macosx/Makefile
 		 src/od-macosx/Info.plist
+		 src/od-macosx/Credits.rtf
 		 src/od-win32/Makefile
 		 src/td-none/Makefile
 		 src/td-amigaos/Makefile

release_.sh

@@ -68,6 +68,8 @@ rm -rf src/od-beos/Makefile.in
 rm -rf src/od-generic/Makefile.in
 rm -rf src/od-linux/Makefile.in
 rm -rf src/od-macosx/Makefile.in
+rm -rf src/od-macosx/Credits.rtf
+rm -rf src/od-macosx/Info.plist
 rm -rf src/od-win32/Makefile.in
 rm -rf src/sd-alsa/Makefile.in
 rm -rf src/sd-amigaos/Makefile.in

src/Makefile.am

@@ -84,6 +84,7 @@ if BUILD_MACOSX_BUNDLE
 		$(INSTALL_DATA) od-macosx/Info.plist $(bundle_contents)
 		$(INSTALL_PROGRAM) uae$(EXEEXT) $(bundle_contents)/MacOS/
 		$(INSTALL_DATA) $(srcdir)/od-macosx/puae.icns $(bundle_contents)/Resources/
+		$(INSTALL_DATA) $(srcdir)/od-macosx/Credits.rtf $(bundle_contents)/Resources/
 endif
 
 noinst_LIBRARIES = \

src/gui-cocoa/cocoaui.m

@@ -193,7 +193,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
 	NSString *menuTitle;
 
 	// Create a menu for manipulating the emulated amiga
-	NSMenu *vAmigaMenu = [[NSMenu alloc] initWithTitle:@"PUAE"];
+	NSMenu *vAmigaMenu = [[NSMenu alloc] initWithTitle:@"Machine"];
 	
 	[self createMenuItemInMenu:vAmigaMenu withTitle:@"Reset" action:@selector(resetAmiga:) tag:0];
 	[self createMenuItemInMenu:vAmigaMenu withTitle:@"Hard Reset" action:@selector(resetAmiga:) tag:1];
@@ -235,7 +235,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
 	[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Cartridge ROM" action:@selector(selectCartridge:) tag:0];
 	[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Flash RAM" action:@selector(selectFlashRAM:) tag:0];
 
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"PUAE" action:nil keyEquivalent:@""];
+	menuItem = [[NSMenuItem alloc] initWithTitle:@"Machine" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:vAmigaMenu];
 	[[NSApp mainMenu] insertItem:menuItem atIndex:1];
 	[menuItem release];

src/od-macosx/Info.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleDocumentTypes</key>
-	<array>
-	    <dict>
-		<key>CFBundleTypeExtensions</key>
-		<array>
-		    <string>uaerc</string>
-		</array>
-		<key>CFBundleTypeName</key>
-		<string>PUAE Configuration</string>
-		<key>CFBundleTypeRole</key>
-		<string>Viewer</string>
-	    </dict>
-	</array>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>uae</string>
-	<key>CFBundleIconFile</key>
-	<string>puae.icns</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleName</key>
-	<string>PUAE</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.3.1.397698e373c41c61eaab29f18e10f870c8c39819</string>
-	<key>CFBundleVersion</key>
-	<string>2.3.1</string>
-</dict>
-</plist>

src/od-macosx/Info.plist.in

@@ -28,8 +28,10 @@
 	<key>CFBundleName</key>
 	<string>@PACKAGE_NAME@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@VERSION@-@PACKAGE_COMMIT@</string>
-	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
+	<key>CFBundleVersion</key>
+	<string>@PACKAGE_COMMIT@</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2006-2011 Mustafa 'GnoStiC' Tufan</string>
 </dict>
 </plist>

src/od-macosx/Makefile.am

@@ -7,6 +7,6 @@ noinst_LIBRARIES = libosdep.a
 libosdep_a_SOURCES = main.m memory.c parser.c
 
 noinst_HEADERS = main.h memory.h hrtimer.h
-noinst_DATA = Info.plist.in puae.icns
+noinst_DATA = Info.plist.in puae.icns Credits.rtf.in
 
 EXTRA_DIST = puae.icns

src/od-macosx/main.m

@@ -126,9 +126,7 @@ in Tiger or later */
 
 -(void)performAbout:(id)sender
 {
-	NSDictionary *nfo;
-	nfo = (NSDictionary *) CFBundleGetInfoDictionary (CFBundleGetMainBundle ());
-	[NSApp orderFrontStandardAboutPanelWithOptions: nfo];
+	[NSApp orderFrontStandardAboutPanelWithOptions: nil];
 }
 
 static void setApplicationMenu (void)
@@ -144,7 +142,7 @@ static void setApplicationMenu (void)
 
     /* Add menu items */
     title = [@"About " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(performAbout:) keyEquivalent:@""];
+    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
 
     [appleMenu addItem:[NSMenuItem separatorItem]];