* 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

1 files changed, 54 insertions, 12 deletions

diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index afb228cf..4192d234 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -24,6 +24,8 @@
           <choice name="SelectFirstNew"/>
           <choice name="SelectFirstUnreadNew"/>
           <choice name="SelectLastSelected"/>
+          <choice name="SelectNewest"/>
+          <choice name="SelectOldest"/>
         </choices>
         <default>SelectLastSelected</default>
       </entry>
@@ -153,7 +155,7 @@
 
       <entry name="CloseToQuotaThreshold" type="Int">
         <label>The threshold for when to warn the user that a folder is nearing its quota limit.</label>
-         <default>85</default>
+         <default>80</default>
       </entry>
 
     </group>
@@ -184,6 +186,12 @@
         <default>false</default>
       </entry>
 
+     <entry name="OutlookCompatibleInvitationReplyComments" type="Bool">
+        <label>Outlook compatible invitation reply comments</label>
+        <whatsthis>When replying to invitations, send the reply comment in way that Microsoft Outlook understands.</whatsthis>
+        <default>false</default>
+      </entry>
+
       <entry name="AutomaticSending" type="Bool">
         <label>Automatic invitation sending</label>
         <whatsthis>When this is checked, you will not see the mail composer window. Instead, all invitation mails are sent automatically. If you want to see the mail before sending it, you can uncheck this option. However, be aware that the text in the composer window is in iCalendar syntax, and you should not try modifying it by hand.</whatsthis>
@@ -200,15 +208,25 @@
         </choices>
         <default>AskForAllButAcceptance</default>
       </entry>
-      
+
       <entry name="DeleteInvitationEmailsAfterSendingReply" type="Bool">
         <label>Delete invitation emails after the reply to them has been sent</label>
         <whatsthis>When this is checked, received invitation emails that have been replied to will be moved to the Trash folder, once the reply has been successfully sent.</whatsthis>
         <default>true</default>
       </entry>
-      
 
-    </group> 
+      <entry name="ShowToltecReplacementText" type="Bool">
+        <label>When encountering a Toltec scheduling message, display a custom replacement text for it.</label>
+        <default>true</default>
+      </entry>
+
+      <entry name="ToltecReplacementText" type="String">
+        <label>The text that will be displayed as a replacement when encountering Toltec scheduling messages.</label>
+        <default code="true">KMail::ObjectTreeParser::defaultToltecReplacementText()</default>
+      </entry>
+
+
+    </group>
 
     <group name="IMAP Resource">
       <entry name="TheIMAPResourceEnabled" type="Bool">
@@ -253,14 +271,12 @@
         <default>0</default>
       </entry>
 
-      <entry name="FilterOnlyDIMAPInbox" type="Bool">
-        <default>true</default>
-        <label>Only filter mails received in disconnected IMAP inbox.</label>
-      </entry>
       <entry name="FilterGroupwareFolders" type="Bool">
         <default>false</default>
         <label>Also filter new mails received in groupware folders.</label>
       </entry>
+      <entry name="FilterSourceFolders" type="IntList">
+      </entry>
 
       <entry name="ImmediatlySyncDIMAPOnGroupwareChanges" type="Bool">
         <default>true</default>
@@ -293,10 +309,6 @@
         <whatsthis>This option enables or disables the search line edit above the message list which can be used to quickly search the information shown in the message list.</whatsthis>
         <default>true</default>
       </entry>
-      <entry name="EnableFolderQuickSearch" type="Bool">
-        <label>Show folder quick search line edit</label>
-        <default>false</default>
-      </entry>
       <entry name="HideLocalInbox" type="Bool">
         <label>Hide local inbox if unused</label>
         <default>true</default>
@@ -333,6 +345,11 @@
         <whatsthis>Remember this mail transport, so that it will be used in future composer windows as well.</whatsthis>
         <default>false</default>
       </entry>
+      <entry name="StickyDictionary" type="Bool">
+        <whatsthis>Remember this dictionary, so that it will be used in future composer windows as well.
+        </whatsthis>
+        <default>false</default>
+      </entry>
       <entry name="WordWrap" type="Bool" key="word-wrap">
         <label>Word &amp;wrap at column:</label>
         <default>true</default>
@@ -347,8 +364,21 @@
         <min>30</min>
         <max>255</max>
       </entry>
+      <entry name="TooManyRecipients" type="Bool" key="too-many-recipients">
+        <label>Warn if the number of recipients is larger than</label>
+        <default>true</default>
+        <whatsthis>If the number of recipients is larger than this value, KMail will warn and ask for a confirmation before sending the mail. The warning can be turned off.</whatsthis>
+      </entry>
+      <entry name="RecipientThreshold" type="Int" key="recipient-threshold">
+        <label></label>
+        <default>5</default>
+        <min>1</min>
+        <max>100</max>
+        <whatsthis>If the number of recipients is larger than this value, KMail will warn and ask for a confirmation before sending the mail. The warning can be turned off.</whatsthis>
+     </entry>
       <entry name="PreviousIdentity" type="UInt" key="previous-identity" />
       <entry name="PreviousFcc" type="String" key="previous-fcc" />
+      <entry name="PreviousDictionary" type="String" />
       <entry name="TransportHistory" type="StringList" key="transport-history" />
       <entry name="CurrentTransport" type="String" key="current-transport" />
       <entry name="DefaultTransport" type="String" key="default-transport" />
@@ -436,6 +466,14 @@
         <label>Use smart &amp;quoting</label>
         <default>true</default>
       </entry>
+      <entry name="StripSignature" type="Bool">
+        <label>Remove the signature when replying</label>
+        <default>true</default>
+      </entry>
+      <entry name="QuoteSelectionOnly" type="Bool">
+        <label>Only quote selected text when replying</label>
+        <default>true</default>
+      </entry>
 
       <entry name="AddresseeSelectorType" type="Enum">
         <label>Type of addressee selector</label>
@@ -515,6 +553,10 @@
     </group>
 
     <group name="Reader">
+     <entry name="CloseAfterReplyOrForward" type="Bool">
+       <label>Close message window after replying or forwarding the message.</label>
+       <default>false</default>
+     </entry>
      <entry name="UseDefaultColors" type="Bool" key="defaultColors">
        <default>true</default>
      </entry>