From be825af0edbe9bae34082d1c97ac7633adedc9b8 Mon Sep 17 00:00:00 2001 From: Jeevanandam M Date: Tue, 29 Oct 2013 12:10:59 +0530 Subject: [PATCH] prepared v4.1 release --- ReplyWithHeader.xcodeproj/project.pbxproj | 2 ++ ReplyWithHeader/MHHeaderString.m | 15 ++++++++------- ReplyWithHeader/MHPreferences.h | 1 + ReplyWithHeader/MHPreferences.m | 15 ++++++++++----- ReplyWithHeader/MailHeader.m | 4 ++-- .../Resources/en.lproj/MHPreferencesView.xib | 5 +++-- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ReplyWithHeader.xcodeproj/project.pbxproj b/ReplyWithHeader.xcodeproj/project.pbxproj index 850e18b..2d7e94b 100644 --- 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 index 700c278..fd4a1ae 100644 --- 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 index 9864e65..ea33a7b 100644 --- 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 index 52b99e1..bd25aa7 100644 --- a/ReplyWithHeader/MHPreferences.m +++ b/ReplyWithHeader/MHPreferences.m @@ -51,6 +51,7 @@ - (void)toggleRwhPreferencesOptions:(BOOL *)state [_MHEntourage2004SupportEnabled setEnabled:state]; [_MHNotifyNewVersion setEnabled:state]; [_MHSubjectPrefixTextEnabled setEnabled:state]; + [_MHRemoveSignatureEnabled setEnabled:state]; [self toggleRwhHeaderTypograpghyOptions:state]; [self toggleRwhHeaderLabelOptions:state]; @@ -58,7 +59,10 @@ - (void)toggleRwhPreferencesOptions:(BOOL *)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 index ceb51d7..dd78fbf 100644 --- 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 index c9fa39e..e6791af 100644 --- a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib +++ b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib @@ -1,8 +1,8 @@ - + - + @@ -17,6 +17,7 @@ +