Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show missing forum messages in dark red and disabled the read state for it.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-12 00:04:32 +00:00
parent 4b8766aec3
commit 1885b79b67
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -78,11 +78,12 @@
#define ROLE_THREAD_MSGID Qt::UserRole #define ROLE_THREAD_MSGID Qt::UserRole
#define ROLE_THREAD_STATUS Qt::UserRole + 1 #define ROLE_THREAD_STATUS Qt::UserRole + 1
#define ROLE_THREAD_MISSING Qt::UserRole + 2
// no need to copy, don't count in ROLE_THREAD_COUNT // no need to copy, don't count in ROLE_THREAD_COUNT
#define ROLE_THREAD_READCHILDREN Qt::UserRole + 2 #define ROLE_THREAD_READCHILDREN Qt::UserRole + 3
#define ROLE_THREAD_UNREADCHILDREN Qt::UserRole + 3 #define ROLE_THREAD_UNREADCHILDREN Qt::UserRole + 4
#define ROLE_THREAD_COUNT 2 #define ROLE_THREAD_COUNT 3
#define IS_UNREAD(status) ((status & FORUM_MSG_STATUS_READ) == 0 || (status & FORUM_MSG_STATUS_UNREAD_BY_USER)) #define IS_UNREAD(status) ((status & FORUM_MSG_STATUS_READ) == 0 || (status & FORUM_MSG_STATUS_UNREAD_BY_USER))
@ -580,17 +581,23 @@ void ForumsDialog::CalculateIconsAndFonts(QTreeWidgetItem *pItem, bool &bHasRead
uint32_t status = pItem->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt(); uint32_t status = pItem->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt();
bool bUnread = IS_UNREAD(status); bool bUnread = IS_UNREAD(status);
bool missing = pItem->data(COLUMN_THREAD_DATA, ROLE_THREAD_MISSING).toBool();
// set icon // set icon
if (bUnread) { if (missing) {
pItem->setIcon(COLUMN_THREAD_READ, QIcon(":/images/message-state-unread.png")); pItem->setIcon(COLUMN_THREAD_READ, QIcon());
} else {
pItem->setIcon(COLUMN_THREAD_READ, QIcon(":/images/message-state-read.png"));
}
if (status & FORUM_MSG_STATUS_READ) {
pItem->setIcon(COLUMN_THREAD_TITLE, QIcon()); pItem->setIcon(COLUMN_THREAD_TITLE, QIcon());
} else { } else {
pItem->setIcon(COLUMN_THREAD_TITLE, QIcon(":/images/message-state-new.png")); if (bUnread) {
pItem->setIcon(COLUMN_THREAD_READ, QIcon(":/images/message-state-unread.png"));
} else {
pItem->setIcon(COLUMN_THREAD_READ, QIcon(":/images/message-state-read.png"));
}
if (status & FORUM_MSG_STATUS_READ) {
pItem->setIcon(COLUMN_THREAD_TITLE, QIcon());
} else {
pItem->setIcon(COLUMN_THREAD_TITLE, QIcon(":/images/message-state-new.png"));
}
} }
int nItem; int nItem;
@ -620,6 +627,10 @@ void ForumsDialog::CalculateIconsAndFonts(QTreeWidgetItem *pItem, bool &bHasRead
qf.setBold(false); qf.setBold(false);
pItem->setTextColor(i, Qt::gray); pItem->setTextColor(i, Qt::gray);
} }
if (missing) {
/* Missing message */
pItem->setTextColor(i, Qt::darkRed);
}
pItem->setFont(i, qf); pItem->setFont(i, qf);
} }
@ -803,7 +814,7 @@ void ForumsDialog::insertThreads()
item->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID, QString::fromStdString(tit->msgId)); item->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID, QString::fromStdString(tit->msgId));
if (m_bIsForumSubscribed) { if (m_bIsForumSubscribed && !(msginfo.msgflags & RS_DISTRIB_MISSING_MSG)) {
rsForums->getMessageStatus(msginfo.forumId, msginfo.msgId, status); rsForums->getMessageStatus(msginfo.forumId, msginfo.msgId, status);
} else { } else {
// show message as read // show message as read
@ -811,6 +822,8 @@ void ForumsDialog::insertThreads()
} }
item->setData(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS, status); item->setData(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS, status);
item->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MISSING, (msginfo.msgflags & RS_DISTRIB_MISSING_MSG) ? true : false);
std::list<QTreeWidgetItem *> threadlist; std::list<QTreeWidgetItem *> threadlist;
threadlist.push_back(item); threadlist.push_back(item);
@ -908,7 +921,7 @@ void ForumsDialog::insertThreads()
child->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID, QString::fromStdString(mit->msgId)); child->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID, QString::fromStdString(mit->msgId));
if (m_bIsForumSubscribed) { if (m_bIsForumSubscribed && !(msginfo.msgflags & RS_DISTRIB_MISSING_MSG)) {
rsForums->getMessageStatus(msginfo.forumId, msginfo.msgId, status); rsForums->getMessageStatus(msginfo.forumId, msginfo.msgId, status);
} else { } else {
// show message as read // show message as read
@ -916,6 +929,8 @@ void ForumsDialog::insertThreads()
} }
child->setData(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS, status); child->setData(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS, status);
child->setData(COLUMN_THREAD_DATA, ROLE_THREAD_MISSING, (msginfo.msgflags & RS_DISTRIB_MISSING_MSG) ? true : false);
if (bFillComplete && bExpandNewMessages && IS_UNREAD(status)) { if (bFillComplete && bExpandNewMessages && IS_UNREAD(status)) {
QTreeWidgetItem *pParent = child; QTreeWidgetItem *pParent = child;
while ((pParent = pParent->parent()) != NULL) { while ((pParent = pParent->parent()) != NULL) {
@ -1261,6 +1276,11 @@ void ForumsDialog::setMsgAsReadUnread(QList<QTreeWidgetItem*> &Rows, bool bRead)
std::list<QTreeWidgetItem*> changedItems; std::list<QTreeWidgetItem*> changedItems;
for (Row = Rows.begin(); Row != Rows.end(); Row++) { for (Row = Rows.begin(); Row != Rows.end(); Row++) {
if ((*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_MISSING).toBool()) {
/* Missing message */
continue;
}
uint32_t status = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt(); uint32_t status = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt();
/* set always as read ... */ /* set always as read ... */