From 3ad9814b98b6405d0f9b6c7b89413465631d2504 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 22 Sep 2016 11:42:52 +0200 Subject: add htmlpart and a model for testing it --- components/mailviewer/qml/HtmlPart.qml | 48 ++++++++++++++++++++++++++++++++ components/mailviewer/qml/MailModel2.qml | 28 +++++++++++++++++++ components/mailviewer/qml/MailPart.qml | 3 ++ components/mailviewer/qml/dummyapp.qml | 3 ++ 4 files changed, 82 insertions(+) create mode 100644 components/mailviewer/qml/HtmlPart.qml create mode 100644 components/mailviewer/qml/MailModel2.qml (limited to 'components/mailviewer') 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, + + 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, + + 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: "

Some Heading

My some paragraph.

" + } +} + 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; } } } -- cgit v1.2.3