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

removed sorting sensitivity and some dead code

Browse Source
This commit is contained in:
csoler 2019-03-18 21:35:55 +01:00
parent 14d29a4490
commit f355abe025
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -140,6 +140,9 @@ MessagesDialog::MessagesDialog(QWidget *parent)
mMessageProxyModel = new MessageSortFilterProxyModel(ui.messageTreeWidget->header(),this);
mMessageProxyModel->setSourceModel(mMessageModel);
mMessageProxyModel->setSortRole(RsMessageModel::SortRole);
mMessageProxyModel->setDynamicSortFilter(false);
mMessageProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
ui.messageTreeWidget->setModel(mMessageProxyModel);
changeBox(0); // set to inbox
@ -179,7 +182,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
headerItem->setToolTip(COLUMN_DATE, tr("Click to sort by date"));
headerItem->setToolTip(COLUMN_TAGS, tr("Click to sort by tags"));
headerItem->setToolTip(COLUMN_STAR, tr("Click to sort by star"));
#endif
mMessageCompareRole = new RSTreeWidgetItemCompareRole;
mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole);
@ -189,6 +191,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::SortRole);
mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole);
#endif
RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this);
itemDelegate->setSpacing(QSize(0, 2));

3
retroshare-gui/src/gui/MessagesDialog.h
View File

@ -138,7 +138,8 @@ private:
QTimer *timer;
int timerIndex;
RSTreeWidgetItemCompareRole *mMessageCompareRole;
//RSTreeWidgetItemCompareRole *mMessageCompareRole;
MessageWidget *msgWidget;
RsMessageModel *mMessageModel;
QSortFilterProxyModel *mMessageProxyModel;

16
retroshare-gui/src/gui/msgs/MessageModel.cpp
View File

@ -427,14 +427,14 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
case COLUMN_THREAD_DATE: return QVariant(QString::number(fmpe.ts)); // we should probably have leading zeroes here
case COLUMN_THREAD_READ: return QVariant((bool)IS_MESSAGE_UNREAD(fmpe.msgflags));
case COLUMN_THREAD_AUTHOR:
{
QString str,comment ;
QList<QIcon> icons;
GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.srcId), false, str, icons, comment,GxsIdDetails::ICON_TYPE_NONE);
return QVariant(str);
}
// case COLUMN_THREAD_AUTHOR:
// {
// QString str,comment ;
// QList<QIcon> icons;
// GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.srcId), false, str, icons, comment,GxsIdDetails::ICON_TYPE_NONE);
//
// return QVariant(str);
// }
case COLUMN_THREAD_STAR: return QVariant((fmpe.msgflags & RS_MSG_STAR)? 1:0);
default: