From 49fe1a4bdabfa3ac425fd39c7979de3fe0edc3d5 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Wed, 29 Sep 2010 09:14:14 +0000
Subject: [PATCH] Use some "Akonadi::StandardMailActionManager"

svn path=/trunk/KDE/kdepim/kmail/; revision=1180871
---
 messageactions.cpp | 35 +++++++++--------------------------
 messageactions.h   |  2 --
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/messageactions.cpp b/messageactions.cpp
index 6b4cd67bc..c5567d206 100644
--- a/messageactions.cpp
+++ b/messageactions.cpp
@@ -22,6 +22,7 @@
 #include "kmreaderwin.h"
 #include "kmkernel.h"
 #include "mailkernel.h"
+#include "kmmainwidget.h"
 #include "util.h"
 
 #include "messagecore/annotationdialog.h"
@@ -111,24 +112,16 @@ MessageActions::MessageActions( KActionCollection *ac, QWidget* parent ) :
   mStatusMenu = new KActionMenu ( i18n( "Mar&k Message" ), this );
   mActionCollection->addAction( "set_status", mStatusMenu );
 
-  KAction *action;
 
-  action = new KAction( KIcon("mail-mark-read"), i18n("Mark Message as &Read"), this );
-  action->setHelpText( i18n("Mark selected messages as read") );
-  connect( action, SIGNAL(triggered(bool)),
-           this, SLOT(slotSetMsgStatusRead()) );
-  mActionCollection->addAction( "status_read", action );
-  mStatusMenu->addAction( action );
+  KMMainWidget* mainwin = kmkernel->getKMMainWidget();
+  if ( mainwin ) {
+    KAction * action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsRead );
+    mStatusMenu->addAction( action );
 
-  action = new KAction( KIcon("mail-mark-unread"), i18n("Mark Message as &Unread"), this );
-  action->setHelpText( i18n("Mark selected messages as unread") );
-  connect( action, SIGNAL(triggered(bool)),
-           this, SLOT(slotSetMsgStatusUnread()) );
-  mActionCollection->addAction( "status_unread", action );
-  action->setShortcut( Qt::CTRL+Qt::Key_U );
-  mStatusMenu->addAction( action );
-
-  mStatusMenu->addSeparator();
+    action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsUnread );
+    mStatusMenu->addAction( action );
+    mStatusMenu->addSeparator();
+  }
 
   mToggleFlagAction = new KToggleAction( KIcon("mail-mark-important"),
                                          i18n("Mark Message as &Important"), this );
@@ -438,16 +431,6 @@ void MessageActions::slotNoQuoteReplyToMsg()
   command->start();
 }
 
-void MessageActions::slotSetMsgStatusUnread()
-{
-  setMessageStatus( Akonadi::MessageStatus::statusUnread() );
-}
-
-void MessageActions::slotSetMsgStatusRead()
-{
-  setMessageStatus( Akonadi::MessageStatus::statusRead() );
-}
-
 void MessageActions::slotSetMsgStatusFlag()
 {
   setMessageStatus( Akonadi::MessageStatus::statusImportant(), true );
diff --git a/messageactions.h b/messageactions.h
index 26c43c562..290f786a3 100644
--- a/messageactions.h
+++ b/messageactions.h
@@ -110,8 +110,6 @@ class MessageActions : public QObject
     void slotReplyAllToMsg();
     void slotNoQuoteReplyToMsg();
     void slotCreateTodo();
-    void slotSetMsgStatusUnread();
-    void slotSetMsgStatusRead();
     void slotSetMsgStatusToAct();
     void slotSetMsgStatusFlag();
     void slotRunUrl( QAction *urlAction );