Proper system defaults fallback for preferences

(Bug #145)

Monotone-Parent: 86d5fda1266a9ae6071c1b0c48daa229594679fb
Monotone-Revision: 33a4befb91778f46b962f6c895f7697b0d1df722

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-06T18:12:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-06 18:12:07 +00:00
parent a9f4d77c2c
commit 725878ebdb
8 changed files with 99 additions and 36 deletions
+8 -20
View File
@@ -290,7 +290,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userTimeFormat
{
return [userDefaults objectForKey: @"TimeFormat"];
return [user timeFormat];
}
- (void) setUserTimeFormat: (NSString *) newFormat
@@ -318,7 +318,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userWeekStartDay
{
return [NSString stringWithFormat: @"%d", [user firstDayOfWeek]];;
return [NSString stringWithFormat: @"%d", [user firstDayOfWeek]];
}
- (void) setUserWeekStartDay: (NSString *) newDay
@@ -343,13 +343,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userDayStartTime
{
NSString *time;
time = [userDefaults objectForKey: @"DayStartTime"];
if (!time)
time = @"08:00";
return time;
return [NSString stringWithFormat: @"%02d:00", [user dayStartHour]];
}
- (void) setUserDayStartTime: (NSString *) newTime
@@ -359,13 +353,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userDayEndTime
{
NSString *time;
time = [userDefaults objectForKey: @"DayEndTime"];
if (!time)
time = @"18:00";
return time;
return [NSString stringWithFormat: @"%02d:00", [user dayEndHour]];
}
- (void) setUserDayEndTime: (NSString *) newTime
@@ -375,7 +363,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSArray *) firstWeekList
{
return [NSArray arrayWithObjects:
return [NSArray arrayWithObjects:
SOGoWeekStartJanuary1,
SOGoWeekStartFirst4DayWeek,
SOGoWeekStartFirstFullWeek,
@@ -541,7 +529,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userMessageForwarding
{
return [userDefaults stringForKey: @"MessageForwarding"];
return [user messageForwarding];
}
- (void) setUserMessageForwarding: (NSString *) newMessageForwarding
@@ -591,7 +579,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userReplyPlacement
{
return [userDefaults stringForKey: @"ReplyPlacement"];
return [user replyPlacement];
}
- (void) setUserReplyPlacement: (NSString *) newReplyPlacement
@@ -612,7 +600,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) userSignaturePlacement
{
return [userDefaults stringForKey: @"SignaturePlacement"];
return [user signaturePlacement];
}
- (NSArray *) composeMessagesType