#42 has been implemented

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

Hide file tree

Showing 8 changed files with 27 additions and 144 deletions.
diff --git 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
@@ -44,7 +44,6 @@
 #define MHTypographyEnabled @"MHHeaderTypographyEnabled"
 #define MHHeaderOptionEnabled @"MHHeaderLabelOptionEnabled"
 #define MHRemoveSignatureEnabled @"MHRemoveSignatureEnabled"
-#define MHEntourage2004SupportEnabled @"MHEntourage2004SupportEnabled"
 #define MHDefaulReplyHeaderBorder @"<br />---------- Original Message ----------<br />"
 #define MHDefaultForwardHeaderBorder @"---------- Forwarded Message ----------<br />"
 #define MHHeaderBorder @"<hr style='border:none;border-top:solid #B5C4DF 1.0pt;padding:0 0 0 0;margin:10px 0 5px 0;' />"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.SystemVersion">13B42</string>
 		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
 		<string key="IBDocument.AppKitVersion">1265</string>
-		<string key="IBDocument.HIToolboxVersion">695.00</string>
+		<string key="IBDocument.HIToolboxVersion">696.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">4514</string>
@@ -99,57 +99,31 @@
 										<string key="NSFrame">{{11, 9}, {566, 407}}</string>
 										<reference key="NSSuperview" ref="1029343919"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="942401193"/>
 										<array class="NSMutableArray" key="NSTabViewItems">
 											<object class="NSTabViewItem" id="1013313776">
 												<string key="NSIdentifier">1</string>
 												<object class="NSView" key="NSView" id="942401193">
 													<reference key="NSNextResponder" ref="144960519"/>
 													<int key="NSvFlags">274</int>
 													<array class="NSMutableArray" key="NSSubviews">
-														<object class="NSButton" id="577128236">
-															<reference key="NSNextResponder" ref="942401193"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{15, 51}, {476, 18}}</string>
-															<reference key="NSSuperview" ref="942401193"/>
-															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="889443858"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="965333510">
-																<int key="NSCellFlags">-2080374784</int>
-																<int key="NSCellFlags2">268435456</int>
-																<string key="NSContents">Entourage 2004 support</string>
-																<reference key="NSSupport" ref="581614428"/>
-																<reference key="NSControlView" ref="577128236"/>
-																<int key="NSButtonFlags">1211912448</int>
-																<int key="NSButtonFlags2">2</int>
-																<reference key="NSNormalImage" ref="1008127819"/>
-																<reference key="NSAlternateImage" ref="413563666"/>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">400</int>
-																<int key="NSPeriodicInterval">75</int>
-															</object>
-															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														</object>
-														<object class="NSTextField" id="889443858">
+														<object class="NSTextField" id="126511310">
 															<reference key="NSNextResponder" ref="942401193"/>
 															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{31, 17}, {501, 28}}</string>
+															<string key="NSFrame">{{31, 322}, {501, 14}}</string>
 															<reference key="NSSuperview" ref="942401193"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="164038164"/>
+															<reference key="NSNextKeyView" ref="277678483"/>
 															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="59098203">
+															<object class="NSTextFieldCell" key="NSCell" id="393972331">
 																<int key="NSCellFlags">67108864</int>
 																<int key="NSCellFlags2">205520896</int>
-																<string key="NSContents">Applied typography fix to support message consistent appearance, while message is received in Entourage 2004 [this option might affect appearance in latest mail clients].</string>
+																<string key="NSContents">Applied customization and manages Forward header.</string>
 																<object class="NSFont" key="NSSupport" id="26">
 																	<string key="NSName">.LucidaGrandeUI</string>
 																	<double key="NSSize">11</double>
 																	<int key="NSfFlags">3100</int>
 																</object>
-																<reference key="NSControlView" ref="889443858"/>
+																<reference key="NSControlView" ref="126511310"/>
 																<object class="NSColor" key="NSBackgroundColor" id="993017804">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
@@ -167,29 +141,6 @@
 															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 														</object>
-														<object class="NSTextField" id="126511310">
-															<reference key="NSNextResponder" ref="942401193"/>
-															<int key="NSvFlags">268</int>
-															<string key="NSFrame">{{31, 322}, {501, 14}}</string>
-															<reference key="NSSuperview" ref="942401193"/>
-															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="277678483"/>
-															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="393972331">
-																<int key="NSCellFlags">67108864</int>
-																<int key="NSCellFlags2">205520896</int>
-																<string key="NSContents">Applied customization and manages Forward header.</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSControlView" ref="126511310"/>
-																<reference key="NSBackgroundColor" ref="993017804"/>
-																<object class="NSColor" key="NSTextColor">
-																	<int key="NSColorSpace">1</int>
-																	<bytes key="NSRGB">MC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMAA</bytes>
-																</object>
-															</object>
-															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-														</object>
 														<object class="NSTextField" id="299132989">
 															<reference key="NSNextResponder" ref="942401193"/>
 															<int key="NSvFlags">268</int>
@@ -581,7 +532,7 @@
 															<string key="NSFrame">{{15, 82}, {516, 18}}</string>
 															<reference key="NSSuperview" ref="942401193"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="577128236"/>
+															<reference key="NSNextKeyView"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSButtonCell" key="NSCell" id="243017198">
 																<int key="NSCellFlags">-2080374784</int>
@@ -1042,14 +993,6 @@
 					</object>
 					<string key="id">360</string>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">_MHEntourage2004SupportEnabled</string>
-						<reference key="source" ref="302651457"/>
-						<reference key="destination" ref="577128236"/>
-					</object>
-					<string key="id">361</string>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">_MHForwardHeaderEnabled</string>
@@ -1226,22 +1169,6 @@
 					</object>
 					<string key="id">375</string>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">values.MHEntourage2004SupportEnabled</string>
-						<reference key="source" ref="577128236"/>
-						<reference key="destination" ref="575662790"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="577128236"/>
-							<reference key="NSDestination" ref="575662790"/>
-							<string key="NSLabel">value: values.MHEntourage2004SupportEnabled</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.MHEntourage2004SupportEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<string key="id">383</string>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">values.MHForwardHeaderEnabled</string>
@@ -1502,8 +1429,6 @@
 						<string key="id">133</string>
 						<reference key="object" ref="942401193"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="577128236"/>
-							<reference ref="889443858"/>
 							<reference ref="126511310"/>
 							<reference ref="299132989"/>
 							<reference ref="416572505"/>
@@ -1521,32 +1446,6 @@
 						</array>
 						<reference key="parent" ref="1013313776"/>
 					</object>
-					<object class="IBObjectRecord">
-						<string key="id">16</string>
-						<reference key="object" ref="577128236"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="965333510"/>
-						</array>
-						<reference key="parent" ref="942401193"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">17</string>
-						<reference key="object" ref="965333510"/>
-						<reference key="parent" ref="577128236"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">106</string>
-						<reference key="object" ref="889443858"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="59098203"/>
-						</array>
-						<reference key="parent" ref="942401193"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">107</string>
-						<reference key="object" ref="59098203"/>
-						<reference key="parent" ref="889443858"/>
-					</object>
 					<object class="IBObjectRecord">
 						<string key="id">205</string>
 						<reference key="object" ref="126511310"/>
@@ -1957,11 +1856,6 @@
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="1.IBUserGuides" ref="0"/>
 				<boolean value="NO" key="1.showNotes"/>
-				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<reference key="106.IBUserGuides" ref="0"/>
-				<boolean value="NO" key="106.showNotes"/>
-				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="107.showNotes"/>
 				<string key="114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="114.IBUserGuides" ref="0"/>
 				<boolean value="NO" key="114.showNotes"/>
@@ -1988,11 +1882,6 @@
 				<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="133.IBUserGuides" ref="0"/>
 				<boolean value="NO" key="133.showNotes"/>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<reference key="16.IBUserGuides" ref="0"/>
-				<boolean value="NO" key="16.showNotes"/>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="17.showNotes"/>
 				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<reference key="203.IBUserGuides" ref="0"/>
 				<boolean value="NO" key="203.showNotes"/>
@@ -2243,7 +2132,6 @@
 						<string key="_MHBundleEnabled">NSButton</string>
 						<string key="_MHBundleTabBox">NSTabView</string>
 						<string key="_MHColorWell">NSColorWell</string>
-						<string key="_MHEntourage2004SupportEnabled">NSButton</string>
 						<string key="_MHForwardHeaderEnabled">NSButton</string>
 						<string key="_MHHeaderInfoFontAndSize">NSTextField</string>
 						<string key="_MHHeaderLabelMode">NSMatrix</string>
@@ -2269,10 +2157,6 @@
 							<string key="name">_MHColorWell</string>
 							<string key="candidateClassName">NSColorWell</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="_MHEntourage2004SupportEnabled">
-							<string key="name">_MHEntourage2004SupportEnabled</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="_MHForwardHeaderEnabled">
 							<string key="name">_MHForwardHeaderEnabled</string>
 							<string key="candidateClassName">NSButton</string>

diff --git a/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist b/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2</string>
+	<string>4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.2</string>
+	<string>4.3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>MHAppCastURL</key>