Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 00:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed double definitions of roles

Browse source
This commit is contained in:
csoler 2019-02-26 11:29:10 +01:00
parent 16cae622e3
commit 40832734cc
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

42
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -151,7 +151,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(insertMessages())); connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(insertMessages()));
connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged()));
connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(messageTreeWidgetCustomPopupMenu(QPoint))); connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&)));
connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint)));
connect(ui.messageTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)) , this, SLOT(clicked(QTreeWidgetItem*,int))); connect(ui.messageTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)) , this, SLOT(clicked(QTreeWidgetItem*,int)));
connect(ui.messageTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)) , this, SLOT(doubleClicked(QTreeWidgetItem*,int))); connect(ui.messageTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)) , this, SLOT(doubleClicked(QTreeWidgetItem*,int)));
@ -229,13 +229,13 @@ MessagesDialog::MessagesDialog(QWidget *parent)
#endif #endif
mMessageCompareRole = new RSTreeWidgetItemCompareRole; mMessageCompareRole = new RSTreeWidgetItemCompareRole;
mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::ROLE_SORT); mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole);
RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this);
itemDelegate->setSpacing(QSize(0, 2)); itemDelegate->setSpacing(QSize(0, 2));
@ -254,7 +254,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
/* Set initial section sizes */ /* Set initial section sizes */
QHeaderView * msgwheader = ui.messageTreeWidget->header () ; QHeaderView * msgwheader = ui.messageTreeWidget->header () ;
msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')); msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')*1.2f);
msgwheader->resizeSection (COLUMN_SUBJECT, 250); msgwheader->resizeSection (COLUMN_SUBJECT, 250);
msgwheader->resizeSection (COLUMN_FROM, 140); msgwheader->resizeSection (COLUMN_FROM, 140);
//msgwheader->resizeSection (COLUMN_SIGNATURE, 24); //msgwheader->resizeSection (COLUMN_SIGNATURE, 24);
@ -539,7 +539,7 @@ int MessagesDialog::getSelectedMessages(QList<QString>& mid)
QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows();
foreach(const QModelIndex& m, qmil) foreach(const QModelIndex& m, qmil)
mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(RsMessageModel::ROLE_MSGID).toString()) ; mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(RsMessageModel::MsgIdRole).toString()) ;
return mid.size(); return mid.size();
} }
@ -586,7 +586,7 @@ bool MessagesDialog::isMessageRead(QTreeWidgetItem *item)
return true; return true;
} }
return !item->data(COLUMN_DATA, RsMessageModel::ROLE_UNREAD).toBool(); return !item->data(COLUMN_DATA, RsMessageModel::UnreadRole).toBool();
} }
bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item)
@ -595,7 +595,7 @@ bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item)
return false; return false;
} }
return item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt() & RS_MSG_STAR; return item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt() & RS_MSG_STAR;
} }
void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/) void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/)
@ -1456,10 +1456,10 @@ void MessagesDialog::setMsgAsReadUnread(const QList<QTreeWidgetItem*> &items, bo
LockUpdate Lock (this, false); LockUpdate Lock (this, false);
foreach (QTreeWidgetItem *item, items) { foreach (QTreeWidgetItem *item, items) {
std::string mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString();
if (rsMail->MessageRead(mid, !read)) { if (rsMail->MessageRead(mid, !read)) {
int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt();
msgFlag &= ~RS_MSG_NEW; msgFlag &= ~RS_MSG_NEW;
if (read) { if (read) {
@ -1468,7 +1468,7 @@ void MessagesDialog::setMsgAsReadUnread(const QList<QTreeWidgetItem*> &items, bo
msgFlag |= RS_MSG_UNREAD_BY_USER; msgFlag |= RS_MSG_UNREAD_BY_USER;
} }
item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag);
InitIconAndFont(item); InitIconAndFont(item);
} }
@ -1508,10 +1508,10 @@ void MessagesDialog::setMsgStar(const QList<QTreeWidgetItem*> &items, bool star)
LockUpdate Lock (this, false); LockUpdate Lock (this, false);
foreach (QTreeWidgetItem *item, items) { foreach (QTreeWidgetItem *item, items) {
std::string mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString();
if (rsMail->MessageStar(mid, star)) { if (rsMail->MessageStar(mid, star)) {
int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt();
msgFlag &= ~RS_MSG_STAR; msgFlag &= ~RS_MSG_STAR;
if (star) { if (star) {
@ -1520,7 +1520,7 @@ void MessagesDialog::setMsgStar(const QList<QTreeWidgetItem*> &items, bool star)
msgFlag &= ~RS_MSG_STAR; msgFlag &= ~RS_MSG_STAR;
} }
item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag);
InitIconAndFont(item); InitIconAndFont(item);
@ -1543,7 +1543,7 @@ void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead
updateInterface(); updateInterface();
return; return;
} }
mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString();
int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL); int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL);
if (nCount == 1) { if (nCount == 1) {
@ -1619,8 +1619,8 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid)
if(!indx.isValid()) if(!indx.isValid())
return false ; return false ;
cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_SRCID).toString().toStdString(); cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::SrcIdRole).toString().toStdString();
mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_MSGID).toString().toStdString(); mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::MsgIdRole).toString().toStdString();
return true; return true;
} }

4
retroshare-gui/src/gui/msgs/MessageModel.cpp
View file

@ -265,6 +265,10 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const
case FilterRole: return filterRole (fmpe,index.column()) ; case FilterRole: return filterRole (fmpe,index.column()) ;
case StatusRole: return statusRole (fmpe,index.column()) ; case StatusRole: return statusRole (fmpe,index.column()) ;
case SortRole: return sortRole (fmpe,index.column()) ; case SortRole: return sortRole (fmpe,index.column()) ;
case MsgFlagsRole: return fmpe.msgflags ;
case UnreadRole: return fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER);
case MsgIdRole: return QString::fromStdString(fmpe.msgId) ;
case SrcIdRole: return QString::fromStdString(fmpe.srcId.toStdString()) ;
default: default:
return QVariant(); return QVariant();
} }

11
retroshare-gui/src/gui/msgs/MessageModel.h
View file

@ -43,14 +43,6 @@ public:
explicit RsMessageModel(QObject *parent = NULL); explicit RsMessageModel(QObject *parent = NULL);
~RsMessageModel(){} ~RsMessageModel(){}
enum Role {
ROLE_SORT = Qt::UserRole,
ROLE_MSGID = Qt::UserRole + 1,
ROLE_SRCID = Qt::UserRole + 2,
ROLE_UNREAD = Qt::UserRole + 3,
ROLE_MSGFLAGS = Qt::UserRole + 4
};
enum BoxName { enum BoxName {
BOX_NONE = 0x00, BOX_NONE = 0x00,
BOX_INBOX = 0x01, BOX_INBOX = 0x01,
@ -76,6 +68,9 @@ public:
StatusRole = Qt::UserRole+2, StatusRole = Qt::UserRole+2,
UnreadRole = Qt::UserRole+3, UnreadRole = Qt::UserRole+3,
FilterRole = Qt::UserRole+4, FilterRole = Qt::UserRole+4,
MsgIdRole = Qt::UserRole+5,
MsgFlagsRole = Qt::UserRole+6,
SrcIdRole = Qt::UserRole+7,
}; };
QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;} QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}