mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 06:06:10 -04:00
Added a standard tab to GxsForums and FeedReader.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
999d9c3920
commit
35cc460e71
12 changed files with 252 additions and 58 deletions
|
|
@ -68,11 +68,16 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
|
|||
connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
|
||||
|
||||
/* connect signals */
|
||||
connect(ui->feedTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(feedItemChanged(QTreeWidgetItem*)));
|
||||
connect(ui->messageTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(messageTabCloseRequested(int)));
|
||||
|
||||
connect(ui->feedTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
|
||||
if (!style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, NULL, this)) {
|
||||
// need signal itemClicked too
|
||||
connect(ui->feedTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
|
||||
}
|
||||
connect(ui->feedTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(feedTreeCustomPopupMenu(QPoint)));
|
||||
|
||||
connect(ui->messageTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(messageTabCloseRequested(int)));
|
||||
connect(ui->messageTabWidget, SIGNAL(currentChanged(int)), this, SLOT(messageTabChanged(int)));
|
||||
|
||||
connect(ui->feedAddButton, SIGNAL(clicked()), this, SLOT(newFeed()));
|
||||
connect(ui->feedProcessButton, SIGNAL(clicked()), this, SLOT(processFeed()));
|
||||
|
||||
|
|
@ -102,7 +107,11 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
|
|||
|
||||
ui->feedTreeWidget->installEventFilter(this);
|
||||
|
||||
feedItemChanged(NULL);
|
||||
mMessageWidget = createMessageWidget("");
|
||||
// remove close button of the the first tab
|
||||
ui->messageTabWidget->hideCloseButton(ui->messageTabWidget->indexOf(mMessageWidget));
|
||||
|
||||
feedTreeItemActivated(NULL);
|
||||
}
|
||||
|
||||
FeedReaderDialog::~FeedReaderDialog()
|
||||
|
|
@ -231,14 +240,33 @@ std::string FeedReaderDialog::currentFeedId()
|
|||
return item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString();
|
||||
}
|
||||
|
||||
void FeedReaderDialog::setCurrentFeedId(const std::string &feedId)
|
||||
{
|
||||
if (feedId.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
QTreeWidgetItemIterator it(ui->feedTreeWidget);
|
||||
QTreeWidgetItem *item;
|
||||
while ((item = *it) != NULL) {
|
||||
if (item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString() == feedId) {
|
||||
ui->feedTreeWidget->setCurrentItem(item);
|
||||
break;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
void FeedReaderDialog::feedTreeCustomPopupMenu(QPoint /*point*/)
|
||||
{
|
||||
QMenu contextMnu(this);
|
||||
|
||||
bool folder = false;
|
||||
std::string feedId;
|
||||
QTreeWidgetItem *item = ui->feedTreeWidget->currentItem();
|
||||
if (item) {
|
||||
folder = item->data(COLUMN_FEED_DATA, ROLE_FEED_FOLDER).toBool();
|
||||
feedId = item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString();
|
||||
}
|
||||
|
||||
QMenu *menu = contextMnu.addMenu(QIcon(""), tr("New"));
|
||||
|
|
@ -253,6 +281,13 @@ void FeedReaderDialog::feedTreeCustomPopupMenu(QPoint /*point*/)
|
|||
|
||||
contextMnu.addSeparator();
|
||||
|
||||
action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
|
||||
if (!item || folder || feedMessageWidget(feedId)) {
|
||||
action->setEnabled(false);
|
||||
}
|
||||
|
||||
contextMnu.addSeparator();
|
||||
|
||||
action = contextMnu.addAction(QIcon(":/images/edit_16.png"), tr("Edit"), this, SLOT(editFeed()));
|
||||
if (!item || item == mRootItem) {
|
||||
action->setEnabled(false);
|
||||
|
|
@ -530,6 +565,9 @@ FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(const std::string &
|
|||
int tabCount = ui->messageTabWidget->count();
|
||||
for (int index = 0; index < tabCount; ++index) {
|
||||
FeedReaderMessageWidget *childWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
|
||||
if (childWidget == mMessageWidget) {
|
||||
continue;
|
||||
}
|
||||
if (childWidget && childWidget->feedId() == id) {
|
||||
return childWidget;
|
||||
}
|
||||
|
|
@ -538,7 +576,17 @@ FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(const std::string &
|
|||
return NULL;
|
||||
}
|
||||
|
||||
void FeedReaderDialog::feedItemChanged(QTreeWidgetItem *item)
|
||||
FeedReaderMessageWidget *FeedReaderDialog::createMessageWidget(const std::string &feedId)
|
||||
{
|
||||
FeedReaderMessageWidget *messageWidget = new FeedReaderMessageWidget(feedId, mFeedReader, mNotify);
|
||||
int index = ui->messageTabWidget->addTab(messageWidget, messageWidget->feedName(true));
|
||||
ui->messageTabWidget->setTabIcon(index, messageWidget->feedIcon());
|
||||
connect(messageWidget, SIGNAL(feedMessageChanged(QWidget*)), this, SLOT(messageTabInfoChanged(QWidget*)));
|
||||
|
||||
return messageWidget;
|
||||
}
|
||||
|
||||
void FeedReaderDialog::feedTreeItemActivated(QTreeWidgetItem *item)
|
||||
{
|
||||
if (!item) {
|
||||
ui->feedAddButton->setEnabled(false);
|
||||
|
|
@ -558,13 +606,27 @@ void FeedReaderDialog::feedItemChanged(QTreeWidgetItem *item)
|
|||
std::string feedId = item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString();
|
||||
/* search exisiting tab */
|
||||
FeedReaderMessageWidget *messageWidget = feedMessageWidget(feedId);
|
||||
|
||||
if (!messageWidget) {
|
||||
/* create a message widget */
|
||||
messageWidget = new FeedReaderMessageWidget(feedId, mFeedReader, mNotify);
|
||||
int index = ui->messageTabWidget->addTab(messageWidget, messageWidget->feedName(true));
|
||||
ui->messageTabWidget->setTabIcon(index, messageWidget->feedIcon());
|
||||
connect(messageWidget, SIGNAL(feedMessageChanged(QWidget*)), this, SLOT(messageTabChanged(QWidget*)));
|
||||
/* not found, use standard tab */
|
||||
messageWidget = mMessageWidget;
|
||||
messageWidget->setFeedId(feedId);
|
||||
}
|
||||
|
||||
ui->messageTabWidget->setCurrentWidget(messageWidget);
|
||||
}
|
||||
|
||||
void FeedReaderDialog::openInNewTab()
|
||||
{
|
||||
std::string feedId = currentFeedId();
|
||||
if (feedId.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* search exisiting tab */
|
||||
FeedReaderMessageWidget *messageWidget = feedMessageWidget(feedId);
|
||||
if (!messageWidget) {
|
||||
/* not found, create new tab */
|
||||
messageWidget = createMessageWidget(feedId);
|
||||
}
|
||||
|
||||
ui->messageTabWidget->setCurrentWidget(messageWidget);
|
||||
|
|
@ -573,12 +635,28 @@ void FeedReaderDialog::feedItemChanged(QTreeWidgetItem *item)
|
|||
void FeedReaderDialog::messageTabCloseRequested(int index)
|
||||
{
|
||||
FeedReaderMessageWidget *messageWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
|
||||
if (messageWidget) {
|
||||
delete(messageWidget);
|
||||
if (!messageWidget) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (messageWidget == mMessageWidget) {
|
||||
return;
|
||||
}
|
||||
|
||||
delete(messageWidget);
|
||||
}
|
||||
|
||||
void FeedReaderDialog::messageTabChanged(QWidget *widget)
|
||||
void FeedReaderDialog::messageTabChanged(int index)
|
||||
{
|
||||
FeedReaderMessageWidget *messageWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
|
||||
if (!messageWidget) {
|
||||
return;
|
||||
}
|
||||
|
||||
setCurrentFeedId(messageWidget->feedId());
|
||||
}
|
||||
|
||||
void FeedReaderDialog::messageTabInfoChanged(QWidget *widget)
|
||||
{
|
||||
int index = ui->messageTabWidget->indexOf(widget);
|
||||
if (index < 0) {
|
||||
|
|
|
|||
|
|
@ -46,12 +46,13 @@ public:
|
|||
virtual UserNotify *getUserNotify(QObject *parent);
|
||||
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *e);
|
||||
virtual void showEvent(QShowEvent *event);
|
||||
bool eventFilter(QObject *obj, QEvent *ev);
|
||||
|
||||
private slots:
|
||||
void feedTreeCustomPopupMenu(QPoint point);
|
||||
void feedItemChanged(QTreeWidgetItem *item);
|
||||
void feedTreeItemActivated(QTreeWidgetItem *item);
|
||||
void openInNewTab();
|
||||
void newFolder();
|
||||
void newFeed();
|
||||
void removeFeed();
|
||||
|
|
@ -60,13 +61,15 @@ private slots:
|
|||
void processFeed();
|
||||
|
||||
void messageTabCloseRequested(int index);
|
||||
void messageTabChanged(QWidget *widget);
|
||||
void messageTabChanged(int index);
|
||||
void messageTabInfoChanged(QWidget *widget);
|
||||
|
||||
/* FeedReaderNotify */
|
||||
void feedChanged(const QString &feedId, int type);
|
||||
|
||||
private:
|
||||
std::string currentFeedId();
|
||||
void setCurrentFeedId(const std::string &feedId);
|
||||
void processSettings(bool load);
|
||||
void addFeedToExpand(const std::string &feedId);
|
||||
void getExpandedFeedIds(QList<std::string> &feedIds);
|
||||
|
|
@ -76,12 +79,14 @@ private:
|
|||
void calculateFeedItems();
|
||||
void calculateFeedItem(QTreeWidgetItem *item, uint32_t &unreadCount, bool &loading);
|
||||
|
||||
FeedReaderMessageWidget *feedMessageWidget(const std::string &id);
|
||||
FeedReaderMessageWidget *feedMessageWidget(const std::string &feedId);
|
||||
FeedReaderMessageWidget *createMessageWidget(const std::string &feedId);
|
||||
|
||||
bool mProcessSettings;
|
||||
QList<std::string> *mOpenFeedIds;
|
||||
QTreeWidgetItem *mRootItem;
|
||||
RSTreeWidgetItemCompareRole *mFeedCompareRole;
|
||||
FeedReaderMessageWidget *mMessageWidget;
|
||||
|
||||
// gui interface
|
||||
RsFeedReader *mFeedReader;
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QTabWidget" name="messageTabWidget">
|
||||
<widget class="RSTabWidget" name="messageTabWidget">
|
||||
<property name="tabsClosable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
|
|
@ -159,6 +159,12 @@
|
|||
<extends>QTreeWidget</extends>
|
||||
<header>gui/common/RSTreeWidget.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>RSTabWidget</class>
|
||||
<extends>QTabWidget</extends>
|
||||
<header>gui/common/RSTabWidget.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="FeedReader_images.qrc"/>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#define ROLE_MSG_LINK Qt::UserRole + 4
|
||||
|
||||
FeedReaderMessageWidget::FeedReaderMessageWidget(const std::string &feedId, RsFeedReader *feedReader, FeedReaderNotify *notify, QWidget *parent) :
|
||||
QWidget(parent), mFeedId(feedId), mFeedReader(feedReader), mNotify(notify), ui(new Ui::FeedReaderMessageWidget)
|
||||
QWidget(parent), mFeedReader(feedReader), mNotify(notify), ui(new Ui::FeedReaderMessageWidget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
|
|
@ -111,17 +111,7 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(const std::string &feedId, RsFe
|
|||
|
||||
ui->msgTreeWidget->installEventFilter(this);
|
||||
|
||||
FeedInfo feedInfo;
|
||||
if (mFeedReader->getFeedInfo(mFeedId, feedInfo)) {
|
||||
mFeedName = QString::fromUtf8(feedInfo.name.c_str());
|
||||
|
||||
mFeedReader->getMessageCount(mFeedId, NULL, NULL, &mUnreadCount);
|
||||
} else {
|
||||
mFeedId.clear();
|
||||
}
|
||||
|
||||
updateMsgs();
|
||||
updateCurrentMessage();
|
||||
setFeedId(feedId);
|
||||
}
|
||||
|
||||
FeedReaderMessageWidget::~FeedReaderMessageWidget()
|
||||
|
|
@ -203,6 +193,35 @@ bool FeedReaderMessageWidget::eventFilter(QObject *obj, QEvent *event)
|
|||
return QWidget::eventFilter(obj, event);
|
||||
}
|
||||
|
||||
void FeedReaderMessageWidget::setFeedId(const std::string &feedId)
|
||||
{
|
||||
if (mFeedId == feedId) {
|
||||
if (!feedId.empty()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
mFeedId = feedId;
|
||||
|
||||
ui->feedProcessButton->setEnabled(!mFeedId.empty());
|
||||
|
||||
if (!mFeedId.empty()) {
|
||||
FeedInfo feedInfo;
|
||||
if (mFeedReader->getFeedInfo(mFeedId, feedInfo)) {
|
||||
mFeedName = QString::fromUtf8(feedInfo.name.c_str());
|
||||
|
||||
mFeedReader->getMessageCount(mFeedId, NULL, NULL, &mUnreadCount);
|
||||
} else {
|
||||
mFeedId.clear();
|
||||
}
|
||||
}
|
||||
|
||||
emit feedMessageChanged(this);
|
||||
|
||||
updateMsgs();
|
||||
updateCurrentMessage();
|
||||
}
|
||||
|
||||
QString FeedReaderMessageWidget::feedName(bool withUnreadCount)
|
||||
{
|
||||
QString name = mFeedName.isEmpty() ? tr("No name") : mFeedName;
|
||||
|
|
@ -250,6 +269,7 @@ void FeedReaderMessageWidget::msgTreeCustomPopupMenu(QPoint /*point*/)
|
|||
action->setEnabled(!selectedItems.empty());
|
||||
|
||||
action = contextMnu.addAction(QIcon(""), tr("Mark all as read"), this, SLOT(markAllAsReadMsg()));
|
||||
action->setEnabled(!mFeedId.empty());
|
||||
|
||||
contextMnu.addSeparator();
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ public:
|
|||
~FeedReaderMessageWidget();
|
||||
|
||||
std::string feedId() { return mFeedId; }
|
||||
void setFeedId(const std::string &feedId);
|
||||
QString feedName(bool withUnreadCount);
|
||||
QIcon feedIcon();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue