prepared v4.1 release

jeevatkm · Oct 29, 2013 · be825af · be825af
1 parent 527371a
commit be825af
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/ReplyWithHeader.xcodeproj/project.pbxproj b/ReplyWithHeader.xcodeproj/project.pbxproj
@@ -504,6 +504,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "${SRCROOT}/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = ReplyWithHeader;
 				SDKROOT = macosx10.7;
@@ -517,6 +518,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "${SRCROOT}/ReplyWithHeader/Resources/en.lproj/MailHeader-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = ReplyWithHeader;
 				SDKROOT = macosx10.7;
 			};

diff --git a/ReplyWithHeader/MHHeaderString.m b/ReplyWithHeader/MHHeaderString.m
@@ -332,18 +332,19 @@ - (void)applyHeaderLabelChange
 // For now it does outlook mail label ordering
 - (void)applyHeaderLabelOptions
 {
+    int headerOrderMode = GET_DEFAULT_INT(MHHeaderOrderMode);
+    int headerLabelMode = GET_DEFAULT_INT(MHHeaderLabelMode);
+    MHLog(@"Mail Header Order mode: %d and Label mode: %d", headerOrderMode, headerLabelMode);
+
     // fix for #26 https://github.com/jeevatkm/ReplyWithHeader/issues/26
-    if ( [MailHeader isLocaleSupported] ) {
-        int headerOrderMode = GET_DEFAULT_INT(MHHeaderOrderMode);
-        int headerLabelMode = GET_DEFAULT_INT(MHHeaderLabelMode);
-        MHLog(@"Mail Header Order mode: %d and Label mode: %d", headerOrderMode, headerLabelMode);
+    if ( [MailHeader isLocaleSupported] ) {       
 
         if (headerOrderMode == 2)
             [self applyHeaderOrderChange];
-
-        if (headerLabelMode == 2)
-            [self applyHeaderLabelChange];
     }
+
+    if (headerLabelMode == 2)
+        [self applyHeaderLabelChange];
 }
 
 @end
diff --git a/ReplyWithHeader/MHPreferences.h b/ReplyWithHeader/MHPreferences.h
@@ -47,6 +47,7 @@
     IBOutlet NSButton *_MHHeaderOptionEnabled;
     IBOutlet NSButton *_MHNotifyNewVersion;
     IBOutlet NSButton *_MHSubjectPrefixTextEnabled;
+    IBOutlet NSButton *_MHRemoveSignatureEnabled;
     IBOutlet NSTextField *_MHHeaderInfoFontAndSize;
     IBOutlet NSColorWell *_MHColorWell;
     IBOutlet NSMatrix *_MHHeaderOrderMode;

diff --git a/ReplyWithHeader/MHPreferences.m b/ReplyWithHeader/MHPreferences.m
@@ -51,14 +51,18 @@ - (void)toggleRwhPreferencesOptions:(BOOL *)state
     [_MHEntourage2004SupportEnabled setEnabled:state];
     [_MHNotifyNewVersion setEnabled:state];
     [_MHSubjectPrefixTextEnabled setEnabled:state];
+    [_MHRemoveSignatureEnabled setEnabled:state];
 
     [self toggleRwhHeaderTypograpghyOptions:state];
     [self toggleRwhHeaderLabelOptions:state];
 }
 
 - (void)toggleRwhHeaderLabelOptions:(BOOL *)state
 {
-    [_MHHeaderOrderMode setEnabled:state];
+    if ([MailHeader isLocaleSupported]) {
+        [_MHHeaderOrderMode setEnabled:state];
+    }
+
     [_MHHeaderLabelMode setEnabled:state];
 }
 
@@ -189,12 +193,13 @@ - (void)awakeFromNib
 
     // fix for #26 https://github.com/jeevatkm/ReplyWithHeader/issues/26
     if ( ![MailHeader isLocaleSupported] ) {
-        [self toggleRwhHeaderLabelOptions:FALSE];
-        [_MHHeaderOptionEnabled setEnabled:FALSE];
+        //[self toggleRwhHeaderLabelOptions:FALSE];
+        //[_MHHeaderOptionEnabled setEnabled:FALSE];
+        [_MHHeaderOrderMode setEnabled:FALSE];
 
         NSString *toolTip = @"Currently this feature is supported in english(en) locale only.";
-        [_MHHeaderOptionEnabled setToolTip:toolTip];
-        [_MHHeaderLabelMode setToolTip:toolTip];
+        //[_MHHeaderOptionEnabled setToolTip:toolTip];
+        //[_MHHeaderLabelMode setToolTip:toolTip];
         [_MHHeaderOrderMode setToolTip:toolTip];
     }
 }

diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m
@@ -265,10 +265,10 @@ + (void)initialize
     // fix for #26 https://github.com/jeevatkm/ReplyWithHeader/issues/26
     if ( ![self isLocaleSupported] )
     {
-        NSLog(@"%@ - Outlook Label & Order, currently supported in english locale only.",
+        NSLog(@"%@ - Outlook order mode, currently supported in english locale only.",
               [self bundleName]);
 
-        SET_DEFAULT_INT(1, MHHeaderLabelMode);
+        //SET_DEFAULT_INT(1, MHHeaderLabelMode);
         SET_DEFAULT_INT(1, MHHeaderOrderMode);
     }
 

diff --git a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MHPreferences">
@@ -17,6 +17,7 @@
                 <outlet property="_MHHeaderOrderMode" destination="255" id="356"/>
                 <outlet property="_MHHeaderTypographyEnabled" destination="203" id="365"/>
                 <outlet property="_MHNotifyNewVersion" destination="324" id="359"/>
+                <outlet property="_MHRemoveSignatureEnabled" destination="3x5-oa-h0B" id="jpj-o4-8IN"/>
                 <outlet property="_MHSelectFont" destination="222" id="366"/>
                 <outlet property="_MHSubjectPrefixTextEnabled" destination="347" id="357"/>
                 <outlet property="_preferencesView" destination="38" id="269"/>