Added About Box back in, which was taken out in initial 2.0 port

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@465 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/macosx/AboutBox.h

@@ -4,7 +4,7 @@
    Mark Grebe <atarimac@cox.net>
    
 */
-/* $Id: AboutBox.h,v 1.1.1.1 2004-06-16 02:30:30 markgrebe Exp $ */
+/* $Id: AboutBox.h,v 1.2 2005-06-04 02:04:06 markgrebe Exp $ */
 
 
 #import <Cocoa/Cocoa.h>
@@ -23,8 +23,6 @@
 
 + (AboutBox *)sharedInstance;
 - (IBAction)showPanel:(id)sender;
-- (void)scrollCredits;
+- (void)OK:(id)sender;
-- (void)clicked;
-- (void)doubleClicked;
 
 @end

stella/src/macosx/AboutBox.m

@@ -3,23 +3,10 @@
    Macintosh OS X SDL port of Stella
    Mark Grebe <atarimac@cox.net>
 */
-/* $Id: AboutBox.m,v 1.1.1.1 2004-06-16 02:30:30 markgrebe Exp $ */
+/* $Id: AboutBox.m,v 1.2 2005-06-04 02:04:06 markgrebe Exp $ */
 
 #import "AboutBox.h";
 
-static int boxDisplayed = FALSE;
-static int shouldScroll = TRUE;
-
-/*------------------------------------------------------------------------------
-*  AboutBoxScroll - Function call which is called from main emulator loop
-*      If About Box is key window, and scrolling hasn't been stop, it will
-*      call the scrollCredits method to advance the scroll.
-*-----------------------------------------------------------------------------*/
-void AboutBoxScroll(void) 
-{
-	if (boxDisplayed && shouldScroll)
-		[[AboutBox sharedInstance] scrollCredits];
-}
 
 @implementation AboutBox
 
@@ -119,74 +106,14 @@ static AboutBox *sharedInstance = nil;
     }
     
     // Show the window
-    [[appNameField window] makeKeyAndOrderFront:nil];
+	[NSApp runModalForWindow:[appNameField window]];
+    [[appNameField window] close];
 	
 }
 
-/*------------------------------------------------------------------------------
+- (void)OK:(id)sender
-*  windowDidBecomeKey - Start the scrolling when the about box is displayed.
-*-----------------------------------------------------------------------------*/
-- (void)windowDidBecomeKey:(NSNotification *)notification
 {
-	boxDisplayed = TRUE;
+	[NSApp stopModal];
-	shouldScroll = TRUE;
-}
-
-/*------------------------------------------------------------------------------
-*  windowDidResignKey - Stop the scrolling when the about box is gone.
-*-----------------------------------------------------------------------------*/
-- (void)windowDidResignKey:(NSNotification *)notification
-{
-	boxDisplayed = FALSE;
-}
-
-/*------------------------------------------------------------------------------
-*  scrollCredits - Perform the scrolling.
-*-----------------------------------------------------------------------------*/
-- (void)scrollCredits
-{
-        if (restartAtTop)
-        {
-            restartAtTop = NO;
-            
-            // Set the position
-            [creditsField scrollPoint:NSMakePoint( 0, 0 )];
-            
-            return;
-        }
-        if (currentPosition >= maxScrollHeight) 
-        {
-            // Reset the position
-            currentPosition = 0;
-            restartAtTop = YES;
-        }
-        else
-        {
-            // Scroll to the position
-            [creditsField scrollPoint:NSMakePoint( 0, currentPosition )];
-            
-            // Increment the scroll position
-            currentPosition += 0.25;
-        }
-}
-
-/*------------------------------------------------------------------------------
-*  clicked - Starts/stops scrolling on mouse click in about box text view.
-*-----------------------------------------------------------------------------*/
-- (void)clicked
-{
-	shouldScroll = !shouldScroll;
-}
-
-/*------------------------------------------------------------------------------
-*  clicked - Restarts at start of about box on double mouse click in about box 
-*      text view.
-*-----------------------------------------------------------------------------*/
-- (void)doubleClicked
-{
-	shouldScroll = !shouldScroll;
-    currentPosition = 0;
-	restartAtTop = YES;
 }
 
 @end

stella/src/macosx/AboutBox.nib/classes.nib

@@ -1,7 +1,7 @@
 {
     IBClasses = (
         {
-            ACTIONS = {scrollClick = id; }; 
+            ACTIONS = {OK = id; }; 
             CLASS = AboutBox; 
             LANGUAGE = ObjC; 
             OUTLETS = {appNameField = id; creditsField = id; versionField = id; }; 

stella/src/macosx/AboutBox.nib/info.nib

@@ -5,7 +5,7 @@
 	<key>IBDocumentLocation</key>
 	<string>345 699 356 240 0 0 1280 1002 </string>
 	<key>IBFramework Version</key>
-	<string>349.0</string>
+	<string>437.0</string>
 	<key>IBOldestOS</key>
 	<integer>2</integer>
 	<key>IBOpenObjects</key>
@@ -13,6 +13,6 @@
 		<integer>20</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7M34</string>
+	<string>8B15</string>
 </dict>
 </plist>

stella/src/macosx/Credits.html

@@ -6,12 +6,8 @@
 </head>
 <body>
 <div style="text-align: center;"><big></big>
-<center><big><big><big><big><br>
+<center><big><big><big><big>
-<br>
-<br>
-<br>
 StellaOSX<br>
-<br>
 </big></big></big>Copyright © 1996-2003 Bradford W. Mott<br>
 <br>
 </big><big>Stella Main Web Page<br>

stella/src/macosx/credits.html

@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Acknowledgements</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+</head>
+<body>
+<div style="text-align: center;"><big></big>
+<center><big><big><big><big>
+StellaOSX<br>
+</big></big></big>Copyright © 1996-2003 Bradford W. Mott<br>
+<br>
+</big><big>Stella Main Web Page<br>
+<a href="http://stella.sourceforge.net">http://stella.sourceforge.net</a><br>
+<br>
+</big><big>Macintosh OS X version by Mark Grebe<br>
+</big><big>Copyright © 2005 <br>
+<br>
+</big><big>Current active members of the Stella development team:<br>
+&nbsp;&nbsp;&nbsp; Bradford Mott (Original Author)<br>
+&nbsp;&nbsp;&nbsp; Steve Anthony (Current Maintainer)<br>
+&nbsp;&nbsp;&nbsp; Mark Grebe&nbsp; (Mac OSX)<br>
+<br>
+Graphics by Simple DirectMedia Layer library<br>
+<a href="http://www.libsdl.org">http://www.libsdl.org</a> <br>
+<br>
+This program is free software; you can redistribute it and/or <br>
+modify it under the terms of the GNU General Public License<br>
+as published by the Free Software Fuoundation;&nbsp; either version 2<br>
+of the License, or (at your option) any later version.<br>
+<br>
+&nbsp;This program is distributed in the hope that it will be useful, <br>
+but WITHOUT ANY WARRENTY; without even the <br>
+implied warranty of MERCHANTABILITY or <br>
+FITNESS FOR A PARTICULAR PURPOSE.&nbsp; <br>
+See the GNU General Public License for more details.<br>
+<br>
+&nbsp; You should have received a copy of the GNU General <br>
+Public License with this program; if not, write to the:<br>
+Free Software Foundation, Inc., <br>
+59 Temple Place - Suite 330,<br>
+Boston, MA 02111-1307, USA.<br>
+</big></center>
+</div>
+</body>
+</html>

stella/src/macosx/stella.pbproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 		080E96DDFE201D6D7F000001 = {
 			children = (
+				2D1A6CD4085135F9007CDBA8,
+				2D1A6CD5085135F9007CDBA8,
 				F5A47A9D01A0482F01D3D55B,
 				F5A47A9E01A0483001D3D55B,
 				2DDBEBE3084582C400812C11,
@@ -298,6 +300,8 @@
 				2DDBEAAE084578BF00812C11,
 				2DDFFA280847EF4E00201CC8,
 				2DDFFA290847EF4E00201CC8,
+				2D1A6D6B08514245007CDBA8,
+				2D1A6D6C08514245007CDBA8,
 				2DDBEAAF084578BF00812C11,
 				2DDBEAB0084578BF00812C11,
 				2DDBEAB1084578BF00812C11,
@@ -351,6 +355,7 @@
 				2D7B4F6C063B513200579B93,
 				089C165CFE840E0CC02AAC07,
 				B2F367C504C7ADC700A80002,
+				2D1A6CD808513610007CDBA8,
 			);
 			isa = PBXGroup;
 			name = Resources;
@@ -569,6 +574,8 @@
 				2DDBEBE5084582C400812C11,
 				2DDFFA2B0847EF4E00201CC8,
 				2D62C40F085011050063A4A3,
+				2D1A6CD6085135F9007CDBA8,
+				2D1A6D6E08514245007CDBA8,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -581,6 +588,7 @@
 				2D16A8E206324136005DF364,
 				2D7B4F6D063B513200579B93,
 				2D113E110672BF2100317017,
+				2D1A6CD908513610007CDBA8,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -674,6 +682,8 @@
 				2DDBEBE6084582C400812C11,
 				2DDFFA2A0847EF4E00201CC8,
 				2D47A45308491D4500ABFB6A,
+				2D1A6CD7085135F9007CDBA8,
+				2D1A6D6D08514245007CDBA8,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -770,6 +780,77 @@
 			settings = {
 			};
 		};
+		2D1A6CD4085135F9007CDBA8 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = AboutBox.h;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		2D1A6CD5085135F9007CDBA8 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = AboutBox.m;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		2D1A6CD6085135F9007CDBA8 = {
+			fileRef = 2D1A6CD4085135F9007CDBA8;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2D1A6CD7085135F9007CDBA8 = {
+			fileRef = 2D1A6CD5085135F9007CDBA8;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2D1A6CD808513610007CDBA8 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
+			path = AboutBox.nib;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		2D1A6CD908513610007CDBA8 = {
+			fileRef = 2D1A6CD808513610007CDBA8;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2D1A6D6B08514245007CDBA8 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = DebuggerDialog.cxx;
+			path = ../gui/DebuggerDialog.cxx;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		2D1A6D6C08514245007CDBA8 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.h;
+			name = DebuggerDialog.hxx;
+			path = ../gui/DebuggerDialog.hxx;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		2D1A6D6D08514245007CDBA8 = {
+			fileRef = 2D1A6D6B08514245007CDBA8;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		2D1A6D6E08514245007CDBA8 = {
+			fileRef = 2D1A6D6C08514245007CDBA8;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		2D26484006795BCC0075A98A = {
 			buildActionMask = 2147483647;
 			files = (