Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed next/prev item and next unread selection

Browse Source
This commit is contained in:
csoler 2018-11-26 22:48:47 +01:00
parent 3a76f25152
commit b179cb5796
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
View File

@ -281,6 +281,10 @@ QVariant RsGxsForumModel::data(const QModelIndex &index, int role) const
return QVariant(font); return QVariant(font);
} }
if(role == UnreadChildrenRole)
return bool(fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_HAS_UNREAD_CHILDREN);
#ifdef DEBUG_FORUMMODEL #ifdef DEBUG_FORUMMODEL
std::cerr << " [ok]" << std::endl; std::cerr << " [ok]" << std::endl;
#endif #endif

9
retroshare-gui/src/gui/gxsforums/GxsForumModel.h
View File

@ -73,10 +73,11 @@ public:
COLUMN_THREAD_NB_COLUMNS =0x08, COLUMN_THREAD_NB_COLUMNS =0x08,
}; };
enum Roles{ SortRole = Qt::UserRole+1, enum Roles{ SortRole = Qt::UserRole+1,
ThreadPinnedRole = Qt::UserRole+2, ThreadPinnedRole = Qt::UserRole+2,
MissingRole = Qt::UserRole+3, MissingRole = Qt::UserRole+3,
StatusRole = Qt::UserRole+4, StatusRole = Qt::UserRole+4,
UnreadChildrenRole = Qt::UserRole+5,
}; };
QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;} QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}

15
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -2001,6 +2001,7 @@ void GxsForumThreadWidget::previousMessage()
if (prevItem.isValid()) { if (prevItem.isValid()) {
ui->threadTreeWidget->setCurrentIndex(prevItem); ui->threadTreeWidget->setCurrentIndex(prevItem);
ui->threadTreeWidget->setFocus(); ui->threadTreeWidget->setFocus();
changedThread(prevItem);
} }
} }
ui->previousButton->setEnabled(index-1 > 0); ui->previousButton->setEnabled(index-1 > 0);
@ -2027,6 +2028,7 @@ void GxsForumThreadWidget::nextMessage()
if (nextItem.isValid()) { if (nextItem.isValid()) {
ui->threadTreeWidget->setCurrentIndex(nextItem); ui->threadTreeWidget->setCurrentIndex(nextItem);
ui->threadTreeWidget->setFocus(); ui->threadTreeWidget->setFocus();
changedThread(nextItem);
} }
} }
ui->previousButton->setEnabled(true); ui->previousButton->setEnabled(true);
@ -2049,10 +2051,20 @@ void GxsForumThreadWidget::downloadAllFiles()
void GxsForumThreadWidget::nextUnreadMessage() void GxsForumThreadWidget::nextUnreadMessage()
{ {
QModelIndex index = mThreadModel->getNextIndex(getCurrentIndex(),true); QModelIndex index = getCurrentIndex();
do
{
if(index.data(RsGxsForumModel::UnreadChildrenRole).toBool())
ui->threadTreeWidget->expand(index);
index = ui->threadTreeWidget->indexBelow(index);
}
while(index.isValid() && !IS_MSG_UNREAD(index.sibling(index.row(),RsGxsForumModel::COLUMN_THREAD_DATA).data(RsGxsForumModel::StatusRole).toUInt()));
ui->threadTreeWidget->setCurrentIndex(index); ui->threadTreeWidget->setCurrentIndex(index);
ui->threadTreeWidget->setFocus(); ui->threadTreeWidget->setFocus();
changedThread(index);
} }
#ifdef TO_REMOVE #ifdef TO_REMOVE
@ -2255,6 +2267,7 @@ bool GxsForumThreadWidget::navigate(const RsGxsMessageId &msgId)
ui->threadTreeWidget->setCurrentIndex(index); ui->threadTreeWidget->setCurrentIndex(index);
ui->threadTreeWidget->setFocus(); ui->threadTreeWidget->setFocus();
changedThread(index);
return true; return true;
} }