diff --git a/ChangeLog b/ChangeLog index 3642b77..9e57d75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-10-06 German Arias + + * Headers/PCPrefController.h: + * PCPrefController.m: Don't retain the user defaults. And don't call + synchronize every time, this are causing conflicts with defaults of the + PC windows, which stores its frames here. + 2013-09-24 German Arias * PCAppController.m (-applicationDidFinishLaunching: and diff --git a/Headers/PCPrefController.h b/Headers/PCPrefController.h index 20f3f5e..06ba4b4 100644 --- a/Headers/PCPrefController.h +++ b/Headers/PCPrefController.h @@ -29,8 +29,6 @@ @interface PCPrefController : NSObject { - NSUserDefaults *userDefaults; - NSMutableDictionary *sectionsDict; IBOutlet NSPanel *panel; diff --git a/PCPrefController.m b/PCPrefController.m index 398d626..ad04462 100644 --- a/PCPrefController.m +++ b/PCPrefController.m @@ -53,17 +53,6 @@ static PCPrefController *_prefCtrllr = nil; return nil; } - // The prefs from the defaults - userDefaults = [NSUserDefaults standardUserDefaults]; - RETAIN(userDefaults); - - if ([userDefaults objectForKey:@"Version"] == nil) - { - // Clean preferences - [NSUserDefaults resetStandardUserDefaults]; - [self setString:@"0.5" forKey:@"Version" notify:NO]; - } - [self loadPrefsSections]; return self; @@ -76,9 +65,6 @@ static PCPrefController *_prefCtrllr = nil; #endif RELEASE(panel); - - [[NSUserDefaults standardUserDefaults] synchronize]; - [super dealloc]; } @@ -95,7 +81,8 @@ static PCPrefController *_prefCtrllr = nil; - (NSString *)stringForKey:(NSString *)key defaultValue:(NSString *)defaultValue { - NSString *stringValue = [userDefaults objectForKey:key]; + NSString *stringValue = [[NSUserDefaults standardUserDefaults] + objectForKey:key]; if (stringValue) { @@ -118,7 +105,8 @@ static PCPrefController *_prefCtrllr = nil; - (BOOL)boolForKey:(NSString *)key defaultValue:(BOOL)defaultValue { - NSString *stringValue = [userDefaults objectForKey:key]; + NSString *stringValue = [[NSUserDefaults standardUserDefaults] + objectForKey:key]; if (stringValue) { @@ -140,7 +128,8 @@ static PCPrefController *_prefCtrllr = nil; - (float)floatForKey:(NSString *)key defaultValue:(float)defaultValue { - NSString *stringValue = [userDefaults objectForKey:key]; + NSString *stringValue = [[NSUserDefaults standardUserDefaults] + objectForKey:key]; if (stringValue) { @@ -157,8 +146,8 @@ static PCPrefController *_prefCtrllr = nil; forKey:(NSString *)aKey notify:(BOOL)notify { - [userDefaults setObject:stringValue forKey:aKey]; - [userDefaults synchronize]; + [[NSUserDefaults standardUserDefaults] setObject:stringValue + forKey:aKey]; if (notify) { @@ -174,8 +163,8 @@ static PCPrefController *_prefCtrllr = nil; { NSString *stringValue = boolValue ? @"YES" : @"NO"; - [userDefaults setObject:stringValue forKey:aKey]; - [userDefaults synchronize]; + [[NSUserDefaults standardUserDefaults] setObject:stringValue + forKey:aKey]; if (notify) { @@ -191,8 +180,8 @@ static PCPrefController *_prefCtrllr = nil; { NSString *stringValue = [NSString stringWithFormat:@"%0.1f", floatValue]; - [userDefaults setObject:stringValue forKey:aKey]; - [userDefaults synchronize]; + [[NSUserDefaults standardUserDefaults] setObject:stringValue + forKey:aKey]; if (notify) { @@ -227,8 +216,6 @@ static PCPrefController *_prefCtrllr = nil; [section readPreferences]; [sectionsDict setObject:section forKey:sectionName]; } - - [userDefaults synchronize]; } - (void)showPanel:(id)sender @@ -268,7 +255,6 @@ static PCPrefController *_prefCtrllr = nil; view = [section view]; [sectionsView setContentView:view]; -// [sectionsView display]; } - (void)changeFont:(id)sender