summaryrefslogtreecommitdiffstats
path: root/kmail/kmsearchpatternedit.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmsearchpatternedit.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmsearchpatternedit.cpp')
-rw-r--r--kmail/kmsearchpatternedit.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index a928e57f3..399bc0e15 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -37,7 +37,13 @@ static const struct {
{ "<recipients>", I18N_NOOP( "All Recipients" ) },
{ "<size>", I18N_NOOP( "Size in Bytes" ) },
{ "<age in days>", I18N_NOOP( "Age in Days" ) },
- { "<status>", I18N_NOOP( "Message Status" ) }
+ { "<status>", I18N_NOOP( "Message Status" ) },
+ { "Subject", I18N_NOOP( "Subject" ) },
+ { "From", I18N_NOOP( "From" ) },
+ { "To", I18N_NOOP( "To" ) },
+ { "CC", I18N_NOOP( "CC" ) },
+ { "Reply-To", I18N_NOOP( "Reply To" ) },
+ { "Organization", I18N_NOOP( "Organization" ) }
};
static const int SpecialRuleFieldsCount =
sizeof( SpecialRuleFields ) / sizeof( *SpecialRuleFields );
@@ -247,16 +253,16 @@ void KMSearchRuleWidget::initFieldList( bool headersOnly, bool absoluteDates )
mFilterFieldList.append( i18n( SpecialRuleFields[Size].displayName ) );
if ( !absoluteDates )
mFilterFieldList.append( i18n( SpecialRuleFields[AgeInDays].displayName ) );
- mFilterFieldList.append( i18n( SpecialRuleFields[Status].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[Subject].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[From].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[To].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[CC].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[ReplyTo].displayName ) );
+ mFilterFieldList.append( i18n( SpecialRuleFields[Organization].displayName ) );
+
// these others only represent message headers and you can add to
// them as you like
- mFilterFieldList.append("Subject");
- mFilterFieldList.append("From");
- mFilterFieldList.append("To");
- mFilterFieldList.append("CC");
- mFilterFieldList.append("Reply-To");
mFilterFieldList.append("List-Id");
- mFilterFieldList.append("Organization");
mFilterFieldList.append("Resent-From");
mFilterFieldList.append("X-Loop");
mFilterFieldList.append("X-Mailing-List");