From e7b821c4308c6ed15daed911184980149cce38ff Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 23 May 2017 10:30:21 +0200
Subject: Always use richtext, and avoid using a browser for simple html

---
 components/mailviewer/contents/ui/MailDataModel.qml |  7 +++----
 components/mailviewer/contents/ui/TextContent.qml   | 10 +++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'components/mailviewer/contents')

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 8a42630a..f4b4e7c7 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -57,15 +57,14 @@ DelegateModel {
             width: parent.width
         }
         Component.onCompleted: {
-            var isHtml = false
-            var forcePlain = false
+            //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) {
                 case "plain":
                     partLoader.setSource("TextContent.qml",
-                                        {"isHtml": isHtml,
-                                        "content": model.content,
+                                        {"content": model.content,
                                         "embedded": model.embeded,
                                         "type": model.type,
                                         "debug": debug})
diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml
index 63573d81..90442b8f 100644
--- a/components/mailviewer/contents/ui/TextContent.qml
+++ b/components/mailviewer/contents/ui/TextContent.qml
@@ -26,7 +26,6 @@ Item {
     property string content
     property bool debug: true
     property bool embedded: true
-    property bool isHtml: true
     property string type
 
     width: partColumn.width
@@ -43,17 +42,18 @@ Item {
         width: parent.width
         spacing: 5
 
-        TextEdit  {
+        TextEdit {
             width: parent.width
 
             readOnly: true
             selectByMouse: true
 
             text: content
-            wrapMode: Text.WordWrap
-            textFormat: textItem.isHtml ? Text.RichText : Text.PlainText
+            wrapMode: TextEdit.Wrap
+            textFormat: Text.RichText
 
-            color: embedded ? Kube.Colors.diabledTextColor : Kube.Colors.textColor
+            color: embedded ? Kube.Colors.disabledTextColor : Kube.Colors.textColor
+            onLinkActivated: Qt.openUrlExternally(link)
         }
 
         //BEGIN debug
-- 
cgit v1.2.3