From b433d15536f049ca90e8bd04deb4d1e837fe97cf Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 26 Jan 2013 11:02:41 +0000 Subject: [PATCH] FeedReader: - Fixed enabled state of read all button - Fixed copy links from context menu git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6091 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/FeedReader/gui/FeedReaderMessageWidget.cpp | 6 ++++-- plugins/FeedReader/gui/FeedReaderMessageWidget.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp index f7eebb105..eb9472179 100644 --- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp +++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp @@ -224,8 +224,10 @@ void FeedReaderMessageWidget::setFeedId(const std::string &feedId) ui->msgTreeWidget->setPlaceholderText(""); } else { if (mFeedInfo.flag.forum) { + ui->msgReadAllButton->setEnabled(false); ui->msgTreeWidget->setPlaceholderText(tr("The messages will be added to the forum")); } else { + ui->msgReadAllButton->setEnabled(true); ui->msgTreeWidget->setPlaceholderText(""); } } @@ -310,7 +312,7 @@ void FeedReaderMessageWidget::msgTreeCustomPopupMenu(QPoint /*point*/) contextMnu.addSeparator(); - action = contextMnu.addAction(QIcon(""), tr("Copy link"), this, SLOT(copyLinskMsg())); + action = contextMnu.addAction(QIcon(""), tr("Copy link"), this, SLOT(copySelectedLinksMsg())); action->setEnabled(!selectedItems.empty()); action = contextMnu.addAction(QIcon(""), tr("Remove"), this, SLOT(removeMsg())); @@ -727,7 +729,7 @@ void FeedReaderMessageWidget::markAllAsReadMsg() setMsgAsReadUnread(items, true); } -void FeedReaderMessageWidget::copyLinksMsg() +void FeedReaderMessageWidget::copySelectedLinksMsg() { QString links; diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.h b/plugins/FeedReader/gui/FeedReaderMessageWidget.h index e4034f966..bc713f5b4 100644 --- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h +++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h @@ -47,7 +47,7 @@ private slots: void markAsReadMsg(); void markAsUnreadMsg(); void markAllAsReadMsg(); - void copyLinksMsg(); + void copySelectedLinksMsg(); void removeMsg(); void processFeed(); void openLinkMsg();