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

Merge pull request #2105 from PhenomRetroShare/Fix_MissingForumMessageText

Browse Source 
Fix Missing Forum Message Text
This commit is contained in:
csoler 2020-11-10 15:51:40 +01:00 committed by GitHub
commit ec94a89413
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ class DistributionItemDelegate: public QStyledItemDelegate
public: public:
DistributionItemDelegate() {} DistributionItemDelegate() {}
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{ {
if(!index.isValid()) if(!index.isValid())
{ {
@ -105,7 +105,7 @@ public:
return ; return ;
} }
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
// disable default icon // disable default icon
opt.icon = QIcon(); opt.icon = QIcon();
@ -135,7 +135,7 @@ public:
painter->drawPixmap(r.topLeft() + p, pix); painter->drawPixmap(r.topLeft() + p, pix);
} }
virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& /*index*/) const override
{ {
static auto img(FilesDefs::getPixmapFromQtResourcePath(IMAGE_WARNING_YELLOW)); static auto img(FilesDefs::getPixmapFromQtResourcePath(IMAGE_WARNING_YELLOW));
@ -148,7 +148,7 @@ class ReadStatusItemDelegate: public QStyledItemDelegate
public: public:
ReadStatusItemDelegate() {} ReadStatusItemDelegate() {}
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{ {
if(!index.isValid()) if(!index.isValid())
{ {
@ -156,7 +156,7 @@ public:
return ; return ;
} }
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
// disable default icon // disable default icon
opt.icon = QIcon(); opt.icon = QIcon();
@ -194,7 +194,7 @@ public:
painter->drawPixmap(r.topLeft() + p, pix); painter->drawPixmap(r.topLeft() + p, pix);
} }
virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& /*index*/) const override
{ {
static auto img(FilesDefs::getPixmapFromQtResourcePath(":/images/message-state-unread.png")); static auto img(FilesDefs::getPixmapFromQtResourcePath(":/images/message-state-unread.png"));
@ -1204,7 +1204,7 @@ void GxsForumThreadWidget::insertMessage()
int current_index = 0 ; int current_index = 0 ;
for(int i=0;i<post_versions.size();++i) for(int i=0;i<static_cast<int>(post_versions.size());++i)
{ {
ui->versions_CB->insertItem(i, ((i==0)?tr("(Latest) "):tr("(Old) "))+" "+DateTime::formatLongDateTime( post_versions[i].first)); ui->versions_CB->insertItem(i, ((i==0)?tr("(Latest) "):tr("(Old) "))+" "+DateTime::formatLongDateTime( post_versions[i].first));
ui->versions_CB->setItemData(i,QString::fromStdString(post_versions[i].second.toStdString())); ui->versions_CB->setItemData(i,QString::fromStdString(post_versions[i].second.toStdString()));
@ -1228,7 +1228,16 @@ void GxsForumThreadWidget::insertMessage()
ui->versions_CB->blockSignals(false) ; ui->versions_CB->blockSignals(false) ;
/* request Post */ /* request Post */
bool missing = index.sibling(index.row(),RsGxsForumModel::COLUMN_THREAD_DATA).data(RsGxsForumModel::MissingRole).toBool();
if (missing)
{
// Don't update data for missing message else get multiple entry.
setMessageLoadingError(tr("Missing Message:\nThis message is missing. You should receive it later."));
}
else
{
updateMessageData(mThreadId); updateMessageData(mThreadId);
}
// markMsgAsRead(); // markMsgAsRead();
} }
@ -1335,7 +1344,7 @@ void GxsForumThreadWidget::previousMessage()
QModelIndex parentIndex = current_index.parent(); QModelIndex parentIndex = current_index.parent();
int index = current_index.row(); int index = current_index.row();
int count = mThreadModel->rowCount(parentIndex) ; //int count = mThreadModel->rowCount(parentIndex) ;
if (index > 0) if (index > 0)
{ {