amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-21 06:33:18 +00:00
Code Issues Projects Releases Wiki Activity

Added the modifications specified by extrafu

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-03-25 14:53:42 -04:00
parent 76307cfaaf
commit bce701208a
8 changed files with 137 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/English.lproj/Localizable.strings
+2 -2
View File
@@ -139,8 +139,8 @@
"messagecheck_every_20_minutes" = "Every 20 minutes";
"messagecheck_every_30_minutes" = "Every 30 minutes";
"messagecheck_once_per_hour" = "Once per hour";
"PersonalAddressBook" = "Personal address book";
"CollectedAddressBook" = "Collected addresses";
"personal" = "Personal addressbook";
"collected" = "Collected addresses";
"Forward messages:" = "Forward messages:";
"messageforward_inline" = "Inline";
UI/PreferencesUI/UIxPreferences.m
+29 -12
View File
@@ -691,18 +691,14 @@ static NSArray *reminderValues = nil;
- (NSArray *) addressBookList
{
/* We want all the SourceIDS */
NSMutableArray *folders;
NSMutableArray *contactFolders;
NSMutableArray *folders, *contactFolders, *availableAddressBooks;
int i, count;
contactFolders = [[[context activeUser] homeFolderInContext: context]
lookupName: @"Contacts"
inContext: context
acquire: NO];
folders = [NSMutableArray arrayWithArray: [contactFolders subFolders]];
int i, count;
count = [folders count]-1;
// Inside this loop we remove all the public or shared addressbooks
@@ -713,21 +709,42 @@ static NSArray *reminderValues = nil;
}
// Parse the objects in order to have only the displayName of the addressbooks to be displayed on the preferences interface
NSMutableArray *availableAddressBooks = [NSMutableArray new];
NSMutableArray *availableAddressBooksName = [NSMutableArray new];
availableAddressBooks = [[NSMutableArray alloc] initWithCapacity: [folders count]];
count = [folders count]-1;
for (i=0; i <= count ; i++) {
[availableAddressBooks addObject:[[folders objectAtIndex:i] realNameInContainer]];
[availableAddressBooksName addObject:[[folders objectAtIndex:i] displayName]];
}
return availableAddressBooks;
}
- (NSString *) itemAddressBookText
{
return [self labelForKey:[NSString stringWithFormat: item]];
NSString *displayNameAddressBookItem, *test;
NSMutableArray *folders, *contactFolders;
int count, i;
if ([item isEqualToString: @"personal"] || [item isEqualToString: @"collected"])
displayNameAddressBookItem = [self labelForKey:[NSString stringWithFormat: item]];
else
{
contactFolders = [[[context activeUser] homeFolderInContext: context]
lookupName: @"Contacts"
inContext: context
acquire: NO];
folders = [NSMutableArray arrayWithArray: [contactFolders subFolders]];
count = [folders count]-1;
for (i=0; i <= count ; i++)
{
if ([item isEqualToString:[[folders objectAtIndex:i] realNameInContainer]])
{
displayNameAddressBookItem = [[folders objectAtIndex:i] displayName];
break;
};
}
}
return displayNameAddressBookItem;
}
- (NSString *) userAddressBook