From 37983d97ec0eb03845f11eb03f429174acfd327b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 6 Jun 2017 00:27:24 +0200 Subject: A simplistic security border Still a bit obnoxious and doesn't really convey a whole lot of information. Consider it a stub for now --- .../mailviewer/contents/ui/MailDataModel.qml | 33 ++++++++++++++++++---- components/mailviewer/contents/ui/TextContent.qml | 7 ++--- 2 files changed, 30 insertions(+), 10 deletions(-) (limited to 'components/mailviewer') diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml index 99bd0dc2..46427194 100644 --- a/components/mailviewer/contents/ui/MailDataModel.qml +++ b/components/mailviewer/contents/ui/MailDataModel.qml @@ -18,6 +18,7 @@ import QtQuick 2.4 import QtQml.Models 2.2 +import org.kube.framework 1.0 as Kube DelegateModel { id: mailDataModel @@ -25,16 +26,38 @@ DelegateModel { delegate: Item { id: partColumn + width: parent.width height: childrenRect.height - Loader { - id: partLoader + + Row { anchors { top: parent.top left: parent.left + right: parent.right + } + height: partLoader.height + spacing: Kube.Units.smallSpacing + Rectangle { + id: border + visible: model.encrypted || model.signed + anchors { + top: parent.top + bottom: parent.bottom + } + width: Kube.Units.smallSpacing + color: Kube.Colors.positiveColor + opacity: 0.5 + } + + Loader { + id: partLoader + anchors { + top: parent.top + } + height: item? item.contentHeight : 0 + width: parent.width } - height: item? item.contentHeight : 0 - width: parent.width } Component.onCompleted: { switch (model.type) { @@ -42,14 +65,12 @@ DelegateModel { partLoader.setSource("TextContent.qml", {"content": model.content, "embedded": model.embeded, - "securityLevel": model.securityLevel, "type": model.type, "debug": debug}) break case "html": partLoader.setSource("HtmlContent.qml", {"content": model.content, - "securityLevel": model.securityLevel, "debug": debug}) break; case "error": diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml index 90442b8f..f8ef7f9a 100644 --- a/components/mailviewer/contents/ui/TextContent.qml +++ b/components/mailviewer/contents/ui/TextContent.qml @@ -21,14 +21,13 @@ import QtQuick 2.7 import org.kube.framework 1.0 as Kube Item { - id: textItem + id: root property string content property bool debug: true property bool embedded: true property string type - width: partColumn.width height: textColumn.height Column { @@ -37,9 +36,9 @@ Item { anchors { top: parent.top left: parent.left + right: parent.right } - width: parent.width spacing: 5 TextEdit { @@ -59,7 +58,7 @@ Item { //BEGIN debug Text { width: parent.width - visible: textItem.debug + visible: root.debug text: type } //END debug -- cgit v1.2.3