Reduced the messagetreeparser to aproximately what we actually require

While in a much more managable state it's still not pretty.
However, further refactoring can now gradually happen as we need to do
further work on it.

Things that should happen eventually:
* Simplify the logic that creates the messageparts (we don't need the  whole formatter plugin complexity)
* Get rid of the nodehelper (let the parts hold the necessary data)
* Get rid of partmetadata (let the part handleit)

1 files changed, 6 insertions, 39 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 6a4beda5..99bd0dc2 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -22,26 +22,6 @@ import QtQml.Models 2.2
 DelegateModel {
     id: mailDataModel
     property bool debug: true
-    function getPartType(type, hasModelChildren, forcePlain) {
-        switch (type) {
-            case "PlainTextContent":
-            case "Content":
-                return "plain";
-            case "HtmlContent":
-                if (forcePlain) {
-                    return "plain";
-                }
-                return "html";
-            case "Signature":
-                return "signature";
-            case "Encryption":
-                return "encryption";
-        }
-        if (hasModelChildren) {
-            return "envelope";
-        }
-        return "";
-    }
 
     delegate: Item {
         id: partColumn
@@ -57,40 +37,27 @@ DelegateModel {
             width: parent.width
         }
         Component.onCompleted: {
-            //If the content is not complex, avoid using a full browser
-            var forcePlain = !model.complexHtmlContent
-            var partType = getPartType(model.type, model.hasModelChildren, forcePlain);
-
-            switch (partType) {
+            switch (model.type) {
                 case "plain":
                     partLoader.setSource("TextContent.qml",
                                         {"content": model.content,
                                         "embedded": model.embeded,
+                                        "securityLevel": model.securityLevel,
                                         "type": model.type,
                                         "debug": debug})
                     break
                 case "html":
                     partLoader.setSource("HtmlContent.qml",
                                         {"content": model.content,
-                                        "debug": debug})
-                    break;
-                case "signature":
-                    partLoader.setSource("SignaturePart.qml",
-                                        {"rootIndex": mailDataModel.modelIndex(index),
                                         "securityLevel": model.securityLevel,
-                                        "model": mailDataModel.model,
-                                        "type": model.type,
                                         "debug": debug})
                     break;
-                case "encryption":
-                    partLoader.setSource("EncryptionPart.qml",
-                                        {"rootIndex": mailDataModel.modelIndex(index),
-                                        "securityLevel": model.securityLevel,
-                                        "type": model.type,
-                                        "model": mailDataModel.model,
+                case "error":
+                    partLoader.setSource("ErrorPart.qml",
+                                        {
                                         "errorType": model.errorType,
                                         "errorString": model.errorString,
-                                        "debug": debug})
+                                        })
                     break;
                 case "envelope":
                     partLoader.setSource("MailPart.qml",