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

Add tags input to edit mail recipients

Browse Source
This commit is contained in:
Francis Lachapelle
2015-06-11 15:42:32 -04:00
parent e01e0adac8
commit 09d469927f
6 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailEditor.m
+15 -16
View File
@@ -84,7 +84,7 @@
NSString *sourceFolder;
NSString *text;
NSMutableArray *fromEMails;
NSDictionary *from;
NSString *from;
SOGoMailFolder *sentFolder;
BOOL isHTML;
@@ -114,7 +114,7 @@ static NSArray *infoKeys = nil;
@"from", @"inReplyTo",
@"replyTo",
@"priority", @"receipt",
@"content", nil];
@"text", nil];
}
- (id) init
@@ -253,21 +253,20 @@ static NSArray *infoKeys = nil;
ASSIGN (from, newFrom);
}
- (NSDictionary *) _emailFromIdentity: (NSDictionary *) identity
- (NSString *) _emailFromIdentity: (NSDictionary *) identity
{
static NSArray *keys = nil;
NSString *fullName, *format;
if (!keys)
{
keys = [NSArray arrayWithObjects: @"email", @"fullName", nil];
[keys retain];
}
fullName = [identity objectForKey: @"fullName"];
if ([fullName length])
format = @"%{fullName} <%{email}>";
else
format = @"%{email}";
return [NSDictionary dictionaryWithObjects: [identity objectsForKeys: keys notFoundMarker: [NSNull null]]
forKeys: [NSArray arrayWithObjects: @"email", @"name", nil]];
return [identity keysWithFormat: format];
}
- (NSDictionary *) from
- (NSString *) from
{
NSDictionary *identity;
@@ -420,7 +419,7 @@ static NSArray *infoKeys = nil;
{
NSArray *identities;
int count, max;
NSDictionary *email;
NSString *email;
SOGoMailAccount *account;
if (!fromEMails)
@@ -461,7 +460,7 @@ static NSArray *infoKeys = nil;
[self setTo: [filteredParams objectForKey: @"to"]];
[self setCc: [filteredParams objectForKey: @"cc"]];
[self setBcc: [filteredParams objectForKey: @"bcc"]];
[self setText: [filteredParams objectForKey: @"content"]];
[self setText: [filteredParams objectForKey: @"text"]];
return filteredParams;
}
@@ -721,9 +720,9 @@ static NSArray *infoKeys = nil;
[self setSourceFolder: [co sourceFolder]];
data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSArray arrayWithObject: [self from]], @"from",
[self from], @"from",
[self localeCode], @"locale",
text, @"content",
text, @"text",
nil];
if ((value = [self replyTo]))
[data setObject: value forKey: @"replyTo"];