From 5880ba07757f85c41474d3eb6473facdcb468482 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 7 Apr 2016 12:09:39 +0200 Subject: Replace the HTML view by a tree of QML views. This allows us to do all the visual hints for the mail parts in qml, instead of HTML. --- framework/domain/messageparser.cpp | 127 ++++++++++++++++++++++++++++++++-- framework/domain/messageparser.h | 38 ++++++++++ framework/domain/stringhtmlwriter.cpp | 5 ++ framework/domain/stringhtmlwriter.h | 1 + 4 files changed, 166 insertions(+), 5 deletions(-) (limited to 'framework') diff --git a/framework/domain/messageparser.cpp b/framework/domain/messageparser.cpp index 7089e2d8..cdaf9db4 100644 --- a/framework/domain/messageparser.cpp +++ b/framework/domain/messageparser.cpp @@ -26,9 +26,117 @@ #include #include #include +#include #include #include +PartModel::PartModel(QSharedPointer partTree, QMap embeddedPartMap) : mPartTree(partTree), mEmbeddedPartMap(embeddedPartMap) +{ +} + +QHash PartModel::roleNames() const +{ + QHash roles; + roles[Text] = "text"; + roles[IsHtml] = "isHtml"; + roles[IsEncrypted] = "isEncrypted"; + roles[IsAttachment] = "isAttachment"; + roles[HasContent] = "hasContent"; + roles[Type] = "type"; + return roles; +} + +QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) const +{ + // qDebug() << "index " << parent << row << column << mPartTree->messageParts().size(); + if (!parent.isValid()) { + if (row < mPartTree->messageParts().size()) { + auto part = mPartTree->messageParts().at(row); + return createIndex(row, column, part.data()); + } + } else { + auto part = static_cast(parent.internalPointer()); + auto subPart = part->messageParts().at(row); + return createIndex(row, column, subPart.data()); + } + return QModelIndex(); +} + +QVariant PartModel::data(const QModelIndex &index, int role) const +{ + // qDebug() << "Getting data for index"; + if (index.isValid()) { + auto part = static_cast(index.internalPointer()); + switch (role) { + case Text: { + // qDebug() << "Getting text: " << part->property("text").toString(); + // FIXME: we should have a list per part, and not one for all parts. + auto text = part->property("htmlContent").toString(); + for (const auto &cid : mEmbeddedPartMap.keys()) { + text.replace(QString("src=\"cid:%1\"").arg(QString(cid)), QString("src=\"%1\"").arg(mEmbeddedPartMap.value(cid).toString())); + } + return text; + } + case IsAttachment: + return part->property("attachment").toBool(); + case IsEncrypted: + return part->property("isEncrypted").toBool(); + case IsHtml: + return part->property("isHtml").toBool(); + case HasContent: + return !part->property("htmlContent").toString().isEmpty(); + case Type: + return part->metaObject()->className(); + } + } + return QVariant(); +} + +QModelIndex PartModel::parent(const QModelIndex &index) const +{ + // qDebug() << "parent " << index; + if (index.isValid()) { + auto part = static_cast(index.internalPointer()); + auto parentPart = static_cast(part->parentPart()); + auto row = 0;//get the parents parent to find the index + if (!parentPart) { + parentPart = mPartTree.data(); + } + int i = 0; + for (const auto &p : parentPart->messageParts()) { + if (p.data() == part) { + row = i; + break; + } + i++; + } + return createIndex(row, index.column(), parentPart); + } + return QModelIndex(); +} + +int PartModel::rowCount(const QModelIndex &parent) const +{ + // qDebug() << "Row count " << parent; + if (!parent.isValid()) { + // qDebug() << "Row count " << mPartTree->messageParts().size(); + return mPartTree->messageParts().size(); + } else { + auto part = static_cast(parent.internalPointer()); + if (part) { + return part->messageParts().size(); + } + } + return 0; +} + +int PartModel::columnCount(const QModelIndex &parent) const +{ + // qDebug() << "Column count " << parent; + return 1; +} + + MessageParser::MessageParser(QObject *parent) : QObject(parent) { @@ -64,20 +172,29 @@ void MessageParser::setMessage(const QVariant &message) ObjectTreeSource source(&htmlWriter, &cssHelper); MimeTreeParser::ObjectTreeParser otp(&source, mNodeHelper.get()); - const auto partTree = otp.parseToTree(msg.data()).dynamicCast(); + mPartTree = otp.parseToTree(msg.data()).dynamicCast(); htmlWriter.begin(QString()); htmlWriter.queue(cssHelper.htmlHead(false)); - if (partTree) { - partTree->fix(); - partTree->copyContentFrom(); - partTree->html(false); + if (mPartTree) { + mPartTree->fix(); + mPartTree->copyContentFrom(); + mPartTree->html(false); } htmlWriter.queue(QStringLiteral("")); htmlWriter.end(); + mEmbeddedPartMap = htmlWriter.embeddedParts(); mHtml = htmlWriter.html(); emit htmlChanged(); } + +QAbstractItemModel *MessageParser::partTree() const +{ + qDebug() << "Getting partTree"; + qDebug() << "Row count " << mPartTree->messageParts().size(); + return new PartModel(mPartTree, mEmbeddedPartMap); +} + diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h index 72b55a5a..ac14fad9 100644 --- a/framework/domain/messageparser.h +++ b/framework/domain/messageparser.h @@ -22,17 +22,24 @@ #include #include #include + +#include +#include + #include +#include namespace MimeTreeParser { class NodeHelper; }; +class QAbstractItemModel; class MessageParser : public QObject { Q_OBJECT Q_PROPERTY (QVariant message READ message WRITE setMessage) Q_PROPERTY (QString html READ html NOTIFY htmlChanged) + Q_PROPERTY (QAbstractItemModel* partTree READ partTree NOTIFY htmlChanged) public: explicit MessageParser(QObject *parent = Q_NULLPTR); @@ -41,11 +48,42 @@ public: QVariant message() const; void setMessage(const QVariant &to); + QAbstractItemModel *partTree() const; signals: void htmlChanged(); private: + QSharedPointer mPartTree; QString mHtml; + QMap mEmbeddedPartMap; std::shared_ptr mNodeHelper; }; + +class PartModel : public QAbstractItemModel { + Q_OBJECT +public: + PartModel(QSharedPointer partTree, QMap embeddedPartMap); + +public: + enum Roles { + Text = Qt::UserRole + 1, + IsHtml, + IsEncrypted, + IsAttachment, + HasContent, + Type + }; + + QHash roleNames() const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + +private: + QSharedPointer mPartTree; + QMap mEmbeddedPartMap; +}; + diff --git a/framework/domain/stringhtmlwriter.cpp b/framework/domain/stringhtmlwriter.cpp index b65c992f..88034492 100644 --- a/framework/domain/stringhtmlwriter.cpp +++ b/framework/domain/stringhtmlwriter.cpp @@ -136,6 +136,11 @@ void StringHtmlWriter::insertExtraHead() } } +QMap StringHtmlWriter::embeddedParts() const +{ + return mEmbeddedPartMap; +} + QString StringHtmlWriter::html() const { if (mState != Ended) { diff --git a/framework/domain/stringhtmlwriter.h b/framework/domain/stringhtmlwriter.h index c1410d57..fa5b760e 100644 --- a/framework/domain/stringhtmlwriter.h +++ b/framework/domain/stringhtmlwriter.h @@ -53,6 +53,7 @@ public: void extraHead(const QString &str) Q_DECL_OVERRIDE; QString html() const; + QMap embeddedParts() const; private: void insertExtraHead(); void resolveCidUrls(); -- cgit v1.2.3