Added Save Properties and Merge Properties to Menu Items in Mac version

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

stella/src/macosx/Menus.h

@@ -4,7 +4,7 @@
    Mark Grebe <atarimac@cox.net>
    
 */
-/* $Id: Menus.h,v 1.5 2005-06-03 05:04:56 markgrebe Exp $ */
+/* $Id: Menus.h,v 1.6 2005-06-03 06:00:22 markgrebe Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
@@ -35,5 +35,7 @@
 - (IBAction)doPrefs:(id)sender;
 - (IBAction)volumePlus:(id)sender;
 - (IBAction)volumeMinus:(id)sender;
+- (IBAction)saveProps:(id)sender;
+- (IBAction)mergeProps:(id)sender;
 
 @end

stella/src/macosx/Menus.m

@@ -4,7 +4,7 @@
    Mark Grebe <atarimac@cox.net>
    
 */
-/* $Id: Menus.m,v 1.8 2005-06-03 05:30:21 markgrebe Exp $ */
+/* $Id: Menus.m,v 1.9 2005-06-03 06:00:22 markgrebe Exp $ */
 
 #import <Cocoa/Cocoa.h>
 #import "SDL.h"
@@ -225,4 +225,14 @@ static Menus *sharedInstance = nil;
 	[self pushKeyEvent:SDLK_LEFTBRACKET:YES:YES];
 }
 
+- (IBAction)saveProps:(id)sender
+{
+	[self pushKeyEvent:SDLK_s:NO:YES];
+}
+
+- (IBAction)mergeProps:(id)sender
+{
+	[self pushKeyEvent:SDLK_s:YES:YES];
+}
+
 @end

stella/src/macosx/SDLMain.nib/classes.nib

@@ -16,11 +16,13 @@
                 grabMouse = id; 
                 heightMinus = id; 
                 heightPlus = id; 
+                mergeProps = id; 
                 ntscPalMode = id; 
                 openCart = id; 
                 paddleChange = id; 
                 pauseGame = id; 
                 restartGame = id; 
+                saveProps = id; 
                 smallerScreen = id; 
                 speedLimit = id; 
                 toggleGlFilter = id; 
@@ -36,7 +38,6 @@
             }; 
             CLASS = Menus; 
             LANGUAGE = ObjC; 
-            OUTLETS = {}; 
             SUPERCLASS = NSObject; 
         }, 
         {CLASS = Preferences; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 

stella/src/macosx/SDLMain.nib/info.nib

@@ -7,7 +7,7 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>116 460 389 44 0 0 1280 1002 </string>
+		<string>116 460 447 44 0 0 1280 1002 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>437.0</string>