* 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, 13 insertions, 8 deletions

diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 1e2d74cbd..8b4f37e8f 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -394,9 +394,9 @@ void TemplatesConfiguration::importFromPhrases()
     "----------  %1  ----------\n"
     "\n"
     "Subject: %OFULLSUBJECT\n"
-    "Date: %ODATE\n"
+    "Date: %ODATE, %OTIMELONG\n"
     "From: %OFROMADDR\n"
-    "To: %OTOADDR\n"
+    "%OADDRESSEESADDR\n"
     "\n"
     "%TEXT\n"
     "-------------------------------------------------------\n"
@@ -509,38 +509,43 @@ void TemplatesConfiguration::slotInsertCommand( TQString cmd, int adjustCursor )
 TQString TemplatesConfiguration::defaultNewMessage() {
   return i18n(
     "%REM=\"Default new message template\"%-\n"
-    "%BLANK"
+    "%BLANK\n"
+    "%BLANK\n"
+    "%BLANK\n"
     );
 }
 
 TQString TemplatesConfiguration::defaultReply() {
   return i18n(
+    "%CURSOR\n"
+    "%BLANK\n"
     "%REM=\"Default reply template\"%-\n"
     "On %ODATEEN %OTIMELONGEN you wrote:\n"
     "%QUOTE\n"
-    "%CURSOR\n"
     );
 }
 
 TQString TemplatesConfiguration::defaultReplyAll() {
   return i18n(
+    "%CURSOR\n"
+    "%BLANK\n"
     "%REM=\"Default reply all template\"%-\n"
     "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
     "%QUOTE\n"
-    "%CURSOR\n"
     );
 }
 
-TQString TemplatesConfiguration::defaultForward() {
+TQString TemplatesConfiguration::defaultForward()
+{
   return i18n(
     "%REM=\"Default forward template\"%-\n"
     "\n"
     "----------  Forwarded Message  ----------\n"
     "\n"
     "Subject: %OFULLSUBJECT\n"
-    "Date: %ODATE\n"
+    "Date: %ODATE, %OTIMELONG\n"
     "From: %OFROMADDR\n"
-    "To: %OTOADDR\n"
+    "%OADDRESSEESADDR\n"
     "\n"
     "%TEXT\n"
     "-------------------------------------------------------\n"