From 31fc464ee7a2f6a34bbfec77a551721a6b334b5f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 28 Feb 2017 18:09:48 +0100 Subject: Removed the old mailviewer. That way I also don't try to edit outdated invisible components to fix bugs... --- components/package/contents/ui/ContentView.qml | 60 --------------- components/package/contents/ui/MailViewer.qml | 27 +------ components/package/contents/ui/MessagePartTree.qml | 89 ---------------------- components/package/contents/ui/TextView.qml | 32 -------- components/package/contents/ui/WebView.qml | 55 ------------- 5 files changed, 4 insertions(+), 259 deletions(-) delete mode 100644 components/package/contents/ui/ContentView.qml delete mode 100644 components/package/contents/ui/MessagePartTree.qml delete mode 100644 components/package/contents/ui/TextView.qml delete mode 100644 components/package/contents/ui/WebView.qml (limited to 'components/package') diff --git a/components/package/contents/ui/ContentView.qml b/components/package/contents/ui/ContentView.qml deleted file mode 100644 index 099d5c5d..00000000 --- a/components/package/contents/ui/ContentView.qml +++ /dev/null @@ -1,60 +0,0 @@ -/* - 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 - -Item { - id: root - property int nestingLevel; - property bool isHtml; - property string content; - property string contentType; - property int contentWidth: contentLoader.item.contentWidth - property int contentHeight: contentLoader.item.contentHeight - Rectangle { - id: contentRect - - //Only for development - // border.width: 1 - // border.color: "black" - // radius: 5 - // anchors.leftMargin: nestingLevel * 5 - anchors.fill: parent - - Loader { - id: contentLoader - property string content: root.content - anchors.fill: parent - sourceComponent: isHtml ? htmlComponent : textComponent - } - - Component { - id: textComponent - TextView { - content: root.content - } - } - Component { - id: htmlComponent - WebView { - content: root.content - } - } - } -} diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml index 150ee5aa..4ee170bd 100644 --- a/components/package/contents/ui/MailViewer.qml +++ b/components/package/contents/ui/MailViewer.qml @@ -27,40 +27,21 @@ Item { id: root property variant message; property string html; - property int desiredHeight: topPartLoader.height + newMailViewer.height + 20 + property int desiredHeight: mailViewer.height + 20 property variant attachments clip: true MV.MailViewer { - id: newMailViewer + id: mailViewer debug: false width: parent.width } - //BEGIN old mail viewer - - MessagePartTree { - id: topPartLoader - anchors.top: newMailViewer.bottom - - Text { - text: "old mailviewer" - color: "blue" - } - - visible: false - // width: parent.width - height: topPartLoader.contentHeight - width: topPartLoader.contentWidth >= parent.width ? topPartLoader.contentWidth : parent.width - } - - //END old mail viewer - Controls1.TreeView { id: mailStructure - anchors.top: messageParser.attachments.rowCount() > 0 ? attachments.bottom : newMailViewer.bottom - visible: newMailViewer.debug + anchors.top: messageParser.attachments.rowCount() > 0 ? attachments.bottom : mailViewer.bottom + visible: mailViewer.debug width: parent.width height: 400 Controls1.TableViewColumn { diff --git a/components/package/contents/ui/MessagePartTree.qml b/components/package/contents/ui/MessagePartTree.qml deleted file mode 100644 index a904f42c..00000000 --- a/components/package/contents/ui/MessagePartTree.qml +++ /dev/null @@ -1,89 +0,0 @@ -/* - 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 - -Item { - id: root - property alias rootIndex: visualModel.rootIndex - property int nestingLevel: 0 - property int contentHeight: messagePartRect.height - property int contentWidth: 0 - Rectangle { - id: messagePartRect - height: partListView.contentHeight - width: root.width - VisualDataModel { - id: visualModel - model: messageParser.partTree - delegate: Rectangle { - id: delegateRect - visible: !model.isHidden - width: childrenRect.width - height: childrenRect.height - // color: Qt.rgba(Math.random(),Math.random(),Math.random(),1) - ContentView { - id: contentView - anchors.top: delegateRect.top - anchors.left: delegateRect.left - width: messagePartRect.width - height: contentHeight - content: model.text - isHtml: model.isHtml - visible: model.hasContent - onVisibleChanged: { - //Resize to 0 if it is not visible so the partLoader has the right offset - if (!visible) { - height = 0 - } - } - onContentWidthChanged: { - root.contentWidth = contentWidth > root.contentWidth ? contentWidth : root.contentWidth - } - contentType: model.type - } - Loader { - id: partLoader - anchors.top: contentView.bottom - anchors.left: contentView.left - visible: model.hasModelChildren - active: model.hasModelChildren - height: item ? item.contentHeight : 0 - width: messagePartRect.width - } - Component.onCompleted: { - if (model.hasModelChildren) { - partLoader.source = "MessagePartTree.qml" - partLoader.item.rootIndex = visualModel.modelIndex(index) - partLoader.item.nestingLevel = root.nestingLevel + 1 - } - } - } - } - - ListView { - id: partListView - model: visualModel - anchors.left: parent.left - anchors.top: parent.top - anchors.right: parent.right - height: parent.height - } - } -} diff --git a/components/package/contents/ui/TextView.qml b/components/package/contents/ui/TextView.qml deleted file mode 100644 index 7fd1272f..00000000 --- a/components/package/contents/ui/TextView.qml +++ /dev/null @@ -1,32 +0,0 @@ -/* - 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.7 - -Item { - id: root - property string content; - property int contentWidth: 0; - property int contentHeight: textView.contentHeight; - Text { - id: textView - wrapMode: Text.WordWrap - anchors.fill: parent - text: content - } -} diff --git a/components/package/contents/ui/WebView.qml b/components/package/contents/ui/WebView.qml deleted file mode 100644 index 509c9809..00000000 --- a/components/package/contents/ui/WebView.qml +++ /dev/null @@ -1,55 +0,0 @@ -/* - 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.7 -import QtWebEngine 1.3 - -Item { - id: root - property string content; - property int contentWidth: 0; - property int contentHeight: 0; - WebEngineView { - id: htmlView - anchors.fill: parent - onLoadingChanged: { - // console.debug("Status is ", loadRequest.status); - // console.debug("Url is ", loadRequest.url); - if (loadRequest.errorCode) { - console.warn("Error is ", loadRequest.errorString); - } - } - Component.onCompleted: { - loadHtml(content, "file:///") - } - onContentsSizeChanged: { - root.contentWidth = contentsSize.width - root.contentHeight = contentsSize.height - } - activeFocusOnPress: false - settings { - autoLoadImages: true - javascriptCanOpenWindows: false - javascriptEnabled: true - localStorageEnabled: false - } - } - onContentChanged: { - htmlView.loadHtml(content, "file:///"); - } -} -- cgit v1.2.3