#43 have been implemented

jeevatkm · Dec 28, 2013 · 8595e75 · 8595e75
1 parent 8885f03
commit 8595e75
Show file tree

Hide file tree

Showing 4 changed files with 368 additions and 27 deletions.
diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h
@@ -57,6 +57,8 @@
 #define MHHeaderLabelMode @"MHHeaderLabelMode"
 #define MHHeaderOrderMode @"MHHeaderOrderMode"
 
+#define MHHeaderAttributionFromTagStyle @"MHHeaderAttributionFromTagStyle"
+
 #define MHPluginNotifyNewVersion @"MHNotifyPluginNewVersion"
 #define MHSubjectPrefixTextEnabled @"MHSubjectPrefixTextEnabled"
 #define MHBundleHeaderLanguageCode @"MHBundleHeaderLanguageCode"

diff --git a/ReplyWithHeader/MHHeaderString.m b/ReplyWithHeader/MHHeaderString.m
@@ -302,7 +302,11 @@ - (void)applyHeaderLabelChange
             range = [[row string] rangeOfString:@":"];
             NSString *fromString = [[row string] substringFromIndex:range.location + 2];
 
-            fromString = [self getFullNameFromEmailAddress:fromString isMailToNeeded:TRUE];
+            NSInteger fromTagStyle = GET_DEFAULT_INT(MHHeaderAttributionFromTagStyle);
+            BOOL mailToNeeded = FALSE;
+
+            if (fromTagStyle == 1) mailToNeeded = TRUE;
+            fromString = [self getFullNameFromEmailAddress:fromString isMailToNeeded:mailToNeeded];
 
             [row replaceCharactersInRange:NSMakeRange(range.location + 2, [row length] - (range.location + 2)) withString:fromString];
         }

diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m
@@ -197,6 +197,7 @@ + (void)assignUserDefaults
                           [NSNumber numberWithBool:NO], MHRemoveSignatureEnabled,
                           [NSNumber numberWithInt:2], MHHeaderLabelMode,
                           [NSNumber numberWithInt:2], MHHeaderOrderMode,
+                          [NSNumber numberWithInt:0], MHHeaderAttributionFromTagStyle,
                           [NSNumber numberWithBool:NO], MHLogEnabled,
                           nil
                           ];