From 79688674ece4418aebd52cfdb1cd4a01c0a880c6 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 26 May 2010 15:20:31 +0000 Subject: [PATCH] changed Messages Context menu order git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3006 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessagesDialog.cpp | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 28ed63d94..e0ab31697 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -411,21 +411,7 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point ) QList RowsRead; QList RowsUnread; int nCount = getSelectedMsgCount (&RowsRead, &RowsUnread); - - if (nCount > 1) { - removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Messages" ), this ); - } else { - removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Message" ), this ); - } - - connect( removemsgAct , SIGNAL( triggered() ), this, SLOT( removemessage() ) ); - contextMnu.addAction( removemsgAct); - - contextMnu.addAction( ui.actionSave_as); - contextMnu.addAction( ui.actionPrintPreview); - contextMnu.addAction( ui.actionPrint); - contextMnu.addSeparator(); - + #ifdef STATIC_MSGID markAsRead = new QAction(QIcon(":/images/message-mail-read.png"), tr( "Mark as read" ), this); connect(markAsRead , SIGNAL(triggered()), this, SLOT(markAsRead())); @@ -444,6 +430,20 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point ) contextMnu.addSeparator(); #endif + if (nCount > 1) { + removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Messages" ), this ); + } else { + removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Message" ), this ); + } + + connect( removemsgAct , SIGNAL( triggered() ), this, SLOT( removemessage() ) ); + contextMnu.addAction( removemsgAct); + + contextMnu.addAction( ui.actionSave_as); + contextMnu.addAction( ui.actionPrintPreview); + contextMnu.addAction( ui.actionPrint); + contextMnu.addSeparator(); + newmsgAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "New Message" ), this ); connect( newmsgAct , SIGNAL( triggered() ), this, SLOT( newmessage() ) ); contextMnu.addAction( newmsgAct);