1 files changed, 64 insertions, 8 deletions

diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 3e0255df..b3d7537d 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -29,41 +29,45 @@
 #include <memory>
 #include <MimeTreeParser/MessagePart>
 
-namespace MimeTreeParser {
-    class NodeHelper;
-};
 class QAbstractItemModel;
 
+class Parser;
+class Part;
+typedef std::shared_ptr<Part> PartPtr;
+class Content;
+typedef std::shared_ptr<Content> ContentPtr;
+class MessagePartPrivate;
+
 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)
+    Q_PROPERTY (QAbstractItemModel* newTree READ newTree NOTIFY htmlChanged)
 
 public:
     explicit MessageParser(QObject *parent = Q_NULLPTR);
+    ~MessageParser();
 
     QString html() const;
 
     QVariant message() const;
     void setMessage(const QVariant &to);
     QAbstractItemModel *partTree() const;
+    QAbstractItemModel *newTree() const;
 
 signals:
     void htmlChanged();
 
 private:
-    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
-    QString mHtml;
-    QMap<QByteArray, QUrl> mEmbeddedPartMap;
-    std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
+    std::unique_ptr<MessagePartPrivate> d;
 };
 
 class PartModel : public QAbstractItemModel {
     Q_OBJECT
 public:
-    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap);
+    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, std::shared_ptr<Parser> parser);
 
 public:
     enum Roles {
@@ -86,5 +90,57 @@ public:
 private:
     QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
     QMap<QByteArray, QUrl> mEmbeddedPartMap;
+    std::shared_ptr<Parser> mParser;
+};
+
+
+class NewContentModel : public QAbstractItemModel {
+    Q_OBJECT
+public:
+    NewContentModel (const PartPtr &part);
+
+public:
+    enum Roles {
+        TypeRole  = Qt::UserRole + 1,
+        ContentRole,
+        IsEmbededRole,
+        SecurityLevelRole
+    };
+
+    QHash<int, QByteArray> 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:
+    const PartPtr &mPart;
+};
+
+class NewModel : public QAbstractItemModel {
+    Q_OBJECT
+public:
+    NewModel(std::shared_ptr<Parser> parser);
+
+public:
+    enum Roles {
+        TypeRole  = Qt::UserRole + 1,
+        ContentsRole,
+        IsEmbededRole,
+        SecurityLevelRole
+    };
+
+    QHash<int, QByteArray> 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:
+    std::shared_ptr<Parser> mParser;
+    QVector<PartPtr> mParts;
+    QMap<Part *, std::shared_ptr<NewContentModel>> mContentMap;
 };