4 files changed, 82 insertions, 0 deletions
diff --git a/components/mailviewer/qml/HtmlPart.qml b/components/mailviewer/qml/HtmlPart.qml
new file mode 100644
index 00000000..f1add75c
--- /dev/null
+++ b/components/mailviewer/qml/HtmlPart.qml
@@ -0,0 +1,48 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 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 General Public License for more details.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+import QtQuick 2.4
+import QtQuick.Controls 1.3
+import QtWebKit 3.0
+// import QtWebEngine 1.3 //This would give use contentsSize
+import QtWebEngine 1.2
+Item {
+    id: root
+    property string content: model.htmlContent
+    property int contentHeight: helperView.contentHeight;
+    //FIXME workaround until QtWebEngine 1.3 with contentsSize
+    height: contentHeight
+    width: delegateRoot.width
+    WebView {
+        id: helperView
+        visible: false
+        Component.onCompleted: loadHtml(content, "file:///")
+    }
+    WebEngineView {
+        id: htmlView
+        anchors.fill: parent
+        Component.onCompleted: loadHtml(content, "file:///")
+    }
+    onContentChanged: {
+        htmlView.loadHtml(content, "file:///");
+        helperView.loadHtml(content, "file:///");
+    }
+}
diff --git a/components/mailviewer/qml/MailModel2.qml b/components/mailviewer/qml/MailModel2.qml
new file mode 100644
index 00000000..9ea45d57
--- /dev/null
+++ b/components/mailviewer/qml/MailModel2.qml
@@ -0,0 +1,28 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 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 General Public License for more details.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+import QtQuick 2.4
+ListModel {
+    ListElement {
+        type: "html"
+        htmlContent: "<!DOCTYPE html>  <html>  <body>  <h1>Some Heading</h1>  <p>My some paragraph.</p> </body>  </html>"
+    }
+}
diff --git a/components/mailviewer/qml/MailPart.qml b/components/mailviewer/qml/MailPart.qml
index 4917271b..966337cd 100644
--- a/components/mailviewer/qml/MailPart.qml
+++ b/components/mailviewer/qml/MailPart.qml
@@ -63,6 +63,9 @@ Item {
                        case "plaintext":
                            loader.source = "TextPart.qml";
                            break;
+                        case "html":
+                            loader.source = "HtmlPart.qml";
+                        break;
                    }
                }
            }
diff --git a/components/mailviewer/qml/dummyapp.qml b/components/mailviewer/qml/dummyapp.qml
index 25892f8e..a186f0f1 100644
--- a/components/mailviewer/qml/dummyapp.qml
+++ b/components/mailviewer/qml/dummyapp.qml
@@ -78,6 +78,9 @@ Rectangle {
                            case "plaintext":
                                loader.source = "TextPart.qml";
                                break;
+                            case "html":
+                                loader.source = "HtmlPart.qml";
+                                break;
                        }
                    }
                }

diff --git a/components/mailviewer/qml/HtmlPart.qml b/components/mailviewer/qml/HtmlPart.qml new file mode 100644 index 00000000..f1add75c --- /dev/null +++ b/components/mailviewer/qml/HtmlPart.qml
@@ -0,0 +1,48 @@
		1	/*
		2	Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
		3
		4	This program is free software; you can redistribute it and/or modify
		5	it under the terms of the GNU General Public License as published by
		6	the Free Software Foundation; either version 2 of the License, or
		7	(at your option) any later version.
		8
		9	This program is distributed in the hope that it will be useful,
		10	but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	GNU General Public License for more details.
		13
		14	You should have received a copy of the GNU General Public License along
		15	with this program; if not, write to the Free Software Foundation, Inc.,
		16	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17	*/
		18
		19	import QtQuick 2.4
		20	import QtQuick.Controls 1.3
		21	import QtWebKit 3.0
		22	// import QtWebEngine 1.3 //This would give use contentsSize
		23	import QtWebEngine 1.2
		24
		25	Item {
		26	id: root
		27	property string content: model.htmlContent
		28	property int contentHeight: helperView.contentHeight;
		29	//FIXME workaround until QtWebEngine 1.3 with contentsSize
		30
		31	height: contentHeight
		32	width: delegateRoot.width
		33
		34	WebView {
		35	id: helperView
		36	visible: false
		37	Component.onCompleted: loadHtml(content, "file:///")
		38	}
		39	WebEngineView {
		40	id: htmlView
		41	anchors.fill: parent
		42	Component.onCompleted: loadHtml(content, "file:///")
		43	}
		44	onContentChanged: {
		45	htmlView.loadHtml(content, "file:///");
		46	helperView.loadHtml(content, "file:///");
		47	}
		48	}


diff --git a/components/mailviewer/qml/MailModel2.qml b/components/mailviewer/qml/MailModel2.qml new file mode 100644 index 00000000..9ea45d57 --- /dev/null +++ b/components/mailviewer/qml/MailModel2.qml
@@ -0,0 +1,28 @@
		1	/*
		2	Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
		3
		4	This program is free software; you can redistribute it and/or modify
		5	it under the terms of the GNU General Public License as published by
		6	the Free Software Foundation; either version 2 of the License, or
		7	(at your option) any later version.
		8
		9	This program is distributed in the hope that it will be useful,
		10	but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	GNU General Public License for more details.
		13
		14	You should have received a copy of the GNU General Public License along
		15	with this program; if not, write to the Free Software Foundation, Inc.,
		16	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17	*/
		18
		19	import QtQuick 2.4
		20
		21	ListModel {
		22
		23	ListElement {
		24	type: "html"
		25	htmlContent: "<!DOCTYPE html> <html> <body> <h1>Some Heading</h1> <p>My some paragraph.</p> </body> </html>"
		26	}
		27	}
		28


diff --git a/components/mailviewer/qml/MailPart.qml b/components/mailviewer/qml/MailPart.qml index 4917271b..966337cd 100644 --- a/components/mailviewer/qml/MailPart.qml +++ b/components/mailviewer/qml/MailPart.qml
@@ -63,6 +63,9 @@ Item {
63	case "plaintext":	63	case "plaintext":
64	loader.source = "TextPart.qml";	64	loader.source = "TextPart.qml";
65	break;	65	break;
		66	case "html":
		67	loader.source = "HtmlPart.qml";
		68	break;
66	}	69	}
67	}	70	}
68	}	71	}


diff --git a/components/mailviewer/qml/dummyapp.qml b/components/mailviewer/qml/dummyapp.qml index 25892f8e..a186f0f1 100644 --- a/components/mailviewer/qml/dummyapp.qml +++ b/components/mailviewer/qml/dummyapp.qml
@@ -78,6 +78,9 @@ Rectangle {
78	case "plaintext":	78	case "plaintext":
79	loader.source = "TextPart.qml";	79	loader.source = "TextPart.qml";
80	break;	80	break;
		81	case "html":
		82	loader.source = "HtmlPart.qml";
		83	break;
81	}	84	}
82	}	85	}
83	}	86	}