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 2012-12-30 02:41:53 +00:00
parent 999d9c3920
commit 35cc460e71
12 changed files with 252 additions and 58 deletions

View file

@ -68,11 +68,16 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int))); connect(mNotify, SIGNAL(notifyMsgChanged(QString,QString,int)), this, SLOT(msgChanged(QString,QString,int)));
/* connect signals */ /* connect signals */
connect(ui->feedTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(feedItemChanged(QTreeWidgetItem*))); connect(ui->feedTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
connect(ui->messageTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(messageTabCloseRequested(int))); 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->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->feedAddButton, SIGNAL(clicked()), this, SLOT(newFeed()));
connect(ui->feedProcessButton, SIGNAL(clicked()), this, SLOT(processFeed())); connect(ui->feedProcessButton, SIGNAL(clicked()), this, SLOT(processFeed()));
@ -102,7 +107,11 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, QWidget *parent)
ui->feedTreeWidget->installEventFilter(this); 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() FeedReaderDialog::~FeedReaderDialog()
@ -231,14 +240,33 @@ std::string FeedReaderDialog::currentFeedId()
return item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString(); 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*/) void FeedReaderDialog::feedTreeCustomPopupMenu(QPoint /*point*/)
{ {
QMenu contextMnu(this); QMenu contextMnu(this);
bool folder = false; bool folder = false;
std::string feedId;
QTreeWidgetItem *item = ui->feedTreeWidget->currentItem(); QTreeWidgetItem *item = ui->feedTreeWidget->currentItem();
if (item) { if (item) {
folder = item->data(COLUMN_FEED_DATA, ROLE_FEED_FOLDER).toBool(); 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")); QMenu *menu = contextMnu.addMenu(QIcon(""), tr("New"));
@ -253,6 +281,13 @@ void FeedReaderDialog::feedTreeCustomPopupMenu(QPoint /*point*/)
contextMnu.addSeparator(); 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())); action = contextMnu.addAction(QIcon(":/images/edit_16.png"), tr("Edit"), this, SLOT(editFeed()));
if (!item || item == mRootItem) { if (!item || item == mRootItem) {
action->setEnabled(false); action->setEnabled(false);
@ -530,6 +565,9 @@ FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(const std::string &
int tabCount = ui->messageTabWidget->count(); int tabCount = ui->messageTabWidget->count();
for (int index = 0; index < tabCount; ++index) { for (int index = 0; index < tabCount; ++index) {
FeedReaderMessageWidget *childWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index)); FeedReaderMessageWidget *childWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
if (childWidget == mMessageWidget) {
continue;
}
if (childWidget && childWidget->feedId() == id) { if (childWidget && childWidget->feedId() == id) {
return childWidget; return childWidget;
} }
@ -538,7 +576,17 @@ FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(const std::string &
return NULL; 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) { if (!item) {
ui->feedAddButton->setEnabled(false); 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(); std::string feedId = item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toString().toStdString();
/* search exisiting tab */ /* search exisiting tab */
FeedReaderMessageWidget *messageWidget = feedMessageWidget(feedId); FeedReaderMessageWidget *messageWidget = feedMessageWidget(feedId);
if (!messageWidget) { if (!messageWidget) {
/* create a message widget */ /* not found, use standard tab */
messageWidget = new FeedReaderMessageWidget(feedId, mFeedReader, mNotify); messageWidget = mMessageWidget;
int index = ui->messageTabWidget->addTab(messageWidget, messageWidget->feedName(true)); messageWidget->setFeedId(feedId);
ui->messageTabWidget->setTabIcon(index, messageWidget->feedIcon()); }
connect(messageWidget, SIGNAL(feedMessageChanged(QWidget*)), this, SLOT(messageTabChanged(QWidget*)));
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); ui->messageTabWidget->setCurrentWidget(messageWidget);
@ -573,12 +635,28 @@ void FeedReaderDialog::feedItemChanged(QTreeWidgetItem *item)
void FeedReaderDialog::messageTabCloseRequested(int index) void FeedReaderDialog::messageTabCloseRequested(int index)
{ {
FeedReaderMessageWidget *messageWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index)); FeedReaderMessageWidget *messageWidget = dynamic_cast<FeedReaderMessageWidget*>(ui->messageTabWidget->widget(index));
if (messageWidget) { if (!messageWidget) {
delete(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); int index = ui->messageTabWidget->indexOf(widget);
if (index < 0) { if (index < 0) {

View file

@ -46,12 +46,13 @@ public:
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);
protected: protected:
virtual void showEvent(QShowEvent *e); virtual void showEvent(QShowEvent *event);
bool eventFilter(QObject *obj, QEvent *ev); bool eventFilter(QObject *obj, QEvent *ev);
private slots: private slots:
void feedTreeCustomPopupMenu(QPoint point); void feedTreeCustomPopupMenu(QPoint point);
void feedItemChanged(QTreeWidgetItem *item); void feedTreeItemActivated(QTreeWidgetItem *item);
void openInNewTab();
void newFolder(); void newFolder();
void newFeed(); void newFeed();
void removeFeed(); void removeFeed();
@ -60,13 +61,15 @@ private slots:
void processFeed(); void processFeed();
void messageTabCloseRequested(int index); void messageTabCloseRequested(int index);
void messageTabChanged(QWidget *widget); void messageTabChanged(int index);
void messageTabInfoChanged(QWidget *widget);
/* FeedReaderNotify */ /* FeedReaderNotify */
void feedChanged(const QString &feedId, int type); void feedChanged(const QString &feedId, int type);
private: private:
std::string currentFeedId(); std::string currentFeedId();
void setCurrentFeedId(const std::string &feedId);
void processSettings(bool load); void processSettings(bool load);
void addFeedToExpand(const std::string &feedId); void addFeedToExpand(const std::string &feedId);
void getExpandedFeedIds(QList<std::string> &feedIds); void getExpandedFeedIds(QList<std::string> &feedIds);
@ -76,12 +79,14 @@ private:
void calculateFeedItems(); void calculateFeedItems();
void calculateFeedItem(QTreeWidgetItem *item, uint32_t &unreadCount, bool &loading); 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; bool mProcessSettings;
QList<std::string> *mOpenFeedIds; QList<std::string> *mOpenFeedIds;
QTreeWidgetItem *mRootItem; QTreeWidgetItem *mRootItem;
RSTreeWidgetItemCompareRole *mFeedCompareRole; RSTreeWidgetItemCompareRole *mFeedCompareRole;
FeedReaderMessageWidget *mMessageWidget;
// gui interface // gui interface
RsFeedReader *mFeedReader; RsFeedReader *mFeedReader;

View file

@ -141,7 +141,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QTabWidget" name="messageTabWidget"> <widget class="RSTabWidget" name="messageTabWidget">
<property name="tabsClosable"> <property name="tabsClosable">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -159,6 +159,12 @@
<extends>QTreeWidget</extends> <extends>QTreeWidget</extends>
<header>gui/common/RSTreeWidget.h</header> <header>gui/common/RSTreeWidget.h</header>
</customwidget> </customwidget>
<customwidget>
<class>RSTabWidget</class>
<extends>QTabWidget</extends>
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="FeedReader_images.qrc"/> <include location="FeedReader_images.qrc"/>

View file

@ -30,7 +30,7 @@
#define ROLE_MSG_LINK Qt::UserRole + 4 #define ROLE_MSG_LINK Qt::UserRole + 4
FeedReaderMessageWidget::FeedReaderMessageWidget(const std::string &feedId, RsFeedReader *feedReader, FeedReaderNotify *notify, QWidget *parent) : 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); ui->setupUi(this);
@ -111,17 +111,7 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(const std::string &feedId, RsFe
ui->msgTreeWidget->installEventFilter(this); ui->msgTreeWidget->installEventFilter(this);
FeedInfo feedInfo; setFeedId(feedId);
if (mFeedReader->getFeedInfo(mFeedId, feedInfo)) {
mFeedName = QString::fromUtf8(feedInfo.name.c_str());
mFeedReader->getMessageCount(mFeedId, NULL, NULL, &mUnreadCount);
} else {
mFeedId.clear();
}
updateMsgs();
updateCurrentMessage();
} }
FeedReaderMessageWidget::~FeedReaderMessageWidget() FeedReaderMessageWidget::~FeedReaderMessageWidget()
@ -203,6 +193,35 @@ bool FeedReaderMessageWidget::eventFilter(QObject *obj, QEvent *event)
return QWidget::eventFilter(obj, 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 FeedReaderMessageWidget::feedName(bool withUnreadCount)
{ {
QString name = mFeedName.isEmpty() ? tr("No name") : mFeedName; QString name = mFeedName.isEmpty() ? tr("No name") : mFeedName;
@ -250,6 +269,7 @@ void FeedReaderMessageWidget::msgTreeCustomPopupMenu(QPoint /*point*/)
action->setEnabled(!selectedItems.empty()); action->setEnabled(!selectedItems.empty());
action = contextMnu.addAction(QIcon(""), tr("Mark all as read"), this, SLOT(markAllAsReadMsg())); action = contextMnu.addAction(QIcon(""), tr("Mark all as read"), this, SLOT(markAllAsReadMsg()));
action->setEnabled(!mFeedId.empty());
contextMnu.addSeparator(); contextMnu.addSeparator();

View file

@ -23,6 +23,7 @@ public:
~FeedReaderMessageWidget(); ~FeedReaderMessageWidget();
std::string feedId() { return mFeedId; } std::string feedId() { return mFeedId; }
void setFeedId(const std::string &feedId);
QString feedName(bool withUnreadCount); QString feedName(bool withUnreadCount);
QIcon feedIcon(); QIcon feedIcon();

View file

@ -72,8 +72,9 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
connect(ui.forumTreeWidget, SIGNAL(treeCustomContextMenuRequested(QPoint)), this, SLOT(forumListCustomPopupMenu(QPoint))); connect(ui.forumTreeWidget, SIGNAL(treeCustomContextMenuRequested(QPoint)), this, SLOT(forumListCustomPopupMenu(QPoint)));
connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum())); connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum()));
connect(ui.forumTreeWidget, SIGNAL(treeItemClicked(QString)), this, SLOT(changedForum(QString))); connect(ui.forumTreeWidget, SIGNAL(treeItemActivated(QString)), this, SLOT(changedForum(QString)));
connect(ui.threadTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(threadTabCloseRequested(int))); connect(ui.threadTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(threadTabCloseRequested(int)));
connect(ui.threadTabWidget, SIGNAL(currentChanged(int)), this, SLOT(threadTabChanged(int)));
connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int))); connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)));
// HACK - TEMPORARY HIJACKING THIS BUTTON FOR REFRESH. // HACK - TEMPORARY HIJACKING THIS BUTTON FOR REFRESH.
@ -96,6 +97,10 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
// load settings // load settings
processSettings(true); processSettings(true);
mThreadWidget = createThreadWidget("");
// remove close button of the the first tab
ui.threadTabWidget->hideCloseButton(ui.threadTabWidget->indexOf(mThreadWidget));
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -148,6 +153,11 @@ void GxsForumsDialog::forumListCustomPopupMenu(QPoint /*point*/)
action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe to Forum"), this, SLOT(unsubscribeToForum())); action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe to Forum"), this, SLOT(unsubscribeToForum()));
action->setEnabled (!mForumId.empty() && IS_GROUP_SUBSCRIBED(subscribeFlags)); action->setEnabled (!mForumId.empty() && IS_GROUP_SUBSCRIBED(subscribeFlags));
action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
if (mForumId.empty() || forumThreadWidget(mForumId)) {
action->setEnabled(false);
}
contextMnu.addSeparator(); contextMnu.addSeparator();
contextMnu.addAction(QIcon(IMAGE_NEWFORUM), tr("New Forum"), this, SLOT(newforum())); contextMnu.addAction(QIcon(IMAGE_NEWFORUM), tr("New Forum"), this, SLOT(newforum()));
@ -320,12 +330,15 @@ void GxsForumsDialog::insertForumsData(const std::list<RsGroupMetaData> &forumLi
updateMessageSummaryList(""); updateMessageSummaryList("");
} }
GxsForumThreadWidget *GxsForumsDialog::forumThreadWidget(const std::string &id) GxsForumThreadWidget *GxsForumsDialog::forumThreadWidget(const std::string &forumId)
{ {
int tabCount = ui.threadTabWidget->count(); int tabCount = ui.threadTabWidget->count();
for (int index = 0; index < tabCount; ++index) { for (int index = 0; index < tabCount; ++index) {
GxsForumThreadWidget *childWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index)); GxsForumThreadWidget *childWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index));
if (childWidget && childWidget->forumId() == id) { if (childWidget == mThreadWidget) {
continue;
}
if (childWidget && childWidget->forumId() == forumId) {
return childWidget; return childWidget;
break; break;
} }
@ -334,9 +347,19 @@ GxsForumThreadWidget *GxsForumsDialog::forumThreadWidget(const std::string &id)
return NULL; return NULL;
} }
void GxsForumsDialog::changedForum(const QString &id) GxsForumThreadWidget *GxsForumsDialog::createThreadWidget(const std::string &forumId)
{ {
mForumId = id.toStdString(); GxsForumThreadWidget *threadWidget = new GxsForumThreadWidget(forumId);
int index = ui.threadTabWidget->addTab(threadWidget, threadWidget->forumName(true));
ui.threadTabWidget->setTabIcon(index, threadWidget->forumIcon());
connect(threadWidget, SIGNAL(forumChanged(QWidget*)), this, SLOT(threadTabInfoChanged(QWidget*)));
return threadWidget;
}
void GxsForumsDialog::changedForum(const QString &forumId)
{
mForumId = forumId.toStdString();
if (mForumId.empty()) { if (mForumId.empty()) {
return; return;
} }
@ -344,14 +367,28 @@ void GxsForumsDialog::changedForum(const QString &id)
// requestGroupSummary_CurrentForum(mForumId); // requestGroupSummary_CurrentForum(mForumId);
/* search exisiting tab */ /* search exisiting tab */
GxsForumThreadWidget *threadWidget = forumThreadWidget(id.toStdString()); GxsForumThreadWidget *threadWidget = forumThreadWidget(mForumId);
if (!threadWidget) { if (!threadWidget) {
/* create a thread widget */ /* not found, use standard tab */
threadWidget = new GxsForumThreadWidget(id.toStdString()); threadWidget = mThreadWidget;
int index = ui.threadTabWidget->addTab(threadWidget, threadWidget->forumName(true)); threadWidget->setForumId(mForumId);
ui.threadTabWidget->setTabIcon(index, threadWidget->forumIcon()); }
connect(threadWidget, SIGNAL(forumChanged(QWidget*)), this, SLOT(threadTabChanged(QWidget*)));
ui.threadTabWidget->setCurrentWidget(threadWidget);
}
void GxsForumsDialog::openInNewTab()
{
if (mForumId.empty()) {
return;
}
/* search exisiting tab */
GxsForumThreadWidget *threadWidget = forumThreadWidget(mForumId);
if (!threadWidget) {
/* not found, create new tab */
threadWidget = createThreadWidget(mForumId);
} }
ui.threadTabWidget->setCurrentWidget(threadWidget); ui.threadTabWidget->setCurrentWidget(threadWidget);
@ -360,12 +397,28 @@ void GxsForumsDialog::changedForum(const QString &id)
void GxsForumsDialog::threadTabCloseRequested(int index) void GxsForumsDialog::threadTabCloseRequested(int index)
{ {
GxsForumThreadWidget *threadWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index)); GxsForumThreadWidget *threadWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index));
if (threadWidget) { if (!threadWidget) {
delete(threadWidget); return;
} }
if (threadWidget == mThreadWidget) {
return;
}
delete(threadWidget);
} }
void GxsForumsDialog::threadTabChanged(QWidget *widget) void GxsForumsDialog::threadTabChanged(int index)
{
GxsForumThreadWidget *threadWidget = dynamic_cast<GxsForumThreadWidget*>(ui.threadTabWidget->widget(index));
if (!threadWidget) {
return;
}
ui.forumTreeWidget->activateId(QString::fromStdString(threadWidget->forumId()), false);
}
void GxsForumsDialog::threadTabInfoChanged(QWidget *widget)
{ {
int index = ui.threadTabWidget->indexOf(widget); int index = ui.threadTabWidget->indexOf(widget);
if (index < 0) { if (index < 0) {

View file

@ -65,9 +65,11 @@ private slots:
void restoreForumKeys(); void restoreForumKeys();
void newforum(); void newforum();
void changedForum(const QString &id); void changedForum(const QString &forumId);
void openInNewTab();
void threadTabCloseRequested(int index); void threadTabCloseRequested(int index);
void threadTabChanged(QWidget *widget); void threadTabChanged(int index);
void threadTabInfoChanged(QWidget *widget);
void copyForumLink(); void copyForumLink();
@ -101,13 +103,15 @@ private:
void requestGroupSummary(); void requestGroupSummary();
void loadGroupSummary(const uint32_t &token); void loadGroupSummary(const uint32_t &token);
GxsForumThreadWidget *forumThreadWidget(const std::string &id); GxsForumThreadWidget *forumThreadWidget(const std::string &forumId);
GxsForumThreadWidget *createThreadWidget(const std::string &forumId);
// void requestGroupSummary_CurrentForum(const std::string &forumId); // void requestGroupSummary_CurrentForum(const std::string &forumId);
// void loadGroupSummary_CurrentForum(const uint32_t &token); // void loadGroupSummary_CurrentForum(const uint32_t &token);
std::string mForumId; std::string mForumId;
TokenQueue *mForumQueue; TokenQueue *mForumQueue;
GxsForumThreadWidget *mThreadWidget;
QTreeWidgetItem *yourForums; QTreeWidgetItem *yourForums;
QTreeWidgetItem *subscribedForums; QTreeWidgetItem *subscribedForums;

View file

@ -168,7 +168,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QTabWidget" name="threadTabWidget"> <widget class="RSTabWidget" name="threadTabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>-1</number> <number>-1</number>
</property> </property>
@ -194,6 +194,12 @@
</action> </action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RSTabWidget</class>
<extends>QTabWidget</extends>
<header>gui/common/RSTabWidget.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>GroupTreeWidget</class> <class>GroupTreeWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View file

@ -70,7 +70,11 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
connect(ui->treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint))); connect(ui->treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint)));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*))); connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(ui->treeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(itemClicked(QTreeWidgetItem*,int))); connect(ui->treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(itemActivated(QTreeWidgetItem*,int)));
if (!style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, NULL, this)) {
// need signal itemClicked too
connect(ui->treeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(itemActivated(QTreeWidgetItem*,int)));
}
/* Add own item delegate */ /* Add own item delegate */
RSItemDelegate *itemDelegate = new RSItemDelegate(this); RSItemDelegate *itemDelegate = new RSItemDelegate(this);
@ -234,7 +238,7 @@ void GroupTreeWidget::currentItemChanged(QTreeWidgetItem *current, QTreeWidgetIt
emit treeCurrentItemChanged(id); emit treeCurrentItemChanged(id);
} }
void GroupTreeWidget::itemClicked(QTreeWidgetItem *item, int column) void GroupTreeWidget::itemActivated(QTreeWidgetItem *item, int column)
{ {
Q_UNUSED(column); Q_UNUSED(column);
@ -244,7 +248,7 @@ void GroupTreeWidget::itemClicked(QTreeWidgetItem *item, int column)
id = item->data(COLUMN_DATA, ROLE_ID).toString(); id = item->data(COLUMN_DATA, ROLE_ID).toString();
} }
emit treeItemClicked(id); emit treeItemActivated(id);
} }
QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIcon &icon, bool expand) QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIcon &icon, bool expand)

View file

@ -100,7 +100,7 @@ public:
signals: signals:
void treeCustomContextMenuRequested(const QPoint &pos); void treeCustomContextMenuRequested(const QPoint &pos);
void treeCurrentItemChanged(const QString &id); void treeCurrentItemChanged(const QString &id);
void treeItemClicked(const QString &id); void treeItemActivated(const QString &id);
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
@ -108,7 +108,7 @@ protected:
private slots: private slots:
void customContextMenuRequested(const QPoint &pos); void customContextMenuRequested(const QPoint &pos);
void currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void itemClicked(QTreeWidgetItem *item, int column); void itemActivated(QTreeWidgetItem *item, int column);
void filterChanged(); void filterChanged();
void sort(); void sort();

View file

@ -90,7 +90,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const std::string &forumId, QWidget *
{ {
ui->setupUi(this); ui->setupUi(this);
mForumId = forumId;
mSubscribeFlags = 0; mSubscribeFlags = 0;
mInProcessSettings = false; mInProcessSettings = false;
mUnreadCount = 0; mUnreadCount = 0;
@ -172,8 +171,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const std::string &forumId, QWidget *
mFillThread = NULL; mFillThread = NULL;
ui->forumName->setText(tr("Loading")); setForumId(forumId);
insertThreads();
ui->threadTreeWidget->installEventFilter(this); ui->threadTreeWidget->installEventFilter(this);
} }
@ -234,9 +232,27 @@ void GxsForumThreadWidget::processSettings(bool load)
mInProcessSettings = false; mInProcessSettings = false;
} }
void GxsForumThreadWidget::setForumId(const std::string &forumId)
{
if (mForumId == forumId) {
if (!forumId.empty()) {
return;
}
}
mForumId = forumId;
ui->forumName->setText(mForumId.empty () ? "" : tr("Loading"));
mNewCount = 0;
mUnreadCount = 0;
emit forumChanged(this);
insertThreads();
}
QString GxsForumThreadWidget::forumName(bool withUnreadCount) QString GxsForumThreadWidget::forumName(bool withUnreadCount)
{ {
QString name = ui->forumName->text(); QString name = mForumId.empty () ? tr("No name") : ui->forumName->text();
if (withUnreadCount && mUnreadCount) { if (withUnreadCount && mUnreadCount) {
name += QString(" (%1)").arg(mUnreadCount); name += QString(" (%1)").arg(mUnreadCount);

View file

@ -41,6 +41,7 @@ public:
void setTextColorMissing(QColor color) { mTextColorMissing = color; } void setTextColorMissing(QColor color) { mTextColorMissing = color; }
std::string forumId() { return mForumId; } std::string forumId() { return mForumId; }
void setForumId(const std::string &forumId);
QString forumName(bool withUnreadCount); QString forumName(bool withUnreadCount);
QIcon forumIcon(); QIcon forumIcon();
unsigned int newCount() { return mNewCount; } unsigned int newCount() { return mNewCount; }