From aaf114296e50bfa93b831491738cd0a780085c3d Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 11 May 2016 11:12:12 +0200 Subject: Let the controller retrieve what it requires, remember the id of the draft to modfiy. --- components/package/contents/ui/Composer.qml | 24 ++++-------------------- components/package/contents/ui/FocusComposer.qml | 8 ++++---- 2 files changed, 8 insertions(+), 24 deletions(-) (limited to 'components/package') diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml index ed8fb2f2..aef6913b 100644 --- a/components/package/contents/ui/Composer.qml +++ b/components/package/contents/ui/Composer.qml @@ -25,8 +25,10 @@ import org.kube.framework.domain 1.0 as KubeFramework Item { id: root - property variant originalMessage - property variant draftMessage + + function loadMessage(message, loadAsDraft) { + composer.loadMessage(message, loadAsDraft) + } function send() { composer.send() @@ -40,26 +42,8 @@ Item { composer.clear(); } - KubeFramework.Retriever { - id: originalMessageRetriever - propertyName: "mimeMessage" - model: KubeFramework.MailListModel { - mail: root.originalMessage - } - } - - KubeFramework.Retriever { - id: draftMessageRetriever - propertyName: "mimeMessage" - model: KubeFramework.MailListModel { - mail: root.draftMessage - } - } - KubeFramework.ComposerController { id: composer - originalMessage: originalMessageRetriever.value - draftMessage: draftMessageRetriever.value } ColumnLayout { diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml index 4e61b6c1..ea410338 100644 --- a/components/package/contents/ui/FocusComposer.qml +++ b/components/package/contents/ui/FocusComposer.qml @@ -23,8 +23,10 @@ import org.kube.framework.theme 1.0 Rectangle { id: root - property variant originalMessage - property variant draftMessage + + function loadMessage(message, loadAsDraft) { + composer.loadMessage(message, loadAsDraft); + } color: ColorPalette.border @@ -62,8 +64,6 @@ Rectangle { Layout.fillWidth: true Layout.fillHeight: true - originalMessage: root.originalMessage - draftMessage: root.draftMessage } RowLayout { -- cgit v1.2.3