From a532b68b8e0de81d76967ab3276c3eeeb01458c8 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 18 Nov 2018 21:36:13 +0100 Subject: [PATCH] improvements of the Forum Model --- .../src/gui/gxsforums/GxsForumModel.cpp | 84 ++++++++++--------- .../src/gui/gxsforums/GxsForumModel.h | 1 + .../gui/gxsforums/GxsForumThreadWidget.cpp | 55 +++++++++++- .../src/gui/gxsforums/GxsForumThreadWidget.ui | 43 +--------- 4 files changed, 98 insertions(+), 85 deletions(-) diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp index b2e6241b9..33dcc2efb 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp @@ -14,15 +14,34 @@ Q_DECLARE_METATYPE(RsMsgMetaData); -std::ostream& operator<<(std::ostream& o, const QModelIndex& i) -{ - return o << i.row() << "," << i.column() << "," << i.internalPointer() ; -} +std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere RsGxsForumModel::RsGxsForumModel(QObject *parent) : QAbstractItemModel(parent) { mPosts.resize(1); // adds a sentinel item + + // adds some fake posts to debug + + int N=5 ; + mPosts.resize(N+1); + + for(int i=1;i<=N;++i) + { + mPosts[0].children.push_back(ForumModelIndex(i)); + mPosts[i].parent = ForumModelIndex(0); + mPosts[i].prow = i-1; + + RsMsgMetaData meta; + meta.mMsgName = "message " + (QString::number(i).toStdString()) ; + mPosts[i].meta_versions.push_back(meta); + } + + // add one child to last post + mPosts.resize(N+2); + mPosts[N].children.push_back(ForumModelIndex(N+1)); + mPosts[N+1].parent = ForumModelIndex(N); + mPosts[N+1].prow = 0; } int RsGxsForumModel::rowCount(const QModelIndex& parent) const @@ -59,14 +78,6 @@ bool RsGxsForumModel::hasChildren(const QModelIndex &parent) const void *ref = (parent.isValid())?parent.internalPointer():NULL ; uint32_t entry = 0; - if(!ref) - { -#ifdef DEBUG_FORUMMODEL - std::cerr << "hasChildren-1(" << parent << ") : " << true << std::endl; -#endif - return true ; - } - if(!convertRefPointerToTabEntry(ref,entry) || entry >= mPosts.size()) { #ifdef DEBUG_FORUMMODEL @@ -115,28 +126,12 @@ QModelIndex RsGxsForumModel::index(int row, int column, const QModelIndex & pare return QModelIndex(); void *parent_ref = (parent.isValid())?parent.internalPointer():NULL ; - uint32_t entry = 0; + uint32_t parent_entry = 0; int source_id=0 ; - if(!parent_ref) // top level. The entry is that of a transfer - { - void *ref = NULL ; + // We dont need to handle parent==NULL because the conversion will return entry=0 which is what we need. - if(row >= (int)mPosts.size() || !convertTabEntryToRefPointer(row,ref)) - { -#ifdef DEBUG_FORUMMODEL - std::cerr << "index-1(" << row << "," << column << " parent=" << parent << ") : " << "NULL" << std::endl; -#endif - return QModelIndex() ; - } - -#ifdef DEBUG_FORUMMODEL - std::cerr << "index-2(" << row << "," << column << " parent=" << parent << ") : " << createIndex(row,column,ref) << std::endl; -#endif - return createIndex(row,column,ref) ; - } - - if(!convertRefPointerToTabEntry(parent_ref,entry) || entry >= mPosts.size()) + if(!convertRefPointerToTabEntry(parent_ref,parent_entry) || parent_entry >= mPosts.size()) { #ifdef DEBUG_FORUMMODEL std::cerr << "index-5(" << row << "," << column << " parent=" << parent << ") : " << "NULL"<< std::endl ; @@ -146,7 +141,7 @@ QModelIndex RsGxsForumModel::index(int row, int column, const QModelIndex & pare void *ref = NULL ; - if(row >= mPosts[entry].children.size() || !convertTabEntryToRefPointer(mPosts[entry].children[row],ref)) + if(row >= mPosts[parent_entry].children.size() || !convertTabEntryToRefPointer(mPosts[parent_entry].children[row],ref)) { #ifdef DEBUG_FORUMMODEL std::cerr << "index-4(" << row << "," << column << " parent=" << parent << ") : " << "NULL" << std::endl; @@ -163,21 +158,32 @@ QModelIndex RsGxsForumModel::index(int row, int column, const QModelIndex & pare QModelIndex RsGxsForumModel::parent(const QModelIndex& child) const { void *child_ref = (child.isValid())?child.internalPointer():NULL ; - uint32_t entry = 0; - int source_id=0 ; if(!child_ref) return QModelIndex() ; - if(!convertRefPointerToTabEntry(child_ref,entry) || entry >= mPosts.size()) + ForumModelIndex child_entry ; + + if(!convertRefPointerToTabEntry(child_ref,child_entry) || child_entry >= mPosts.size()) return QModelIndex() ; void *parent_ref =NULL; + ForumModelIndex parent_entry = mPosts[child_entry].parent; + QModelIndex indx; - if(!convertTabEntryToRefPointer(mPosts[entry].parent,parent_ref)) - return QModelIndex() ; + if(parent_entry == 0) // top level index + indx = QModelIndex() ; + else + { + if(!convertTabEntryToRefPointer(parent_entry,parent_ref)) + return QModelIndex() ; - return createIndex(entry,child.column(),parent_ref) ; // I'm not sure about the .column() here ! + indx = createIndex(mPosts[parent_entry].prow,child.column(),parent_ref) ; + } +#ifdef DEBUG_FORUMMODEL + std::cerr << "parent-1(" << child << ") : " << indx << std::endl; +#endif + return indx; } QVariant RsGxsForumModel::headerData(int section, Qt::Orientation orientation, int role) const @@ -239,7 +245,7 @@ QVariant RsGxsForumModel::data(const QModelIndex &index, int role) const const RsMsgMetaData& meta(mPosts[entry].meta_versions[0]) ; -#ifdef DEBUG_DOWNLOADLIST +#ifdef DEBUG_FORUMMODEL std::cerr << " [ok]" << std::endl; #endif diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h index 7b8845f80..e5fdbf976 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h @@ -14,6 +14,7 @@ struct ForumPostEntry std::vector children; ForumModelIndex parent; + int prow ; // parent row }; // This class is the item model used by Qt to display the information diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index d04d982c3..d33aab4eb 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -27,6 +27,7 @@ #include "GxsForumThreadWidget.h" #include "ui_GxsForumThreadWidget.h" #include "GxsForumsFillThread.h" +#include "GxsForumModel.h" #include "GxsForumsDialog.h" #include "gui/RetroShareLink.h" #include "gui/common/RSTreeWidgetItem.h" @@ -179,8 +180,9 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget mStateHelper->addWidget(mTokenTypeInsertThreads, ui->nextUnreadButton); mStateHelper->addWidget(mTokenTypeInsertThreads, ui->previousButton); mStateHelper->addWidget(mTokenTypeInsertThreads, ui->nextButton); - +#ifdef SUSPENDED_CODE mStateHelper->addClear(mTokenTypeInsertThreads, ui->threadTreeWidget); +#endif mStateHelper->addWidget(mTokenTypeMessageData, ui->newmessageButton); // mStateHelper->addWidget(mTokenTypeMessageData, ui->postText); @@ -200,6 +202,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget mThreadCompareRole = new RSTreeWidgetItemCompareRole; mThreadCompareRole->setRole(COLUMN_THREAD_DATE, ROLE_THREAD_SORT); + ui->threadTreeWidget->setModel(new RsGxsForumModel(this)); ui->threadTreeWidget->setItemDelegateForColumn(COLUMN_THREAD_DISTRIBUTION,new DistributionItemDelegate()) ; connect(ui->versions_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(changedVersion())); @@ -247,12 +250,14 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget ttheader->resizeSection (COLUMN_THREAD_DISTRIBUTION, 24*f); ttheader->resizeSection (COLUMN_THREAD_AUTHOR, 150*f); +#ifdef SUSPENDED_CODE /* Set text of column "Read" to empty - without this the column has a number as header text */ QTreeWidgetItem *headerItem = ui->threadTreeWidget->headerItem(); headerItem->setText(COLUMN_THREAD_READ, "") ; headerItem->setText(COLUMN_THREAD_DISTRIBUTION, ""); headerItem->setData(COLUMN_THREAD_READ,Qt::UserRole, tr("Read status")) ; // this is used to display drop menus. headerItem->setData(COLUMN_THREAD_DISTRIBUTION,Qt::UserRole, tr("Distribution")); +#endif /* add filter actions */ ui->filterLineEdit->addFilter(QIcon(), tr("Title"), COLUMN_THREAD_TITLE, tr("Search Title")); @@ -294,9 +299,11 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget ui->subscribeToolButton->setToolTip(tr( "

Subscribing to the forum will gather \ available posts from your subscribed friends, and make the \ forum visible to all other friends.

Afterwards you can unsubscribe from the context menu of the forum list at left.

")); - ui->threadTreeWidget->enableColumnCustomize(true); +#ifdef SUSPENDED_CODE + ui->threadTreeWidget->enableColumnCustomize(true); ui->threadTreeWidget->sortItems(COLUMN_THREAD_DATE, Qt::DescendingOrder); +#endif } void GxsForumThreadWidget::blank() @@ -312,7 +319,9 @@ void GxsForumThreadWidget::blank() ui->by_label->hide(); ui->postText->setImageBlockWidget(ui->imageBlockWidget) ; ui->postText->resetImagesStatus(Settings->getForumLoadEmbeddedImages()); +#ifdef SUSPENDED_CODE ui->threadTreeWidget->clear(); +#endif ui->forumName->setText(""); mStateHelper->setWidgetEnabled(ui->newthreadButton, false); @@ -509,7 +518,7 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) if (mFillThread) { return; } - +#ifdef TODO QMenu contextMnu(this); QList selectedItems = ui->threadTreeWidget->selectedItems(); @@ -690,6 +699,7 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/) } contextMnu.exec(QCursor::pos()); +#endif } void GxsForumThreadWidget::contextMenuTextBrowser(QPoint point) @@ -713,6 +723,7 @@ void GxsForumThreadWidget::contextMenuTextBrowser(QPoint point) bool GxsForumThreadWidget::eventFilter(QObject *obj, QEvent *event) { +#ifdef TODO if (obj == ui->threadTreeWidget) { if (event->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast(event); @@ -726,6 +737,8 @@ bool GxsForumThreadWidget::eventFilter(QObject *obj, QEvent *event) } // pass the event on to the parent class return RsGxsUpdateBroadcastWidget::eventFilter(obj, event); +#endif + return true; } void GxsForumThreadWidget::togglethreadview() @@ -762,6 +775,7 @@ void GxsForumThreadWidget::changedVersion() void GxsForumThreadWidget::changedThread() { +#ifdef TODO /* just grab the ids of the current item */ QTreeWidgetItem *item = ui->threadTreeWidget->currentItem(); @@ -779,6 +793,7 @@ void GxsForumThreadWidget::changedThread() ui->postText->resetImagesStatus(Settings->getForumLoadEmbeddedImages()) ; insertMessage(); +#endif } void GxsForumThreadWidget::clickedThread(QTreeWidgetItem *item, int column) @@ -883,6 +898,7 @@ void GxsForumThreadWidget::calculateIconsAndFonts(QTreeWidgetItem *item, bool &h void GxsForumThreadWidget::calculateUnreadCount() { +#ifdef TODO unsigned int unreadCount = 0; unsigned int newCount = 0; @@ -913,10 +929,12 @@ void GxsForumThreadWidget::calculateUnreadCount() if (changed) { emit groupChanged(this); } +#endif } void GxsForumThreadWidget::calculateIconsAndFonts(QTreeWidgetItem *item /*= NULL*/) { +#ifdef TODO bool dummy1 = false; bool dummy2 = false; @@ -933,6 +951,7 @@ void GxsForumThreadWidget::calculateIconsAndFonts(QTreeWidgetItem *item /*= NULL dummy2 = false; calculateIconsAndFonts(ui->threadTreeWidget->topLevelItem(index), dummy1, dummy2); } +#endif } static void cleanupItems (QList &items) @@ -1086,6 +1105,7 @@ static QString getDurationString(uint32_t days) void GxsForumThreadWidget::fillThreadFinished() { +#ifdef TODO #ifdef DEBUG_FORUMS std::cerr << "GxsForumThreadWidget::fillThreadFinished" << std::endl; #endif @@ -1204,6 +1224,7 @@ void GxsForumThreadWidget::fillThreadFinished() #ifdef DEBUG_FORUMS std::cerr << "GxsForumThreadWidget::fillThreadFinished done" << std::endl; #endif +#endif } void GxsForumThreadWidget::fillThreadProgress(int current, int count) @@ -1526,6 +1547,7 @@ static void copyItem(QTreeWidgetItem *item, const QTreeWidgetItem *newItem) void GxsForumThreadWidget::fillThreads(QList &threadList, bool expandNewMessages, QList &itemToExpand) { +#ifdef TODO #ifdef DEBUG_FORUMS std::cerr << "GxsForumThreadWidget::fillThreads()" << std::endl; #endif @@ -1597,6 +1619,7 @@ void GxsForumThreadWidget::fillThreads(QList &threadList, boo #ifdef DEBUG_FORUMS std::cerr << "GxsForumThreadWidget::fillThreads() done" << std::endl; #endif +#endif } void GxsForumThreadWidget::fillChildren(QTreeWidgetItem *parentItem, QTreeWidgetItem *newParentItem, bool expandNewMessages, QList &itemToExpand) @@ -1665,6 +1688,7 @@ void GxsForumThreadWidget::fillChildren(QTreeWidgetItem *parentItem, QTreeWidget void GxsForumThreadWidget::insertMessage() { +#ifdef TODO if (groupId().isNull()) { mStateHelper->setActive(mTokenTypeMessageData, false); @@ -1764,10 +1788,12 @@ void GxsForumThreadWidget::insertMessage() /* request Post */ RsGxsGrpMsgIdPair msgId = std::make_pair(groupId(), mThreadId); requestMessageData(msgId); +#endif } void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg) { +#ifdef TODO /* As some time has elapsed since request - check that this is still the current msg. * otherwise, another request will fill the data */ @@ -1842,10 +1868,12 @@ void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg) ui->postText->setHtml(extraTxt); } // ui->threadTitle->setText(QString::fromUtf8(msg.mMeta.mMsgName.c_str())); +#endif } void GxsForumThreadWidget::previousMessage() { +#ifdef TODO QTreeWidgetItem *item = ui->threadTreeWidget->currentItem(); if (item == NULL) { return; @@ -1859,10 +1887,12 @@ void GxsForumThreadWidget::previousMessage() ui->threadTreeWidget->setCurrentItem(previousItem); } } +#endif } void GxsForumThreadWidget::nextMessage() { +#ifdef TODO QTreeWidgetItem *item = ui->threadTreeWidget->currentItem(); if (item == NULL) { return; @@ -1877,6 +1907,7 @@ void GxsForumThreadWidget::nextMessage() ui->threadTreeWidget->setCurrentItem(nextItem); } } +#endif } void GxsForumThreadWidget::downloadAllFiles() @@ -1895,6 +1926,7 @@ void GxsForumThreadWidget::downloadAllFiles() void GxsForumThreadWidget::nextUnreadMessage() { +#ifdef TODO QTreeWidgetItem *currentItem = ui->threadTreeWidget->currentItem(); while (true) { @@ -1923,12 +1955,14 @@ void GxsForumThreadWidget::nextUnreadMessage() /* start from top */ currentItem = NULL; } +#endif } /* get selected messages the messages tree is single selected, but who knows ... */ int GxsForumThreadWidget::getSelectedMsgCount(QList *rows, QList *rowsRead, QList *rowsUnread) { +#ifdef TODO if (rowsRead) rowsRead->clear(); if (rowsUnread) rowsUnread->clear(); @@ -1946,6 +1980,8 @@ int GxsForumThreadWidget::getSelectedMsgCount(QList *rows, QLi } return selectedItems.size(); +#endif + return 0; } void GxsForumThreadWidget::setMsgReadStatus(QList &rows, bool read) @@ -2035,6 +2071,7 @@ void GxsForumThreadWidget::showInPeopleTab() void GxsForumThreadWidget::markMsgAsReadUnread (bool read, bool children, bool forum) { +#ifdef TODO if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mSubscribeFlags)) { return; } @@ -2081,6 +2118,7 @@ void GxsForumThreadWidget::markMsgAsReadUnread (bool read, bool children, bool f } setMsgReadStatus(rows, read); +#endif } void GxsForumThreadWidget::markMsgAsRead() @@ -2110,6 +2148,7 @@ void GxsForumThreadWidget::setAllMessagesReadDo(bool read, uint32_t &/*token*/) bool GxsForumThreadWidget::navigate(const RsGxsMessageId &msgId) { +#ifdef TODO if (mStateHelper->isLoading(mTokenTypeInsertThreads)) { mNavigatePendingMsgId = msgId; @@ -2131,6 +2170,7 @@ bool GxsForumThreadWidget::navigate(const RsGxsMessageId &msgId) return true; } } +#endif return false; } @@ -2149,7 +2189,7 @@ void GxsForumThreadWidget::copyMessageLink() if (groupId().isNull() || mThreadId.isNull()) { return; } - +#ifdef TODO QTreeWidgetItem *item = ui->threadTreeWidget->currentItem(); QString thread_title = (item != NULL)?item->text(COLUMN_THREAD_TITLE):QString() ; @@ -2161,6 +2201,7 @@ void GxsForumThreadWidget::copyMessageLink() urls.push_back(link); RSLinkClipboard::copyLinks(urls); } +#endif } void GxsForumThreadWidget::subscribeGroup(bool subscribe) @@ -2188,6 +2229,7 @@ void GxsForumThreadWidget::createmessage() void GxsForumThreadWidget::togglePinUpPost() { +#ifdef TODO if (groupId().isNull() || mThreadId.isNull()) return; @@ -2215,6 +2257,7 @@ void GxsForumThreadWidget::togglePinUpPost() ui->threadTreeWidget->takeTopLevelItem(ui->threadTreeWidget->indexOfTopLevelItem(item)); // forces the re-creation of all posts widgets. A bit extreme. We should rather only delete item above updateDisplay(true) ; +#endif } void GxsForumThreadWidget::createthread() @@ -2434,6 +2477,7 @@ void GxsForumThreadWidget::saveImage() void GxsForumThreadWidget::changedViewBox() { +#ifdef TODO if (mInProcessSettings) { return; } @@ -2444,6 +2488,7 @@ void GxsForumThreadWidget::changedViewBox() ui->threadTreeWidget->clear(); insertThreads(); +#endif } void GxsForumThreadWidget::filterColumnChanged(int column) @@ -2465,12 +2510,14 @@ void GxsForumThreadWidget::filterColumnChanged(int column) void GxsForumThreadWidget::filterItems(const QString& text) { +#ifdef TODO int filterColumn = ui->filterLineEdit->currentFilter(); int count = ui->threadTreeWidget->topLevelItemCount(); for (int index = 0; index < count; ++index) { filterItem(ui->threadTreeWidget->topLevelItem(index), text, filterColumn); } +#endif } bool GxsForumThreadWidget::filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn) diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index 56d08267f..fa372b940 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -215,7 +215,7 @@ - + Qt::CustomContextMenu @@ -225,42 +225,6 @@ true - - - Title - - - - - - - - - :/images/message-state-header.png:/images/message-state-header.png - - - - - Date - - - - - - - - Distribution - - - - :/icons/flag-green.png:/icons/flag-green.png - - - - - Author - - @@ -558,11 +522,6 @@ QTextBrowser
gui/common/RSTextBrowser.h
- - RSTreeWidget - QTreeWidget -
gui/common/RSTreeWidget.h
- ElidedLabel QLabel