Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 20:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keep current selection when updating a forum. Still need to keep the expand/collapse property

Browse source
This commit is contained in:
csoler 2018-12-04 23:36:07 +01:00
parent 6fae40d417
commit 11b4981bd4
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
View file

@ -56,9 +56,7 @@ void RsGxsForumModel::preMods()
} }
void RsGxsForumModel::postMods() void RsGxsForumModel::postMods()
{ {
//emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount(QModelIndex())-1,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL));
emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(0,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(0,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL));
//emit layoutChanged();
} }
void RsGxsForumModel::setTreeMode(TreeMode mode) void RsGxsForumModel::setTreeMode(TreeMode mode)

27
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -338,7 +338,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
connect(ui->newmessageButton, SIGNAL(clicked()), this, SLOT(replytoforummessage())); connect(ui->newmessageButton, SIGNAL(clicked()), this, SLOT(replytoforummessage()));
connect(ui->newthreadButton, SIGNAL(clicked()), this, SLOT(createthread())); connect(ui->newthreadButton, SIGNAL(clicked()), this, SLOT(createthread()));
connect(mThreadModel,SIGNAL(forumLoaded()),this,SLOT(updateGroupName())); connect(mThreadModel,SIGNAL(forumLoaded()),this,SLOT(postForumLoading()));
ui->newmessageButton->setText(tr("Reply")); ui->newmessageButton->setText(tr("Reply"));
ui->newthreadButton->setText(tr("New thread")); ui->newthreadButton->setText(tr("New thread"));
@ -589,6 +589,8 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
if (complete) { if (complete) {
/* Fill complete */ /* Fill complete */
mUpdating=true; mUpdating=true;
updateGroupData(); updateGroupData();
mThreadModel->setForum(groupId()); mThreadModel->setForum(groupId());
@ -1601,6 +1603,7 @@ void GxsForumThreadWidget::filterItems(const QString& text)
ui->filterLineEdit->setToolTip(tr("Found %1 results.").arg(count)) ; ui->filterLineEdit->setToolTip(tr("Found %1 results.").arg(count)) ;
} }
#ifdef TO_REMOVE
bool GxsForumThreadWidget::filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn) bool GxsForumThreadWidget::filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn)
{ {
bool visible = true; bool visible = true;
@ -1627,16 +1630,28 @@ bool GxsForumThreadWidget::filterItem(QTreeWidgetItem *item, const QString &text
return (visible || visibleChildCount); return (visible || visibleChildCount);
} }
#endif
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
/** Request / Response of Data ********************************/ /** Request / Response of Data ********************************/
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
void GxsForumThreadWidget::updateGroupName() void GxsForumThreadWidget::postForumLoading()
{ {
ui->threadTreeWidget->selectionModel()->clear(); QModelIndex indx = mThreadModel->getIndexOfMessage(mThreadId);
ui->threadTreeWidget->selectionModel()->reset();
mThreadId.clear(); if(indx.isValid())
{
QModelIndex index = mThreadProxyModel->mapFromSource(indx);
ui->threadTreeWidget->selectionModel()->select(index,QItemSelectionModel::ClearAndSelect);
}
else
{
ui->threadTreeWidget->selectionModel()->clear();
ui->threadTreeWidget->selectionModel()->reset();
mThreadId.clear();
}
ui->forumName->setText(QString::fromUtf8(mForumGroup.mMeta.mGroupName.c_str())); ui->forumName->setText(QString::fromUtf8(mForumGroup.mMeta.mGroupName.c_str()));
ui->threadTreeWidget->sortByColumn(RsGxsForumModel::COLUMN_THREAD_DATE, Qt::DescendingOrder); ui->threadTreeWidget->sortByColumn(RsGxsForumModel::COLUMN_THREAD_DATE, Qt::DescendingOrder);
ui->threadTreeWidget->update(); ui->threadTreeWidget->update();
@ -1650,7 +1665,7 @@ void GxsForumThreadWidget::updateGroupData()
mSubscribeFlags = 0; mSubscribeFlags = 0;
mSignFlags = 0; mSignFlags = 0;
mThreadId.clear(); //mThreadId.clear();
mForumDescription.clear(); mForumDescription.clear();
ui->threadTreeWidget->selectionModel()->clear(); ui->threadTreeWidget->selectionModel()->clear();
ui->threadTreeWidget->selectionModel()->reset(); ui->threadTreeWidget->selectionModel()->reset();

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
View file

@ -102,7 +102,7 @@ private slots:
void changedThread(QModelIndex index); void changedThread(QModelIndex index);
void changedVersion(); void changedVersion();
void clickedThread (QModelIndex index); void clickedThread (QModelIndex index);
void updateGroupName(); void postForumLoading();
void reply_with_private_message(); void reply_with_private_message();
void replytoforummessage(); void replytoforummessage();