added configurable option for header blue line border

jeevatkm · Oct 19, 2018 · 181f41e · 181f41e
1 parent 3cc0aad
commit 181f41e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 50 deletions.
diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h
@@ -66,8 +66,9 @@
 #define MHSubjectPrefixTextEnabled @"MHSubjectPrefixTextEnabled"
 #define MHRawHeadersEnabled @"MHRawHeadersEnabled"
 #define MHBundleHeaderLanguageCode @"MHBundleHeaderLanguageCode"
+#define MHHeaderBlueLineBorderEnabled @"MHHeaderBlueLineBorderEnabled"
 
-#define MHPreferencesNibName @"MHPreferencesView"
+#define MHPreferencesNibName @"MHPreferences"
 
 #define MHLogEnabled @"MHDebugLog"
 

diff --git a/ReplyWithHeader/MHQuotedMailOriginal.h b/ReplyWithHeader/MHQuotedMailOriginal.h
@@ -38,6 +38,7 @@
 @private
     id document;
     DOMDocumentFragment *headerBorder;
+    DOMDocumentFragment *headerBorderSpacer;
     BOOL isHTMLMail;
     DOMHTMLDivElement *originalEmail;
     int textNodeLocation; //which

diff --git a/ReplyWithHeader/MHQuotedMailOriginal.m b/ReplyWithHeader/MHQuotedMailOriginal.m
@@ -75,12 +75,26 @@ - (void)insertForHTMLMail:(DOMDocumentFragment *)headerFragment
     {
         DOMNode *nodeRef = [self getBlockquoteTagNode];
         [nodeRef insertBefore:headerFragment refChild:[nodeRef firstChild]];
-        [nodeRef insertBefore:headerBorder refChild:[nodeRef firstChild]];
+        if (GET_DEFAULT_BOOL(MHHeaderBlueLineBorderEnabled))
+        {
+            [nodeRef insertBefore:headerBorder refChild:[nodeRef firstChild]];
+        }
+        else
+        {
+            [nodeRef insertBefore:headerBorderSpacer refChild:[nodeRef firstChild]];
+        }
     }
     else
     {
         [originalEmail insertBefore:headerFragment refChild: [originalEmail firstChild]];
-        [originalEmail insertBefore:headerBorder refChild: [originalEmail firstChild]];
+        if (GET_DEFAULT_BOOL(MHHeaderBlueLineBorderEnabled))
+        {
+            [originalEmail insertBefore:headerBorder refChild: [originalEmail firstChild]];
+        }
+        else
+        {            
+            [originalEmail insertBefore:headerBorderSpacer refChild: [originalEmail firstChild]];
+        }
     }
 }
 
@@ -255,6 +269,7 @@ - (void)initVars
 
     // now initialze header border string into html form
     headerBorder = [self createDocumentFragment:borderString];
+    headerBorderSpacer = [self createDocumentFragment:@"<br><br>"];
 
     textNodeLocation = 0;
 }

diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m
@@ -237,6 +237,7 @@ + (void)assignUserDefaults
                           [NSArchiver archivedDataWithRootObject:[NSColor blackColor]], MHHeaderColor,
                           [NSNumber numberWithBool:NO], MHSubjectPrefixTextEnabled,
                           [NSNumber numberWithBool:NO], MHRawHeadersEnabled,
+                          [NSNumber numberWithBool:YES], MHHeaderBlueLineBorderEnabled,
                           [NSNumber numberWithBool:NO], MHRemoveSignatureEnabled,
                           [NSNumber numberWithInt:1], MHHeaderAttributionFromTagStyle,
                           [NSNumber numberWithInt:1], MHHeaderAttributionToCcTagStyle,