Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Connected the menu actions reply, reply all and forward in MessagesDialog. Now they work again.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4233 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-06-05 13:37:49 +00:00
parent 11a56d2737
commit a5ccab9a13
2 changed files with 64 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

38
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -41,9 +41,6 @@
/* Images for context menu icons */
#define IMAGE_MESSAGE ":/images/folder-draft.png"
#define IMAGE_MESSAGEREPLY ":/images/mail_reply.png"
#define IMAGE_MESSAGEREPLYALL ":/images/mail_replyall.png"
#define IMAGE_MESSAGEFORWARD ":/images/mail_forward.png"
#define IMAGE_MESSAGEREMOVE ":/images/message-mail-imapdelete.png"
#define IMAGE_STAR_ON ":/images/star-on-16.png"
#define IMAGE_STAR_OFF ":/images/star-off-16.png"
@ -252,12 +249,12 @@ MessagesDialog::MessagesDialog(QWidget *parent)
ui.forwardmessageButton->setToolTip(tr("Forward selected Message"));
ui.replyallmessageButton->setToolTip(tr("Reply to All"));
QMenu * printmenu = new QMenu();
QMenu *printmenu = new QMenu();
printmenu->addAction(ui.actionPrint);
printmenu->addAction(ui.actionPrintPreview);
ui.printbutton->setMenu(printmenu);
QMenu * viewmenu = new QMenu();
QMenu *viewmenu = new QMenu();
viewmenu->addAction(ui.actionTextBesideIcon);
viewmenu->addAction(ui.actionIconOnly);
//viewmenu->addAction(ui.actionTextUnderIcon);
@ -559,18 +556,14 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
contextMnu.addSeparator();
action = contextMnu.addAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply to Message"), this, SLOT(replytomessage()));
if (nCount != 1) {
action->setDisabled(true);
}
action = contextMnu.addAction(QIcon(IMAGE_MESSAGEREPLYALL), tr("Reply to All"), this, SLOT(replyallmessage()));
if (nCount != 1) {
action->setDisabled(true);
}
action = contextMnu.addAction(QIcon(IMAGE_MESSAGEFORWARD), tr("Forward Message"), this, SLOT(forwardmessage()));
if (nCount != 1) {
action->setDisabled(true);
}
contextMnu.addAction(ui.actionReply);
ui.actionReply->setEnabled(nCount == 1);
contextMnu.addAction(ui.actionReplyAll);
ui.actionReplyAll->setEnabled(nCount == 1);
contextMnu.addAction(ui.actionForward);
ui.actionForward->setEnabled(nCount == 1);
contextMnu.addSeparator();
@ -1936,6 +1929,17 @@ void MessagesDialog::connectActions()
ui.actionSaveAs->disconnect();
ui.removemessageButton->disconnect();
ui.actionReply->disconnect();
ui.actionReplyAll->disconnect();
ui.actionForward->disconnect();
if (msgWidget) {
// connect actions
msg->connectAction(MessageWidget::ACTION_REPLY, ui.actionReply);
msg->connectAction(MessageWidget::ACTION_REPLY_ALL, ui.actionReplyAll);
msg->connectAction(MessageWidget::ACTION_FORWARD, ui.actionForward);
}
if (msg) {
if (tab == 0) {
// connect with own slot to remove multiple messages