From 4fce5d61ccbebc01721fc5022eb230353b569b68 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 3 Feb 2019 19:39:19 +0100 Subject: [PATCH 01/25] added basic model file for Mail message tree --- libretroshare/src/retroshare/rstypes.h | 4 +- retroshare-gui/src/gui/msgs/MessageModel.cpp | 552 +++++++++++++++++++ retroshare-gui/src/gui/msgs/MessageModel.h | 172 ++++++ retroshare-gui/src/retroshare-gui.pro | 2 + 4 files changed, 728 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/gui/msgs/MessageModel.cpp create mode 100644 retroshare-gui/src/gui/msgs/MessageModel.h diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 71a8406a1..cec7034ba 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -50,8 +50,8 @@ typedef Sha1CheckSum RsFileHash ; typedef Sha1CheckSum RsMessageId ; const uint32_t FT_STATE_FAILED = 0x0000 ; -const uint32_t FT_STATE_OKAY = 0x0001 ; -const uint32_t FT_STATE_WAITING = 0x0002 ; +const uint32_t FT_STATE_OKAY = 0x0001 ; +const uint32_t FT_STATE_WAITING = 0x0002 ; const uint32_t FT_STATE_DOWNLOADING = 0x0003 ; const uint32_t FT_STATE_COMPLETE = 0x0004 ; const uint32_t FT_STATE_QUEUED = 0x0005 ; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp new file mode 100644 index 000000000..b1572a844 --- /dev/null +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -0,0 +1,552 @@ +/******************************************************************************* + * retroshare-gui/src/gui/msgs/RsMessageModel.cpp * + * * + * Copyright 2019 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + +#include + +#include +#include +#include +#include +#include + +#include "util/HandleRichText.h" +#include "util/DateTime.h" +#include "gui/gxs/GxsIdDetails.h" +#include "MessageModel.h" +#include "retroshare/rsexpr.h" + +//#define DEBUG_MESSAGE_MODEL + +#define IS_MESSAGE_UNREAD(flags) (flags & RS_MSG_UNREAD_BY_USER) + +std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere + +const QString RsMessageModel::FilterString("filtered"); + +RsMessageModel::RsMessageModel(QObject *parent) + : QAbstractItemModel(parent) +{ + mFilteringEnabled=false; +} + +void RsMessageModel::preMods() +{ + emit layoutAboutToBeChanged(); +} +void RsMessageModel::postMods() +{ + emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(0,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); +} + +// void RsGxsForumModel::setSortMode(SortMode mode) +// { +// preMods(); +// +// mSortMode = mode; +// +// postMods(); +// } + +int RsMessageModel::rowCount(const QModelIndex& parent) const +{ + if(!parent.isValid()) + return 0; + + if(parent.column() > 0) + return 0; + + if(mMessages.empty()) // security. Should never happen. + return 0; + + if(parent.internalPointer() == NULL) + return mMessages.size(); + + return 0; +} + +int RsMessageModel::columnCount(const QModelIndex &parent) const +{ + return COLUMN_THREAD_NB_COLUMNS ; +} + +bool RsMessageModel::getMessageData(const QModelIndex& i,Rs::Msgs::MessageInfo& fmpe) const +{ + if(!i.isValid()) + return true; + + quintptr ref = i.internalId(); + uint32_t index = 0; + + if(!convertInternalIdToMsgIndex(ref,index) || index >= mMessages.size()) + return false ; + + return rsMsgs->getMessage(mMessages[index].msgId,fmpe); +} + +bool RsMessageModel::hasChildren(const QModelIndex &parent) const +{ + if(!parent.isValid()) + return true; + + return false ; +} + +bool RsMessageModel::convertMsgIndexToInternalId(uint32_t index,quintptr& id) +{ + // the internal id is set to the place in the table of items. We simply shift to allow 0 to mean something special. + + id = index + 1 ; + + return true; +} + +bool RsMessageModel::convertInternalIdToMsgIndex(quintptr ref,uint32_t& index) +{ + if(ref == 0) + return false ; + + index = ref - 1; + return true; +} + +QModelIndex RsMessageModel::index(int row, int column, const QModelIndex & parent) const +{ + if(row < 0 || column < 0 || column >= COLUMN_THREAD_NB_COLUMNS) + return QModelIndex(); + + quintptr ref ; + + if(parent.internalId() == 0 && convertMsgIndexToInternalId(row,ref)) + return createIndex(row,column,ref) ; + + return QModelIndex(); +} + +QModelIndex RsMessageModel::parent(const QModelIndex& index) const +{ + if(!index.isValid()) + return QModelIndex(); + + return QModelIndex(); +} + +Qt::ItemFlags RsMessageModel::flags(const QModelIndex& index) const +{ + if (!index.isValid()) + return 0; + + return QAbstractItemModel::flags(index); +} + +QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if(role == Qt::DisplayRole) + switch(section) + { + case COLUMN_THREAD_DATE: return tr("Date"); + case COLUMN_THREAD_AUTHOR: return tr("Author"); + default: + return QVariant(); + } + + if(role == Qt::DecorationRole) + switch(section) + { + case COLUMN_THREAD_READ: return QIcon(":/images/message-state-read.png"); + default: + return QVariant(); + } + + return QVariant(); +} + +QVariant RsMessageModel::data(const QModelIndex &index, int role) const +{ +#ifdef DEBUG_FORUMMODEL + std::cerr << "calling data(" << index << ") role=" << role << std::endl; +#endif + + if(!index.isValid()) + return QVariant(); + + switch(role) + { + case Qt::SizeHintRole: return sizeHintRole(index.column()) ; + case Qt::StatusTipRole:return QVariant(); + default: break; + } + + quintptr ref = (index.isValid())?index.internalId():0 ; + uint32_t entry = 0; + +#ifdef DEBUG_FORUMMODEL + std::cerr << "data(" << index << ")" ; +#endif + + if(!ref) + { +#ifdef DEBUG_FORUMMODEL + std::cerr << " [empty]" << std::endl; +#endif + return QVariant() ; + } + + if(!convertInternalIdToMsgIndex(ref,entry) || entry >= mMessages.size()) + { +#ifdef DEBUG_FORUMMODEL + std::cerr << "Bad pointer: " << (void*)ref << std::endl; +#endif + return QVariant() ; + } + + const Rs::Msgs::MsgInfoSummary& fmpe(mMessages[entry]); + + if(role == Qt::FontRole) + { + QFont font ; +// font.setBold( (fmpe.mPostFlags & (ForumModelPostEntry::FLAG_POST_HAS_UNREAD_CHILDREN | ForumModelPostEntry::FLAG_POST_IS_PINNED)) || IS_MSG_UNREAD(fmpe.mMsgStatus)); + return QVariant(font); + } + +#ifdef DEBUG_FORUMMODEL + std::cerr << " [ok]" << std::endl; +#endif + + switch(role) + { + case Qt::DisplayRole: return displayRole (fmpe,index.column()) ; + case Qt::DecorationRole: return decorationRole(fmpe,index.column()) ; + case Qt::ToolTipRole: return toolTipRole (fmpe,index.column()) ; + case Qt::UserRole: return userRole (fmpe,index.column()) ; + case Qt::TextColorRole: return textColorRole (fmpe,index.column()) ; + case Qt::BackgroundRole: return backgroundRole(fmpe,index.column()) ; + + case FilterRole: return filterRole (fmpe,index.column()) ; + case StatusRole: return statusRole (fmpe,index.column()) ; + case SortRole: return sortRole (fmpe,index.column()) ; + default: + return QVariant(); + } +} + +QVariant RsMessageModel::textColorRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ +// if( (fmpe.msgflags & ForumModelPostEntry::FLAG_POST_IS_MISSING)) +// return QVariant(mTextColorMissing); +// +// if(IS_MSG_UNREAD(fmpe.mMsgStatus) || (fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_IS_PINNED)) +// return QVariant(mTextColorUnread); +// else +// return QVariant(mTextColorRead); + + return QVariant(); +} + +QVariant RsMessageModel::statusRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ +// if(column != COLUMN_THREAD_DATA) +// return QVariant(); + + return QVariant();//fmpe.mMsgStatus); +} + +QVariant RsMessageModel::filterRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ + if(!mFilteringEnabled) + return QVariant(FilterString); + + return QVariant(QString()); +} + +uint32_t RsMessageModel::updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings) +{ + QString s ; + uint32_t count = 0; + + return count; +} + + +void RsMessageModel::setFilter(int column,const QStringList& strings,uint32_t& count) +{ + preMods(); + + if(!strings.empty()) + { + count = updateFilterStatus(ForumModelIndex(0),column,strings); + mFilteringEnabled = true; + } + else + { + count=0; + mFilteringEnabled = false; + } + + postMods(); +} + +QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ + if(column == COLUMN_THREAD_AUTHOR) + { + QString str,comment ; + QList icons; + + if(!GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.srcId.toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + return QVariant(); + + int S = QFontMetricsF(QApplication::font()).height(); + QImage pix( (*icons.begin()).pixmap(QSize(4*S,4*S)).toImage()); + + QString embeddedImage; + if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, 8*S * 8*S)) + comment = "
" + embeddedImage + "" + comment + "
"; + + return comment; + } + + return QVariant(); +} + +QVariant RsMessageModel::backgroundRole(const Rs::Msgs::MsgInfoSummary &fmpe, int column) const +{ + return QVariant(); +} + +QVariant RsMessageModel::sizeHintRole(int col) const +{ + float factor = QFontMetricsF(QApplication::font()).height()/14.0f ; + + switch(col) + { + default: + case COLUMN_THREAD_SUBJECT: return QVariant( QSize(factor * 170, factor*14 )); + case COLUMN_THREAD_DATE: return QVariant( QSize(factor * 75 , factor*14 )); + case COLUMN_THREAD_AUTHOR: return QVariant( QSize(factor * 75 , factor*14 )); + } +} + +QVariant RsMessageModel::authorRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ +// if(column == COLUMN_THREAD_DATA) +// return QVariant(QString::fromStdString(fmpe.mAuthorId.toStdString())); + + return QVariant(); +} + +QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ + switch(column) + { + 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 icons; + GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.srcId), false, str, icons, comment,GxsIdDetails::ICON_TYPE_NONE); + + return QVariant(str); + } + default: + return displayRole(fmpe,column); + } +} + +QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const +{ + switch(col) + { + case COLUMN_THREAD_SUBJECT: return QVariant(QString::fromUtf8(fmpe.title.c_str())); + + case COLUMN_THREAD_READ:return QVariant(); + case COLUMN_THREAD_DATE:{ + QDateTime qtime; + qtime.setTime_t(fmpe.ts); + + return QVariant(DateTime::formatDateTime(qtime)); + } + + case COLUMN_THREAD_AUTHOR: return QVariant(); + + default: + return QVariant("[ TODO ]"); + } + + + return QVariant("[ERROR]"); +} + +QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const +{ + switch(col) + { + case COLUMN_THREAD_AUTHOR: return QVariant(QString::fromStdString(fmpe.srcId.toStdString())); + case COLUMN_THREAD_MSGID: return QVariant(QString::fromStdString(fmpe.msgId)); + default: + return QVariant(); + } +} + +QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const +{ + if(col == COLUMN_THREAD_READ) + return QVariant(IS_MESSAGE_UNREAD(fmpe.msgflags)); + else + return QVariant(); +} + +void RsMessageModel::clear() +{ + preMods(); + + mMessages.clear(); + + postMods(); + + emit messagesLoaded(); +} + +void RsMessageModel::setMessages(const std::list& msgs) +{ + preMods(); + + beginRemoveRows(QModelIndex(),0,mMessages.size()-1); + endRemoveRows(); + + mMessages.clear(); + + for(auto it(msgs.begin());it!=msgs.end();++it) + mMessages.push_back(*it); + + // now update prow for all posts + +#ifdef DEBUG_FORUMMODEL + debug_dump(); +#endif + + beginInsertRows(QModelIndex(),0,mMessages.size()-1); + endInsertRows(); + postMods(); + + emit messagesLoaded(); +} + +void RsMessageModel::updateMessages() +{ + std::list msgs ; + + rsMsgs->getMessageSummaries(msgs); + setMessages(msgs); +} + +// RsThread::async([this, group_id]() +// { +// // 1 - get message data from p3GxsForums +// +// std::list forumIds; +// std::vector msg_metas; +// std::vector groups; +// +// forumIds.push_back(group_id); +// +// if(!rsGxsForums->getForumsInfo(forumIds,groups)) +// { +// std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum group info for forum " << group_id << std::endl; +// return; +// } +// +// if(!rsGxsForums->getForumMsgMetaData(group_id,msg_metas)) +// { +// std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum message info for forum " << group_id << std::endl; +// return; +// } +// +// // 2 - sort the messages into a proper hierarchy +// +// auto post_versions = new std::map > >() ; +// std::vector *vect = new std::vector(); +// RsGxsForumGroup group = groups[0]; +// +// computeMessagesHierarchy(group,msg_metas,*vect,*post_versions); +// +// // 3 - update the model in the UI thread. +// +// RsQThreadUtils::postToObject( [group,vect,post_versions,this]() +// { +// /* Here it goes any code you want to be executed on the Qt Gui +// * thread, for example to update the data model with new information +// * after a blocking call to RetroShare API complete, note that +// * Qt::QueuedConnection is important! +// */ +// +// setPosts(group,*vect,*post_versions) ; +// +// delete vect; +// delete post_versions; +// +// +// }, this ); +// +// }); + +static bool decreasing_time_comp(const std::pair& e1,const std::pair& e2) { return e2.first < e1.first ; } + +void RsMessageModel::setMsgReadStatus(const QModelIndex& i,bool read_status) +{ + if(!i.isValid()) + return ; + + preMods(); + + quintptr ref = i.internalId(); + uint32_t index = 0; + + if(!convertInternalIdToMsgIndex(ref,index) || index >= mMessages.size()) + return ; + + rsMsgs->MessageRead(mMessages[index].msgId,!read_status); + + postMods(); +} + +QModelIndex RsMessageModel::getIndexOfMessage(const std::string& mid) const +{ + // Brutal search. This is not so nice, so dont call that in a loop! If too costly, we'll use a map. + + for(uint32_t i=0;imsgId << ": from " << it->srcId << ": flags=" << it->msgflags << ": title=\"" << it->title << "\"" << std::endl; +} + diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h new file mode 100644 index 000000000..5cf13f370 --- /dev/null +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -0,0 +1,172 @@ +/******************************************************************************* + * retroshare-gui/src/gui/msgs/RsMessageModel.h * + * * + * Copyright 2019 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + +#pragma once + +#include +#include + +#include "retroshare/rsmsgs.h" + +// This class holds the actual hierarchy of posts, represented by identifiers +// It is responsible for auto-updating when necessary and holds a mutex to allow the Model to +// safely access the data. + +// The model contains a post in place 0 that is the parent of all posts. + +typedef uint32_t ForumModelIndex; + +struct ForumModelPostEntry +{ + ForumModelPostEntry() : mPublishTs(0),mMostRecentTsInThread(0),mPostFlags(0),mReputationWarningLevel(0),mMsgStatus(0),prow(0) {} + + enum { // flags for display of posts. To be used in mPostFlags + FLAG_POST_IS_PINNED = 0x0001, + FLAG_POST_IS_MISSING = 0x0002, + FLAG_POST_IS_REDACTED = 0x0004, + FLAG_POST_HAS_UNREAD_CHILDREN = 0x0008, + FLAG_POST_HAS_READ_CHILDREN = 0x0010, + FLAG_POST_PASSES_FILTER = 0x0020, + FLAG_POST_CHILDREN_PASSES_FILTER = 0x0040, + }; + + std::string mTitle ; + RsGxsId mAuthorId ; + RsGxsMessageId mMsgId; + uint32_t mPublishTs; + uint32_t mMostRecentTsInThread; + uint32_t mPostFlags; + int mReputationWarningLevel; + int mMsgStatus; + + std::vector mChildren; + ForumModelIndex mParent; + int prow ; // parent row +}; + +// This class is the item model used by Qt to display the information + +class RsMessageModel : public QAbstractItemModel +{ + Q_OBJECT + +public: + explicit RsMessageModel(QObject *parent = NULL); + ~RsMessageModel(){} + + enum Columns { + COLUMN_THREAD_STAR =0x00, + COLUMN_THREAD_ATTACHMENT =0x01, + COLUMN_THREAD_SUBJECT =0x02, + COLUMN_THREAD_READ =0x03, + COLUMN_THREAD_AUTHOR =0x04, + COLUMN_THREAD_DATE =0x05, + COLUMN_THREAD_TAGS =0x06, + COLUMN_THREAD_MSGID =0x07, + COLUMN_THREAD_NB_COLUMNS =0x08, + }; + + enum Roles{ SortRole = Qt::UserRole+1, + StatusRole = Qt::UserRole+2, + UnreadRole = Qt::UserRole+3, + FilterRole = Qt::UserRole+4, + }; + + QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;} + QModelIndex getIndexOfMessage(const std::string &mid) const; + + static const QString FilterString ; + + // This method will asynchroneously update the data + + void updateMessages(); + const RsMessageId& currentMessageId() const; + + void setMsgReadStatus(const QModelIndex& i, bool read_status); + void setFilter(int column, const QStringList& strings, uint32_t &count) ; + + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + + QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex& child) const override; + Qt::ItemFlags flags(const QModelIndex& index) const override; + + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + + bool getMessageData(const QModelIndex& i,Rs::Msgs::MessageInfo& fmpe) const; + void clear() ; + + QVariant sizeHintRole (int col) const; + + QVariant displayRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant toolTipRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant userRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant statusRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant authorRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant sortRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant fontRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant filterRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant textColorRole (const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + QVariant backgroundRole(const Rs::Msgs::MsgInfoSummary& fmpe, int col) const; + + /*! + * \brief debug_dump + * Dumps the hierarchy of posts in the terminal, to allow checking whether the internal representation is correct. + */ + void debug_dump() const; + +signals: + void messagesLoaded(); // emitted after the messages have been set. Can be used to updated the UI. + +private: + bool mFilteringEnabled; + + void preMods() ; + void postMods() ; + + void *getParentRef(void *ref,int& row) const; + void *getChildRef(void *ref,int row) const; + //bool hasIndex(int row,int column,const QModelIndex& parent)const; + int getChildrenCount(void *ref) const; + + static bool convertMsgIndexToInternalId(uint32_t entry,quintptr& ref); + static bool convertInternalIdToMsgIndex(quintptr ref,uint32_t& index); + static void computeReputationLevel(uint32_t forum_sign_flags, ForumModelPostEntry& entry); + + void update_posts(const RsGxsGroupId &group_id); + uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings); + + static void generateMissingItem(const RsGxsMessageId &msgId,ForumModelPostEntry& entry); + static ForumModelIndex addEntry(std::vector& posts,const ForumModelPostEntry& entry,ForumModelIndex parent); + + void setMessages(const std::list& msgs); + + QColor mTextColorRead ; + QColor mTextColorUnread ; + QColor mTextColorUnreadChildren; + QColor mTextColorNotSubscribed ; + QColor mTextColorMissing ; + + std::vector mMessages; +}; diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 692deba9a..5769274b8 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -447,6 +447,7 @@ HEADERS += rshare.h \ gui/msgs/MessageComposer.h \ gui/msgs/MessageWindow.h \ gui/msgs/MessageWidget.h \ + gui/msgs/MessageModel.h \ gui/msgs/TagsMenu.h \ gui/msgs/textformat.h \ gui/msgs/MessageUserNotify.h \ @@ -802,6 +803,7 @@ SOURCES += main.cpp \ gui/msgs/MessageComposer.cpp \ gui/msgs/MessageWidget.cpp \ gui/msgs/MessageWindow.cpp \ + gui/msgs/MessageModel.cpp \ gui/msgs/TagsMenu.cpp \ gui/msgs/MessageUserNotify.cpp \ gui/common/RsButtonOnText.cpp \ From b7c8c16e2931c6841f2f4a0d08f92450ce021bc9 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 8 Feb 2019 15:41:20 +0100 Subject: [PATCH 02/25] inserted the model into the widget --- retroshare-gui/src/gui/MessagesDialog.cpp | 135 +++++++++++++++--- retroshare-gui/src/gui/MessagesDialog.h | 7 +- retroshare-gui/src/gui/MessagesDialog.ui | 14 +- .../src/gui/gxs/GxsIdTreeWidgetItem.h | 81 +++++++++++ retroshare-gui/src/gui/msgs/MessageModel.h | 10 ++ retroshare-gui/src/gui/msgs/MessageWidget.cpp | 2 +- 6 files changed, 214 insertions(+), 35 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 0f9419f07..74f370540 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -40,6 +40,7 @@ #include "msgs/MessageUserNotify.h" #include "msgs/MessageWidget.h" #include "msgs/TagsMenu.h" +#include "msgs/MessageModel.h" #include "settings/rsharesettings.h" #include "util/DateTime.h" @@ -99,20 +100,24 @@ MessagesDialog::LockUpdate::LockUpdate (MessagesDialog *pDialog, bool bUpdate) { +#ifdef TODO m_pDialog = pDialog; m_bUpdate = bUpdate; ++m_pDialog->lockUpdate; +#endif } MessagesDialog::LockUpdate::~LockUpdate () { +#ifdef TODO if(--m_pDialog->lockUpdate < 0) m_pDialog->lockUpdate = 0; if (m_bUpdate && m_pDialog->lockUpdate == 0) { m_pDialog->insertMessages(); } +#endif } void MessagesDialog::LockUpdate::setUpdate(bool bUpdate) @@ -120,6 +125,25 @@ void MessagesDialog::LockUpdate::setUpdate(bool bUpdate) m_bUpdate = bUpdate; } +class MessageSortFilterProxyModel: public QSortFilterProxyModel +{ +public: + MessageSortFilterProxyModel(const QHeaderView *header,QObject *parent = NULL): QSortFilterProxyModel(parent),m_header(header) {} + + bool lessThan(const QModelIndex& left, const QModelIndex& right) const override + { + return left.data(RsMessageModel::SortRole) < right.data(RsMessageModel::SortRole) ; + } + + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override + { + return sourceModel()->index(source_row,0,source_parent).data(RsMessageModel::FilterRole).toString() == RsMessageModel::FilterString ; + } + +private: + const QHeaderView *m_header ; +}; + /** Constructor */ MessagesDialog::MessagesDialog(QWidget *parent) : MainPage(parent) @@ -165,6 +189,22 @@ MessagesDialog::MessagesDialog(QWidget *parent) mCurrMsgId = ""; + mMessageModel = new RsMessageModel(this); + mMessageProxyModel = new MessageSortFilterProxyModel(ui.messageTreeWidget->header(),this); + mMessageProxyModel->setSourceModel(mMessageModel); + mMessageProxyModel->setSortRole(RsMessageModel::SortRole); + ui.messageTreeWidget->setModel(mMessageProxyModel); + + mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); + mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; + + ui.messageTreeWidget->setSortingEnabled(true); + + //ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_DISTRIBUTION,new DistributionItemDelegate()) ; + ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; + //ui.messageTreeWidget->setItemDelegateForColumn(RsGxsForumModel::COLUMN_THREAD_READ,new ReadStatusItemDelegate()) ; + +#ifdef TO_REMOVE // Set the QStandardItemModel ui.messageTreeWidget->setColumnCount(COLUMN_COUNT); QTreeWidgetItem *headerItem = ui.messageTreeWidget->headerItem(); @@ -190,6 +230,7 @@ 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, ROLE_SORT); @@ -287,9 +328,11 @@ MessagesDialog::MessagesDialog(QWidget *parent) // create timer for navigation timer = new RsProtectedTimer(this); +#ifdef TODO timer->setInterval(300); timer->setSingleShot(true); connect(timer, SIGNAL(timeout()), this, SLOT(updateCurrentMessage())); +#endif ui.messageTreeWidget->installEventFilter(this); @@ -380,6 +423,7 @@ void MessagesDialog::processSettings(bool load) bool MessagesDialog::eventFilter(QObject *obj, QEvent *event) { +#ifdef TODO if (obj == ui.messageTreeWidget) { if (event->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast(event); @@ -390,12 +434,14 @@ bool MessagesDialog::eventFilter(QObject *obj, QEvent *event) } } } +#endif // pass the event on to the parent class return MainPage::eventFilter(obj, event); } void MessagesDialog::changeEvent(QEvent *e) { +#ifdef TODO QWidget::changeEvent(e); switch (e->type()) { case QEvent::StyleChange: @@ -405,6 +451,7 @@ void MessagesDialog::changeEvent(QEvent *e) // remove compiler warnings break; } +#endif } void MessagesDialog::fillQuickView() @@ -486,17 +533,32 @@ void MessagesDialog::fillQuickView() // else // MainPage::keyPressEvent(e) ; //} +int MessagesDialog::getSelectedMessages(QList& mid) +{ + //To check if the selection has more than one row. + + mid.clear(); + QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); + + foreach(const QModelIndex& m, qmil) + mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(ROLE_MSGID).toString()) ; + + return mid.size(); +} int MessagesDialog::getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar) { +#ifdef TODO if (items) items->clear(); if (itemsRead) itemsRead->clear(); if (itemsUnread) itemsUnread->clear(); if (itemsStar) itemsStar->clear(); //To check if the selection has more than one row. - QList selectedItems = ui.messageTreeWidget->selectedItems(); - foreach (QTreeWidgetItem *item, selectedItems) + QList selectedMessages; + getSelectedMessages(selectedMessages); + + foreach (const QString&, selectedMessages) { if (items || itemsRead || itemsUnread || itemsStar) { if (items) items->append(item); @@ -516,6 +578,8 @@ int MessagesDialog::getSelectedMsgCount (QList *items, QListclear(); +// ui.messageTreeWidget->clear(); ui.quickViewWidget->setCurrentItem(NULL); listMode = LIST_BOX; - insertMessages(); - insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem()); +// insertMessages(); +// insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem()); + switch(box_row) + { + case 0: mMessageModel->setCurrentBox(RsMessageModel::BOX_INBOX ); break; + case 1: mMessageModel->setCurrentBox(RsMessageModel::BOX_OUTBOX); break; + case 2: mMessageModel->setCurrentBox(RsMessageModel::BOX_DRAFTS); break; + case 3: mMessageModel->setCurrentBox(RsMessageModel::BOX_SENT ); break; + case 4: mMessageModel->setCurrentBox(RsMessageModel::BOX_TRASH ); break; + default: + mMessageModel->setCurrentBox(RsMessageModel::BOX_NONE); break; + } inChange = false; } void MessagesDialog::changeQuickView(int newrow) { +#warning Missing code here! +#ifdef TODO Q_UNUSED(newrow); if (inChange) { @@ -799,16 +875,20 @@ void MessagesDialog::changeQuickView(int newrow) insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem()); inChange = false; +#endif } void MessagesDialog::messagesTagsChanged() { +#ifdef TODO if (lockUpdate) { return; } fillQuickView(); insertMessages(); +#endif +#warning Missing code here! } static void InitIconAndFont(QTreeWidgetItem *item) @@ -877,6 +957,7 @@ static void InitIconAndFont(QTreeWidgetItem *item) item->setData(COLUMN_DATA, ROLE_UNREAD, isNew); } +#ifdef TO_REMOVE void MessagesDialog::insertMessages() { if (lockUpdate) { @@ -1336,10 +1417,12 @@ void MessagesDialog::insertMessages() updateMessageSummaryList(); } +#endif // current row in messageTreeWidget has changed void MessagesDialog::currentItemChanged(QTreeWidgetItem *item) { +#ifdef TODO timer->stop(); if (item) { @@ -1350,6 +1433,7 @@ void MessagesDialog::currentItemChanged(QTreeWidgetItem *item) } updateInterface(); +#endif } // click in messageTreeWidget @@ -1377,9 +1461,10 @@ void MessagesDialog::clicked(QTreeWidgetItem *item, int column) return; } } - +#ifdef TODO timer->stop(); timerIndex = ui.messageTreeWidget->indexOfTopLevelItem(item); +#endif // show current message directly updateCurrentMessage(); @@ -1421,8 +1506,10 @@ void MessagesDialog::doubleClicked(QTreeWidgetItem *item, int column) // show current message directly void MessagesDialog::updateCurrentMessage() { +#ifdef TODO timer->stop(); insertMsgTxtAndFiles(ui.messageTreeWidget->topLevelItem(timerIndex)); +#endif } void MessagesDialog::setMsgAsReadUnread(const QList &items, bool read) @@ -1573,10 +1660,11 @@ void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) { - QTreeWidgetItem *item = ui.messageTreeWidget->currentItem(); + QModelIndex indx = ui.messageTreeWidget->currentIndex(); +#ifdef TODO /* get its Ids */ - if (!item) + if (!indx.isValid()) { //If no message is selected. assume first message is selected. if (ui.messageTreeWidget->topLevelItemCount() == 0) @@ -1588,8 +1676,13 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) if (!item) { return false; } - cid = item->data(COLUMN_DATA, ROLE_SRCID).toString().toStdString(); - mid = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); +#endif + if(!indx.isValid()) + return false ; + + cid = indx.sibling(indx.row(),COLUMN_DATA).data(ROLE_SRCID).toString().toStdString(); + mid = indx.sibling(indx.row(),COLUMN_DATA).data(ROLE_MSGID).toString().toStdString(); + return true; } @@ -1597,7 +1690,8 @@ void MessagesDialog::removemessage() { LockUpdate Lock (this, true); - QList selectedItems = ui.messageTreeWidget->selectedItems(); + QList selectedMessages ; + getSelectedMessages(selectedMessages); bool doDelete = false; int listrow = ui.listWidget->currentRow(); @@ -1609,16 +1703,11 @@ void MessagesDialog::removemessage() } } - foreach (QTreeWidgetItem *item, selectedItems) { - QString mid = item->data(COLUMN_DATA, ROLE_MSGID).toString(); - - // close tab showing this message -// closeTab(mid.toStdString()); - + foreach (const QString& m, selectedMessages) { if (doDelete) { - rsMail->MessageDelete(mid.toStdString()); + rsMail->MessageDelete(m.toStdString()); } else { - rsMail->MessageToTrash(mid.toStdString(), true); + rsMail->MessageToTrash(m.toStdString(), true); } } @@ -1658,7 +1747,9 @@ void MessagesDialog::buttonStyle() void MessagesDialog::filterChanged(const QString& text) { +#ifdef TODO ui.messageTreeWidget->filterItems(ui.filterLineEdit->currentFilter(), text); +#endif } void MessagesDialog::filterColumnChanged(int column) @@ -1669,9 +1760,11 @@ void MessagesDialog::filterColumnChanged(int column) if (column == COLUMN_CONTENT) { // need content ... refill - insertMessages(); + //insertMessages(); } +#ifdef TODO ui.messageTreeWidget->filterItems(column, ui.filterLineEdit->text()); +#endif // save index Settings->setValueToGroup("MessageDialog", "filterColumn", column); diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 5801a6320..8b3a96dcd 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -30,6 +30,8 @@ class RSTreeWidgetItemCompareRole; class MessageWidget; +class QTreeWidgetItem; +class RsMessageModel; class MessagesDialog : public MainPage { @@ -59,9 +61,10 @@ public: protected: bool eventFilter(QObject *obj, QEvent *ev); void changeEvent(QEvent *e); + int getSelectedMessages(QList& mid); public slots: - void insertMessages(); + //void insertMessages(); void messagesTagsChanged(); private slots: @@ -153,6 +156,8 @@ private: RSTreeWidgetItemCompareRole *mMessageCompareRole; MessageWidget *msgWidget; + RsMessageModel *mMessageModel; + QSortFilterProxyModel *mMessageProxyModel; /* Color definitions (for standard see qss.default) */ QColor mTextColorInbox; diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 1203a1eb2..1ea2a904b 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -6,7 +6,7 @@ 0 0 - 775 + 842 485 @@ -726,7 +726,7 @@ Qt::Vertical - + Qt::CustomContextMenu @@ -745,11 +745,6 @@ false - - - 1 - - @@ -843,11 +838,6 @@ QLineEdit
gui/common/LineEditClear.h
- - RSTreeWidget - QTreeWidget -
gui/common/RSTreeWidget.h
- RSTabWidget QTabWidget diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index edb8515e4..c8b83dbe0 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -21,6 +21,8 @@ #ifndef _GXS_ID_TREEWIDGETITEM_H #define _GXS_ID_TREEWIDGETITEM_H +#include +#include #include #include "gui/common/RSTreeWidgetItem.h" @@ -69,4 +71,83 @@ private: RsGxsImage mAvatar; }; +// This class is responsible of rendering authors of type RsGxsId in tree views. Used in forums, messages, etc. + +class GxsIdTreeItemDelegate: public QStyledItemDelegate +{ +public: + GxsIdTreeItemDelegate() {} + + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override + { + QStyleOptionViewItemV4 opt = option; + initStyleOption(&opt, index); + + // disable default icon + opt.icon = QIcon(); + const QRect r = option.rect; + + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + QString str; + QList icons; + QString comment; + + QFontMetricsF fm(option.font); + float f = fm.height(); + + QIcon icon ; + + if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + icon = GxsIdDetails::getLoadingIcon(id); + else + icon = *icons.begin(); + + QPixmap pix = icon.pixmap(r.size()); + + return QSize(1.2*(pix.width() + fm.width(str)),std::max(1.1*pix.height(),1.4*fm.height())); + } + + virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex& index) const override + { + if(!index.isValid()) + { + std::cerr << "(EE) attempt to draw an invalid index." << std::endl; + return ; + } + + QStyleOptionViewItemV4 opt = option; + initStyleOption(&opt, index); + + // disable default icon + opt.icon = QIcon(); + // draw default item + QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, 0); + + const QRect r = option.rect; + + RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); + QString str; + QList icons; + QString comment; + + QFontMetricsF fm(painter->font()); + float f = fm.height(); + + QIcon icon ; + + if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + icon = GxsIdDetails::getLoadingIcon(id); + else + icon = *icons.begin(); + + QPixmap pix = icon.pixmap(r.size()); + const QPoint p = QPoint(r.height()/2.0, (r.height() - pix.height())/2); + + // draw pixmap at center of item + painter->drawPixmap(r.topLeft() + p, pix); + painter->drawText(r.topLeft() + QPoint(r.height()+ f/2.0 + f/2.0,f*1.0), str); + } +}; + + #endif diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 5cf13f370..89b0894f8 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -71,6 +71,15 @@ public: explicit RsMessageModel(QObject *parent = NULL); ~RsMessageModel(){} + enum BoxName { + BOX_NONE = 0x00, + BOX_INBOX = 0x01, + BOX_OUTBOX = 0x02, + BOX_DRAFTS = 0x03, + BOX_SENT = 0x04, + BOX_TRASH = 0x05 + }; + enum Columns { COLUMN_THREAD_STAR =0x00, COLUMN_THREAD_ATTACHMENT =0x01, @@ -96,6 +105,7 @@ public: // This method will asynchroneously update the data + void setCurrentBox(BoxName bn) {} void updateMessages(); const RsMessageId& currentMessageId() const; diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index 02d74b5da..5294c1d26 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -108,7 +108,7 @@ MessageWidget *MessageWidget::openMsg(const std::string &msgId, bool window) msgWidget->isWindow = window; msgWidget->fill(msgId); - if (parent) { + if (parent) { parent->addWidget(msgWidget); } From 7a7ebed9d2f3764afb7e89371ee195f265acc74b Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 10 Feb 2019 15:13:39 +0100 Subject: [PATCH 03/25] improved Mail model --- retroshare-gui/src/gui/MessagesDialog.cpp | 2 ++ retroshare-gui/src/gui/msgs/MessageModel.cpp | 19 ++++++++++++------- retroshare-gui/src/gui/msgs/MessageModel.h | 1 - 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 74f370540..684c08de9 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -195,6 +195,8 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setSortRole(RsMessageModel::SortRole); ui.messageTreeWidget->setModel(mMessageProxyModel); + mMessageModel->updateMessages(); + mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index b1572a844..47430fab3 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -36,6 +36,8 @@ #define IS_MESSAGE_UNREAD(flags) (flags & RS_MSG_UNREAD_BY_USER) +#define IMAGE_STAR_ON ":/images/star-on-16.png" + std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere const QString RsMessageModel::FilterString("filtered"); @@ -161,7 +163,9 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in switch(section) { case COLUMN_THREAD_DATE: return tr("Date"); - case COLUMN_THREAD_AUTHOR: return tr("Author"); + case COLUMN_THREAD_AUTHOR: return tr("From"); + case COLUMN_THREAD_SUBJECT: return tr("Subject"); + case COLUMN_THREAD_TAGS: return tr("Tags"); default: return QVariant(); } @@ -169,6 +173,7 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in if(role == Qt::DecorationRole) switch(section) { + case COLUMN_THREAD_STAR: return QIcon(IMAGE_STAR_ON); case COLUMN_THREAD_READ: return QIcon(":/images/message-state-read.png"); default: return QVariant(); @@ -179,7 +184,7 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in QVariant RsMessageModel::data(const QModelIndex &index, int role) const { -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL std::cerr << "calling data(" << index << ") role=" << role << std::endl; #endif @@ -196,13 +201,13 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const quintptr ref = (index.isValid())?index.internalId():0 ; uint32_t entry = 0; -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL std::cerr << "data(" << index << ")" ; #endif if(!ref) { -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL std::cerr << " [empty]" << std::endl; #endif return QVariant() ; @@ -210,7 +215,7 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const if(!convertInternalIdToMsgIndex(ref,entry) || entry >= mMessages.size()) { -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL std::cerr << "Bad pointer: " << (void*)ref << std::endl; #endif return QVariant() ; @@ -225,7 +230,7 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const return QVariant(font); } -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL std::cerr << " [ok]" << std::endl; #endif @@ -439,7 +444,7 @@ void RsMessageModel::setMessages(const std::list& msgs // now update prow for all posts -#ifdef DEBUG_FORUMMODEL +#ifdef DEBUG_MESSAGE_MODEL debug_dump(); #endif diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 89b0894f8..438a3aa5f 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -164,7 +164,6 @@ private: static bool convertInternalIdToMsgIndex(quintptr ref,uint32_t& index); static void computeReputationLevel(uint32_t forum_sign_flags, ForumModelPostEntry& entry); - void update_posts(const RsGxsGroupId &group_id); uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings); static void generateMissingItem(const RsGxsMessageId &msgId,ForumModelPostEntry& entry); From 16cae622e3c4acc2f3f6d4e22f03d9223b25e7a5 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Feb 2019 10:46:32 +0100 Subject: [PATCH 04/25] fixed icons in attachment and read columns --- libretroshare/src/retroshare/rsmsgs.h | 6 +- retroshare-gui/src/gui/MessagesDialog.cpp | 201 ++++++------------- retroshare-gui/src/gui/msgs/MessageModel.cpp | 164 +++++++++++++-- retroshare-gui/src/gui/msgs/MessageModel.h | 44 +--- 4 files changed, 223 insertions(+), 192 deletions(-) diff --git a/libretroshare/src/retroshare/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h index ad189e03f..4893bb6c6 100644 --- a/libretroshare/src/retroshare/rsmsgs.h +++ b/libretroshare/src/retroshare/rsmsgs.h @@ -93,8 +93,8 @@ const ChatLobbyFlags RS_CHAT_LOBBY_FLAGS_PGP_SIGNED ( 0x00000010 ) ; // requi typedef uint64_t ChatLobbyId ; typedef uint64_t ChatLobbyMsgId ; typedef std::string ChatLobbyNickName ; - -typedef uint64_t MessageId ; +typedef std::string RsMailMessageId; // should be uint32_t !! +typedef uint64_t MessageId ; namespace Rs @@ -237,7 +237,7 @@ struct MsgInfoSummary : RsSerializable MsgInfoSummary() : msgflags(0), count(0), ts(0) {} virtual ~MsgInfoSummary() = default; - std::string msgId; + RsMailMessageId msgId; RsPeerId srcId; uint32_t msgflags; diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 684c08de9..32159c946 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -66,20 +66,14 @@ #define COLUMN_SUBJECT 2 #define COLUMN_UNREAD 3 #define COLUMN_FROM 4 -#define COLUMN_SIGNATURE 5 -#define COLUMN_DATE 6 -#define COLUMN_CONTENT 7 -#define COLUMN_TAGS 8 -#define COLUMN_COUNT 9 +//#define COLUMN_SIGNATURE 5 +#define COLUMN_DATE 5 +#define COLUMN_CONTENT 6 +#define COLUMN_TAGS 7 +#define COLUMN_COUNT 8 #define COLUMN_DATA 0 // column for storing the userdata like msgid and srcid -#define ROLE_SORT Qt::UserRole -#define ROLE_MSGID Qt::UserRole + 1 -#define ROLE_SRCID Qt::UserRole + 2 -#define ROLE_UNREAD Qt::UserRole + 3 -#define ROLE_MSGFLAGS Qt::UserRole + 4 - #define ROLE_QUICKVIEW_TYPE Qt::UserRole #define ROLE_QUICKVIEW_ID Qt::UserRole + 1 #define ROLE_QUICKVIEW_TEXT Qt::UserRole + 2 @@ -195,7 +189,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setSortRole(RsMessageModel::SortRole); ui.messageTreeWidget->setModel(mMessageProxyModel); - mMessageModel->updateMessages(); + changeBox(RsMessageModel::BOX_INBOX); mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; @@ -235,13 +229,13 @@ MessagesDialog::MessagesDialog(QWidget *parent) #endif mMessageCompareRole = new RSTreeWidgetItemCompareRole; - mMessageCompareRole->setRole(COLUMN_SUBJECT, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_UNREAD, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_FROM, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_DATE, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_TAGS, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_STAR, ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::ROLE_SORT); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); @@ -256,12 +250,14 @@ MessagesDialog::MessagesDialog(QWidget *parent) Shortcut = new QShortcut(QKeySequence (Qt::SHIFT | Qt::Key_Delete), ui.messageTreeWidget, 0, 0, Qt::WidgetShortcut); connect(Shortcut, SIGNAL(activated()), this, SLOT( removemessage ())); + QFontMetricsF fm(font()); + /* Set initial section sizes */ QHeaderView * msgwheader = ui.messageTreeWidget->header () ; - msgwheader->resizeSection (COLUMN_ATTACHEMENTS, 24); + msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')); msgwheader->resizeSection (COLUMN_SUBJECT, 250); msgwheader->resizeSection (COLUMN_FROM, 140); - msgwheader->resizeSection (COLUMN_SIGNATURE, 24); + //msgwheader->resizeSection (COLUMN_SIGNATURE, 24); msgwheader->resizeSection (COLUMN_DATE, 140); QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); @@ -306,9 +302,9 @@ MessagesDialog::MessagesDialog(QWidget *parent) QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_ATTACHEMENTS, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_DATE, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_UNREAD, QHeaderView::Fixed); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_SIGNATURE, QHeaderView::Fixed); + //QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_SIGNATURE, QHeaderView::Fixed); msgwheader->resizeSection (COLUMN_UNREAD, 24); - msgwheader->resizeSection (COLUMN_SIGNATURE, 24); + //msgwheader->resizeSection (COLUMN_SIGNATURE, 24); msgwheader->resizeSection (COLUMN_STAR, 24); QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); msgwheader->setStretchLastSection(false); @@ -543,7 +539,7 @@ int MessagesDialog::getSelectedMessages(QList& mid) QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); foreach(const QModelIndex& m, qmil) - mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(ROLE_MSGID).toString()) ; + mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(RsMessageModel::ROLE_MSGID).toString()) ; return mid.size(); } @@ -590,7 +586,7 @@ bool MessagesDialog::isMessageRead(QTreeWidgetItem *item) return true; } - return !item->data(COLUMN_DATA, ROLE_UNREAD).toBool(); + return !item->data(COLUMN_DATA, RsMessageModel::ROLE_UNREAD).toBool(); } bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) @@ -599,7 +595,7 @@ bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) return false; } - return item->data(COLUMN_DATA, ROLE_MSGFLAGS).toInt() & RS_MSG_STAR; + return item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt() & RS_MSG_STAR; } void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/) @@ -609,7 +605,10 @@ void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/) MessageInfo msgInfo; if (!getCurrentMsg(cid, mid)) + { + std::cerr << "No current message!" << std::endl; return ; + } if(!rsMail->getMessage(mid, msgInfo)) return ; @@ -895,68 +894,6 @@ void MessagesDialog::messagesTagsChanged() static void InitIconAndFont(QTreeWidgetItem *item) { - int msgFlags = item->data(COLUMN_DATA, ROLE_MSGFLAGS).toInt(); - - // show the real "New" state - if (msgFlags & RS_MSG_NEW) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-state-new.png")); - } else { - if (msgFlags & RS_MSG_USER_REQUEST) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/user/user_request16.png")); - } else if (msgFlags & RS_MSG_FRIEND_RECOMMENDATION) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/user/friend_suggestion16.png")); - } else if (msgFlags & RS_MSG_PUBLISH_KEY) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/share-icon-16.png")); - } else if (msgFlags & RS_MSG_UNREAD_BY_USER) { - if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_REPLIED) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-replied.png")); - } else if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_FORWARDED) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-forwarded.png")); - } else if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == (RS_MSG_REPLIED | RS_MSG_FORWARDED)) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-replied-forw.png")); - } else { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail.png")); - } - } else { - if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_REPLIED) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-replied-read.png")); - } else if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_FORWARDED) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-forwarded-read.png")); - } else if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == (RS_MSG_REPLIED | RS_MSG_FORWARDED)) { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-replied-forw-read.png")); - } else { - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-read.png")); - } - } - } - - if (msgFlags & RS_MSG_STAR) { - item->setIcon(COLUMN_STAR, QIcon(IMAGE_STAR_ON)); - item->setData(COLUMN_STAR, ROLE_SORT, 1); - } else { - item->setIcon(COLUMN_STAR, QIcon(IMAGE_STAR_OFF)); - item->setData(COLUMN_STAR, ROLE_SORT, 0); - } - - bool isNew = msgFlags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER); - - // set icon - if (isNew) { - item->setIcon(COLUMN_UNREAD, QIcon(":/images/message-state-unread.png")); - item->setData(COLUMN_UNREAD, ROLE_SORT, 1); - } else { - item->setIcon(COLUMN_UNREAD, QIcon(":/images/message-state-read.png")); - item->setData(COLUMN_UNREAD, ROLE_SORT, 0); - } - - // set font - for (int i = 0; i < COLUMN_COUNT; ++i) { - QFont qf = item->font(i); - qf.setBold(isNew); - item->setFont(i, qf); - } - - item->setData(COLUMN_DATA, ROLE_UNREAD, isNew); } #ifdef TO_REMOVE @@ -1519,10 +1456,10 @@ void MessagesDialog::setMsgAsReadUnread(const QList &items, bo LockUpdate Lock (this, false); foreach (QTreeWidgetItem *item, items) { - std::string mid = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); + std::string mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); if (rsMail->MessageRead(mid, !read)) { - int msgFlag = item->data(COLUMN_DATA, ROLE_MSGFLAGS).toInt(); + int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); msgFlag &= ~RS_MSG_NEW; if (read) { @@ -1531,7 +1468,7 @@ void MessagesDialog::setMsgAsReadUnread(const QList &items, bo msgFlag |= RS_MSG_UNREAD_BY_USER; } - item->setData(COLUMN_DATA, ROLE_MSGFLAGS, msgFlag); + item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); InitIconAndFont(item); } @@ -1571,10 +1508,10 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) LockUpdate Lock (this, false); foreach (QTreeWidgetItem *item, items) { - std::string mid = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); + std::string mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); if (rsMail->MessageStar(mid, star)) { - int msgFlag = item->data(COLUMN_DATA, ROLE_MSGFLAGS).toInt(); + int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); msgFlag &= ~RS_MSG_STAR; if (star) { @@ -1583,7 +1520,7 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) msgFlag &= ~RS_MSG_STAR; } - item->setData(COLUMN_DATA, ROLE_MSGFLAGS, msgFlag); + item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); InitIconAndFont(item); @@ -1606,7 +1543,7 @@ void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead updateInterface(); return; } - mid = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); + mid = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGID).toString().toStdString(); int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL); if (nCount == 1) { @@ -1682,8 +1619,8 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) if(!indx.isValid()) return false ; - cid = indx.sibling(indx.row(),COLUMN_DATA).data(ROLE_SRCID).toString().toStdString(); - mid = indx.sibling(indx.row(),COLUMN_DATA).data(ROLE_MSGID).toString().toStdString(); + cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_SRCID).toString().toStdString(); + mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_MSGID).toString().toStdString(); return true; } @@ -1720,12 +1657,11 @@ void MessagesDialog::undeletemessage() { LockUpdate Lock (this, true); - QList items; - getSelectedMsgCount (&items, NULL, NULL, NULL); - foreach (QTreeWidgetItem *item, items) { - QString mid = item->data(COLUMN_DATA, ROLE_MSGID).toString(); - rsMail->MessageToTrash(mid.toStdString(), false); - } + QList msgids; + getSelectedMessages(msgids); + + foreach (const QString& s, msgids) + rsMail->MessageToTrash(s.toStdString(), false); // LockUpdate -> insertMessages(); } @@ -1990,14 +1926,11 @@ void MessagesDialog::tagAboutToShow() // activate actions from the first selected row MsgTagInfo tagInfo; - QList items; - getSelectedMsgCount (&items, NULL, NULL, NULL); + QList msgids; + getSelectedMessages(msgids); - if (items.size()) { - std::string msgId = items.front()->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); - - rsMail->getMessageTag(msgId, tagInfo); - } + if(!msgids.empty()) + rsMail->getMessageTag(msgids.front().toStdString(), tagInfo); menu->activateActions(tagInfo.tagIds); } @@ -2006,12 +1939,12 @@ void MessagesDialog::tagRemoveAll() { LockUpdate Lock (this, false); - QList items; - getSelectedMsgCount (&items, NULL, NULL, NULL); - foreach (QTreeWidgetItem *item, items) { - std::string msgId = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); + QList msgids; + getSelectedMessages(msgids); - rsMail->setMessageTag(msgId, 0, false); + foreach(const QString& s, msgids) + { + rsMail->setMessageTag(s.toStdString(), 0, false); Lock.setUpdate(true); } @@ -2026,32 +1959,23 @@ void MessagesDialog::tagSet(int tagId, bool set) LockUpdate Lock (this, false); - QList items; - getSelectedMsgCount (&items, NULL, NULL, NULL); - foreach (QTreeWidgetItem *item, items) { - std::string msgId = item->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); + QList msgids; + getSelectedMessages(msgids); - if (rsMail->setMessageTag(msgId, tagId, set)) { + foreach (const QString& s, msgids) + if (rsMail->setMessageTag(s.toStdString(), tagId, set)) Lock.setUpdate(true); - } - } - - // LockUpdate -> insertMessages(); } void MessagesDialog::emptyTrash() { LockUpdate Lock (this, true); - std::list msgList; - rsMail->getMessageSummaries(msgList); + std::list msgs ; + mMessageModel->getMessageSummaries(RsMessageModel::BOX_TRASH,msgs); - std::list::const_iterator it; - for (it = msgList.begin(); it != msgList.end(); ++it) { - if (it->msgflags & RS_MSG_TRASH) { - rsMail->MessageDelete(it->msgId); - } - } + for(auto it(msgs.begin());it!=msgs.end();++it) + rsMail->MessageDelete(it->msgId); // LockUpdate -> insertMessages(); } @@ -2142,13 +2066,16 @@ void MessagesDialog::updateInterface() int tab = ui.tabWidget->currentIndex(); - if (tab == 0) { - count = getSelectedMsgCount(NULL, NULL, NULL, NULL); - } else { + if (tab == 0) + { + QList msgs; + count = getSelectedMessages(msgs); + } + else + { MessageWidget *msg = dynamic_cast(ui.tabWidget->widget(tab)); - if (msg && msg->msgId().empty() == false) { + if (msg && msg->msgId().empty() == false) count = 1; - } } ui.replymessageButton->setEnabled(count == 1); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 47430fab3..55fb89e42 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -26,17 +26,20 @@ #include #include +#include "gui/common/TagDefs.h" #include "util/HandleRichText.h" #include "util/DateTime.h" #include "gui/gxs/GxsIdDetails.h" #include "MessageModel.h" #include "retroshare/rsexpr.h" +#include "retroshare/rsmsgs.h" //#define DEBUG_MESSAGE_MODEL -#define IS_MESSAGE_UNREAD(flags) (flags & RS_MSG_UNREAD_BY_USER) +#define IS_MESSAGE_UNREAD(flags) (flags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER)) #define IMAGE_STAR_ON ":/images/star-on-16.png" +#define IMAGE_STAR_OFF ":/images/star-off-16.png" std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere @@ -46,6 +49,7 @@ RsMessageModel::RsMessageModel(QObject *parent) : QAbstractItemModel(parent) { mFilteringEnabled=false; + mCurrentBox = BOX_NONE; } void RsMessageModel::preMods() @@ -174,11 +178,25 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in switch(section) { case COLUMN_THREAD_STAR: return QIcon(IMAGE_STAR_ON); - case COLUMN_THREAD_READ: return QIcon(":/images/message-state-read.png"); + case COLUMN_THREAD_READ: return QIcon(":/images/message-state-header.png"); + case COLUMN_THREAD_ATTACHMENT: return QIcon(":/images/attachment.png"); default: return QVariant(); } + if(role == Qt::ToolTipRole) + switch(section) + { + case COLUMN_THREAD_ATTACHMENT: return tr("Click to sort by attachments"); + case COLUMN_THREAD_SUBJECT: return tr("Click to sort by subject"); + case COLUMN_THREAD_READ: return tr("Click to sort by read"); + case COLUMN_THREAD_AUTHOR: return tr("Click to sort by from"); + case COLUMN_THREAD_DATE: return tr("Click to sort by date"); + case COLUMN_THREAD_TAGS: return tr("Click to sort by tags"); + case COLUMN_THREAD_STAR: return tr("Click to sort by star"); + default: + return QVariant(); + } return QVariant(); } @@ -226,7 +244,8 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const if(role == Qt::FontRole) { QFont font ; -// font.setBold( (fmpe.mPostFlags & (ForumModelPostEntry::FLAG_POST_HAS_UNREAD_CHILDREN | ForumModelPostEntry::FLAG_POST_IS_PINNED)) || IS_MSG_UNREAD(fmpe.mMsgStatus)); + font.setBold(fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER)); + return QVariant(font); } @@ -356,6 +375,14 @@ QVariant RsMessageModel::authorRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col return QVariant(); } +// QVariant RsMessageModel::unreadRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +// { +// if(column == COLUMN_THREAD_UNREAD) +// return QVariant(); +// lconst Rs::Msgs::MsgInfoSummary& fmpe,int column) const +// +// } + QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { switch(column) @@ -371,6 +398,8 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum return QVariant(str); } + case COLUMN_THREAD_STAR: return QVariant((fmpe.msgflags & RS_MSG_STAR)? 1:0); + default: return displayRole(fmpe,column); } @@ -380,21 +409,48 @@ QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co { switch(col) { - case COLUMN_THREAD_SUBJECT: return QVariant(QString::fromUtf8(fmpe.title.c_str())); + case COLUMN_THREAD_SUBJECT: return QVariant(QString::fromUtf8(fmpe.title.c_str())); + case COLUMN_THREAD_ATTACHMENT:return QVariant(QString::number(fmpe.count)); - case COLUMN_THREAD_READ:return QVariant(); - case COLUMN_THREAD_DATE:{ - QDateTime qtime; - qtime.setTime_t(fmpe.ts); + case COLUMN_THREAD_READ:return QVariant(); + case COLUMN_THREAD_DATE:{ + QDateTime qtime; + qtime.setTime_t(fmpe.ts); - return QVariant(DateTime::formatDateTime(qtime)); - } + return QVariant(DateTime::formatDateTime(qtime)); + } - case COLUMN_THREAD_AUTHOR: return QVariant(); + case COLUMN_THREAD_TAGS:{ + // Tags + Rs::Msgs::MsgTagInfo tagInfo; + rsMsgs->getMessageTag(fmpe.msgId, tagInfo); - default: - return QVariant("[ TODO ]"); - } + Rs::Msgs::MsgTagType Tags; + rsMsgs->getMessageTagTypes(Tags); + + QString text; + + // build tag names + std::map >::iterator Tag; + for (auto tagit = tagInfo.tagIds.begin(); tagit != tagInfo.tagIds.end(); ++tagit) + { + if (!text.isNull()) + text += ","; + + auto Tag = Tags.types.find(*tagit); + + if (Tag != Tags.types.end()) + text += TagDefs::name(Tag->first, Tag->second.first); + else + std::cerr << "(WW) unknown tag " << (int)Tag->first << " in message " << fmpe.msgId << std::endl; + } + return text; + } + case COLUMN_THREAD_AUTHOR: return QVariant(); + + default: + return QVariant("[ TODO ]"); + } return QVariant("[ERROR]"); @@ -413,10 +469,43 @@ QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const { + if(col == COLUMN_THREAD_READ) + if(fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER)) + return QIcon(":/images/message-state-unread.png"); + else + return QIcon(":/images/message-state-read.png"); + + if(col == COLUMN_THREAD_SUBJECT) + { + if(fmpe.msgflags & RS_MSG_NEW ) return QIcon(":/images/message-state-new.png"); + if(fmpe.msgflags & RS_MSG_USER_REQUEST) return QIcon(":/images/user/user_request16.png"); + if(fmpe.msgflags & RS_MSG_FRIEND_RECOMMENDATION) return QIcon(":/images/user/friend_suggestion16.png"); + if(fmpe.msgflags & RS_MSG_PUBLISH_KEY) return QIcon(":/images/share-icon-16.png"); + + if(fmpe.msgflags & RS_MSG_UNREAD_BY_USER) + { + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_REPLIED) return QIcon(":/images/message-mail-replied.png"); + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_FORWARDED) return QIcon(":/images/message-mail-forwarded.png"); + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == (RS_MSG_REPLIED | RS_MSG_FORWARDED)) return QIcon(":/images/message-mail-replied-forw.png"); + + return QIcon(":/images/message-mail.png"); + } + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_REPLIED) return QIcon(":/images/message-mail-replied-read.png"); + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_FORWARDED) return QIcon(":/images/message-mail-forwarded-read.png"); + if((fmpe.msgflags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == (RS_MSG_REPLIED | RS_MSG_FORWARDED)) return QIcon(":/images/message-mail-replied-forw-read.png"); + + return QIcon(":/images/message-mail-read.png"); + } + + if(col == COLUMN_THREAD_STAR) + return QIcon((fmpe.msgflags & RS_MSG_STAR) ? (IMAGE_STAR_ON ): (IMAGE_STAR_OFF)); + + bool isNew = fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER); + if(col == COLUMN_THREAD_READ) - return QVariant(IS_MESSAGE_UNREAD(fmpe.msgflags)); - else - return QVariant(); + return QIcon(isNew ? ":/images/message-state-unread.png": ":/images/message-state-read.png"); + + return QVariant(); } void RsMessageModel::clear() @@ -455,11 +544,48 @@ void RsMessageModel::setMessages(const std::list& msgs emit messagesLoaded(); } +void RsMessageModel::setCurrentBox(BoxName bn) +{ + if(mCurrentBox != bn) + { + mCurrentBox = bn; + updateMessages(); + } +} + +void RsMessageModel::getMessageSummaries(BoxName box,std::list& msgs) +{ + rsMsgs->getMessageSummaries(msgs); + + // filter out messages that are not in the right box. + + for(auto it(msgs.begin());it!=msgs.end();) + { + bool ok = false; + + switch(box) + { + case BOX_INBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_INBOX ; break ; + case BOX_SENT : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_SENTBOX; break ; + case BOX_OUTBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_OUTBOX ; break ; + case BOX_DRAFTS : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_DRAFTBOX ; break ; + case BOX_TRASH : ok = (it->msgflags & RS_MSG_TRASH) ; break ; + default: + continue; + } + + if(ok) + ++it; + else + it = msgs.erase(it) ; + } +} + void RsMessageModel::updateMessages() { - std::list msgs ; + std::list msgs; - rsMsgs->getMessageSummaries(msgs); + getMessageSummaries(mCurrentBox,msgs); setMessages(msgs); } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 438a3aa5f..db777612a 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -33,34 +33,6 @@ typedef uint32_t ForumModelIndex; -struct ForumModelPostEntry -{ - ForumModelPostEntry() : mPublishTs(0),mMostRecentTsInThread(0),mPostFlags(0),mReputationWarningLevel(0),mMsgStatus(0),prow(0) {} - - enum { // flags for display of posts. To be used in mPostFlags - FLAG_POST_IS_PINNED = 0x0001, - FLAG_POST_IS_MISSING = 0x0002, - FLAG_POST_IS_REDACTED = 0x0004, - FLAG_POST_HAS_UNREAD_CHILDREN = 0x0008, - FLAG_POST_HAS_READ_CHILDREN = 0x0010, - FLAG_POST_PASSES_FILTER = 0x0020, - FLAG_POST_CHILDREN_PASSES_FILTER = 0x0040, - }; - - std::string mTitle ; - RsGxsId mAuthorId ; - RsGxsMessageId mMsgId; - uint32_t mPublishTs; - uint32_t mMostRecentTsInThread; - uint32_t mPostFlags; - int mReputationWarningLevel; - int mMsgStatus; - - std::vector mChildren; - ForumModelIndex mParent; - int prow ; // parent row -}; - // This class is the item model used by Qt to display the information class RsMessageModel : public QAbstractItemModel @@ -71,6 +43,14 @@ public: explicit RsMessageModel(QObject *parent = NULL); ~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 { BOX_NONE = 0x00, BOX_INBOX = 0x01, @@ -102,10 +82,11 @@ public: QModelIndex getIndexOfMessage(const std::string &mid) const; static const QString FilterString ; + static void getMessageSummaries(BoxName box,std::list& msgs); // This method will asynchroneously update the data - void setCurrentBox(BoxName bn) {} + void setCurrentBox(BoxName bn) ; void updateMessages(); const RsMessageId& currentMessageId() const; @@ -162,13 +143,9 @@ private: static bool convertMsgIndexToInternalId(uint32_t entry,quintptr& ref); static bool convertInternalIdToMsgIndex(quintptr ref,uint32_t& index); - static void computeReputationLevel(uint32_t forum_sign_flags, ForumModelPostEntry& entry); uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings); - static void generateMissingItem(const RsGxsMessageId &msgId,ForumModelPostEntry& entry); - static ForumModelIndex addEntry(std::vector& posts,const ForumModelPostEntry& entry,ForumModelIndex parent); - void setMessages(const std::list& msgs); QColor mTextColorRead ; @@ -177,5 +154,6 @@ private: QColor mTextColorNotSubscribed ; QColor mTextColorMissing ; + BoxName mCurrentBox ; std::vector mMessages; }; From 40832734cc0173e16b860aeb04541a861cc64836 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Feb 2019 11:29:10 +0100 Subject: [PATCH 05/25] fixed double definitions of roles --- retroshare-gui/src/gui/MessagesDialog.cpp | 42 ++++++++++---------- retroshare-gui/src/gui/msgs/MessageModel.cpp | 4 ++ retroshare-gui/src/gui/msgs/MessageModel.h | 11 ++--- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 32159c946..4c49b36b7 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -151,7 +151,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(insertMessages())); 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.messageTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)) , this, SLOT(clicked(QTreeWidgetItem*,int))); connect(ui.messageTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)) , this, SLOT(doubleClicked(QTreeWidgetItem*,int))); @@ -229,13 +229,13 @@ MessagesDialog::MessagesDialog(QWidget *parent) #endif mMessageCompareRole = new RSTreeWidgetItemCompareRole; - mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::ROLE_SORT); - mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::ROLE_SORT); + mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); @@ -254,7 +254,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* Set initial section sizes */ 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_FROM, 140); //msgwheader->resizeSection (COLUMN_SIGNATURE, 24); @@ -539,7 +539,7 @@ int MessagesDialog::getSelectedMessages(QList& mid) QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); 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(); } @@ -586,7 +586,7 @@ bool MessagesDialog::isMessageRead(QTreeWidgetItem *item) return true; } - return !item->data(COLUMN_DATA, RsMessageModel::ROLE_UNREAD).toBool(); + return !item->data(COLUMN_DATA, RsMessageModel::UnreadRole).toBool(); } bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) @@ -595,7 +595,7 @@ bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) 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*/) @@ -1456,10 +1456,10 @@ void MessagesDialog::setMsgAsReadUnread(const QList &items, bo LockUpdate Lock (this, false); 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)) { - int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); + int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); msgFlag &= ~RS_MSG_NEW; if (read) { @@ -1468,7 +1468,7 @@ void MessagesDialog::setMsgAsReadUnread(const QList &items, bo msgFlag |= RS_MSG_UNREAD_BY_USER; } - item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); + item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); InitIconAndFont(item); } @@ -1508,10 +1508,10 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) LockUpdate Lock (this, false); 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)) { - int msgFlag = item->data(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS).toInt(); + int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); msgFlag &= ~RS_MSG_STAR; if (star) { @@ -1520,7 +1520,7 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) msgFlag &= ~RS_MSG_STAR; } - item->setData(COLUMN_DATA, RsMessageModel::ROLE_MSGFLAGS, msgFlag); + item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); InitIconAndFont(item); @@ -1543,7 +1543,7 @@ void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead updateInterface(); 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); if (nCount == 1) { @@ -1619,8 +1619,8 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) if(!indx.isValid()) return false ; - cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_SRCID).toString().toStdString(); - mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::ROLE_MSGID).toString().toStdString(); + cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::SrcIdRole).toString().toStdString(); + mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::MsgIdRole).toString().toStdString(); return true; } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 55fb89e42..b5c60012d 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -265,6 +265,10 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const case FilterRole: return filterRole (fmpe,index.column()) ; case StatusRole: return statusRole (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: return QVariant(); } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index db777612a..479ffd7dd 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -43,14 +43,6 @@ public: explicit RsMessageModel(QObject *parent = NULL); ~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 { BOX_NONE = 0x00, BOX_INBOX = 0x01, @@ -76,6 +68,9 @@ public: StatusRole = Qt::UserRole+2, UnreadRole = Qt::UserRole+3, 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) ;} From 875d0a15da66d266116f8c3fca6bf8fffde8adbd Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Feb 2019 14:09:49 +0100 Subject: [PATCH 06/25] fixed display of selected msg --- retroshare-gui/src/gui/MessagesDialog.cpp | 160 ++++++++++------------ retroshare-gui/src/gui/MessagesDialog.h | 6 +- 2 files changed, 77 insertions(+), 89 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 4c49b36b7..e85b0d399 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -153,8 +153,8 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const 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(itemDoubleClicked(QTreeWidgetItem*,int)) , this, SLOT(doubleClicked(QTreeWidgetItem*,int))); + connect(ui.messageTreeWidget, SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&))); + connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); connect(ui.messageTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*))); connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(const QModelIndex&))); connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); @@ -181,8 +181,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) listMode = LIST_NOTHING; - mCurrMsgId = ""; - mMessageModel = new RsMessageModel(this); mMessageProxyModel = new MessageSortFilterProxyModel(ui.messageTreeWidget->header(),this); mMessageProxyModel->setSourceModel(mMessageModel); @@ -229,13 +227,13 @@ MessagesDialog::MessagesDialog(QWidget *parent) #endif mMessageCompareRole = new RSTreeWidgetItemCompareRole; - mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole); mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole); + mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); @@ -257,7 +255,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')*1.2f); msgwheader->resizeSection (COLUMN_SUBJECT, 250); msgwheader->resizeSection (COLUMN_FROM, 140); - //msgwheader->resizeSection (COLUMN_SIGNATURE, 24); msgwheader->resizeSection (COLUMN_DATE, 140); QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); @@ -1376,44 +1373,44 @@ void MessagesDialog::currentItemChanged(QTreeWidgetItem *item) } // click in messageTreeWidget -void MessagesDialog::clicked(QTreeWidgetItem *item, int column) +void MessagesDialog::clicked(const QModelIndex& index) { - if (!item) { + if(!index.isValid()) return; - } - switch (column) { - case COLUMN_UNREAD: - { - QList items; - items.append(item); - setMsgAsReadUnread(items, !isMessageRead(item)); - insertMsgTxtAndFiles(item, false); - updateMessageSummaryList(); - return; - } - case COLUMN_STAR: - { - QList items; - items.append(item); - setMsgStar(items, !hasMessageStar(item)); - return; - } - } +// switch (index.column()) +// { +// case COLUMN_UNREAD: +// { +// QList items; +// items.append(item); +// setMsgAsReadUnread(items, !isMessageRead(item)); +// insertMsgTxtAndFiles(item, false); +// updateMessageSummaryList(); +// return; +// } +// case COLUMN_STAR: +// { +// QList items; +// items.append(item); +// setMsgStar(items, !hasMessageStar(item)); +// return; +// } +// } #ifdef TODO timer->stop(); timerIndex = ui.messageTreeWidget->indexOfTopLevelItem(item); #endif // show current message directly - updateCurrentMessage(); + insertMsgTxtAndFiles(index); } // double click in messageTreeWidget -void MessagesDialog::doubleClicked(QTreeWidgetItem *item, int column) +void MessagesDialog::doubleClicked(const QModelIndex& index) { /* activate row */ - clicked (item, column); + clicked(index); std::string cid; std::string mid; @@ -1445,10 +1442,6 @@ void MessagesDialog::doubleClicked(QTreeWidgetItem *item, int column) // show current message directly void MessagesDialog::updateCurrentMessage() { -#ifdef TODO - timer->stop(); - insertMsgTxtAndFiles(ui.messageTreeWidget->topLevelItem(timerIndex)); -#endif } void MessagesDialog::setMsgAsReadUnread(const QList &items, bool read) @@ -1531,70 +1524,65 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) // LockUpdate } -void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead) +void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) { /* get its Ids */ std::string cid; std::string mid; - if (item == NULL) { - mCurrMsgId.clear(); - msgWidget->fill(mCurrMsgId); - updateInterface(); - return; - } - mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString(); + if(!index.isValid()) + { + mCurrMsgId.clear(); + msgWidget->fill(mCurrMsgId); + updateInterface(); + return; + } + mid = index.data(RsMessageModel::MsgIdRole).toString().toStdString(); - int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL); - if (nCount == 1) { - ui.actionSaveAs->setEnabled(true); - ui.actionPrintPreview->setEnabled(true); - ui.actionPrint->setEnabled(true); - } else { - ui.actionSaveAs->setDisabled(true); - ui.actionPrintPreview->setDisabled(true); - ui.actionPrint->setDisabled(true); - } - - if (mCurrMsgId == mid) { - // message doesn't changed - return; - } +// int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL); +// +// if (nCount == 1) { +// ui.actionSaveAs->setEnabled(true); +// ui.actionPrintPreview->setEnabled(true); +// ui.actionPrint->setEnabled(true); +// } else { +// ui.actionSaveAs->setDisabled(true); +// ui.actionPrintPreview->setDisabled(true); +// ui.actionPrint->setDisabled(true); +// } /* Save the Data.... for later */ - mCurrMsgId = mid; - MessageInfo msgInfo; if (!rsMail -> getMessage(mid, msgInfo)) { std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl; return; } - QList items; - items.append(item); - - bool bSetToReadOnActive = Settings->getMsgSetToReadOnActivate(); - - if (msgInfo.msgflags & RS_MSG_NEW) { - // set always to read or unread - if (bSetToReadOnActive == false || bSetToRead == false) { - // set locally to unread - setMsgAsReadUnread(items, false); - } else { - setMsgAsReadUnread(items, true); - } - updateMessageSummaryList(); - } else { - if ((msgInfo.msgflags & RS_MSG_UNREAD_BY_USER) && bSetToRead && bSetToReadOnActive) { - // set to read - setMsgAsReadUnread(items, true); - updateMessageSummaryList(); - } - } +// QList items; +// items.append(item); +// +// bool bSetToReadOnActive = Settings->getMsgSetToReadOnActivate(); +// +// if (msgInfo.msgflags & RS_MSG_NEW) { +// // set always to read or unread +// if (bSetToReadOnActive == false || bSetToRead == false) { +// // set locally to unread +// setMsgAsReadUnread(items, false); +// } else { +// setMsgAsReadUnread(items, true); +// } +// updateMessageSummaryList(); +// } else { +// if ((msgInfo.msgflags & RS_MSG_UNREAD_BY_USER) && bSetToRead && bSetToReadOnActive) { +// // set to read +// setMsgAsReadUnread(items, true); +// updateMessageSummaryList(); +// } +// } updateInterface(); - msgWidget->fill(mCurrMsgId); + msgWidget->fill(mid); } bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 8b3a96dcd..45b810a4c 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -77,8 +77,8 @@ private slots: void changeQuickView(int newrow); void updateCurrentMessage(); void currentItemChanged(QTreeWidgetItem *item); - void clicked(QTreeWidgetItem *item, int column); - void doubleClicked(QTreeWidgetItem *item, int column); + void clicked(const QModelIndex&); + void doubleClicked(const QModelIndex&); void newmessage(); void openAsWindow(); @@ -125,7 +125,7 @@ private: void connectActions(); void updateMessageSummaryList(); - void insertMsgTxtAndFiles(QTreeWidgetItem *item = NULL, bool bSetToRead = true); + void insertMsgTxtAndFiles(const QModelIndex& index = QModelIndex()); bool getCurrentMsg(std::string &cid, std::string &mid); void setMsgAsReadUnread(const QList &items, bool read); From 5cbff98e4054a6aa93072a6f3e40f036956f2d6b Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Feb 2019 14:45:48 +0100 Subject: [PATCH 07/25] fixed toggling read/unread and star status --- retroshare-gui/src/gui/MessagesDialog.cpp | 80 ++++++-------------- retroshare-gui/src/gui/MessagesDialog.h | 5 +- retroshare-gui/src/gui/msgs/MessageModel.cpp | 18 ++--- retroshare-gui/src/gui/msgs/MessageModel.h | 5 +- 4 files changed, 39 insertions(+), 69 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index e85b0d399..3c4c6644f 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -577,22 +577,20 @@ int MessagesDialog::getSelectedMsgCount (QList *items, QListdata(COLUMN_DATA, RsMessageModel::UnreadRole).toBool(); + return !index.data(RsMessageModel::UnreadRole).toBool(); } -bool MessagesDialog::hasMessageStar(QTreeWidgetItem *item) +bool MessagesDialog::hasMessageStar(const QModelIndex& index) { - if (!item) { + if (!index.isValid()) return false; - } - return item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt() & RS_MSG_STAR; + return index.data(RsMessageModel::MsgFlagsRole).toInt() & RS_MSG_STAR; } void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/) @@ -1378,25 +1376,21 @@ void MessagesDialog::clicked(const QModelIndex& index) if(!index.isValid()) return; -// switch (index.column()) -// { -// case COLUMN_UNREAD: -// { -// QList items; -// items.append(item); -// setMsgAsReadUnread(items, !isMessageRead(item)); -// insertMsgTxtAndFiles(item, false); -// updateMessageSummaryList(); -// return; -// } -// case COLUMN_STAR: -// { -// QList items; -// items.append(item); -// setMsgStar(items, !hasMessageStar(item)); -// return; -// } -// } + switch (index.column()) + { + case COLUMN_UNREAD: + { + mMessageModel->setMsgReadStatus(index, !isMessageRead(index)); + insertMsgTxtAndFiles(index); + updateMessageSummaryList(); + return; + } + case COLUMN_STAR: + { + mMessageModel->setMsgStar(index, !hasMessageStar(index)); + return; + } + } #ifdef TODO timer->stop(); timerIndex = ui.messageTreeWidget->indexOfTopLevelItem(item); @@ -1490,39 +1484,13 @@ void MessagesDialog::markAsUnread() void MessagesDialog::markWithStar(bool checked) { - QList items; - getSelectedMsgCount (&items, NULL, NULL, NULL); + QModelIndexList lst = ui.messageTreeWidget->selectionModel()->selectedRows(); - setMsgStar(items, checked); + foreach(const QModelIndex& index,lst) + mMessageModel->setMsgStar(index, checked); } -void MessagesDialog::setMsgStar(const QList &items, bool star) -{ - LockUpdate Lock (this, false); - foreach (QTreeWidgetItem *item, items) { - std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString(); - - if (rsMail->MessageStar(mid, star)) { - int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); - msgFlag &= ~RS_MSG_STAR; - - if (star) { - msgFlag |= RS_MSG_STAR; - } else { - msgFlag &= ~RS_MSG_STAR; - } - - item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); - - InitIconAndFont(item); - - Lock.setUpdate(true); - } - } - - // LockUpdate -} void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) { diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 45b810a4c..d178f77c1 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -129,11 +129,10 @@ private: bool getCurrentMsg(std::string &cid, std::string &mid); void setMsgAsReadUnread(const QList &items, bool read); - void setMsgStar(const QList &items, bool mark); int getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar); - bool isMessageRead(QTreeWidgetItem *item); - bool hasMessageStar(QTreeWidgetItem *item); + bool isMessageRead(const QModelIndex &index); + bool hasMessageStar(const QModelIndex &index); void processSettings(bool load); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index b5c60012d..f85503dbc 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -58,7 +58,7 @@ void RsMessageModel::preMods() } void RsMessageModel::postMods() { - emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(0,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); + emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mMessages.size()-1,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); } // void RsGxsForumModel::setSortMode(SortMode mode) @@ -651,15 +651,14 @@ void RsMessageModel::setMsgReadStatus(const QModelIndex& i,bool read_status) return ; preMods(); + rsMsgs->MessageRead(i.data(MsgIdRole).toString().toStdString(),!read_status); + postMods(); +} - quintptr ref = i.internalId(); - uint32_t index = 0; - - if(!convertInternalIdToMsgIndex(ref,index) || index >= mMessages.size()) - return ; - - rsMsgs->MessageRead(mMessages[index].msgId,!read_status); - +void RsMessageModel::setMsgStar(const QModelIndex& i,bool star) +{ + preMods(); + rsMsgs->MessageStar(i.data(MsgIdRole).toString().toStdString(),star); postMods(); } @@ -685,3 +684,4 @@ void RsMessageModel::debug_dump() const std::cerr << "Id: " << it->msgId << ": from " << it->srcId << ": flags=" << it->msgflags << ": title=\"" << it->title << "\"" << std::endl; } + diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 479ffd7dd..baf2c45ba 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -85,7 +85,6 @@ public: void updateMessages(); const RsMessageId& currentMessageId() const; - void setMsgReadStatus(const QModelIndex& i, bool read_status); void setFilter(int column, const QStringList& strings, uint32_t &count) ; int rowCount(const QModelIndex& parent = QModelIndex()) const override; @@ -122,6 +121,10 @@ public: */ void debug_dump() const; + // control over message flags and so on. This is handled by the model because it will allow it to update accordingly + void setMsgReadStatus(const QModelIndex& i, bool read_status); + void setMsgStar(const QModelIndex& index,bool star) ; + signals: void messagesLoaded(); // emitted after the messages have been set. Can be used to updated the UI. From 0570c3fa3864d1e8447bbac68fd608fef6abe236 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Feb 2019 15:05:00 +0100 Subject: [PATCH 08/25] fixed context menu --- retroshare-gui/src/gui/MessagesDialog.cpp | 106 +++++++++---------- retroshare-gui/src/gui/MessagesDialog.h | 2 +- retroshare-gui/src/gui/msgs/MessageModel.cpp | 6 +- 3 files changed, 56 insertions(+), 58 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 3c4c6644f..211c9faa2 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -541,40 +541,31 @@ int MessagesDialog::getSelectedMessages(QList& mid) return mid.size(); } -int MessagesDialog::getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar) +int MessagesDialog::getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar) { -#ifdef TODO + QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); + if (items) items->clear(); if (itemsRead) itemsRead->clear(); if (itemsUnread) itemsUnread->clear(); if (itemsStar) itemsStar->clear(); - //To check if the selection has more than one row. - QList selectedMessages; - getSelectedMessages(selectedMessages); - - foreach (const QString&, selectedMessages) + foreach(const QModelIndex& m, qmil) { - if (items || itemsRead || itemsUnread || itemsStar) { - if (items) items->append(item); + if (items) + items->append(m); - if (item->data(COLUMN_DATA, ROLE_UNREAD).toBool()) { - if (itemsUnread) itemsUnread->append(item); - } else { - if (itemsRead) itemsRead->append(item); - } + if (m.data(RsMessageModel::UnreadRole).toBool()) + if (itemsUnread) + itemsUnread->append(m); + else if(itemsRead) + itemsRead->append(m); - if (itemsStar) { - if (item->data(COLUMN_DATA, ROLE_MSGFLAGS).toInt() & RS_MSG_STAR) { - itemsStar->append(item); - } - } - } + if (itemsStar && m.data(RsMessageModel::MsgFlagsRole).toInt() & RS_MSG_STAR) + itemsStar->append(m); } - return selectedItems.size(); -#endif - return 0; + return qmil.size(); } bool MessagesDialog::isMessageRead(const QModelIndex& index) @@ -608,9 +599,10 @@ void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/) if(!rsMail->getMessage(mid, msgInfo)) return ; - QList itemsRead; - QList itemsUnread; - QList itemsStar; + QList itemsRead; + QList itemsUnread; + QList itemsStar; + int nCount = getSelectedMsgCount (NULL, &itemsRead, &itemsUnread, &itemsStar); /** Defines the actions for the context menu */ @@ -1438,47 +1430,51 @@ void MessagesDialog::updateCurrentMessage() { } -void MessagesDialog::setMsgAsReadUnread(const QList &items, bool read) -{ - LockUpdate Lock (this, false); - - foreach (QTreeWidgetItem *item, items) { - std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString(); - - if (rsMail->MessageRead(mid, !read)) { - int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); - msgFlag &= ~RS_MSG_NEW; - - if (read) { - msgFlag &= ~RS_MSG_UNREAD_BY_USER; - } else { - msgFlag |= RS_MSG_UNREAD_BY_USER; - } - - item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); - - InitIconAndFont(item); - } - } - - // LockUpdate -} +// void MessagesDialog::setMsgAsReadUnread(const QList &items, bool read) +// { +// LockUpdate Lock (this, false); +// +// foreach (QTreeWidgetItem *item, items) { +// std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString(); +// +// if (rsMail->MessageRead(mid, !read)) { +// int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); +// msgFlag &= ~RS_MSG_NEW; +// +// if (read) { +// msgFlag &= ~RS_MSG_UNREAD_BY_USER; +// } else { +// msgFlag |= RS_MSG_UNREAD_BY_USER; +// } +// +// item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); +// +// InitIconAndFont(item); +// } +// } +// +// // LockUpdate +// } void MessagesDialog::markAsRead() { - QList itemsUnread; + QList itemsUnread; getSelectedMsgCount (NULL, NULL, &itemsUnread, NULL); - setMsgAsReadUnread (itemsUnread, true); + foreach(const QModelIndex& index,itemsUnread) + mMessageModel->setMsgReadStatus(index,true); + updateMessageSummaryList(); } void MessagesDialog::markAsUnread() { - QList itemsRead; + QList itemsRead; getSelectedMsgCount (NULL, &itemsRead, NULL, NULL); - setMsgAsReadUnread (itemsRead, false); + foreach(const QModelIndex& index,itemsRead) + mMessageModel->setMsgReadStatus(index,false); + updateMessageSummaryList(); } diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index d178f77c1..1926c23dc 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -130,7 +130,7 @@ private: bool getCurrentMsg(std::string &cid, std::string &mid); void setMsgAsReadUnread(const QList &items, bool read); - int getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar); + int getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar); bool isMessageRead(const QModelIndex &index); bool hasMessageStar(const QModelIndex &index); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index f85503dbc..cd32dd05a 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -652,14 +652,16 @@ void RsMessageModel::setMsgReadStatus(const QModelIndex& i,bool read_status) preMods(); rsMsgs->MessageRead(i.data(MsgIdRole).toString().toStdString(),!read_status); - postMods(); + + emit dataChanged(i.sibling(i.row(),0),i.sibling(i.row(),COLUMN_THREAD_NB_COLUMNS-1)); } void RsMessageModel::setMsgStar(const QModelIndex& i,bool star) { preMods(); rsMsgs->MessageStar(i.data(MsgIdRole).toString().toStdString(),star); - postMods(); + + emit dataChanged(i.sibling(i.row(),0),i.sibling(i.row(),COLUMN_THREAD_NB_COLUMNS-1)); } QModelIndex RsMessageModel::getIndexOfMessage(const std::string& mid) const From 26792a7471c0b20d22f74ceaeea83abea65599aa Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 3 Mar 2019 21:49:09 +0100 Subject: [PATCH 09/25] removed some timer calls --- retroshare-gui/src/gui/MessagesDialog.cpp | 86 +++++++---------------- retroshare-gui/src/gui/MessagesDialog.h | 2 - 2 files changed, 26 insertions(+), 62 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 211c9faa2..8c218626d 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -321,15 +321,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) // fill quick view fillQuickView(); - // create timer for navigation - timer = new RsProtectedTimer(this); -#ifdef TODO - timer->setInterval(300); - timer->setSingleShot(true); - connect(timer, SIGNAL(timeout()), this, SLOT(updateCurrentMessage())); -#endif - - ui.messageTreeWidget->installEventFilter(this); + //ui.messageTreeWidget->installEventFilter(this); // remove close button of the the first tab ui.tabWidget->hideCloseButton(0); @@ -351,10 +343,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) MessagesDialog::~MessagesDialog() { - // stop and delete timer - timer->stop(); - delete(timer); - // save settings processSettings(false); } @@ -418,36 +406,35 @@ void MessagesDialog::processSettings(bool load) bool MessagesDialog::eventFilter(QObject *obj, QEvent *event) { -#ifdef TODO - if (obj == ui.messageTreeWidget) { - if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); - if (keyEvent && keyEvent->key() == Qt::Key_Space) { - // Space pressed - clicked(ui.messageTreeWidget->currentItem(), COLUMN_UNREAD); - return true; // eat event - } - } - } -#endif + if (obj == ui.messageTreeWidget && event->type() == QEvent::KeyPress) + { + QKeyEvent *keyEvent = static_cast(event); + + if (keyEvent && keyEvent->key() == Qt::Key_Space) + { + // Space pressed + clicked(ui.messageTreeWidget->currentIndex()); + return true; // eat event + } + } + // pass the event on to the parent class return MainPage::eventFilter(obj, event); } -void MessagesDialog::changeEvent(QEvent *e) -{ -#ifdef TODO - QWidget::changeEvent(e); - switch (e->type()) { - case QEvent::StyleChange: - insertMessages(); - break; - default: - // remove compiler warnings - break; - } -#endif -} +// void MessagesDialog::changeEvent(QEvent *e) +// { +// QWidget::changeEvent(e); +// +// switch (e->type()) { +// case QEvent::StyleChange: +// insertMessages(); +// break; +// default: +// // remove compiler warnings +// break; +// } +// } void MessagesDialog::fillQuickView() { @@ -1345,23 +1332,6 @@ void MessagesDialog::insertMessages() } #endif -// current row in messageTreeWidget has changed -void MessagesDialog::currentItemChanged(QTreeWidgetItem *item) -{ -#ifdef TODO - timer->stop(); - - if (item) { - timerIndex = ui.messageTreeWidget->indexOfTopLevelItem(item); - timer->start(); - } else { - timerIndex = -1; - } - - updateInterface(); -#endif -} - // click in messageTreeWidget void MessagesDialog::clicked(const QModelIndex& index) { @@ -1383,10 +1353,6 @@ void MessagesDialog::clicked(const QModelIndex& index) return; } } -#ifdef TODO - timer->stop(); - timerIndex = ui.messageTreeWidget->indexOfTopLevelItem(item); -#endif // show current message directly insertMsgTxtAndFiles(index); diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 1926c23dc..084ba70de 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -60,7 +60,6 @@ public: protected: bool eventFilter(QObject *obj, QEvent *ev); - void changeEvent(QEvent *e); int getSelectedMessages(QList& mid); public slots: @@ -76,7 +75,6 @@ private slots: void changeBox(int newrow); void changeQuickView(int newrow); void updateCurrentMessage(); - void currentItemChanged(QTreeWidgetItem *item); void clicked(const QModelIndex&); void doubleClicked(const QModelIndex&); From b5b2c430c5f8c1ac8ab77493dccdbc1319fe7817 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 12 Mar 2019 14:17:42 +0100 Subject: [PATCH 10/25] fixed QuickView filtering system --- libretroshare/src/retroshare/rsmsgs.h | 2 + libretroshare/src/services/p3msgservice.cc | 14 +- libretroshare/src/services/p3msgservice.h | 3 +- retroshare-gui/src/gui/MessagesDialog.cpp | 143 ++++++------------ retroshare-gui/src/gui/MessagesDialog.h | 13 -- .../src/gui/msgs/MessageComposer.cpp | 3 +- retroshare-gui/src/gui/msgs/MessageModel.cpp | 48 ++++-- retroshare-gui/src/gui/msgs/MessageModel.h | 47 ++++-- 8 files changed, 132 insertions(+), 141 deletions(-) diff --git a/libretroshare/src/retroshare/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h index 4893bb6c6..6658a53bc 100644 --- a/libretroshare/src/retroshare/rsmsgs.h +++ b/libretroshare/src/retroshare/rsmsgs.h @@ -241,6 +241,7 @@ struct MsgInfoSummary : RsSerializable RsPeerId srcId; uint32_t msgflags; + std::list msgtags; // that leaves 25 bits for user-defined tags. std::string title; int count; /* file count */ @@ -253,6 +254,7 @@ struct MsgInfoSummary : RsSerializable RS_SERIAL_PROCESS(srcId); RS_SERIAL_PROCESS(msgflags); + RS_SERIAL_PROCESS(msgtags); RS_SERIAL_PROCESS(title); RS_SERIAL_PROCESS(count); diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc index 3e51558d8..3e2f9902c 100644 --- a/libretroshare/src/services/p3msgservice.cc +++ b/libretroshare/src/services/p3msgservice.cc @@ -1290,6 +1290,12 @@ bool p3MsgService::MessageToDraft(MessageInfo &info, const std::string &msgParen return false; } +bool p3MsgService::getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info) +{ + RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ + return locked_getMessageTag(msgId,info); +} + bool p3MsgService::getMessageTagTypes(MsgTagType& tags) { RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ @@ -1413,10 +1419,8 @@ bool p3MsgService::removeMessageTagType(uint32_t tagId) return true; } -bool p3MsgService::getMessageTag(const std::string &msgId, MsgTagInfo& info) +bool p3MsgService::locked_getMessageTag(const std::string &msgId, MsgTagInfo& info) { - RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ - uint32_t mid = atoi(msgId.c_str()); if (mid == 0) { std::cerr << "p3MsgService::MessageGetMsgTag: Unknown msgId " << msgId << std::endl; @@ -1740,6 +1744,10 @@ void p3MsgService::initRsMIS(RsMsgItem *msg, MsgInfoSummary &mis) mis.title = msg->subject; mis.count = msg->attachment.items.size(); mis.ts = msg->sendTime; + + MsgTagInfo taginfo; + locked_getMessageTag(mis.msgId,taginfo); + mis.msgtags = taginfo.tagIds ; } void p3MsgService::initMIRsMsg(RsMsgItem *msg,const MessageInfo& info) diff --git a/libretroshare/src/services/p3msgservice.h b/libretroshare/src/services/p3msgservice.h index 658425c4f..d94df85ba 100644 --- a/libretroshare/src/services/p3msgservice.h +++ b/libretroshare/src/services/p3msgservice.h @@ -77,11 +77,11 @@ public: bool MessageToDraft(Rs::Msgs::MessageInfo &info, const std::string &msgParentId); bool MessageToTrash(const std::string &mid, bool bTrash); + bool getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info); bool getMessageTagTypes(Rs::Msgs::MsgTagType& tags); bool setMessageTagType(uint32_t tagId, std::string& text, uint32_t rgb_color); bool removeMessageTagType(uint32_t tagId); - bool getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info); /* set == false && tagId == 0 --> remove all */ bool setMessageTag(const std::string &msgId, uint32_t tagId, bool set); @@ -142,6 +142,7 @@ public: private: void sendDistantMsgItem(RsMsgItem *msgitem); + bool locked_getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info); /** This contains the ongoing tunnel handling contacts. * The map is indexed by the hash */ diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 8c218626d..5218e49b9 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -92,33 +92,6 @@ #define ROW_TRASHBOX 4 -MessagesDialog::LockUpdate::LockUpdate (MessagesDialog *pDialog, bool bUpdate) -{ -#ifdef TODO - m_pDialog = pDialog; - m_bUpdate = bUpdate; - - ++m_pDialog->lockUpdate; -#endif -} - -MessagesDialog::LockUpdate::~LockUpdate () -{ -#ifdef TODO - if(--m_pDialog->lockUpdate < 0) - m_pDialog->lockUpdate = 0; - - if (m_bUpdate && m_pDialog->lockUpdate == 0) { - m_pDialog->insertMessages(); - } -#endif -} - -void MessagesDialog::LockUpdate::setUpdate(bool bUpdate) -{ - m_bUpdate = bUpdate; -} - class MessageSortFilterProxyModel: public QSortFilterProxyModel { public: @@ -149,24 +122,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) inChange = false; lockUpdate = 0; - connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(insertMessages())); - connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); - connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&))); - connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); - connect(ui.messageTreeWidget, SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&))); - connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); - connect(ui.messageTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*))); - connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(const QModelIndex&))); - connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); - connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int))); - connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); - connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int))); - connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage())); - - connect(ui.actionTextBesideIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); - connect(ui.actionIconOnly, SIGNAL(triggered()), this, SLOT(buttonStyle())); - connect(ui.actionTextUnderIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); - ui.actionTextBesideIcon->setData(Qt::ToolButtonTextBesideIcon); ui.actionIconOnly->setData(Qt::ToolButtonIconOnly); ui.actionTextUnderIcon->setData(Qt::ToolButtonTextUnderIcon); @@ -339,6 +294,26 @@ MessagesDialog::MessagesDialog(QWidget *parent) ").arg(QString::number(2*S)).arg(QString::number(S)) ; registerHelpButton(ui.helpButton,help_str,"MessagesDialog") ; + + connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), mMessageModel, SLOT(updateMessages())); + connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); + connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&))); + connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); + connect(ui.messageTreeWidget, SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&))); + connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); + connect(ui.messageTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*))); + connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(const QModelIndex&))); + connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); + connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int))); + connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); + connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int))); + connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage())); + + connect(ui.actionTextBesideIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); + connect(ui.actionIconOnly, SIGNAL(triggered()), this, SLOT(buttonStyle())); + connect(ui.actionTextUnderIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); + + } MessagesDialog::~MessagesDialog() @@ -830,40 +805,34 @@ void MessagesDialog::changeBox(int box_row) void MessagesDialog::changeQuickView(int newrow) { -#warning Missing code here! -#ifdef TODO Q_UNUSED(newrow); - if (inChange) { - // already in change method - return; - } - - inChange = true; - - ui.messageTreeWidget->clear(); - ui.listWidget->setCurrentItem(NULL); listMode = LIST_QUICKVIEW; - insertMessages(); - insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem()); + RsMessageModel::QuickViewFilter f = RsMessageModel::QUICK_VIEW_ALL ; - inChange = false; -#endif + if(newrow >= 0) // -1 means that nothing is selected + switch(newrow) + { + case 0x00: f = RsMessageModel::QUICK_VIEW_STARRED ; break; + case 0x01: f = RsMessageModel::QUICK_VIEW_SYSTEM ; break; + case 0x02: f = RsMessageModel::QUICK_VIEW_IMPORTANT; break; + case 0x03: f = RsMessageModel::QUICK_VIEW_WORK ; break; + case 0x04: f = RsMessageModel::QUICK_VIEW_PERSONAL ; break; + case 0x05: f = RsMessageModel::QUICK_VIEW_TODO ; break; + case 0x06: f = RsMessageModel::QUICK_VIEW_LATER ; break; + default: + f = RsMessageModel::QuickViewFilter( (int)RsMessageModel::QUICK_VIEW_USER + newrow - 0x06); + } + mMessageModel->setQuickViewFilter(f); + insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex()); } void MessagesDialog::messagesTagsChanged() { -#ifdef TODO - if (lockUpdate) { - return; - } - fillQuickView(); - insertMessages(); -#endif -#warning Missing code here! + mMessageModel->updateMessages(); } static void InitIconAndFont(QTreeWidgetItem *item) @@ -1545,8 +1514,6 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) void MessagesDialog::removemessage() { - LockUpdate Lock (this, true); - QList selectedMessages ; getSelectedMessages(selectedMessages); @@ -1567,21 +1534,15 @@ void MessagesDialog::removemessage() rsMail->MessageToTrash(m.toStdString(), true); } } - - // LockUpdate -> insertMessages(); } void MessagesDialog::undeletemessage() { - LockUpdate Lock (this, true); - QList msgids; getSelectedMessages(msgids); foreach (const QString& s, msgids) rsMail->MessageToTrash(s.toStdString(), false); - - // LockUpdate -> insertMessages(); } void MessagesDialog::setToolbarButtonStyle(Qt::ToolButtonStyle style) @@ -1638,21 +1599,19 @@ void MessagesDialog::updateMessageSummaryList() unsigned int systemCount = 0; /* calculating the new messages */ -// rsMail->getMessageCount (&inboxCount, &newInboxCount, &newOutboxCount, &newDraftCount, &newSentboxCount); std::list msgList; - std::list::const_iterator it; - rsMail->getMessageSummaries(msgList); QMap tagCount; /* calculating the new messages */ - for (it = msgList.begin(); it != msgList.end(); ++it) { + for (auto it = msgList.begin(); it != msgList.end(); ++it) + { /* calcluate tag count */ - MsgTagInfo tagInfo; - rsMail->getMessageTag(it->msgId, tagInfo); - for (std::list::iterator tagId = tagInfo.tagIds.begin(); tagId != tagInfo.tagIds.end(); ++tagId) { + + for (auto tagId = (*it).msgtags.begin(); tagId != (*it).msgtags.end(); ++tagId) + { int nCount = tagCount [*tagId]; ++nCount; tagCount [*tagId] = nCount; @@ -1836,6 +1795,7 @@ void MessagesDialog::updateMessageSummaryList() void MessagesDialog::tagAboutToShow() { +#ifdef TODO TagsMenu *menu = dynamic_cast(ui.tagButton->menu()); if (menu == NULL) { return; @@ -1851,22 +1811,16 @@ void MessagesDialog::tagAboutToShow() rsMail->getMessageTag(msgids.front().toStdString(), tagInfo); menu->activateActions(tagInfo.tagIds); +#endif } void MessagesDialog::tagRemoveAll() { - LockUpdate Lock (this, false); - QList msgids; getSelectedMessages(msgids); foreach(const QString& s, msgids) - { rsMail->setMessageTag(s.toStdString(), 0, false); - Lock.setUpdate(true); - } - - // LockUpdate -> insertMessages(); } void MessagesDialog::tagSet(int tagId, bool set) @@ -1875,27 +1829,20 @@ void MessagesDialog::tagSet(int tagId, bool set) return; } - LockUpdate Lock (this, false); - QList msgids; getSelectedMessages(msgids); foreach (const QString& s, msgids) - if (rsMail->setMessageTag(s.toStdString(), tagId, set)) - Lock.setUpdate(true); + rsMail->setMessageTag(s.toStdString(), tagId, set); } void MessagesDialog::emptyTrash() { - LockUpdate Lock (this, true); - std::list msgs ; mMessageModel->getMessageSummaries(RsMessageModel::BOX_TRASH,msgs); for(auto it(msgs.begin());it!=msgs.end();++it) rsMail->MessageDelete(it->msgId); - - // LockUpdate -> insertMessages(); } void MessagesDialog::tabChanged(int /*tab*/) diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 084ba70de..ba56f0224 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -105,19 +105,6 @@ private slots: void tabCloseRequested(int tab); private: - class LockUpdate - { - public: - LockUpdate (MessagesDialog *pDialog, bool bUpdate); - ~LockUpdate (); - - void setUpdate(bool bUpdate); - - private: - MessagesDialog *m_pDialog; - bool m_bUpdate; - }; - void updateInterface(); void connectActions(); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 7c2db10eb..8f485b410 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -976,7 +976,8 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/) msgComposer->addEmptyRecipient(); - if (msgId.empty() == false) { + if (!msgId.empty()) + { // fill existing message MessageInfo msgInfo; if (!rsMail->getMessage(msgId, msgInfo)) { diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index cd32dd05a..eccff958b 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -50,6 +50,7 @@ RsMessageModel::RsMessageModel(QObject *parent) { mFilteringEnabled=false; mCurrentBox = BOX_NONE; + mQuickViewFilter = QUICK_VIEW_ALL; } void RsMessageModel::preMods() @@ -295,9 +296,29 @@ QVariant RsMessageModel::statusRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col return QVariant();//fmpe.mMsgStatus); } +bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const +{ + QString s = displayRole(fmpe,mFilterColumn).toString(); + bool passes_strings = true ; + + if(!mFilterStrings.empty()) + for(auto iter(mFilterStrings.begin()); iter != mFilterStrings.end(); ++iter) + passes_strings = passes_strings && s.contains(*iter,Qt::CaseInsensitive); + else + passes_strings = true; + + bool passes_quick_view = + (mQuickViewFilter==QUICK_VIEW_ALL) + || (std::find(fmpe.msgtags.begin(),fmpe.msgtags.end(),mQuickViewFilter) != fmpe.msgtags.end()) + || (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR)) + || (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM)); + + return passes_quick_view && passes_strings; +} + QVariant RsMessageModel::filterRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { - if(!mFilteringEnabled) + if(passesFilter(fmpe,column)) return QVariant(FilterString); return QVariant(QString()); @@ -312,20 +333,12 @@ uint32_t RsMessageModel::updateFilterStatus(ForumModelIndex i,int column,const Q } -void RsMessageModel::setFilter(int column,const QStringList& strings,uint32_t& count) +void RsMessageModel::setFilter(int column,const QStringList& strings) { preMods(); - if(!strings.empty()) - { - count = updateFilterStatus(ForumModelIndex(0),column,strings); - mFilteringEnabled = true; - } - else - { - count=0; - mFilteringEnabled = false; - } + mFilterColumn = column; + mFilterStrings = strings; postMods(); } @@ -557,6 +570,16 @@ void RsMessageModel::setCurrentBox(BoxName bn) } } +void RsMessageModel::setQuickViewFilter(QuickViewFilter fn) +{ + if(fn != mQuickViewFilter) + { + preMods(); + mQuickViewFilter = fn ; + postMods(); + } +} + void RsMessageModel::getMessageSummaries(BoxName box,std::list& msgs) { rsMsgs->getMessageSummaries(msgs); @@ -575,6 +598,7 @@ void RsMessageModel::getMessageSummaries(BoxName box,std::listmsgflags & RS_MSG_BOXMASK) == RS_MSG_DRAFTBOX ; break ; case BOX_TRASH : ok = (it->msgflags & RS_MSG_TRASH) ; break ; default: + ++it; continue; } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index baf2c45ba..5e7f78d9f 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -53,17 +53,29 @@ public: }; enum Columns { - COLUMN_THREAD_STAR =0x00, - COLUMN_THREAD_ATTACHMENT =0x01, - COLUMN_THREAD_SUBJECT =0x02, - COLUMN_THREAD_READ =0x03, - COLUMN_THREAD_AUTHOR =0x04, - COLUMN_THREAD_DATE =0x05, - COLUMN_THREAD_TAGS =0x06, - COLUMN_THREAD_MSGID =0x07, - COLUMN_THREAD_NB_COLUMNS =0x08, + COLUMN_THREAD_STAR = 0x00, + COLUMN_THREAD_ATTACHMENT = 0x01, + COLUMN_THREAD_SUBJECT = 0x02, + COLUMN_THREAD_READ = 0x03, + COLUMN_THREAD_AUTHOR = 0x04, + COLUMN_THREAD_DATE = 0x05, + COLUMN_THREAD_TAGS = 0x06, + COLUMN_THREAD_MSGID = 0x07, + COLUMN_THREAD_NB_COLUMNS = 0x08, }; + enum QuickViewFilter { + QUICK_VIEW_ALL = 0x00, + QUICK_VIEW_IMPORTANT = 0x01, // These numbers have been carefuly chosen to match the ones in rsmsgs.h + QUICK_VIEW_WORK = 0x02, + QUICK_VIEW_PERSONAL = 0x03, + QUICK_VIEW_TODO = 0x04, + QUICK_VIEW_LATER = 0x05, + QUICK_VIEW_STARRED = 0x06, + QUICK_VIEW_SYSTEM = 0x07, + QUICK_VIEW_USER = 100 + }; + enum Roles{ SortRole = Qt::UserRole+1, StatusRole = Qt::UserRole+2, UnreadRole = Qt::UserRole+3, @@ -77,15 +89,16 @@ public: QModelIndex getIndexOfMessage(const std::string &mid) const; static const QString FilterString ; - static void getMessageSummaries(BoxName box,std::list& msgs); + static void getMessageSummaries(BoxName box, std::list& msgs); // This method will asynchroneously update the data void setCurrentBox(BoxName bn) ; - void updateMessages(); + void setQuickViewFilter(QuickViewFilter fn) ; + const RsMessageId& currentMessageId() const; - void setFilter(int column, const QStringList& strings, uint32_t &count) ; + void setFilter(int column, const QStringList& strings) ; int rowCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; @@ -125,11 +138,14 @@ public: void setMsgReadStatus(const QModelIndex& i, bool read_status); void setMsgStar(const QModelIndex& index,bool star) ; +public slots: + void updateMessages(); + signals: void messagesLoaded(); // emitted after the messages have been set. Can be used to updated the UI. private: - bool mFilteringEnabled; + bool passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const; void preMods() ; void postMods() ; @@ -153,5 +169,10 @@ private: QColor mTextColorMissing ; BoxName mCurrentBox ; + QuickViewFilter mQuickViewFilter ; + QStringList mFilterStrings; + int mFilterColumn; + bool mFilteringEnabled; + std::vector mMessages; }; From 59b1d44e5b3065c87d690b35d108b89e17c276d4 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 12 Mar 2019 14:27:06 +0100 Subject: [PATCH 11/25] resotred string filter system --- retroshare-gui/src/gui/MessagesDialog.cpp | 19 ++++++------------- retroshare-gui/src/gui/msgs/MessageModel.h | 3 +-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 5218e49b9..88f20c6c6 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -145,7 +145,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) changeBox(RsMessageModel::BOX_INBOX); mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); - mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; + //mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; ui.messageTreeWidget->setSortingEnabled(true); @@ -1564,24 +1564,17 @@ void MessagesDialog::buttonStyle() void MessagesDialog::filterChanged(const QString& text) { -#ifdef TODO - ui.messageTreeWidget->filterItems(ui.filterLineEdit->currentFilter(), text); -#endif + QStringList items = text.split(' ',QString::SkipEmptyParts); + mMessageModel->setFilter(ui.filterLineEdit->currentFilter(),items); } void MessagesDialog::filterColumnChanged(int column) { - if (inProcessSettings) { + if (inProcessSettings) return; - } - if (column == COLUMN_CONTENT) { - // need content ... refill - //insertMessages(); - } -#ifdef TODO - ui.messageTreeWidget->filterItems(column, ui.filterLineEdit->text()); -#endif + QStringList items = ui.filterLineEdit->text().split(' ',QString::SkipEmptyParts); + mMessageModel->setFilter(column,items); // save index Settings->setValueToGroup("MessageDialog", "filterColumn", column); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 5e7f78d9f..06b7fecb3 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -95,11 +95,10 @@ public: void setCurrentBox(BoxName bn) ; void setQuickViewFilter(QuickViewFilter fn) ; + void setFilter(int column, const QStringList& strings) ; const RsMessageId& currentMessageId() const; - void setFilter(int column, const QStringList& strings) ; - int rowCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; From c9561c2684d6ddd1142c1434c78f79518dae58ba Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 12 Mar 2019 15:59:54 +0100 Subject: [PATCH 12/25] fixed search filter --- retroshare-gui/src/gui/MessagesDialog.cpp | 77 +++++++------- retroshare-gui/src/gui/msgs/MessageModel.cpp | 103 ++++++++----------- retroshare-gui/src/gui/msgs/MessageModel.h | 14 ++- 3 files changed, 94 insertions(+), 100 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 88f20c6c6..8909abc11 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -823,7 +823,7 @@ void MessagesDialog::changeQuickView(int newrow) case 0x05: f = RsMessageModel::QUICK_VIEW_TODO ; break; case 0x06: f = RsMessageModel::QUICK_VIEW_LATER ; break; default: - f = RsMessageModel::QuickViewFilter( (int)RsMessageModel::QUICK_VIEW_USER + newrow - 0x06); + f = RsMessageModel::QuickViewFilter( (int)RsMessageModel::QUICK_VIEW_USER + newrow - 0x07); } mMessageModel->setQuickViewFilter(f); insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex()); @@ -1438,18 +1438,6 @@ void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) } mid = index.data(RsMessageModel::MsgIdRole).toString().toStdString(); -// int nCount = getSelectedMsgCount (NULL, NULL, NULL, NULL); -// -// if (nCount == 1) { -// ui.actionSaveAs->setEnabled(true); -// ui.actionPrintPreview->setEnabled(true); -// ui.actionPrint->setEnabled(true); -// } else { -// ui.actionSaveAs->setDisabled(true); -// ui.actionPrintPreview->setDisabled(true); -// ui.actionPrint->setDisabled(true); -// } - /* Save the Data.... for later */ MessageInfo msgInfo; @@ -1458,27 +1446,17 @@ void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) return; } -// QList items; -// items.append(item); -// -// bool bSetToReadOnActive = Settings->getMsgSetToReadOnActivate(); -// -// if (msgInfo.msgflags & RS_MSG_NEW) { -// // set always to read or unread -// if (bSetToReadOnActive == false || bSetToRead == false) { -// // set locally to unread -// setMsgAsReadUnread(items, false); -// } else { -// setMsgAsReadUnread(items, true); -// } -// updateMessageSummaryList(); -// } else { -// if ((msgInfo.msgflags & RS_MSG_UNREAD_BY_USER) && bSetToRead && bSetToReadOnActive) { -// // set to read -// setMsgAsReadUnread(items, true); -// updateMessageSummaryList(); -// } -// } + bool bSetToReadOnActive = Settings->getMsgSetToReadOnActivate(); + + if (msgInfo.msgflags & RS_MSG_NEW) // set always to read or unread + { + if (!bSetToReadOnActive) // set locally to unread + mMessageModel->setMsgReadStatus(index, false); + else + mMessageModel->setMsgReadStatus(index, true); + } + else if ((msgInfo.msgflags & RS_MSG_UNREAD_BY_USER) && bSetToReadOnActive) // set to read + mMessageModel->setMsgReadStatus(index, true); updateInterface(); msgWidget->fill(mid); @@ -1565,7 +1543,21 @@ void MessagesDialog::buttonStyle() void MessagesDialog::filterChanged(const QString& text) { QStringList items = text.split(' ',QString::SkipEmptyParts); - mMessageModel->setFilter(ui.filterLineEdit->currentFilter(),items); + + RsMessageModel::FilterType f = RsMessageModel::FILTER_TYPE_NONE; + + switch(ui.filterLineEdit->currentFilter()) + { + case COLUMN_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; + case COLUMN_FROM: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case COLUMN_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; + case COLUMN_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; + case COLUMN_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; + case COLUMN_ATTACHEMENTS: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + default:break; + } + + mMessageModel->setFilter(f,items); } void MessagesDialog::filterColumnChanged(int column) @@ -1573,8 +1565,21 @@ void MessagesDialog::filterColumnChanged(int column) if (inProcessSettings) return; + RsMessageModel::FilterType f = RsMessageModel::FILTER_TYPE_NONE; + + switch(column) + { + case COLUMN_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; + case COLUMN_FROM: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case COLUMN_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; + case COLUMN_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; + case COLUMN_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; + case COLUMN_ATTACHEMENTS: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + default:break; + } + QStringList items = ui.filterLineEdit->text().split(' ',QString::SkipEmptyParts); - mMessageModel->setFilter(column,items); + mMessageModel->setFilter(f,items); // save index Settings->setValueToGroup("MessageDialog", "filterColumn", column); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index eccff958b..5e6fb3e41 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -51,6 +51,7 @@ RsMessageModel::RsMessageModel(QObject *parent) mFilteringEnabled=false; mCurrentBox = BOX_NONE; mQuickViewFilter = QUICK_VIEW_ALL; + mFilterType = FILTER_TYPE_NONE; } void RsMessageModel::preMods() @@ -277,13 +278,13 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const QVariant RsMessageModel::textColorRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { -// if( (fmpe.msgflags & ForumModelPostEntry::FLAG_POST_IS_MISSING)) -// return QVariant(mTextColorMissing); -// -// if(IS_MSG_UNREAD(fmpe.mMsgStatus) || (fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_IS_PINNED)) -// return QVariant(mTextColorUnread); -// else -// return QVariant(mTextColorRead); + Rs::Msgs::MsgTagType tags; + rsMsgs->getMessageTagTypes(tags); + + for(auto it(fmpe.msgtags.begin());it!=fmpe.msgtags.end();++it) + for(auto it2(tags.types.begin());it2!=tags.types.end();++it2) + if(it2->first == *it) + return QColor(it2->second.second); return QVariant(); } @@ -298,14 +299,42 @@ QVariant RsMessageModel::statusRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { - QString s = displayRole(fmpe,mFilterColumn).toString(); + QString s ; bool passes_strings = true ; if(!mFilterStrings.empty()) + { + switch(mFilterType) + { + case FILTER_TYPE_SUBJECT: s = displayRole(fmpe,COLUMN_THREAD_SUBJECT).toString(); + break; + + case FILTER_TYPE_FROM: + case FILTER_TYPE_DATE: s = displayRole(fmpe,COLUMN_THREAD_DATE).toString(); + break; + case FILTER_TYPE_CONTENT: { + Rs::Msgs::MessageInfo minfo; + rsMsgs->getMessage(fmpe.msgId,minfo); + s = QTextDocument(QString::fromUtf8(minfo.msg.c_str())).toPlainText(); + } + break; + case FILTER_TYPE_TAGS: s = displayRole(fmpe,COLUMN_THREAD_TAGS).toString(); + break; + + case FILTER_TYPE_ATTACHMENTS: + { + Rs::Msgs::MessageInfo minfo; + rsMsgs->getMessage(fmpe.msgId,minfo); + + for(auto it(minfo.files.begin());it!=minfo.files.end();++it) + s += QString::fromUtf8((*it).fname.c_str())+" "; + } + }; + } + + if(!s.isNull()) for(auto iter(mFilterStrings.begin()); iter != mFilterStrings.end(); ++iter) passes_strings = passes_strings && s.contains(*iter,Qt::CaseInsensitive); - else - passes_strings = true; bool passes_quick_view = (mQuickViewFilter==QUICK_VIEW_ALL) @@ -333,11 +362,11 @@ uint32_t RsMessageModel::updateFilterStatus(ForumModelIndex i,int column,const Q } -void RsMessageModel::setFilter(int column,const QStringList& strings) +void RsMessageModel::setFilter(FilterType filter_type, const QStringList& strings) { preMods(); - mFilterColumn = column; + mFilterType = filter_type; mFilterStrings = strings; postMods(); @@ -617,56 +646,6 @@ void RsMessageModel::updateMessages() setMessages(msgs); } -// RsThread::async([this, group_id]() -// { -// // 1 - get message data from p3GxsForums -// -// std::list forumIds; -// std::vector msg_metas; -// std::vector groups; -// -// forumIds.push_back(group_id); -// -// if(!rsGxsForums->getForumsInfo(forumIds,groups)) -// { -// std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum group info for forum " << group_id << std::endl; -// return; -// } -// -// if(!rsGxsForums->getForumMsgMetaData(group_id,msg_metas)) -// { -// std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum message info for forum " << group_id << std::endl; -// return; -// } -// -// // 2 - sort the messages into a proper hierarchy -// -// auto post_versions = new std::map > >() ; -// std::vector *vect = new std::vector(); -// RsGxsForumGroup group = groups[0]; -// -// computeMessagesHierarchy(group,msg_metas,*vect,*post_versions); -// -// // 3 - update the model in the UI thread. -// -// RsQThreadUtils::postToObject( [group,vect,post_versions,this]() -// { -// /* Here it goes any code you want to be executed on the Qt Gui -// * thread, for example to update the data model with new information -// * after a blocking call to RetroShare API complete, note that -// * Qt::QueuedConnection is important! -// */ -// -// setPosts(group,*vect,*post_versions) ; -// -// delete vect; -// delete post_versions; -// -// -// }, this ); -// -// }); - static bool decreasing_time_comp(const std::pair& e1,const std::pair& e2) { return e2.first < e1.first ; } void RsMessageModel::setMsgReadStatus(const QModelIndex& i,bool read_status) diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 06b7fecb3..c6167a073 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -76,6 +76,16 @@ public: QUICK_VIEW_USER = 100 }; + enum FilterType { + FILTER_TYPE_NONE = 0x00, + FILTER_TYPE_SUBJECT = 0x01, // These numbers have been carefuly chosen to match the ones in rsmsgs.h + FILTER_TYPE_FROM = 0x02, + FILTER_TYPE_DATE = 0x03, + FILTER_TYPE_CONTENT = 0x04, + FILTER_TYPE_TAGS = 0x05, + FILTER_TYPE_ATTACHMENTS = 0x06, + }; + enum Roles{ SortRole = Qt::UserRole+1, StatusRole = Qt::UserRole+2, UnreadRole = Qt::UserRole+3, @@ -95,9 +105,9 @@ public: void setCurrentBox(BoxName bn) ; void setQuickViewFilter(QuickViewFilter fn) ; - void setFilter(int column, const QStringList& strings) ; const RsMessageId& currentMessageId() const; + void setFilter(FilterType filter_type, const QStringList& strings) ; int rowCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; @@ -170,7 +180,7 @@ private: BoxName mCurrentBox ; QuickViewFilter mQuickViewFilter ; QStringList mFilterStrings; - int mFilterColumn; + FilterType mFilterType; bool mFilteringEnabled; std::vector mMessages; From a67a35624df6c01872d325b61a17eba24ca69b3d Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 12 Mar 2019 16:40:35 +0100 Subject: [PATCH 13/25] fixed re-loading of icons in author item delegate --- .../src/gui/gxs/GxsIdTreeWidgetItem.h | 56 ++++++++++++++++++- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index c8b83dbe0..771233aa6 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -22,8 +22,10 @@ #define _GXS_ID_TREEWIDGETITEM_H #include +#include #include #include +#include #include "gui/common/RSTreeWidgetItem.h" #include "gui/gxs/GxsIdDetails.h" @@ -75,8 +77,14 @@ private: class GxsIdTreeItemDelegate: public QStyledItemDelegate { + Q_OBJECT + public: - GxsIdTreeItemDelegate() {} + GxsIdTreeItemDelegate() + { + mLoading = false; + mReloadPeriod = 0; + } QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override { @@ -98,7 +106,10 @@ public: QIcon icon ; if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + { icon = GxsIdDetails::getLoadingIcon(id); + launchAsyncLoading(); + } else icon = *icons.begin(); @@ -135,8 +146,28 @@ public: QIcon icon ; - if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) - icon = GxsIdDetails::getLoadingIcon(id); + if(id.isNull()) + { + str = tr("[Retroshare]"); + icon = QIcon(); + } + if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) + { + str = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; + } + else if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + { + if(mReloadPeriod > 3) + { + str = tr("[Unknown]"); + icon = QIcon(); + } + else + { + icon = GxsIdDetails::getLoadingIcon(id); + launchAsyncLoading(); + } + } else icon = *icons.begin(); @@ -147,6 +178,25 @@ public: painter->drawPixmap(r.topLeft() + p, pix); painter->drawText(r.topLeft() + QPoint(r.height()+ f/2.0 + f/2.0,f*1.0), str); } + + void launchAsyncLoading() const + { + if(mLoading) + return; + + mLoading = true; + ++mReloadPeriod; + std::cerr << "Re-loading" << std::endl; + + QTimer::singleShot(1000,this,SLOT(reload())); + } + +private slots: + void reload() { mLoading=false; emit commitData(NULL) ; } + +private: + mutable bool mLoading; + mutable int mReloadPeriod; }; From 14d29a4490cfb4f4f2b425b7e3cac8d1d90f96db Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 12 Mar 2019 16:59:45 +0100 Subject: [PATCH 14/25] fixed small bug in box initialization --- retroshare-gui/src/gui/MessagesDialog.cpp | 7 +------ retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h | 6 ------ retroshare-gui/src/gui/msgs/MessageModel.cpp | 11 +---------- retroshare-gui/src/gui/msgs/MessageModel.h | 1 - 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 8909abc11..1ed9b89c7 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -142,7 +142,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setSortRole(RsMessageModel::SortRole); ui.messageTreeWidget->setModel(mMessageProxyModel); - changeBox(RsMessageModel::BOX_INBOX); + changeBox(0); // set to inbox mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); //mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; @@ -782,14 +782,9 @@ void MessagesDialog::changeBox(int box_row) inChange = true; -// ui.messageTreeWidget->clear(); - ui.quickViewWidget->setCurrentItem(NULL); listMode = LIST_BOX; -// insertMessages(); -// insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem()); - switch(box_row) { case 0: mMessageModel->setCurrentBox(RsMessageModel::BOX_INBOX ); break; diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 771233aa6..abc198ad9 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -146,11 +146,6 @@ public: QIcon icon ; - if(id.isNull()) - { - str = tr("[Retroshare]"); - icon = QIcon(); - } if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) { str = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; @@ -186,7 +181,6 @@ public: mLoading = true; ++mReloadPeriod; - std::cerr << "Re-loading" << std::endl; QTimer::singleShot(1000,this,SLOT(reload())); } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 5e6fb3e41..bc7906d7a 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -48,10 +48,10 @@ const QString RsMessageModel::FilterString("filtered"); RsMessageModel::RsMessageModel(QObject *parent) : QAbstractItemModel(parent) { - mFilteringEnabled=false; mCurrentBox = BOX_NONE; mQuickViewFilter = QUICK_VIEW_ALL; mFilterType = FILTER_TYPE_NONE; + mFilterStrings.clear(); } void RsMessageModel::preMods() @@ -63,15 +63,6 @@ void RsMessageModel::postMods() emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mMessages.size()-1,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); } -// void RsGxsForumModel::setSortMode(SortMode mode) -// { -// preMods(); -// -// mSortMode = mode; -// -// postMods(); -// } - int RsMessageModel::rowCount(const QModelIndex& parent) const { if(!parent.isValid()) diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index c6167a073..8668bf05e 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -181,7 +181,6 @@ private: QuickViewFilter mQuickViewFilter ; QStringList mFilterStrings; FilterType mFilterType; - bool mFilteringEnabled; std::vector mMessages; }; From f355abe0257dd6d4d1bc34ef799ac80284d1c5f1 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 18 Mar 2019 21:35:55 +0100 Subject: [PATCH 15/25] removed sorting sensitivity and some dead code --- retroshare-gui/src/gui/MessagesDialog.cpp | 5 ++++- retroshare-gui/src/gui/MessagesDialog.h | 3 ++- retroshare-gui/src/gui/msgs/MessageModel.cpp | 16 ++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 1ed9b89c7..a076ae94e 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -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)); diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index ba56f0224..4206043f6 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -138,7 +138,8 @@ private: QTimer *timer; int timerIndex; - RSTreeWidgetItemCompareRole *mMessageCompareRole; + //RSTreeWidgetItemCompareRole *mMessageCompareRole; + MessageWidget *msgWidget; RsMessageModel *mMessageModel; QSortFilterProxyModel *mMessageProxyModel; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index bc7906d7a..6495b95a3 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -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 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 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: From 258c544a7597a688bab0356a4afeb14e92525e87 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 18 Mar 2019 22:00:15 +0100 Subject: [PATCH 16/25] fixed navigation with arrows in MessagesDialog --- retroshare-gui/src/gui/MessagesDialog.cpp | 75 ++++++++++++----------- retroshare-gui/src/gui/MessagesDialog.h | 1 + 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index a076ae94e..5a1e77f70 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -152,9 +152,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) ui.messageTreeWidget->setSortingEnabled(true); - //ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_DISTRIBUTION,new DistributionItemDelegate()) ; ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; - //ui.messageTreeWidget->setItemDelegateForColumn(RsGxsForumModel::COLUMN_THREAD_READ,new ReadStatusItemDelegate()) ; #ifdef TO_REMOVE // Set the QStandardItemModel @@ -211,15 +209,18 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* Set initial section sizes */ QHeaderView * msgwheader = ui.messageTreeWidget->header () ; msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')*1.2f); - msgwheader->resizeSection (COLUMN_SUBJECT, 250); - msgwheader->resizeSection (COLUMN_FROM, 140); - msgwheader->resizeSection (COLUMN_DATE, 140); + msgwheader->resizeSection (COLUMN_SUBJECT, fm.width("You have a message")*3.0); + msgwheader->resizeSection (COLUMN_FROM, fm.width("[Retroshare]")*1.5); + msgwheader->resizeSection (COLUMN_DATE, fm.width("01/01/1970")*1.5); + msgwheader->resizeSection (COLUMN_STAR, fm.width('0')*1.5); + msgwheader->resizeSection (COLUMN_UNREAD, fm.width('0')*1.5); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); - msgwheader->resizeSection (COLUMN_STAR, 24); - - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_UNREAD, QHeaderView::Fixed); - msgwheader->resizeSection (COLUMN_UNREAD, 24); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_ATTACHEMENTS, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_SUBJECT, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_FROM, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_DATE, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_UNREAD, QHeaderView::Fixed); ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.replyallmessageButton->setToolTip(tr("Reply to All")); @@ -240,11 +241,11 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* add filter actions */ - ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject")); - ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From")); - ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE, tr("Search Date")); - ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT, tr("Search Content")); - ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS, tr("Search Tags")); + ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject")); + ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From")); + ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE, tr("Search Date")); + ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT, tr("Search Content")); + ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS, tr("Search Tags")); ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS, tr("Search Attachments")); //setting default filter by column as subject @@ -254,14 +255,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) processSettings(true); /* Set header sizes for the fixed columns and resize modes, must be set after processSettings */ - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_ATTACHEMENTS, QHeaderView::Fixed); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_DATE, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_UNREAD, QHeaderView::Fixed); - //QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_SIGNATURE, QHeaderView::Fixed); - msgwheader->resizeSection (COLUMN_UNREAD, 24); - //msgwheader->resizeSection (COLUMN_SIGNATURE, 24); - msgwheader->resizeSection (COLUMN_STAR, 24); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); msgwheader->setStretchLastSection(false); // fill folder list @@ -300,23 +293,23 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), mMessageModel, SLOT(updateMessages())); connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); - connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&))); - connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); - connect(ui.messageTreeWidget, SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&))); - connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); - connect(ui.messageTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*))); - connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(const QModelIndex&))); - connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); - connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int))); - connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); - connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int))); - connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage())); + + connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); + connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); + connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int))); + connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); + connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int))); + connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage())); connect(ui.actionTextBesideIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); - connect(ui.actionIconOnly, SIGNAL(triggered()), this, SLOT(buttonStyle())); - connect(ui.actionTextUnderIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); + connect(ui.actionIconOnly, SIGNAL(triggered()), this, SLOT(buttonStyle())); + connect(ui.actionTextUnderIcon, SIGNAL(triggered()), this, SLOT(buttonStyle())); + connect(ui.messageTreeWidget, SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&))); + connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); + connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&))); + connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(currentChanged(const QModelIndex&,const QModelIndex&))); } MessagesDialog::~MessagesDialog() @@ -1299,6 +1292,16 @@ void MessagesDialog::insertMessages() } #endif +// click in messageTreeWidget +void MessagesDialog::currentChanged(const QModelIndex& new_index,const QModelIndex& old_index) +{ + if(!new_index.isValid()) + return; + + // show current message directly + insertMsgTxtAndFiles(new_index); +} + // click in messageTreeWidget void MessagesDialog::clicked(const QModelIndex& index) { diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 4206043f6..dd5fb96be 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -77,6 +77,7 @@ private slots: void updateCurrentMessage(); void clicked(const QModelIndex&); void doubleClicked(const QModelIndex&); + void currentChanged(const QModelIndex& new_index, const QModelIndex &old_index); void newmessage(); void openAsWindow(); From 3419b44ec1c3efb0d052990fa0e3679e468cf477 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 19 Mar 2019 10:22:20 +0100 Subject: [PATCH 17/25] fixed a few bugs in msg model and cleaned up dead code --- retroshare-gui/src/gui/MessagesDialog.cpp | 669 ++----------------- retroshare-gui/src/gui/MessagesDialog.h | 4 +- retroshare-gui/src/gui/msgs/MessageModel.cpp | 25 +- retroshare-gui/src/gui/msgs/MessageModel.h | 1 + 4 files changed, 72 insertions(+), 627 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 5a1e77f70..e8e6a8aeb 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -61,19 +61,6 @@ #define IMAGE_DECRYPTMESSAGE ":/images/decrypt-mail.png" #define IMAGE_AUTHOR_INFO ":/images/info16.png" -#define COLUMN_STAR 0 -#define COLUMN_ATTACHEMENTS 1 -#define COLUMN_SUBJECT 2 -#define COLUMN_UNREAD 3 -#define COLUMN_FROM 4 -//#define COLUMN_SIGNATURE 5 -#define COLUMN_DATE 5 -#define COLUMN_CONTENT 6 -#define COLUMN_TAGS 7 -#define COLUMN_COUNT 8 - -#define COLUMN_DATA 0 // column for storing the userdata like msgid and srcid - #define ROLE_QUICKVIEW_TYPE Qt::UserRole #define ROLE_QUICKVIEW_ID Qt::UserRole + 1 #define ROLE_QUICKVIEW_TEXT Qt::UserRole + 2 @@ -95,7 +82,7 @@ class MessageSortFilterProxyModel: public QSortFilterProxyModel { public: - MessageSortFilterProxyModel(const QHeaderView *header,QObject *parent = NULL): QSortFilterProxyModel(parent),m_header(header) {} + MessageSortFilterProxyModel(const QHeaderView *header,QObject *parent = NULL): QSortFilterProxyModel(parent),m_header(header) , m_sortingEnabled(false) {} bool lessThan(const QModelIndex& left, const QModelIndex& right) const override { @@ -107,8 +94,16 @@ public: return sourceModel()->index(source_row,0,source_parent).data(RsMessageModel::FilterRole).toString() == RsMessageModel::FilterString ; } + void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) override + { + if(m_sortingEnabled) + return QSortFilterProxyModel::sort(column,order) ; + } + + void setSortingEnabled(bool b) { m_sortingEnabled = b ; } private: const QHeaderView *m_header ; + bool m_sortingEnabled; }; /** Constructor */ @@ -148,54 +143,16 @@ MessagesDialog::MessagesDialog(QWidget *parent) changeBox(0); // set to inbox mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); - //mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; ui.messageTreeWidget->setSortingEnabled(true); - ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; - -#ifdef TO_REMOVE - // Set the QStandardItemModel - ui.messageTreeWidget->setColumnCount(COLUMN_COUNT); - QTreeWidgetItem *headerItem = ui.messageTreeWidget->headerItem(); - headerItem->setText(COLUMN_ATTACHEMENTS, ""); - headerItem->setIcon(COLUMN_ATTACHEMENTS, QIcon(":/images/attachment.png")); - headerItem->setText(COLUMN_SUBJECT, tr("Subject")); - headerItem->setText(COLUMN_UNREAD, ""); - headerItem->setIcon(COLUMN_UNREAD, QIcon(":/images/message-state-header.png")); - headerItem->setText(COLUMN_FROM, tr("From")); - headerItem->setText(COLUMN_SIGNATURE, ""); - headerItem->setIcon(COLUMN_SIGNATURE, QIcon(":/images/signature.png")); - headerItem->setText(COLUMN_DATE, tr("Date")); - headerItem->setText(COLUMN_TAGS, tr("Tags")); - headerItem->setText(COLUMN_CONTENT, tr("Content")); - headerItem->setText(COLUMN_STAR, ""); - headerItem->setIcon(COLUMN_STAR, QIcon(IMAGE_STAR_ON)); - - headerItem->setToolTip(COLUMN_ATTACHEMENTS, tr("Click to sort by attachments")); - headerItem->setToolTip(COLUMN_SUBJECT, tr("Click to sort by subject")); - headerItem->setToolTip(COLUMN_UNREAD, tr("Click to sort by read")); - headerItem->setToolTip(COLUMN_FROM, tr("Click to sort by from")); - headerItem->setToolTip(COLUMN_SIGNATURE, tr("Click to sort by signature")); - 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")); - - mMessageCompareRole = new RSTreeWidgetItemCompareRole; - mMessageCompareRole->setRole(COLUMN_SUBJECT, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_UNREAD, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_FROM, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_DATE, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_TAGS, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_ATTACHEMENTS, RsMessageModel::SortRole); - mMessageCompareRole->setRole(COLUMN_STAR, RsMessageModel::SortRole); -#endif + ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); ui.messageTreeWidget->setItemDelegate(itemDelegate); - ui.messageTreeWidget->sortByColumn(COLUMN_DATA, Qt::DescendingOrder); + //ui.messageTreeWidget->sortByColumn(COLUMN_DATA, Qt::DescendingOrder); // workaround for Qt bug, should be solved in next Qt release 4.7.0 // http://bugreports.qt.nokia.com/browse/QTBUG-8270 @@ -208,19 +165,19 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* Set initial section sizes */ QHeaderView * msgwheader = ui.messageTreeWidget->header () ; - msgwheader->resizeSection (COLUMN_ATTACHEMENTS, fm.width('0')*1.2f); - msgwheader->resizeSection (COLUMN_SUBJECT, fm.width("You have a message")*3.0); - msgwheader->resizeSection (COLUMN_FROM, fm.width("[Retroshare]")*1.5); - msgwheader->resizeSection (COLUMN_DATE, fm.width("01/01/1970")*1.5); - msgwheader->resizeSection (COLUMN_STAR, fm.width('0')*1.5); - msgwheader->resizeSection (COLUMN_UNREAD, fm.width('0')*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_STAR, fm.width('0')*1.1); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_ATTACHMENT, fm.width('0')*1.1); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_SUBJECT, fm.width("You have a message")*3.0); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR, fm.width("[Retroshare]")*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.1); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_ATTACHEMENTS, QHeaderView::Fixed); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_SUBJECT, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_FROM, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_DATE, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_STAR, QHeaderView::Fixed); - QHeaderView_setSectionResizeModeColumn(msgwheader, COLUMN_UNREAD, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Fixed); ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.replyallmessageButton->setToolTip(tr("Reply to All")); @@ -241,15 +198,15 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* add filter actions */ - ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject")); - ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From")); - ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE, tr("Search Date")); - ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT, tr("Search Content")); - ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS, tr("Search Tags")); - ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS, tr("Search Attachments")); + ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject")); + ui.filterLineEdit->addFilter(QIcon(), tr("From"), RsMessageModel::COLUMN_THREAD_AUTHOR, tr("Search From")); + ui.filterLineEdit->addFilter(QIcon(), tr("Date"), RsMessageModel::COLUMN_THREAD_DATE, tr("Search Date")); + ui.filterLineEdit->addFilter(QIcon(), tr("Content"), RsMessageModel::COLUMN_THREAD_CONTENT, tr("Search Content")); + ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), RsMessageModel::COLUMN_THREAD_TAGS, tr("Search Tags")); + ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), RsMessageModel::COLUMN_THREAD_ATTACHMENT, tr("Search Attachments")); //setting default filter by column as subject - ui.filterLineEdit->setCurrentFilter(COLUMN_SUBJECT); + ui.filterLineEdit->setCurrentFilter(RsMessageModel::COLUMN_THREAD_SUBJECT); // load settings processSettings(true); @@ -309,9 +266,18 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(ui.messageTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&))); connect(ui.messageTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(messageTreeWidgetCustomPopupMenu(const QPoint&))); + connect(ui.messageTreeWidget->header(),SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(sortColumn(int,Qt::SortOrder))); + connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(currentChanged(const QModelIndex&,const QModelIndex&))); } +void MessagesDialog::sortColumn(int col,Qt::SortOrder so) +{ + mMessageProxyModel->setSortingEnabled(true); + mMessageProxyModel->sort(col,so); + mMessageProxyModel->setSortingEnabled(false); +} + MessagesDialog::~MessagesDialog() { // save settings @@ -337,7 +303,7 @@ void MessagesDialog::processSettings(bool load) // load settings // filterColumn - ui.filterLineEdit->setCurrentFilter(Settings->value("filterColumn", COLUMN_SUBJECT).toInt()); + ui.filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RsMessageModel::COLUMN_THREAD_SUBJECT).toInt()); // state of message tree if (Settings->value("MessageTreeVersion").toInt() == messageTreeVersion) { @@ -475,17 +441,6 @@ void MessagesDialog::fillQuickView() updateMessageSummaryList(); } -// replaced by shortcut -//void MessagesDialog::keyPressEvent(QKeyEvent *e) -//{ -// if(e->key() == Qt::Key_Delete) -// { -// removemessage() ; -// e->accept() ; -// } -// else -// MainPage::keyPressEvent(e) ; -//} int MessagesDialog::getSelectedMessages(QList& mid) { //To check if the selection has more than one row. @@ -494,7 +449,7 @@ int MessagesDialog::getSelectedMessages(QList& mid) QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); foreach(const QModelIndex& m, qmil) - mid.push_back(m.sibling(m.row(),COLUMN_DATA).data(RsMessageModel::MsgIdRole).toString()) ; + mid.push_back(m.sibling(m.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString()) ; return mid.size(); } @@ -830,468 +785,6 @@ static void InitIconAndFont(QTreeWidgetItem *item) { } -#ifdef TO_REMOVE -void MessagesDialog::insertMessages() -{ - if (lockUpdate) { - return; - } - - std::list msgList; - std::list::const_iterator it; - MessageInfo msgInfo; - bool gotInfo; - QString text; - - RsPeerId ownId = rsPeers->getOwnId(); - - rsMail -> getMessageSummaries(msgList); - - int filterColumn = ui.filterLineEdit->currentFilter(); - - /* check the mode we are in */ - unsigned int msgbox = 0; - bool isTrash = false; - bool doFill = true; - int quickViewType = 0; - uint32_t quickViewId = 0; - QString boxText; - QIcon boxIcon; - QString placeholderText; - - switch (listMode) { - case LIST_NOTHING: - doFill = false; - break; - - case LIST_BOX: - { - QListWidgetItem *listItem = ui.listWidget->currentItem(); - if (listItem) { - boxIcon = listItem->icon(); - } - - int listrow = ui.listWidget->currentRow(); - - switch (listrow) { - case ROW_INBOX: - msgbox = RS_MSG_INBOX; - boxText = tr("Inbox"); - break; - case ROW_OUTBOX: - msgbox = RS_MSG_OUTBOX; - boxText = tr("Outbox"); - break; - case ROW_DRAFTBOX: - msgbox = RS_MSG_DRAFTBOX; - boxText = tr("Drafts"); - break; - case ROW_SENTBOX: - msgbox = RS_MSG_SENTBOX; - boxText = tr("Sent"); - break; - case ROW_TRASHBOX: - isTrash = true; - boxText = tr("Trash"); - break; - default: - doFill = false; - } - } - break; - - case LIST_QUICKVIEW: - { - QListWidgetItem *listItem = ui.quickViewWidget->currentItem(); - if (listItem) { - quickViewType = listItem->data(ROLE_QUICKVIEW_TYPE).toInt(); - quickViewId = listItem->data(ROLE_QUICKVIEW_ID).toInt(); - - boxText = listItem->text(); - boxIcon = listItem->icon(); - - switch (quickViewType) { - case QUICKVIEW_TYPE_NOTHING: - doFill = false; - break; - case QUICKVIEW_TYPE_STATIC: - switch (quickViewId) { - case QUICKVIEW_STATIC_ID_STARRED: - placeholderText = tr("No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message."); - break; - case QUICKVIEW_STATIC_ID_SYSTEM: - placeholderText = tr("No system messages available."); - break; - } - break; - case QUICKVIEW_TYPE_TAG: - break; - } - } else { - doFill = false; - } - } - break; - - default: - doFill = false; - } - - ui.tabWidget->setTabText (0, boxText); - ui.tabWidget->setTabIcon (0, boxIcon); - ui.messageTreeWidget->setPlaceholderText(placeholderText); - - QTreeWidgetItem *headerItem = ui.messageTreeWidget->headerItem(); - if (msgbox == RS_MSG_INBOX) { - headerItem->setText(COLUMN_FROM, tr("From")); - headerItem->setToolTip(COLUMN_FROM, tr("Click to sort by from")); - } else { - headerItem->setText(COLUMN_FROM, tr("To")); - headerItem->setToolTip(COLUMN_FROM, tr("Click to sort by to")); - } - - if (doFill) { - MsgTagType Tags; - rsMail->getMessageTagTypes(Tags); - - /* search messages */ - std::list msgToShow; - for(it = msgList.begin(); it != msgList.end(); ++it) { - if (listMode == LIST_BOX) { - if (isTrash) { - if ((it->msgflags & RS_MSG_TRASH) == 0) { - continue; - } - } else { - if (it->msgflags & RS_MSG_TRASH) { - continue; - } - if ((it->msgflags & RS_MSG_BOXMASK) != msgbox) { - continue; - } - } - } else if (listMode == LIST_QUICKVIEW && quickViewType == QUICKVIEW_TYPE_TAG) { - MsgTagInfo tagInfo; - rsMail->getMessageTag(it->msgId, tagInfo); - if (std::find(tagInfo.tagIds.begin(), tagInfo.tagIds.end(), quickViewId) == tagInfo.tagIds.end()) { - continue; - } - } else if (listMode == LIST_QUICKVIEW && quickViewType == QUICKVIEW_TYPE_STATIC) { - if (quickViewId == QUICKVIEW_STATIC_ID_STARRED && (it->msgflags & RS_MSG_STAR) == 0) { - continue; - } - if (quickViewId == QUICKVIEW_STATIC_ID_SYSTEM && (it->msgflags & RS_MSG_SYSTEM) == 0) { - continue; - } - } else { - continue; - } - - msgToShow.push_back(*it); - } - - /* remove old items */ - QTreeWidgetItemIterator itemIterator(ui.messageTreeWidget); - QTreeWidgetItem *treeItem; - while ((treeItem = *itemIterator) != NULL) { - ++itemIterator; - std::string msgIdFromRow = treeItem->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString(); - for(it = msgToShow.begin(); it != msgToShow.end(); ++it) { - if (it->msgId == msgIdFromRow) { - break; - } - } - - if (it == msgToShow.end ()) { - delete(treeItem); - } - } - - for(it = msgToShow.begin(); it != msgToShow.end(); ++it) - { - /* check the message flags, to decide which - * group it should go in... - * - * InBox - * OutBox - * Drafts - * Sent - * - * FLAGS = OUTGOING. - * -> Outbox/Drafts/Sent - * + SENT -> Sent - * + IN_PROGRESS -> Draft. - * + nuffing -> Outbox. - * FLAGS = INCOMING = (!OUTGOING) - * -> + NEW -> Bold. - * - */ - - gotInfo = false; - msgInfo = MessageInfo(); // clear - - // search exisisting items - QTreeWidgetItemIterator existingItemIterator(ui.messageTreeWidget); - while ((treeItem = *existingItemIterator) != NULL) { - ++existingItemIterator; - if (it->msgId == treeItem->data(COLUMN_DATA, ROLE_MSGID).toString().toStdString()) { - break; - } - } - - /* make a widget per friend */ - - bool insertItem = false; - - GxsIdRSTreeWidgetItem *item; - if (treeItem) { - item = dynamic_cast(treeItem); - if (!item) { - std::cerr << "MessagesDialog::insertMessages() Item is no GxsIdRSTreeWidgetItem" << std::endl; - continue; - } - } else { - item = new GxsIdRSTreeWidgetItem(mMessageCompareRole,GxsIdDetails::ICON_TYPE_AVATAR); - insertItem = true; - } - - /* So Text should be: - * (1) Msg / Broadcast - * (1b) Person / Channel Name - * (2) Rank - * (3) Date - * (4) Title - * (5) Msg - * (6) File Count - * (7) File Total - */ - - QString dateString; - // Date First.... (for sorting) - { - QDateTime qdatetime; - qdatetime.setTime_t(it->ts); - - // add string to all data - dateString = qdatetime.toString("_yyyyMMdd_hhmmss"); - - //if the mail is on same date show only time. - if (qdatetime.daysTo(QDateTime::currentDateTime()) == 0) - { - item->setText(COLUMN_DATE, DateTime::formatTime(qdatetime.time())); - } - else - { - item->setText(COLUMN_DATE, DateTime::formatDateTime(qdatetime)); - } - // for sorting - item->setData(COLUMN_DATE, ROLE_SORT, qdatetime); - } - - // From .... - { - bool setText = true; - if (msgbox == RS_MSG_INBOX || msgbox == RS_MSG_OUTBOX) - { - if ((it->msgflags & RS_MSG_SYSTEM) && it->srcId == ownId) { - text = "RetroShare"; - } - else - { - if (it->msgflags & RS_MSG_DISTANT) - { - // distant message - setText = false; - if (gotInfo || rsMail->getMessage(it->msgId, msgInfo)) { - gotInfo = true; - - if(msgbox != RS_MSG_INBOX && !msgInfo.rsgxsid_msgto.empty()) - item->setId(RsGxsId(*msgInfo.rsgxsid_msgto.begin()), COLUMN_FROM, false); - else - item->setId(RsGxsId(msgInfo.rsgxsid_srcId), COLUMN_FROM, false); - } - else - std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl; - } - else - text = QString::fromUtf8(rsPeers->getPeerName(it->srcId).c_str()); - } - } - else - { - if (gotInfo || rsMail->getMessage(it->msgId, msgInfo)) { - gotInfo = true; - - text.clear(); - - for(std::set::const_iterator pit = msgInfo.rspeerid_msgto.begin(); pit != msgInfo.rspeerid_msgto.end(); ++pit) - { - if (!text.isEmpty()) - text += ", "; - - std::string peerName = rsPeers->getPeerName(*pit); - if (peerName.empty()) - text += PeerDefs::rsid("", *pit); - else - text += QString::fromUtf8(peerName.c_str()); - } - for(std::set::const_iterator pit = msgInfo.rsgxsid_msgto.begin(); pit != msgInfo.rsgxsid_msgto.end(); ++pit) - { - if (!text.isEmpty()) - text += ", "; - - RsIdentityDetails details; - if (rsIdentity->getIdDetails(*pit, details) && !details.mNickname.empty()) - text += QString::fromUtf8(details.mNickname.c_str()) ; - else - text += PeerDefs::rsid("", *pit); - } - } else { - std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl; - } - } - if (setText) - { - item->setText(COLUMN_FROM, text); - item->setData(COLUMN_FROM, ROLE_SORT, text + dateString); - } else { - item->setData(COLUMN_FROM, ROLE_SORT, item->text(COLUMN_FROM) + dateString); - } - } - - // Subject - text = QString::fromUtf8(it->title.c_str()); - - item->setText(COLUMN_SUBJECT, text); - item->setData(COLUMN_SUBJECT, ROLE_SORT, text + dateString); - - // internal data - QString msgId = QString::fromStdString(it->msgId); - item->setData(COLUMN_DATA, ROLE_SRCID, QString::fromStdString(it->srcId.toStdString())); - item->setData(COLUMN_DATA, ROLE_MSGID, msgId); - item->setData(COLUMN_DATA, ROLE_MSGFLAGS, it->msgflags); - - // Init icon and font - InitIconAndFont(item); - - // Tags - MsgTagInfo tagInfo; - rsMail->getMessageTag(it->msgId, tagInfo); - - text.clear(); - - // build tag names - std::map >::iterator Tag; - for (std::list::iterator tagId = tagInfo.tagIds.begin(); tagId != tagInfo.tagIds.end(); ++tagId) { - if (text.isEmpty() == false) { - text += ","; - } - Tag = Tags.types.find(*tagId); - if (Tag != Tags.types.end()) { - text += TagDefs::name(Tag->first, Tag->second.first); - } else { - // clean tagId - rsMail->setMessageTag(it->msgId, *tagId, false); - } - } - item->setText(COLUMN_TAGS, text); - item->setData(COLUMN_TAGS, ROLE_SORT, text); - - // set color - QColor color; - if (tagInfo.tagIds.size()) { - Tag = Tags.types.find(tagInfo.tagIds.front()); - if (Tag != Tags.types.end()) { - color = Tag->second.second; - } else { - // clean tagId - rsMail->setMessageTag(it->msgId, tagInfo.tagIds.front(), false); - } - } - if (!color.isValid()) { - color = ui.messageTreeWidget->palette().color(QPalette::Text); - } - QBrush brush = QBrush(color); - for (int i = 0; i < COLUMN_COUNT; ++i) { - item->setForeground(i, brush); - } - - // No of Files. - { - item->setText(COLUMN_ATTACHEMENTS, QString::number(it->count)); - item->setData(COLUMN_ATTACHEMENTS, ROLE_SORT, item->text(COLUMN_ATTACHEMENTS) + dateString); - item->setTextAlignment(COLUMN_ATTACHEMENTS, Qt::AlignHCenter); - } - - if (filterColumn == COLUMN_CONTENT) { - // need content for filter - if (gotInfo || rsMail->getMessage(it->msgId, msgInfo)) { - gotInfo = true; - QTextDocument doc; - doc.setHtml(QString::fromUtf8(msgInfo.msg.c_str())); - item->setText(COLUMN_CONTENT, doc.toPlainText().replace(QString("\n"), QString(" "))); - } else { - std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl; - item->setText(COLUMN_CONTENT, ""); - } - } - - else if(it->msgflags & RS_MSG_DISTANT) - { - item->setIcon(COLUMN_SIGNATURE, QIcon(":/images/blue_lock_open.png")) ; - item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-read.png")) ; - - if (msgbox == RS_MSG_INBOX ) - { - item->setToolTip(COLUMN_SIGNATURE, tr("This message comes from a distant person.")) ; - } - else if (msgbox == RS_MSG_OUTBOX) - { - item->setToolTip(COLUMN_SIGNATURE, tr("This message goes to a distant person.")) ; - } - - if(it->msgflags & RS_MSG_SIGNED) - { - if(it->msgflags & RS_MSG_SIGNATURE_CHECKS) - { - item->setIcon(COLUMN_SIGNATURE, QIcon(":/images/stock_signature_ok.png")) ; - item->setToolTip(COLUMN_SIGNATURE, tr("This message was signed and the signature checks")) ; - } - else - { - item->setIcon(COLUMN_SIGNATURE, QIcon(":/images/stock_signature_bad.png")) ; - item->setToolTip(COLUMN_SIGNATURE, tr("This message was signed but the signature doesn't check")) ; - } - } - } - else - item->setIcon(COLUMN_SIGNATURE, QIcon()) ; - - if (insertItem) { - /* add to the list */ - ui.messageTreeWidget->addTopLevelItem(item); - } - } - } else { - ui.messageTreeWidget->clear(); - } - - ui.messageTreeWidget->showColumn(COLUMN_ATTACHEMENTS); - ui.messageTreeWidget->showColumn(COLUMN_SUBJECT); - ui.messageTreeWidget->showColumn(COLUMN_UNREAD); - ui.messageTreeWidget->showColumn(COLUMN_FROM); - ui.messageTreeWidget->showColumn(COLUMN_DATE); - ui.messageTreeWidget->showColumn(COLUMN_TAGS); - ui.messageTreeWidget->hideColumn(COLUMN_CONTENT); - - if (!ui.filterLineEdit->text().isEmpty()) { - ui.messageTreeWidget->filterItems(ui.filterLineEdit->currentFilter(), ui.filterLineEdit->text()); - } - - updateMessageSummaryList(); -} -#endif - // click in messageTreeWidget void MessagesDialog::currentChanged(const QModelIndex& new_index,const QModelIndex& old_index) { @@ -1310,14 +803,14 @@ void MessagesDialog::clicked(const QModelIndex& index) switch (index.column()) { - case COLUMN_UNREAD: + case RsMessageModel::COLUMN_THREAD_READ: { mMessageModel->setMsgReadStatus(index, !isMessageRead(index)); insertMsgTxtAndFiles(index); updateMessageSummaryList(); return; } - case COLUMN_STAR: + case RsMessageModel::COLUMN_THREAD_STAR: { mMessageModel->setMsgStar(index, !hasMessageStar(index)); return; @@ -1366,32 +859,6 @@ void MessagesDialog::updateCurrentMessage() { } -// void MessagesDialog::setMsgAsReadUnread(const QList &items, bool read) -// { -// LockUpdate Lock (this, false); -// -// foreach (QTreeWidgetItem *item, items) { -// std::string mid = item->data(COLUMN_DATA, RsMessageModel::MsgIdRole).toString().toStdString(); -// -// if (rsMail->MessageRead(mid, !read)) { -// int msgFlag = item->data(COLUMN_DATA, RsMessageModel::MsgFlagsRole).toInt(); -// msgFlag &= ~RS_MSG_NEW; -// -// if (read) { -// msgFlag &= ~RS_MSG_UNREAD_BY_USER; -// } else { -// msgFlag |= RS_MSG_UNREAD_BY_USER; -// } -// -// item->setData(COLUMN_DATA, RsMessageModel::MsgFlagsRole, msgFlag); -// -// InitIconAndFont(item); -// } -// } -// -// // LockUpdate -// } - void MessagesDialog::markAsRead() { QList itemsUnread; @@ -1460,6 +927,7 @@ void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) mMessageModel->setMsgReadStatus(index, true); updateInterface(); + updateMessageSummaryList(); msgWidget->fill(mid); } @@ -1467,26 +935,11 @@ bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid) { QModelIndex indx = ui.messageTreeWidget->currentIndex(); -#ifdef TODO - /* get its Ids */ - if (!indx.isValid()) - { - //If no message is selected. assume first message is selected. - if (ui.messageTreeWidget->topLevelItemCount() == 0) - { - item = ui.messageTreeWidget->topLevelItem(0); - } - } - - if (!item) { - return false; - } -#endif if(!indx.isValid()) return false ; - cid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::SrcIdRole).toString().toStdString(); - mid = indx.sibling(indx.row(),COLUMN_DATA).data(RsMessageModel::MsgIdRole).toString().toStdString(); + cid = indx.sibling(indx.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::SrcIdRole).toString().toStdString(); + mid = indx.sibling(indx.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString().toStdString(); return true; } @@ -1513,6 +966,9 @@ void MessagesDialog::removemessage() rsMail->MessageToTrash(m.toStdString(), true); } } + + mMessageModel->updateMessages(); + updateMessageSummaryList(); } void MessagesDialog::undeletemessage() @@ -1522,6 +978,9 @@ void MessagesDialog::undeletemessage() foreach (const QString& s, msgids) rsMail->MessageToTrash(s.toStdString(), false); + + mMessageModel->updateMessages(); + updateMessageSummaryList(); } void MessagesDialog::setToolbarButtonStyle(Qt::ToolButtonStyle style) @@ -1549,12 +1008,12 @@ void MessagesDialog::filterChanged(const QString& text) switch(ui.filterLineEdit->currentFilter()) { - case COLUMN_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; - case COLUMN_FROM: f = RsMessageModel::FILTER_TYPE_FROM ; break; - case COLUMN_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; - case COLUMN_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; - case COLUMN_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; - case COLUMN_ATTACHEMENTS: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + case RsMessageModel::COLUMN_THREAD_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; + case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case RsMessageModel::COLUMN_THREAD_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; + case RsMessageModel::COLUMN_THREAD_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; + case RsMessageModel::COLUMN_THREAD_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; + case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; default:break; } @@ -1570,12 +1029,12 @@ void MessagesDialog::filterColumnChanged(int column) switch(column) { - case COLUMN_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; - case COLUMN_FROM: f = RsMessageModel::FILTER_TYPE_FROM ; break; - case COLUMN_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; - case COLUMN_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; - case COLUMN_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; - case COLUMN_ATTACHEMENTS: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + case RsMessageModel::COLUMN_THREAD_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; + case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case RsMessageModel::COLUMN_THREAD_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; + case RsMessageModel::COLUMN_THREAD_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; + case RsMessageModel::COLUMN_THREAD_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; + case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; default:break; } diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index dd5fb96be..0e371585e 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -32,6 +32,7 @@ class RSTreeWidgetItemCompareRole; class MessageWidget; class QTreeWidgetItem; class RsMessageModel; +class MessageSortFilterProxyModel ; class MessagesDialog : public MainPage { @@ -71,6 +72,7 @@ private slots: void messageTreeWidgetCustomPopupMenu(QPoint point); void folderlistWidgetCustomPopupMenu(QPoint); void showAuthorInPeopleTab(); + void sortColumn(int col,Qt::SortOrder so); void changeBox(int newrow); void changeQuickView(int newrow); @@ -143,7 +145,7 @@ private: MessageWidget *msgWidget; RsMessageModel *mMessageModel; - QSortFilterProxyModel *mMessageProxyModel; + MessageSortFilterProxyModel *mMessageProxyModel; /* Color definitions (for standard see qss.default) */ QColor mTextColorInbox; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 6495b95a3..f97351d25 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -406,35 +406,17 @@ QVariant RsMessageModel::sizeHintRole(int col) const QVariant RsMessageModel::authorRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { -// if(column == COLUMN_THREAD_DATA) -// return QVariant(QString::fromStdString(fmpe.mAuthorId.toStdString())); - return QVariant(); } -// QVariant RsMessageModel::unreadRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const -// { -// if(column == COLUMN_THREAD_UNREAD) -// return QVariant(); -// lconst Rs::Msgs::MsgInfoSummary& fmpe,int column) const -// -// } - QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const { switch(column) { - case COLUMN_THREAD_DATE: return QVariant(QString::number(fmpe.ts)); // we should probably have leading zeroes here + 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_READ: return QVariant((bool)IS_MESSAGE_UNREAD(fmpe.msgflags)); -// case COLUMN_THREAD_AUTHOR: -// { -// QString str,comment ; -// QList 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: @@ -449,6 +431,7 @@ QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co case COLUMN_THREAD_SUBJECT: return QVariant(QString::fromUtf8(fmpe.title.c_str())); case COLUMN_THREAD_ATTACHMENT:return QVariant(QString::number(fmpe.count)); + case COLUMN_THREAD_STAR: case COLUMN_THREAD_READ:return QVariant(); case COLUMN_THREAD_DATE:{ QDateTime qtime; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index 8668bf05e..f971ecbfa 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -62,6 +62,7 @@ public: COLUMN_THREAD_TAGS = 0x06, COLUMN_THREAD_MSGID = 0x07, COLUMN_THREAD_NB_COLUMNS = 0x08, + COLUMN_THREAD_CONTENT = 0x08, }; enum QuickViewFilter { From dc24bb6f0319a013eb4c22ebff327c509d18deaf Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 21 Mar 2019 10:14:50 +0100 Subject: [PATCH 18/25] added save/restore current selection --- retroshare-gui/src/gui/MessagesDialog.cpp | 38 +++++++++++++++++++- retroshare-gui/src/gui/MessagesDialog.h | 10 +++++- retroshare-gui/src/gui/msgs/MessageModel.cpp | 25 +++++++------ retroshare-gui/src/gui/msgs/MessageModel.h | 2 ++ 4 files changed, 63 insertions(+), 12 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index e8e6a8aeb..5bac2d57b 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -144,9 +144,10 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); - ui.messageTreeWidget->setSortingEnabled(true); + ui.messageTreeWidget->setSortingEnabled(false); ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true); + ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); @@ -251,6 +252,9 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), mMessageModel, SLOT(updateMessages())); connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); + connect(mMessageModel,SIGNAL(messagesAboutToLoad()),this,SLOT(preModelUpdate())); + connect(mMessageModel,SIGNAL(messagesLoaded()),this,SLOT(postModelUpdate())); + connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int))); @@ -271,10 +275,42 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(currentChanged(const QModelIndex&,const QModelIndex&))); } +void MessagesDialog::preModelUpdate() +{ + // save current selection + + mTmpSavedSelectedIds.clear(); + QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); + + foreach(const QModelIndex& m, qmil) + mTmpSavedSelectedIds.push_back(m.sibling(m.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString()) ; + + std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl; +} + +void MessagesDialog::postModelUpdate() +{ + // restore selection + + std::cerr << "Post-change: restoring selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl; + QItemSelection sel; + + foreach(const QString& s,mTmpSavedSelectedIds) + { + QModelIndex i = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(s.toStdString())); + + sel.select(i.sibling(i.row(),0),i.sibling(i.row(),RsMessageModel::COLUMN_THREAD_NB_COLUMNS-1)); + } + + ui.messageTreeWidget->selectionModel()->select(sel,QItemSelectionModel::SelectCurrent); +} + void MessagesDialog::sortColumn(int col,Qt::SortOrder so) { mMessageProxyModel->setSortingEnabled(true); + ui.messageTreeWidget->setSortingEnabled(true); mMessageProxyModel->sort(col,so); + ui.messageTreeWidget->setSortingEnabled(false); mMessageProxyModel->setSortingEnabled(false); } diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 0e371585e..010f4a079 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -59,6 +59,10 @@ public: void setTextColorInbox(QColor color) { mTextColorInbox = color; } +signals: + void messagesAboutToLoad(); + void messagesLoaded(); + protected: bool eventFilter(QObject *obj, QEvent *ev); int getSelectedMessages(QList& mid); @@ -66,7 +70,9 @@ protected: public slots: //void insertMessages(); void messagesTagsChanged(); - + void preModelUpdate(); + void postModelUpdate(); + private slots: /** Create the context popup menu and it's submenus */ void messageTreeWidgetCustomPopupMenu(QPoint point); @@ -152,6 +158,8 @@ private: /** Qt Designer generated object */ Ui::MessagesDialog ui; + + QList mTmpSavedSelectedIds; }; #endif diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index f97351d25..839b5689d 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -547,9 +547,13 @@ void RsMessageModel::setMessages(const std::list& msgs endRemoveRows(); mMessages.clear(); + mMessagesMap.clear(); for(auto it(msgs.begin());it!=msgs.end();++it) + { + mMessagesMap[(*it).msgId] = mMessages.size(); mMessages.push_back(*it); + } // now update prow for all posts @@ -614,10 +618,14 @@ void RsMessageModel::getMessageSummaries(BoxName box,std::list msgs; getMessageSummaries(mCurrentBox,msgs); setMessages(msgs); + + emit messagesLoaded(); } static bool decreasing_time_comp(const std::pair& e1,const std::pair& e2) { return e2.first < e1.first ; } @@ -645,16 +653,15 @@ QModelIndex RsMessageModel::getIndexOfMessage(const std::string& mid) const { // Brutal search. This is not so nice, so dont call that in a loop! If too costly, we'll use a map. - for(uint32_t i=0;isecond >= mMessages.size()) + return QModelIndex(); - return QModelIndex(); + quintptr ref ; + convertMsgIndexToInternalId(it->second,ref); + + return createIndex(it->second,0,ref); } void RsMessageModel::debug_dump() const @@ -662,5 +669,3 @@ void RsMessageModel::debug_dump() const for(auto it(mMessages.begin());it!=mMessages.end();++it) std::cerr << "Id: " << it->msgId << ": from " << it->srcId << ": flags=" << it->msgflags << ": title=\"" << it->title << "\"" << std::endl; } - - diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h index f971ecbfa..d6939fff1 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.h +++ b/retroshare-gui/src/gui/msgs/MessageModel.h @@ -153,6 +153,7 @@ public slots: signals: void messagesLoaded(); // emitted after the messages have been set. Can be used to updated the UI. + void messagesAboutToLoad(); private: bool passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const; @@ -184,4 +185,5 @@ private: FilterType mFilterType; std::vector mMessages; + std::map mMessagesMap; }; From b4ab766da914fe31459cec1ca482980b6dd22b97 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 21 Mar 2019 22:39:32 +0100 Subject: [PATCH 19/25] factored some duplicate code in MessagesDialog.cpp --- retroshare-gui/src/gui/MessagesDialog.cpp | 13 ++++--------- retroshare-gui/src/gui/MessagesDialog.ui | 7 +++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 5bac2d57b..947650af9 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -173,12 +173,12 @@ MessagesDialog::MessagesDialog(QWidget *parent) msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.5); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.1); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Fixed); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Interactive); ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.replyallmessageButton->setToolTip(tr("Reply to All")); @@ -196,7 +196,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) // Set initial size of the splitter ui.listSplitter->setStretchFactor(0, 0); ui.listSplitter->setStretchFactor(1, 1); - /* add filter actions */ ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject")); @@ -280,10 +279,7 @@ void MessagesDialog::preModelUpdate() // save current selection mTmpSavedSelectedIds.clear(); - QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); - - foreach(const QModelIndex& m, qmil) - mTmpSavedSelectedIds.push_back(m.sibling(m.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString()) ; + getSelectedMessages(mTmpSavedSelectedIds); std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl; } @@ -298,7 +294,6 @@ void MessagesDialog::postModelUpdate() foreach(const QString& s,mTmpSavedSelectedIds) { QModelIndex i = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(s.toStdString())); - sel.select(i.sibling(i.row(),0),i.sibling(i.row(),RsMessageModel::COLUMN_THREAD_NB_COLUMNS-1)); } diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 1ea2a904b..6d53864e6 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -454,7 +454,7 @@ Qt::NoFocus - + :/icons/help_64.png:/icons/help_64.png @@ -745,6 +745,9 @@ false + + true + @@ -850,8 +853,8 @@ listWidget - + From d38ad9791115d316ae68884abbca3d5baf1e92f0 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Mar 2019 10:05:54 +0100 Subject: [PATCH 20/25] changed order of operation between init and processSettngs because it was messing up the msg list --- retroshare-gui/src/gui/MessagesDialog.cpp | 100 ++++++++++++---------- retroshare-gui/src/gui/MessagesDialog.h | 6 +- 2 files changed, 59 insertions(+), 47 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 947650af9..7f6220b4e 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -144,7 +144,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); - ui.messageTreeWidget->setSortingEnabled(false); ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true); ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true); @@ -166,19 +165,13 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* Set initial section sizes */ QHeaderView * msgwheader = ui.messageTreeWidget->header () ; - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_STAR, fm.width('0')*1.1); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_ATTACHMENT, fm.width('0')*1.1); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_SUBJECT, fm.width("You have a message")*3.0); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR, fm.width("[Retroshare]")*1.5); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.5); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.1); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR, fm.width("[Retroshare]")*1.1); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.1); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Interactive); ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.replyallmessageButton->setToolTip(tr("Reply to All")); @@ -192,18 +185,18 @@ MessagesDialog::MessagesDialog(QWidget *parent) viewmenu->addAction(ui.actionTextBesideIcon); viewmenu->addAction(ui.actionIconOnly); ui.viewtoolButton->setMenu(viewmenu); - + // Set initial size of the splitter ui.listSplitter->setStretchFactor(0, 0); ui.listSplitter->setStretchFactor(1, 1); /* add filter actions */ - ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject")); - ui.filterLineEdit->addFilter(QIcon(), tr("From"), RsMessageModel::COLUMN_THREAD_AUTHOR, tr("Search From")); - ui.filterLineEdit->addFilter(QIcon(), tr("Date"), RsMessageModel::COLUMN_THREAD_DATE, tr("Search Date")); - ui.filterLineEdit->addFilter(QIcon(), tr("Content"), RsMessageModel::COLUMN_THREAD_CONTENT, tr("Search Content")); - ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), RsMessageModel::COLUMN_THREAD_TAGS, tr("Search Tags")); - ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), RsMessageModel::COLUMN_THREAD_ATTACHMENT, tr("Search Attachments")); + ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject")); + ui.filterLineEdit->addFilter(QIcon(), tr("From"), RsMessageModel::COLUMN_THREAD_AUTHOR, tr("Search From")); + ui.filterLineEdit->addFilter(QIcon(), tr("Date"), RsMessageModel::COLUMN_THREAD_DATE, tr("Search Date")); + ui.filterLineEdit->addFilter(QIcon(), tr("Content"), RsMessageModel::COLUMN_THREAD_CONTENT, tr("Search Content")); + ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), RsMessageModel::COLUMN_THREAD_TAGS, tr("Search Tags")); + ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), RsMessageModel::COLUMN_THREAD_ATTACHMENT,tr("Search Attachments")); //setting default filter by column as subject ui.filterLineEdit->setCurrentFilter(RsMessageModel::COLUMN_THREAD_SUBJECT); @@ -211,9 +204,24 @@ MessagesDialog::MessagesDialog(QWidget *parent) // load settings processSettings(true); + /////////////////////////////////////////////////////////////////////////////////////// + // Post "load settings" actions (which makes sure they are not affected by settings) // + /////////////////////////////////////////////////////////////////////////////////////// + + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_STAR, fm.width('0')*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_ATTACHMENT, fm.width('0')*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.5); + + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Fixed); + + ui.messageTreeWidget->setSortingEnabled(true); + /* Set header sizes for the fixed columns and resize modes, must be set after processSettings */ msgwheader->setStretchLastSection(false); + // fill folder list updateMessageSummaryList(); ui.listWidget->setCurrentRow(ROW_INBOX); @@ -303,9 +311,9 @@ void MessagesDialog::postModelUpdate() void MessagesDialog::sortColumn(int col,Qt::SortOrder so) { mMessageProxyModel->setSortingEnabled(true); - ui.messageTreeWidget->setSortingEnabled(true); + //ui.messageTreeWidget->setSortingEnabled(true); mMessageProxyModel->sort(col,so); - ui.messageTreeWidget->setSortingEnabled(false); + //ui.messageTreeWidget->setSortingEnabled(false); mMessageProxyModel->setSortingEnabled(false); } @@ -512,20 +520,20 @@ int MessagesDialog::getSelectedMsgCount (QList *items, QListmapToSource(proxy_index); + + switch (proxy_index.column()) { case RsMessageModel::COLUMN_THREAD_READ: { - mMessageModel->setMsgReadStatus(index, !isMessageRead(index)); - insertMsgTxtAndFiles(index); + mMessageModel->setMsgReadStatus(real_index, !isMessageRead(proxy_index)); + insertMsgTxtAndFiles(proxy_index); updateMessageSummaryList(); return; } case RsMessageModel::COLUMN_THREAD_STAR: { - mMessageModel->setMsgStar(index, !hasMessageStar(index)); + mMessageModel->setMsgStar(real_index, !hasMessageStar(proxy_index)); return; } } // show current message directly - insertMsgTxtAndFiles(index); + insertMsgTxtAndFiles(proxy_index); } // double click in messageTreeWidget -void MessagesDialog::doubleClicked(const QModelIndex& index) +void MessagesDialog::doubleClicked(const QModelIndex& proxy_index) { /* activate row */ - clicked(index); + clicked(proxy_index); std::string cid; std::string mid; @@ -922,20 +932,22 @@ void MessagesDialog::markWithStar(bool checked) -void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) +void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& proxy_index) { /* get its Ids */ std::string cid; std::string mid; - if(!index.isValid()) + QModelIndex real_index = mMessageProxyModel->mapToSource(proxy_index); + + if(!real_index.isValid()) { mCurrMsgId.clear(); msgWidget->fill(mCurrMsgId); updateInterface(); return; } - mid = index.data(RsMessageModel::MsgIdRole).toString().toStdString(); + mid = real_index.data(RsMessageModel::MsgIdRole).toString().toStdString(); /* Save the Data.... for later */ @@ -950,12 +962,12 @@ void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& index) if (msgInfo.msgflags & RS_MSG_NEW) // set always to read or unread { if (!bSetToReadOnActive) // set locally to unread - mMessageModel->setMsgReadStatus(index, false); + mMessageModel->setMsgReadStatus(real_index, false); else - mMessageModel->setMsgReadStatus(index, true); + mMessageModel->setMsgReadStatus(real_index, true); } else if ((msgInfo.msgflags & RS_MSG_UNREAD_BY_USER) && bSetToReadOnActive) // set to read - mMessageModel->setMsgReadStatus(index, true); + mMessageModel->setMsgReadStatus(real_index, true); updateInterface(); updateMessageSummaryList(); @@ -1138,12 +1150,12 @@ void MessagesDialog::updateMessageSummaryList() break; } } - + int listrow = ui.listWidget->currentRow(); QString textTotal; - switch (listrow) + switch (listrow) { case ROW_INBOX: textTotal = tr("Total:") + " " + QString::number(inboxCount); diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h index 010f4a079..9eeb577f0 100644 --- a/retroshare-gui/src/gui/MessagesDialog.h +++ b/retroshare-gui/src/gui/MessagesDialog.h @@ -85,7 +85,7 @@ private slots: void updateCurrentMessage(); void clicked(const QModelIndex&); void doubleClicked(const QModelIndex&); - void currentChanged(const QModelIndex& new_index, const QModelIndex &old_index); + void currentChanged(const QModelIndex& new_proxy_index, const QModelIndex &old_proxy_index); void newmessage(); void openAsWindow(); @@ -119,13 +119,13 @@ private: void connectActions(); void updateMessageSummaryList(); - void insertMsgTxtAndFiles(const QModelIndex& index = QModelIndex()); + void insertMsgTxtAndFiles(const QModelIndex& proxy_index = QModelIndex()); bool getCurrentMsg(std::string &cid, std::string &mid); void setMsgAsReadUnread(const QList &items, bool read); int getSelectedMsgCount (QList *items, QList *itemsRead, QList *itemsUnread, QList *itemsStar); - bool isMessageRead(const QModelIndex &index); + bool isMessageRead(const QModelIndex &real_index); bool hasMessageStar(const QModelIndex &index); void processSettings(bool load); From 90995f16ce366c17dcc74c8082603ef1fa586ff1 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Mar 2019 10:25:54 +0100 Subject: [PATCH 21/25] fixed filter/sort by author name --- retroshare-gui/src/gui/MessagesDialog.cpp | 13 +++-- .../src/gui/gxs/GxsIdTreeWidgetItem.h | 51 ++++++++++++------- retroshare-gui/src/gui/msgs/MessageModel.cpp | 10 +++- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 7f6220b4e..40c828449 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -121,9 +121,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) ui.actionIconOnly->setData(Qt::ToolButtonIconOnly); ui.actionTextUnderIcon->setData(Qt::ToolButtonTextUnderIcon); - connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); - connect(ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); - msgWidget = new MessageWidget(true, this); ui.msgLayout->addWidget(msgWidget); @@ -145,15 +142,11 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; - ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true); - ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true); RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); itemDelegate->setSpacing(QSize(0, 2)); ui.messageTreeWidget->setItemDelegate(itemDelegate); - //ui.messageTreeWidget->sortByColumn(COLUMN_DATA, Qt::DescendingOrder); - // workaround for Qt bug, should be solved in next Qt release 4.7.0 // http://bugreports.qt.nokia.com/browse/QTBUG-8270 QShortcut *Shortcut = new QShortcut(QKeySequence (Qt::Key_Delete), ui.messageTreeWidget, 0, 0, Qt::WidgetShortcut); @@ -208,6 +201,9 @@ MessagesDialog::MessagesDialog(QWidget *parent) // Post "load settings" actions (which makes sure they are not affected by settings) // /////////////////////////////////////////////////////////////////////////////////////// + ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true); + ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_STAR, fm.width('0')*1.5); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_ATTACHMENT, fm.width('0')*1.5); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.5); @@ -259,6 +255,9 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), mMessageModel, SLOT(updateMessages())); connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged())); + connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); + connect(ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); + connect(mMessageModel,SIGNAL(messagesAboutToLoad()),this,SLOT(preModelUpdate())); connect(mMessageModel,SIGNAL(messagesLoaded()),this,SLOT(postModelUpdate())); diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 8a8452a34..02eff1d32 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -138,33 +138,23 @@ public: RsGxsId id(index.data(Qt::UserRole).toString().toStdString()); QString str; - QList icons; QString comment; QFontMetricsF fm(painter->font()); float f = fm.height(); QIcon icon ; - - if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) - { - str = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; - } - else if(!GxsIdDetails::MakeIdDesc(id, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) - { + if(! computeNameIconAndComment(id,str,icon,comment)) if(mReloadPeriod > 3) - { + { str = tr("[Unknown]"); - icon = QIcon(); - } - else - { + icon = QIcon(); + } + else + { icon = GxsIdDetails::getLoadingIcon(id); launchAsyncLoading(); - } - } - else - icon = *icons.begin(); + } QPixmap pix = icon.pixmap(r.size()); const QPoint p = QPoint(r.height()/2.0, (r.height() - pix.height())/2); @@ -185,6 +175,33 @@ public: QTimer::singleShot(1000,this,SLOT(reload())); } + static bool computeName(const RsGxsId& id,QString& name) + { + QList icons; + QString comment; + + if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) + name = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; + else if(!GxsIdDetails::MakeIdDesc(id, false, name, icons, comment,GxsIdDetails::ICON_TYPE_NONE)) + return false; + + return true; + } + + static bool computeNameIconAndComment(const RsGxsId& id,QString& name,QIcon& icon,QString& comment) + { + QList icons; + + if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) + name = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; + else if(!GxsIdDetails::MakeIdDesc(id, true, name, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) + return false; + else + icon = *icons.begin(); + + return true; + } + private slots: void reload() { mLoading=false; emit commitData(NULL) ; } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 839b5689d..2ee805ea8 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -30,6 +30,7 @@ #include "util/HandleRichText.h" #include "util/DateTime.h" #include "gui/gxs/GxsIdDetails.h" +#include "gui/gxs/GxsIdTreeWidgetItem.h" #include "MessageModel.h" #include "retroshare/rsexpr.h" #include "retroshare/rsmsgs.h" @@ -300,7 +301,8 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum case FILTER_TYPE_SUBJECT: s = displayRole(fmpe,COLUMN_THREAD_SUBJECT).toString(); break; - case FILTER_TYPE_FROM: + case FILTER_TYPE_FROM: s = sortRole(fmpe.COLUMN_THREAD_AUTHOR).toString(); + break; case FILTER_TYPE_DATE: s = displayRole(fmpe,COLUMN_THREAD_DATE).toString(); break; case FILTER_TYPE_CONTENT: { @@ -419,6 +421,12 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum case COLUMN_THREAD_STAR: return QVariant((fmpe.msgflags & RS_MSG_STAR)? 1:0); + case COLUMN_THREAD_AUTHOR:{ + QString name; + + if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.srcId.toStdString()),name)) + return name; + } default: return displayRole(fmpe,column); } From 5820364b0dcab308f143bf0bdf1aef6500d6b8cb Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Mar 2019 11:21:31 +0100 Subject: [PATCH 22/25] fixed sorting --- retroshare-gui/src/gui/MessagesDialog.cpp | 20 ++++++++++++++------ retroshare-gui/src/gui/msgs/MessageModel.cpp | 11 ++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 40c828449..7ae9c4e3e 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -134,13 +134,13 @@ MessagesDialog::MessagesDialog(QWidget *parent) mMessageProxyModel->setSortRole(RsMessageModel::SortRole); mMessageProxyModel->setDynamicSortFilter(false); mMessageProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); + mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); ui.messageTreeWidget->setModel(mMessageProxyModel); changeBox(0); // set to inbox - mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); - ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ; RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this); @@ -1042,6 +1042,8 @@ void MessagesDialog::buttonStyle() setToolbarButtonStyle((Qt::ToolButtonStyle) dynamic_cast(sender())->data().toInt()); } + + void MessagesDialog::filterChanged(const QString& text) { QStringList items = text.split(' ',QString::SkipEmptyParts); @@ -1051,15 +1053,18 @@ void MessagesDialog::filterChanged(const QString& text) switch(ui.filterLineEdit->currentFilter()) { case RsMessageModel::COLUMN_THREAD_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; - case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; case RsMessageModel::COLUMN_THREAD_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; case RsMessageModel::COLUMN_THREAD_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; case RsMessageModel::COLUMN_THREAD_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; - case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; default:break; } mMessageModel->setFilter(f,items); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); + + QCoreApplication::processEvents(); } void MessagesDialog::filterColumnChanged(int column) @@ -1072,19 +1077,22 @@ void MessagesDialog::filterColumnChanged(int column) switch(column) { case RsMessageModel::COLUMN_THREAD_SUBJECT: f = RsMessageModel::FILTER_TYPE_SUBJECT ; break; - case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; + case RsMessageModel::COLUMN_THREAD_AUTHOR: f = RsMessageModel::FILTER_TYPE_FROM ; break; case RsMessageModel::COLUMN_THREAD_DATE: f = RsMessageModel::FILTER_TYPE_DATE ; break; case RsMessageModel::COLUMN_THREAD_CONTENT: f = RsMessageModel::FILTER_TYPE_CONTENT ; break; case RsMessageModel::COLUMN_THREAD_TAGS: f = RsMessageModel::FILTER_TYPE_TAGS ; break; - case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; + case RsMessageModel::COLUMN_THREAD_ATTACHMENT: f = RsMessageModel::FILTER_TYPE_ATTACHMENTS ; break; default:break; } QStringList items = ui.filterLineEdit->text().split(' ',QString::SkipEmptyParts); mMessageModel->setFilter(f,items); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // save index Settings->setValueToGroup("MessageDialog", "filterColumn", column); + + QCoreApplication::processEvents(); } void MessagesDialog::updateMessageSummaryList() diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 2ee805ea8..cbfbc81bd 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -301,7 +301,9 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum case FILTER_TYPE_SUBJECT: s = displayRole(fmpe,COLUMN_THREAD_SUBJECT).toString(); break; - case FILTER_TYPE_FROM: s = sortRole(fmpe.COLUMN_THREAD_AUTHOR).toString(); + case FILTER_TYPE_FROM: s = sortRole(fmpe,COLUMN_THREAD_AUTHOR).toString(); + if(s.isNull()) + passes_strings = false; break; case FILTER_TYPE_DATE: s = displayRole(fmpe,COLUMN_THREAD_DATE).toString(); break; @@ -335,6 +337,8 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum || (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR)) || (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM)); + std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() << "\" strings:" << passes_strings << " quick_view:" << passes_quick_view << std::endl; + return passes_quick_view && passes_strings; } @@ -357,6 +361,11 @@ uint32_t RsMessageModel::updateFilterStatus(ForumModelIndex i,int column,const Q void RsMessageModel::setFilter(FilterType filter_type, const QStringList& strings) { + std::cerr << "Setting filter to filter_type=" << int(filter_type) << " and strings to " ; + foreach(const QString& str,strings) + std::cerr << "\"" << str.toStdString() << "\" " ; + std::cerr << std::endl; + preMods(); mFilterType = filter_type; From 1d4934b71e7e56e917ff6927665f6bcfa947c731 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Mar 2019 11:32:43 +0100 Subject: [PATCH 23/25] fixed QuickView filtering --- retroshare-gui/src/gui/MessagesDialog.cpp | 6 ++++-- retroshare-gui/src/gui/msgs/MessageModel.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 7ae9c4e3e..8b5b923ca 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -810,6 +810,8 @@ void MessagesDialog::changeQuickView(int newrow) f = RsMessageModel::QuickViewFilter( (int)RsMessageModel::QUICK_VIEW_USER + newrow - 0x07); } mMessageModel->setQuickViewFilter(f); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // this triggers the update of the proxy model + insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex()); } @@ -1062,7 +1064,7 @@ void MessagesDialog::filterChanged(const QString& text) } mMessageModel->setFilter(f,items); - mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // this triggers the update of the proxy model QCoreApplication::processEvents(); } @@ -1087,7 +1089,7 @@ void MessagesDialog::filterColumnChanged(int column) QStringList items = ui.filterLineEdit->text().split(' ',QString::SkipEmptyParts); mMessageModel->setFilter(f,items); - mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); + mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // this triggers the update of the proxy model // save index Settings->setValueToGroup("MessageDialog", "filterColumn", column); diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index cbfbc81bd..3f30b2342 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -337,7 +337,10 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum || (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR)) || (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM)); - std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() << "\" strings:" << passes_strings << " quick_view:" << passes_quick_view << std::endl; + std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() + << "MsgFlags=" << fmpe.msgflags << " msgtags=" ; + foreach(uint32_t i,fmpe.msgtags) std::cerr << i << " " ; + std::cerr << "\" strings:" << passes_strings << " quick_view:" << passes_quick_view << std::endl; return passes_quick_view && passes_strings; } @@ -598,6 +601,8 @@ void RsMessageModel::setQuickViewFilter(QuickViewFilter fn) { if(fn != mQuickViewFilter) { + std::cerr << "Changing new quickview filter to " << fn << std::endl; + preMods(); mQuickViewFilter = fn ; postMods(); From f404962b51823b7ce850c77822df15a730318f7b Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 26 Mar 2019 11:47:11 +0100 Subject: [PATCH 24/25] fixed notification display for msgs --- retroshare-gui/src/gui/MessagesDialog.cpp | 2 +- retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h | 11 ++++++++++- retroshare-gui/src/gui/msgs/MessageWidget.cpp | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 8b5b923ca..16f7b80b3 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -215,7 +215,7 @@ MessagesDialog::MessagesDialog(QWidget *parent) ui.messageTreeWidget->setSortingEnabled(true); /* Set header sizes for the fixed columns and resize modes, must be set after processSettings */ - msgwheader->setStretchLastSection(false); + msgwheader->setStretchLastSection(true); // fill folder list diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h index 02eff1d32..6e910b63b 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h @@ -144,7 +144,13 @@ public: float f = fm.height(); QIcon icon ; - if(! computeNameIconAndComment(id,str,icon,comment)) + + if(id.isNull()) + { + str = tr("[Notification]"); + icon = QIcon(":/icons/logo_128.png"); + } + else if(! computeNameIconAndComment(id,str,icon,comment)) if(mReloadPeriod > 3) { str = tr("[Unknown]"); @@ -193,7 +199,10 @@ public: QList icons; if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) + { name = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; + icon = QIcon(":/icons/avatar_128.png"); + } else if(!GxsIdDetails::MakeIdDesc(id, true, name, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR)) return false; else diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index 5294c1d26..d0a59e14b 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -600,8 +600,8 @@ void MessageWidget::fill(const std::string &msgId) link = RetroShareLink::createMessage(msgInfo.rspeerid_srcId, ""); } - if ((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.rspeerid_srcId == ownId) { - ui.fromText->setText("RetroShare"); + if (((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.rspeerid_srcId == ownId) || msgInfo.rspeerid_srcId.isNull()) { + ui.fromText->setText("[Notification]"); if (toolButtonReply) toolButtonReply->setEnabled(false); } else { ui.fromText->setText(link.toHtml()); From 031a717de0f14532eae90f76f71647065d55855c Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 28 Mar 2019 20:06:32 +0100 Subject: [PATCH 25/25] moved column resize after procesSettings() --- retroshare-gui/src/gui/MessagesDialog.cpp | 29 +++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 16f7b80b3..e8c130e88 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -158,13 +158,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) /* Set initial section sizes */ QHeaderView * msgwheader = ui.messageTreeWidget->header () ; - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_SUBJECT, fm.width("You have a message")*3.0); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR, fm.width("[Retroshare]")*1.1); - msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.1); - - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); - QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.replyallmessageButton->setToolTip(tr("Reply to All")); @@ -208,6 +201,14 @@ MessagesDialog::MessagesDialog(QWidget *parent) msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_ATTACHMENT, fm.width('0')*1.5); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.5); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_SUBJECT, fm.width("You have a message")*3.0); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR, fm.width("[Retroshare]")*1.1); + msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.1); + + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Fixed); @@ -397,20 +398,6 @@ bool MessagesDialog::eventFilter(QObject *obj, QEvent *event) return MainPage::eventFilter(obj, event); } -// void MessagesDialog::changeEvent(QEvent *e) -// { -// QWidget::changeEvent(e); -// -// switch (e->type()) { -// case QEvent::StyleChange: -// insertMessages(); -// break; -// default: -// // remove compiler warnings -// break; -// } -// } - void MessagesDialog::fillQuickView() { MsgTagType tags;