From e4040f1c10bfd5df379fd2d3c2b278e099b9e72f Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Sun, 30 Oct 2016 15:37:21 +0100 Subject: clean up components/mailviewer --- components/package/contents/ui/MailViewer.qml | 147 ++++++++++++-------------- 1 file changed, 69 insertions(+), 78 deletions(-) (limited to 'components') diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml index f8e0a33b..95b03b1b 100644 --- a/components/package/contents/ui/MailViewer.qml +++ b/components/package/contents/ui/MailViewer.qml @@ -1,20 +1,20 @@ /* - 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. -*/ + * 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 @@ -28,70 +28,61 @@ Item { id: root property variant message; property string html; - property bool enablePartTreeView : true; - property int desiredHeight: enablePartTreeView ? topPartLoader.height + newMailViewer.height + mailStructure.height + 50 : topPartLoader.height + newMailViewer.height + 50; + property int desiredHeight: topPartLoader.height + newMailViewer.height + 50; + + clip: true + + MV.MailViewer { + id: newMailViewer + 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 + } - Rectangle { - id: rootRectangle - anchors.fill: parent - anchors.margins: 0 - ScrollView { - id: scrollView - anchors.fill: parent - anchors.margins: 0 - verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff - Column { - spacing: 2 - Text { - text: "New Mailviewer:" - color: "blue" - } - MV.MailViewer { - id: newMailViewer - debug: false - width: rootRectangle.width - } - Text { - text: "Old Mailviewer:" - color: "blue" - } - MessagePartTree { - id: topPartLoader - // width: rootRectangle.width - height: topPartLoader.contentHeight - width: topPartLoader.contentWidth >= rootRectangle.width ? topPartLoader.contentWidth : rootRectangle.width - } - TreeView { - id: mailStructure - visible: enablePartTreeView - width: rootRectangle.width - height: 400 - TableViewColumn { - role: "type" - title: "Type" - width: 300 - } - TableViewColumn { - role: "embeded" - title: "Embeded" - width: 60 - } - TableViewColumn { - role: "securityLevel" - title: "SecurityLevel" - width: 60 - } - TableViewColumn { - role: "content" - title: "Content" - width: 200 - } - //model: messageParser.partTree - model: messageParser.newTree - } - } - } + TreeView { + id: mailStructure + visible: false + width: parent.width + height: 400 + TableViewColumn { + role: "type" + title: "Type" + width: 300 + } + TableViewColumn { + role: "embeded" + title: "Embeded" + width: 60 + } + TableViewColumn { + role: "securityLevel" + title: "SecurityLevel" + width: 60 + } + TableViewColumn { + role: "content" + title: "Content" + width: 200 + } + //model: messageParser.partTree + model: messageParser.newTree } + //END old mail viewer KubeFramework.MessageParser { id: messageParser -- cgit v1.2.3