Due to popular demand we now have the "Set Status" submenu also in the RMB menu

of the headers.
Patch by Laurent Montel <lmontel@mandrakesoft.com>.

svn path=/trunk/kdenetwork/kmail/; revision=74809

kmheaders.cpp

@@ -2061,6 +2061,7 @@ void KMHeaders::slotRMB()
   mOwner->folderToPopupMenu( dir, TRUE, this, &mMenuToFolder, msgMoveMenu );
   QPopupMenu *msgCopyMenu = new QPopupMenu();
   mOwner->folderToPopupMenu( dir, FALSE, this, &mMenuToFolder, msgCopyMenu );
+  QPopupMenu *setStatusMenu = new QPopupMenu();
 
   mOwner->replyAction->plug(menu);
   mOwner->replyAllAction->plug(menu);
@@ -2071,8 +2072,14 @@ void KMHeaders::slotRMB()
   mOwner->editAction->plug(menu);
   menu->insertItem(i18n("&Move to"), msgMoveMenu);
   menu->insertItem(i18n("&Copy to"), msgCopyMenu);
+  menu->insertItem(i18n("&Set Status"), setStatusMenu);
+  mOwner->newAction->plug(setStatusMenu);
+  mOwner->unreadAction->plug(setStatusMenu);
+   mOwner->readAction->plug(setStatusMenu);
+   mOwner->repliedAction->plug(setStatusMenu);
+   mOwner->queueAction->plug(setStatusMenu);
+   mOwner->sentAction->plug(setStatusMenu);
   mOwner->deleteAction->plug(menu);
-
   menu->exec (QCursor::pos(), 0);
   delete menu;
 }

kmmainwin.cpp

@@ -1512,17 +1512,17 @@ void KMMainWin::setupMenuBar()
 		      SLOT(slotEditMsg()), actionCollection(), "edit" );
 
   //----- Set status submenu
-  (void) new KAction( i18n("New"), 0, this,
+  newAction= new KAction( i18n("New"), 0, this,
     SLOT(slotSetMsgStatusNew()), actionCollection(), "status_new");
-  (void) new KAction( i18n("Unread"), 0, this,
+  unreadAction=new KAction( i18n("Unread"), 0, this,
     SLOT(slotSetMsgStatusUnread()), actionCollection(), "status_unread");
-  (void) new KAction( i18n("Read"), 0, this,
+  readAction=new KAction( i18n("Read"), 0, this,
     SLOT(slotSetMsgStatusRead()), actionCollection(), "status_read");
-  (void) new KAction( i18n("Replied"), 0, this,
+  repliedAction= new KAction( i18n("Replied"), 0, this,
     SLOT(slotSetMsgStatusReplied()), actionCollection(), "status_replied");
-  (void) new KAction( i18n("Queued"), 0, this,
+  queueAction=new KAction( i18n("Queued"), 0, this,
     SLOT(slotSetMsgStatusQueued()), actionCollection(), "status_queued");
-  (void) new KAction( i18n("Sent"), 0, this,
+  sentAction=new KAction( i18n("Sent"), 0, this,
     SLOT(slotSetMsgStatusSent()), actionCollection(), "status_sent");
 
   KActionMenu *moveActionMenu = new KActionMenu( i18n("&Move to" ),

kmmainwin.h

@@ -77,7 +77,8 @@ public:
   static void cleanup();
   KAction *replyAction, *replyAllAction, *replyListAction,
       *forwardAction, *redirectAction,
-    *deleteAction, *saveAsAction, *bounceAction, *editAction;
+    *deleteAction, *saveAsAction, *bounceAction, *editAction,
+    *newAction,*unreadAction,*readAction,*repliedAction,*queueAction,*sentAction;
 
 public slots:
   virtual void show();