diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-06 04:48:53 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-06 04:48:53 +0000 |
| commit | c5017013517e053f43acbdae524026a8b496cb94 (patch) | |
| tree | 057349f06e123590254e37b0fc4811abd6f410a1 /macosx/ConfigurationController.m | |
| parent | fda7db4491a0c1620afcd50d7f53985442c6e856 (diff) | |
| download | pcsxr-c5017013517e053f43acbdae524026a8b496cb94.tar.gz | |
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
Diffstat (limited to 'macosx/ConfigurationController.m')
| -rwxr-xr-x | macosx/ConfigurationController.m | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index b3f5f5c6..633be834 100755 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -155,21 +155,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; } } -- (void)memoryCardDidChangeNotification:(NSNotification *)aNote -{ - NSNumber *aNumber = [[aNote userInfo] objectForKey:memCardChangeNumberKey]; - int iNum = aNumber ? [aNumber intValue] : 3; - - if (iNum & 1) { - NSURL *path = [[NSUserDefaults standardUserDefaults] URLForKey:@"Mcd1"]; - [mcd1Label setTitleWithMnemonic:[path path]]; - } - if (iNum & 2) { - NSURL *path = [[NSUserDefaults standardUserDefaults] URLForKey:@"Mcd2"]; - [mcd2Label setTitleWithMnemonic:[path path]]; - } -} - - (void)awakeFromNib { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; @@ -221,8 +206,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; #endif // setup labels - [mcd1Label setTitleWithMnemonic:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.Mcd1 length:strlen(Config.Mcd1)]]; - [mcd2Label setTitleWithMnemonic:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.Mcd2 length:strlen(Config.Mcd2)]]; int tag = [defaults integerForKey:@"AutoDetectVideoType"]; if (tag) @@ -256,10 +239,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; { [[NSNotificationCenter defaultCenter] removeObserver:self]; RELEASEOBJ(checkBoxDefaults); - if (memCardEdit) { - [memCardEdit close]; - RELEASEOBJ(memCardEdit); - } + SUPERDEALLOC; } @@ -276,23 +256,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; return nil; } -- (IBAction)mcdEditClicked:(id)sender -{ - if (!memCardEdit) { - memCardEdit = [[PcsxrMemCardController alloc] init]; - } - [[memCardEdit window] center]; - [memCardEdit showWindow:sender]; -} - -- (BOOL)isMemoryCardWindowVisible -{ - if (!memCardEdit) { - return NO; - } else { - return [[memCardEdit window] isVisible]; - } -} - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem { |