From 8401b26bfaeafc08dfa6dcd025349e127e5bfff5 Mon Sep 17 00:00:00 2001
From: markgrebe <markgrebe@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 2 Aug 2004 04:09:10 +0000
Subject: [PATCH] Added preference to allow user to select the directory in
 which ROM images are stored.  This simply sets the default directory to start
 the browsing in, and doesn't preclude the user from selecting a file outside
 that directory

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@333 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 stella/src/macosx/Menus.h                     |   5 +-
 stella/src/macosx/Menus.m                     |  54 ++++++++++++++++--
 stella/src/macosx/SDLMain.nib/classes.nib     |   2 +
 stella/src/macosx/SDLMain.nib/info.nib        |   4 +-
 stella/src/macosx/SDLMain.nib/objects.nib     | Bin 7911 -> 8380 bytes
 stella/src/macosx/SettingsMACOSX.cxx          |   7 ++-
 stella/src/macosx/mainSDL.cxx                 |  20 +++++--
 .../src/macosx/stella.pbproj/project.pbxproj  |   4 +-
 8 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/stella/src/macosx/Menus.h b/stella/src/macosx/Menus.h
index 5b216e914..051ad7503 100755
--- a/stella/src/macosx/Menus.h
+++ b/stella/src/macosx/Menus.h
@@ -4,7 +4,7 @@
    Mark Grebe <atarimac@cox.net>
    
 */
-/* $Id: Menus.h,v 1.2 2004-07-14 06:54:17 markgrebe Exp $ */
+/* $Id: Menus.h,v 1.3 2004-08-02 04:08:10 markgrebe Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
@@ -15,11 +15,13 @@
 	IBOutlet id videoModeMatrix;
 	IBOutlet id volumeSlider;
 	IBOutlet id aspectRatioField;
+	IBOutlet id romDirField;
 	int openGlEnabled;
 	int gameMenusEnabled;
 }
 
 + (Menus *)sharedInstance;
+- (NSString *) browseDir;
 - (void)setSpeedLimitMenu:(int)limit;
 - (void)initVideoMenu:(int)openGl;
 - (void)setPaddleMenu:(int)number;
@@ -28,6 +30,7 @@
 - (void)pushKeyEvent:(int)key:(bool)shift;
 - (IBAction) paddleChange:(id) sender;
 - (IBAction) prefsOK:(id) sender;
+- (IBAction) romdirSelect:(id) sender;
 - (IBAction)prefsMenu:(id)sender;
 - (IBAction)biggerScreen:(id)sender;
 - (IBAction)smallerScreen:(id)sender;
diff --git a/stella/src/macosx/Menus.m b/stella/src/macosx/Menus.m
index ed4b5c40f..4c37bd50d 100755
--- a/stella/src/macosx/Menus.m
+++ b/stella/src/macosx/Menus.m
@@ -4,7 +4,7 @@
    Mark Grebe <atarimac@cox.net>
    
 */
-/* $Id: Menus.m,v 1.2 2004-07-14 06:54:17 markgrebe Exp $ */
+/* $Id: Menus.m,v 1.3 2004-08-02 04:08:10 markgrebe Exp $ */
 
 #import <Cocoa/Cocoa.h>
 #import "Menus.h"
@@ -17,8 +17,10 @@
 #define QZ_COMMA		0x2B
 
 extern void setPaddleMode(int mode);
-extern void getPrefsSettings(int *gl, int *volume, float *aspect);
-extern void setPrefsSettings(int gl, int volume, float aspect);
+extern void getPrefsSettings(int *gl, int *volume, float *aspect, const char **romdir);
+extern void setPrefsSettings(int gl, int volume, float aspect, const char *romdir);
+void getRomdirSetting(char *romdir);
+
 
 /*------------------------------------------------------------------------------
 *  releaseCmdKeys - This method fixes an issue when modal windows are used with
@@ -52,22 +54,29 @@ void releaseCmdKeys(NSString *character, int keyCode)
 char *browseFile(void) {
     NSOpenPanel *openPanel = nil;
 	char *fileName;
+	NSString *dirName;
+	char cdirName[FILENAME_MAX];
 	
 	fileName = malloc(FILENAME_MAX);
 	if (fileName == NULL)
 	    return NULL;
 	
+	getRomdirSetting(cdirName);
+	dirName = [NSString stringWithCString:cdirName];
+	
     openPanel = [NSOpenPanel openPanel];
     [openPanel setCanChooseDirectories:NO];
     [openPanel setCanChooseFiles:YES];
     
-    if ([openPanel runModalForDirectory:nil file:nil types:nil] == NSOKButton) {
+    if ([openPanel runModalForDirectory:dirName file:nil types:nil] == NSOKButton) {
 		[[[openPanel filenames] objectAtIndex:0] getCString:fileName];
         releaseCmdKeys(@"o",QZ_o);
+		[dirName release];
 		return fileName;
 		}
     else {
         releaseCmdKeys(@"o",QZ_o);
+		[dirName release];
         return NULL;
 		}
     }
@@ -129,6 +138,22 @@ static Menus *sharedInstance = nil;
 	return(self);
 }
 
+/*------------------------------------------------------------------------------
+* browseDir - Method which allows user to choose a directory.
+*-----------------------------------------------------------------------------*/
+- (NSString *) browseDir {
+    NSOpenPanel *openPanel;
+    
+    openPanel = [NSOpenPanel openPanel];
+    [openPanel setCanChooseDirectories:YES];
+    [openPanel setCanChooseFiles:NO];
+    
+    if ([openPanel runModalForTypes:nil] == NSOKButton)
+        return([[openPanel filenames] objectAtIndex:0]);
+    else
+        return nil;
+    }
+
 - (void)setSpeedLimitMenu:(int)limit
 {
 	if (limit)
@@ -167,20 +192,27 @@ static Menus *sharedInstance = nil;
 {
     int gl, volume;
 	float aspectRatio;
+	const char *romdir;
+	const char *newRomdir;
+	NSString *romDirString;
 	
-	getPrefsSettings(&gl, &volume, &aspectRatio);
+	getPrefsSettings(&gl, &volume, &aspectRatio, &romdir);
+	romDirString = [NSString stringWithCString:romdir];
 	
 	[volumeSlider setIntValue:volume];
 	[videoModeMatrix selectCellWithTag:gl];
 	[aspectRatioField setFloatValue:aspectRatio];
+	[romDirField setStringValue:romDirString];
 
     [NSApp runModalForWindow:[volumeSlider window]];
 	
 	gl = [[videoModeMatrix selectedCell] tag];
 	volume = [volumeSlider intValue];
 	aspectRatio = [aspectRatioField floatValue];
+	romDirString = [romDirField stringValue];
+	newRomdir = [romDirString cString];
 	
-	setPrefsSettings(gl, volume, aspectRatio);
+	setPrefsSettings(gl, volume, aspectRatio, newRomdir);
 }
 
 - (IBAction) prefsOK:(id) sender
@@ -188,6 +220,16 @@ static Menus *sharedInstance = nil;
     [NSApp stopModal];
     [[volumeSlider window] close];
 }
+
+- (IBAction) romdirSelect:(id) sender
+{
+	NSString *directory;
+	
+	directory = [self browseDir];
+	if (directory != nil)
+		[romDirField setStringValue:directory];
+}
+
 - (IBAction)prefsMenu:(id)sender
 {
 	[[Menus sharedInstance] prefsStart];
diff --git a/stella/src/macosx/SDLMain.nib/classes.nib b/stella/src/macosx/SDLMain.nib/classes.nib
index 21c23e381..c924199ee 100644
--- a/stella/src/macosx/SDLMain.nib/classes.nib
+++ b/stella/src/macosx/SDLMain.nib/classes.nib
@@ -23,6 +23,7 @@
                 prefsMenu = id; 
                 prefsOK = id; 
                 rightJoyChange = id; 
+                romdirSelect = id; 
                 smallerScreen = id; 
                 speedLimit = id; 
                 toggleGlFilter = id; 
@@ -41,6 +42,7 @@
                 filterMenu = id; 
                 limitSpeedMenu = id; 
                 paddlesMenu = id; 
+                romDirField = id; 
                 videoModeMatrix = id; 
                 volumeSlider = id; 
             }; 
diff --git a/stella/src/macosx/SDLMain.nib/info.nib b/stella/src/macosx/SDLMain.nib/info.nib
index f05116f85..43a619b76 100644
--- a/stella/src/macosx/SDLMain.nib/info.nib
+++ b/stella/src/macosx/SDLMain.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>495 397 359 316 0 0 1280 1002 </string>
+	<string>451 517 359 316 0 0 1280 1002 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
@@ -13,8 +13,8 @@
 	<string>349.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>578</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7H63</string>
diff --git a/stella/src/macosx/SDLMain.nib/objects.nib b/stella/src/macosx/SDLMain.nib/objects.nib
index e2c67dc2f640089d934eaef4aa143aafaaa8d8c8..9f7952cb15248b4d7885ac75a8f1c60321695a94 100644
GIT binary patch
literal 8380
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
L&DtAQuiXD1phvmD

literal 7911
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
H-)8?GYCH35

diff --git a/stella/src/macosx/SettingsMACOSX.cxx b/stella/src/macosx/SettingsMACOSX.cxx
index 8dd9f59a4..bf6460140 100644
--- a/stella/src/macosx/SettingsMACOSX.cxx
+++ b/stella/src/macosx/SettingsMACOSX.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: SettingsMACOSX.cxx,v 1.1.1.1 2004-06-16 02:30:30 markgrebe Exp $
+// $Id: SettingsMACOSX.cxx,v 1.2 2004-08-02 04:08:10 markgrebe Exp $
 //============================================================================
 
 #include <cassert>
@@ -41,6 +41,8 @@ void prefsSave(void);
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 SettingsMACOSX::SettingsMACOSX()
 {
+  char workingDir[FILENAME_MAX];
+  
   // First set variables that the parent class needs
   myBaseDir = "./";
   string stelladir = myBaseDir;
@@ -65,6 +67,9 @@ SettingsMACOSX::SettingsMACOSX()
 #ifdef SNAPSHOT_SUPPORT
   set("ssdir", "./");
 #endif
+  getwd(workingDir);
+  set("romdir", workingDir);
+
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/stella/src/macosx/mainSDL.cxx b/stella/src/macosx/mainSDL.cxx
index 47045402d..9bb5614e5 100644
--- a/stella/src/macosx/mainSDL.cxx
+++ b/stella/src/macosx/mainSDL.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: mainSDL.cxx,v 1.5 2004-08-02 00:28:48 markgrebe Exp $
+// $Id: mainSDL.cxx,v 1.6 2004-08-02 04:08:10 markgrebe Exp $
 //============================================================================
 
 #include <fstream>
@@ -56,8 +56,9 @@ int stellaMain(int argc, char* argv[]);
 void setPaddleMode(int mode);
 void setLeftJoystickMode(int mode);
 void setRightJoystickMode(int mode);
-void getPrefsSettings(int *gl, int *volume, float *aspect);
-void setPrefsSettings(int gl, int volume, float aspect);
+void getPrefsSettings(int *gl, int *volume, float *aspect, const char **romdir);
+void setPrefsSettings(int gl, int volume, float aspect, const char *romdir);
+void getRomdirSetting(char *romdir);
 char *browseFile(void);
 void prefsStart(void);
 void hideApp(void);
@@ -286,7 +287,7 @@ void setPaddleMode(int mode)
 	theSettings->setInt("paddle",thePaddleMode);
 }
 
-void getPrefsSettings(int *gl, int *volume, float *aspect)
+void getPrefsSettings(int *gl, int *volume, float *aspect, const char **romdir)
 {
   if (theSettings->getString("video") == "gl")
 	*gl = 1;
@@ -298,9 +299,16 @@ void getPrefsSettings(int *gl, int *volume, float *aspect)
 	*volume = 100;
 	
   *aspect = theSettings->getFloat("gl_aspect");
+  
+  *romdir = theSettings->getString("romdir").c_str();
 }
 
-void setPrefsSettings(int gl, int volume, float aspect)
+void getRomdirSetting(char *romdir)
+{
+  strcpy(romdir, theSettings->getString("romdir").c_str());
+}
+
+void setPrefsSettings(int gl, int volume, float aspect, const char *romdir)
 {
   if (gl)
 	theSettings->setString("video","gl");
@@ -311,6 +319,8 @@ void setPrefsSettings(int gl, int volume, float aspect)
   theSound->setVolume(volume);
   
   theSettings->setFloat("gl_aspect",aspect);
+  
+  theSettings->setString("romdir",romdir);
 }
 
 /**
diff --git a/stella/src/macosx/stella.pbproj/project.pbxproj b/stella/src/macosx/stella.pbproj/project.pbxproj
index 9abe54455..516757a25 100755
--- a/stella/src/macosx/stella.pbproj/project.pbxproj
+++ b/stella/src/macosx/stella.pbproj/project.pbxproj
@@ -392,7 +392,7 @@
 	<key>CFBundleExecutable</key>
 	<string>StellaOSX</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.4</string>
+	<string>1.4.1</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>docs</string>
 	<key>CFBundleHelpBookName</key>
@@ -408,7 +408,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>1.4</string>
+	<string>1.4.1</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain.nib</string>
 	<key>NSPrincipalClass</key>