* 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, 17 insertions, 1 deletions

diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index b900b7b5..cc543195 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -138,7 +138,11 @@ void MessageActions::setSelectedVisibleSernums(const TQValueList< Q_UINT32 > & s
 
 void MessageActions::updateActions()
 {
-  const bool singleMsg = (mCurrentMessage != 0);
+  bool singleMsg = (mCurrentMessage != 0);
+  if ( mCurrentMessage && mCurrentMessage->parent() ) {
+    if ( mCurrentMessage->parent()->isTemplates() )
+      singleMsg = false;
+  }
   const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage;
   const bool flagsAvailable = GlobalSettings::self()->allowLocalFlags() ||
       !((mCurrentMessage && mCurrentMessage->parent()) ? mCurrentMessage->parent()->isReadOnly() : true);
@@ -164,6 +168,18 @@ void MessageActions::updateActions()
   mEditAction->setEnabled( singleMsg );
 }
 
+template<typename T> void MessageActions::replyCommand()
+{
+  if ( !mCurrentMessage )
+    return;
+  const TQString text = mMessageView ? mMessageView->copyText() : "";
+  KMCommand *command = new T( mParent, mCurrentMessage, text );
+  connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
+           this, TQT_SIGNAL( replyActionFinished() ) );
+  command->start();
+}
+
+
 void MessageActions::slotCreateTodo()
 {
   if ( !mCurrentMessage )