From 8885f0358941d5ccba17413d0d80dc1dc0926bb6 Mon Sep 17 00:00:00 2001 From: Jeevanandam M Date: Sat, 28 Dec 2013 15:31:18 +0530 Subject: [PATCH 1/2] #42 has been implemented --- README.md | 10 +- ReplyWithHeader/MHConstants.h | 1 - ReplyWithHeader/MHPreferences.h | 1 - ReplyWithHeader/MHPreferences.m | 1 - ReplyWithHeader/MHQuotedMailOriginal.m | 11 +- ReplyWithHeader/MailHeader.m | 9 +- .../Resources/en.lproj/MHPreferencesView.xib | 134 ++---------------- .../Resources/en.lproj/MailHeader-Info.plist | 4 +- 8 files changed, 27 insertions(+), 144 deletions(-) diff --git a/README.md b/README.md index 54c6e3e..614ced6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ Quoting reply and forward headers of email in Mail.app ------------------------------------------------------ -[ReplyWithHeader][2] plugin enables Apple Mail.app to represent meaningful reply and forward headers and blends with corporate world email communication. +[ReplyWithHeader][2] is an Apple Mail bundle/plugin that enables quoting of the email message header in a reply and forward email message. It brings Outlook Mail Header capabilities to Apple Mail and adds missing functionality of headers to Mail.app. Blends with corporate world email communication. -* [Plugin Homepage][2] +* [Plugin page - Features, supported version, etc][2] * [Download Latest Release - MacUpdate.com][5] * [Issue Tracker](#issue-tracker) * [How to Install](#how-to-install) @@ -40,12 +40,14 @@ Jeevanandam M. (jeeva@myjeeva.com) Credits ------- +* Since v3.5, [Jeevanandam M.][6] have taken over the project to make wonderful :) * Jason Schroth (jschroth) extended his helping hands towards maintaining [ReplyWithHeader][2] mail bundle from Aug 9th, 2012 to Sep 16, 2013 * Saptarshi Guha (saptarshiguha) initially started [ReplyWithHeader][2] mail bundle development for Apple Mail Application on Oct 22nd, 2010. He handed over the project to Jason Schroth (jschroth). [1]: http://myjeeva.com [2]: http://myjeeva.com/replywithheader -[3]: https://github.com/jeevatkm/ReplyWithHeaders/issues -[4]: https://github.com/jeevatkm/ReplyWithHeaders/blob/master/ReplyWithHeader/LICENSE.txt +[3]: https://github.com/jeevatkm/ReplyWithHeader/issues +[4]: https://github.com/jeevatkm/ReplyWithHeader/blob/master/ReplyWithHeader/LICENSE.txt [5]: https://www.macupdate.com/app/mac/49256/replywithheader +[6]: https://github.com/jeevatkm diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h index f9e255a..26673f9 100644 --- a/ReplyWithHeader/MHConstants.h +++ b/ReplyWithHeader/MHConstants.h @@ -44,7 +44,6 @@ #define MHTypographyEnabled @"MHHeaderTypographyEnabled" #define MHHeaderOptionEnabled @"MHHeaderLabelOptionEnabled" #define MHRemoveSignatureEnabled @"MHRemoveSignatureEnabled" -#define MHEntourage2004SupportEnabled @"MHEntourage2004SupportEnabled" #define MHDefaulReplyHeaderBorder @"
---------- Original Message ----------
" #define MHDefaultForwardHeaderBorder @"---------- Forwarded Message ----------
" #define MHHeaderBorder @"
" diff --git a/ReplyWithHeader/MHPreferences.h b/ReplyWithHeader/MHPreferences.h index 3b99e54..f01a718 100644 --- a/ReplyWithHeader/MHPreferences.h +++ b/ReplyWithHeader/MHPreferences.h @@ -41,7 +41,6 @@ IBOutlet NSButton *_MHBundleEnabled; IBOutlet NSButton *_MHForwardHeaderEnabled; IBOutlet NSButton *_MHHeaderTypographyEnabled; - IBOutlet NSButton *_MHEntourage2004SupportEnabled; IBOutlet NSButton *_MHSelectFont; IBOutlet NSButton *_MHHeaderOptionEnabled; IBOutlet NSButton *_MHNotifyNewVersion; diff --git a/ReplyWithHeader/MHPreferences.m b/ReplyWithHeader/MHPreferences.m index 42b0d6e..e5cead1 100644 --- a/ReplyWithHeader/MHPreferences.m +++ b/ReplyWithHeader/MHPreferences.m @@ -48,7 +48,6 @@ - (void)toggleMailPreferencesOptions:(BOOL *)state [_MHHeaderTypographyEnabled setEnabled:state]; [_MHForwardHeaderEnabled setEnabled:state]; [_MHHeaderOptionEnabled setEnabled:state]; - [_MHEntourage2004SupportEnabled setEnabled:state]; [_MHNotifyNewVersion setEnabled:state]; [_MHSubjectPrefixTextEnabled setEnabled:state]; [_MHRemoveSignatureEnabled setEnabled:state]; diff --git a/ReplyWithHeader/MHQuotedMailOriginal.m b/ReplyWithHeader/MHQuotedMailOriginal.m index 94f634d..a61919c 100644 --- a/ReplyWithHeader/MHQuotedMailOriginal.m +++ b/ReplyWithHeader/MHQuotedMailOriginal.m @@ -133,12 +133,6 @@ - (void)insertMailHeader:(MHHeaderString *)mailHeader MHLog(@"Header HTML %@", [[headerFragment firstChild] outerHTML]); - // Entourage 2004 text size transformations - if (GET_DEFAULT_BOOL(MHEntourage2004SupportEnabled)) - { - [self applyEntourage2004Support:headerFragment]; - } - if (msgComposeType == 1 || msgComposeType == 2 || (manageForwardHeader && msgComposeType == 3)) { if ( isHTMLMail ) @@ -368,7 +362,8 @@ - (void)prepareQuotedPlainText } } -- (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment +// issue #42 +/*- (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment { // kind of silly, but this code is required so that the adulation appears correctly // in Entourage 2004 would interpret the paragraph tag and ignore @@ -424,7 +419,7 @@ - (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment [[headerFragment firstChild] replaceChild:brelem oldChild:[fragmentNodes item:i] ]; } } -} +} */ - (DOMDocumentFragment *)createDocumentFragment:(NSString *)htmlString { diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m index e11df0e..5d72a3f 100644 --- a/ReplyWithHeader/MailHeader.m +++ b/ReplyWithHeader/MailHeader.m @@ -193,7 +193,6 @@ + (void)assignUserDefaults MHDefaultHeaderFontName, MHHeaderFontName, MHDefaultHeaderFontSize, MHHeaderFontSize, [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], MHHeaderColor, - [NSNumber numberWithBool:NO], MHEntourage2004SupportEnabled, [NSNumber numberWithBool:YES], MHSubjectPrefixTextEnabled, [NSNumber numberWithBool:NO], MHRemoveSignatureEnabled, [NSNumber numberWithInt:2], MHHeaderLabelMode, @@ -229,7 +228,7 @@ + (void)smoothValueTransToNewMailPrefUI if (GET_DEFAULT_BOOL(@"entourage2004Support")) { - SET_DEFAULT_BOOL(GET_DEFAULT_BOOL(@"entourage2004Support"), MHEntourage2004SupportEnabled); + SET_DEFAULT_BOOL(GET_DEFAULT_BOOL(@"entourage2004Support"), @"MHEntourage2004SupportEnabled"); REMOVE_DEFAULT(@"entourage2004Support"); } @@ -255,6 +254,12 @@ + (void)smoothValueTransToNewMailPrefUI REMOVE_DEFAULT(@"RwhReplyHeaderText"); } // [end] + + // issue #42 + if (GET_DEFAULT(@"MHEntourage2004SupportEnabled")) + { + REMOVE_DEFAULT(@"MHEntourage2004SupportEnabled"); + } } diff --git a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib index dc801b8..a88fa6b 100644 --- a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib +++ b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib @@ -2,10 +2,10 @@ 1070 - 13A603 + 13B42 4514 1265 - 695.00 + 696.00 com.apple.InterfaceBuilder.CocoaPlugin 4514 @@ -99,7 +99,6 @@ {{11, 9}, {566, 407}} - 1 @@ -107,49 +106,24 @@ 274 - - - 268 - {{15, 51}, {476, 18}} - - - - YES - - -2080374784 - 268435456 - Entourage 2004 support - - - 1211912448 - 2 - - - - - 400 - 75 - - NO - - + 268 - {{31, 17}, {501, 28}} + {{31, 322}, {501, 14}} - + YES - + 67108864 205520896 - Applied typography fix to support message consistent appearance, while message is received in Entourage 2004 [this option might affect appearance in latest mail clients]. + Applied customization and manages Forward header. .LucidaGrandeUI 11 3100 - + 6 System @@ -167,29 +141,6 @@ NO 1 - - - 268 - {{31, 322}, {501, 14}} - - - - YES - - 67108864 - 205520896 - Applied customization and manages Forward header. - - - - - 1 - MC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMAA - - - NO - 1 - 268 @@ -581,7 +532,7 @@ {{15, 82}, {516, 18}} - + YES -2080374784 @@ -1042,14 +993,6 @@ 360 - - - _MHEntourage2004SupportEnabled - - - - 361 - _MHForwardHeaderEnabled @@ -1226,22 +1169,6 @@ 375 - - - values.MHEntourage2004SupportEnabled - - - - - - value: values.MHEntourage2004SupportEnabled - value - values.MHEntourage2004SupportEnabled - 2 - - - 383 - values.MHForwardHeaderEnabled @@ -1502,8 +1429,6 @@ 133 - - @@ -1521,32 +1446,6 @@ - - 16 - - - - - - - - 17 - - - - - 106 - - - - - - - - 107 - - - 205 @@ -1957,11 +1856,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -1988,11 +1882,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -2243,7 +2132,6 @@ NSButton NSTabView NSColorWell - NSButton NSButton NSTextField NSMatrix @@ -2269,10 +2157,6 @@ _MHColorWell NSColorWell - - _MHEntourage2004SupportEnabled - NSButton - _MHForwardHeaderEnabled NSButton diff --git a/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist b/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist index e7dadd7..c0aca5b 100644 --- a/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist +++ b/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.2 + 4.3 CFBundleSignature ???? CFBundleVersion - 4.2 + 4.3 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} MHAppCastURL From 8595e75a4aa8e7d1d2c40ef650df6ea0ba1d58e1 Mon Sep 17 00:00:00 2001 From: Jeevanandam M Date: Sat, 28 Dec 2013 18:26:47 +0530 Subject: [PATCH 2/2] #43 have been implemented --- ReplyWithHeader/MHConstants.h | 2 + ReplyWithHeader/MHHeaderString.m | 6 +- ReplyWithHeader/MailHeader.m | 1 + .../Resources/en.lproj/MHPreferencesView.xib | 386 ++++++++++++++++-- 4 files changed, 368 insertions(+), 27 deletions(-) diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h index 26673f9..0789cd9 100644 --- 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 index ebda910..51845a5 100644 --- 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 index 5d72a3f..69f1b0d 100644 --- 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 ]; diff --git a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib index a88fa6b..653fa54 100644 --- a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib +++ b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib @@ -99,6 +99,7 @@ {{11, 9}, {566, 407}} + 1 @@ -109,7 +110,7 @@ 268 - {{31, 322}, {501, 14}} + {{31, 250}, {501, 14}} @@ -144,7 +145,7 @@ 268 - {{31, 271}, {501, 14}} + {{31, 203}, {501, 14}} @@ -167,7 +168,7 @@ 268 - {{15, 342}, {516, 18}} + {{15, 268}, {516, 18}} @@ -192,7 +193,7 @@ 268 - {{15, 291}, {516, 18}} + {{15, 220}, {516, 18}} @@ -217,7 +218,7 @@ 268 - {{26, 250}, {94, 17}} + {{26, 182}, {94, 17}} @@ -249,7 +250,7 @@ 268 - {{26, 223}, {94, 17}} + {{26, 155}, {94, 17}} @@ -272,7 +273,7 @@ NSColor pasteboard type - {{125, 223}, {44, 19}} + {{125, 155}, {44, 19}} @@ -287,7 +288,7 @@ 268 - {{122, 248}, {189, 17}} + {{122, 180}, {189, 17}} @@ -311,7 +312,7 @@ 268 - {{316, 248}, {149, 19}} + {{316, 180}, {149, 19}} @@ -340,7 +341,7 @@ 268 - {{80, 165}, {346, 23}} + {{80, 99}, {346, 23}} @@ -412,7 +413,7 @@ 268 - {{15, 191}, {516, 18}} + {{15, 125}, {516, 18}} @@ -437,7 +438,7 @@ 268 - {{80, 142}, {346, 19}} + {{80, 76}, {346, 19}} @@ -504,7 +505,7 @@ 268 - {{15, 111}, {516, 18}} + {{15, 45}, {516, 18}} @@ -529,10 +530,10 @@ 268 - {{15, 82}, {516, 18}} + {{15, 16}, {516, 18}} - + YES -2080374784 @@ -551,11 +552,289 @@ NO + + + 268 + {{15, 341}, {516, 17}} + + + + _NS:397 + {251, 750} + YES + + 68157504 + 272630784 + From header attribution style: + + _NS:397 + + + + + NO + 1 + + + + 268 + {{33, 299}, {353, 38}} + + + + _NS:9 + YES + NO + 2 + 1 + + + -2080374784 + 0 + Default (From: Name) + + LucidaGrande + 12 + 16 + + + 1211912448 + 0 + + + + 200 + 25 + + + 67108864 + 0 + Extended (From: Name [mailto:email-address]) + + + 1 + 1211912448 + 0 + + 549453824 + {18, 18} + + + + + + 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 +BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3 +bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA +AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA +b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA +ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx +OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2 +LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl +c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA +AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM +CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1 +cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3 +AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET +ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp +AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML +AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+ +BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI +BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu +CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz +CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e +DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx +EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw +FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg +GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D +HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd +IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx +KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C +Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT +NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn +PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA +RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi +TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP +VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J +XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT +Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw +cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh +fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp +iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK +lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH +obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h +rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb +vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2 +y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 +2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb +6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn ++3f8B/yY/Sn9uv5L/tz/bf//A + + + + + + 3 + MCAwAA + + + + 400 + 75 + + + {295, 18} + {4, 2} + 1143480320 + NSActionCell + + 67108864 + 0 + Radio + + 1211912448 + 0 + + 549453824 + {18, 18} + + + + + + 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 +BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3 +bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA +AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA +b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA +ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx +OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2 +LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl +c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA +AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM +CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1 +cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3 +AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET +ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp +AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML +AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+ +BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI +BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu +CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz +CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e +DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx +EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw +FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg +GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D +HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd +IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx +KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C +Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT +NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn +PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA +RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi +TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP +VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J +XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT +Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw +cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh +fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp +iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK +lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH +obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h +rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb +vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2 +y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 +2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb +6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn ++3f8B/yY/Sn9uv5L/tz/bf//A + + + + + + + + 400 + 75 + + + + + 3 + MQA + + + {{10, 33}, {546, 361}} - + Manage Headers @@ -627,10 +906,7 @@ 6 System textBackgroundColor - - 3 - MQA - + 3 @@ -647,7 +923,6 @@ 268 {{14, 17}, {518, 22}} - YES 67108864 @@ -853,15 +1128,12 @@ {{454, 405}, {119, 25}} + YES 67108928 133120 - - LucidaGrande - 12 - 16 - + 112869376 129 @@ -1349,6 +1621,22 @@ RtI-Hc-LYI + + + selectedTag: values.MHHeaderAttributionFromTagStyle + + + + + + selectedTag: values.MHHeaderAttributionFromTagStyle + selectedTag + values.MHHeaderAttributionFromTagStyle + 2 + + + LmJ-vR-Zt5 + @@ -1443,6 +1731,8 @@ + + @@ -1844,6 +2134,44 @@ + + uhJ-rc-zld + + + + + + + + 952-It-eIl + + + + + + + + + + zVR-s0-P4b + + + + + jmN-T5-LTm + + + + + E8s-S7-RGq + + + + + fnc-nZ-KKl + + + @@ -2058,6 +2386,8 @@ com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2071,8 +2401,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin