Moving the memory card manager to the preferences window.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85870 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 5 insertions, 19 deletions

diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index d54cc590..92d051d2 100755
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -120,15 +120,9 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
 	return [NSArray arrayWithArray:memCard2Array];
 }
 
-- (id)init
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil;
 {
-	self = [self initWithWindowNibName:@"MemCardManager"];
-	return self;
-}
-
-- (id)initWithWindow:(NSWindow *)window
-{
-    self = [super initWithWindow:window];
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         //LoadMcds(Config.Mcd1, Config.Mcd2);
     }
@@ -190,13 +184,11 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
 	[self setupValues: theNum ? [theNum intValue] : 3];
 }
 
-- (void)windowDidLoad
+- (void)awakeFromNib
 {
-    [super windowDidLoad];
+	[super awakeFromNib];
+	[self setupValues:3];
     
-    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
-	[[self window] setDelegate:self];
-	//[self setupValues];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(memoryCardDidChangeNotification:) name:memChangeNotifier object:nil];
 
 	imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate date] interval:3.0/10.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
@@ -208,12 +200,6 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
 	[[NSNotificationCenter defaultCenter] postNotificationName:memoryAnimateTimerKey object:self];
 }
 
-- (IBAction)showWindow:(id)sender
-{
-	[super showWindow:sender];
-	[self setupValues:3];
-}
-
 - (int)findFreeMemCardBlockInCard:(int)target_card length:(int)len
 {
 	int foundcount = 0, i = 0;