From fa96fffe9539d2fc0e1844542aaa071dc620def1 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Wed, 29 Sep 2010 12:26:27 +0000
Subject: [PATCH] Use more "Akonadi::StandardMailActionManager"

svn path=/trunk/KDE/kdepim/kmail/; revision=1180928
---
 messageactions.cpp | 41 ++++++-----------------------------------
 messageactions.h   |  3 ---
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/messageactions.cpp b/messageactions.cpp
index d2270a43c..48dc65f73 100644
--- a/messageactions.cpp
+++ b/messageactions.cpp
@@ -122,26 +122,13 @@ MessageActions::MessageActions( KActionCollection *ac, QWidget* parent ) :
     action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsUnread );
     mStatusMenu->addAction( action );
     mStatusMenu->addSeparator();
-  }
+    action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsImportant );
+    mStatusMenu->addAction( action );
+
+    action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsActionItem );
+    mStatusMenu->addAction( action );
 
-  mToggleFlagAction = new KToggleAction( KIcon("mail-mark-important"),
-                                         i18n("Mark Message as &Important"), this );
-  mToggleFlagAction->setShortcut( Qt::CTRL + Qt::Key_I );
-  connect( mToggleFlagAction, SIGNAL(triggered(bool)),
-           this, SLOT(slotSetMsgStatusFlag()) );
-  mToggleFlagAction->setCheckedState( KGuiItem(i18n("Remove &Important Message Mark")) );
-  mToggleFlagAction->setIconText( i18n( "Important" ) );
-  mActionCollection->addAction( "status_flag", mToggleFlagAction );
-  mStatusMenu->addAction( mToggleFlagAction );
-
-  mToggleToActAction = new KToggleAction( KIcon("mail-mark-task"),
-                                          i18n("Mark Message as &Action Item"), this );
-  connect( mToggleToActAction, SIGNAL(triggered(bool)),
-           this, SLOT(slotSetMsgStatusToAct()) );
-  mToggleToActAction->setCheckedState( KGuiItem(i18n("Remove &Action Item Message Mark")) );
-  mToggleToActAction->setIconText( i18n( "Action Item" ) );
-  mActionCollection->addAction( "status_toact", mToggleToActAction );
-  mStatusMenu->addAction( mToggleToActAction );
+  }
 
   mEditAction = new KAction( KIcon("accessories-text-editor"), i18n("&Edit Message"), this );
   mActionCollection->addAction( "edit", mEditAction );
@@ -279,14 +266,8 @@ void MessageActions::updateActions()
   updateAnnotateAction();
 
   mStatusMenu->setEnabled( multiVisible );
-  mToggleFlagAction->setEnabled( flagsAvailable );
-  mToggleToActAction->setEnabled( flagsAvailable );
 
   if ( mCurrentItem.hasPayload<KMime::Message::Ptr>() ) {
-    Akonadi::MessageStatus status;
-    status.setStatusFromFlags( mCurrentItem.flags() );
-    mToggleToActAction->setChecked( status.isToAct() );
-    mToggleFlagAction->setChecked( status.isImportant() );
 
     MessageCore::MailingList mailList;
     mailList = MessageCore::MailingList::detect( MessageCore::Util::message( mCurrentItem ) );
@@ -432,16 +413,6 @@ void MessageActions::slotNoQuoteReplyToMsg()
   command->start();
 }
 
-void MessageActions::slotSetMsgStatusFlag()
-{
-  setMessageStatus( Akonadi::MessageStatus::statusImportant(), true );
-}
-
-void MessageActions::slotSetMsgStatusToAct()
-{
-  setMessageStatus( Akonadi::MessageStatus::statusToAct(), true );
-}
-
 void MessageActions::slotRunUrl( QAction *urlAction )
 {
   const QVariant q = urlAction->data();
diff --git a/messageactions.h b/messageactions.h
index 290f786a3..1cafe9202 100644
--- a/messageactions.h
+++ b/messageactions.h
@@ -110,8 +110,6 @@ class MessageActions : public QObject
     void slotReplyAllToMsg();
     void slotNoQuoteReplyToMsg();
     void slotCreateTodo();
-    void slotSetMsgStatusToAct();
-    void slotSetMsgStatusFlag();
     void slotRunUrl( QAction *urlAction );
     void slotPrintMsg();
 
@@ -131,7 +129,6 @@ class MessageActions : public QObject
     KActionMenu *mStatusMenu;
     KActionMenu *mForwardActionMenu;
     KActionMenu *mMailingListActionMenu;
-    KToggleAction *mToggleFlagAction, *mToggleToActAction;
     KAction *mEditAction, *mAnnotateAction, *mPrintAction;
     bool mKorganizerIsOnSystem;
     Akonadi::Monitor *mMonitor;