From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * 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 --- kmail/kmsearchpattern.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kmail/kmsearchpattern.h') diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 00a26c7b..45ffe680 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -230,7 +230,8 @@ namespace KMail { { I18N_NOOP( "Spam" ), "kmmsgspam" }, { I18N_NOOP( "Ham" ), "kmmsgham" }, { I18N_NOOP( "To Do" ), "kmmsgtodo" }, - { I18N_NOOP( "Has Attachment"), "kmmsgattachment" } + { I18N_NOOP( "Invitation" ), "kmmsginvitation" }, + { I18N_NOOP( "Has Attachment"), "kmmsgattachment" } //must be last }; // If you change the ordering here; also do it in the array above enum StatusValueTypes { @@ -249,7 +250,8 @@ namespace KMail { StatusSpam = 12, StatusHam = 13, StatusToDo = 14, - StatusHasAttachment = 15 + StatusInvitation = 15, + StatusHasAttachment = 16 //must be last }; static const int StatusValueCount = @@ -291,7 +293,7 @@ public: KConfig group and there is a constructor, mainly used by KMFilter to initialize from a preset KConfig-Group. - From a class hierarchy point of view, it is a TQPtrList of + From a class hierarchy point of view, it is a TQPtrList of KMSearchRule's that adds the boolean operators (see Operator) 'and' and 'or' that connect the rules logically, and has a name under which it could be stored in the config file. -- cgit v1.2.3