From d3228a2899992370e3fb19609eb1433d02de0f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Nicole?= Date: Wed, 21 Feb 2018 21:11:01 +0100 Subject: T7024 fix: implement attachment-based forwarding Summary: Implement attachment-based forwarding. Some notes: - `loadAsDraft` was removed in favor of new enum `loadType` in QML, and callback based generic programming in C++ Reviewers: cmollekopf Tags: #kube Maniphest Tasks: T7024 Differential Revision: https://phabricator.kde.org/D10676 --- views/composer/qml/View.qml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'views') diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml index 4086f715..1ea67513 100644 --- a/views/composer/qml/View.qml +++ b/views/composer/qml/View.qml @@ -30,7 +30,7 @@ Kube.View { id: root property bool newMessage: false - property bool loadAsDraft: false + property int loadType: Kube.ComposerController.Draft property variant message: {} property variant recipients: [] @@ -58,11 +58,21 @@ Kube.View { function loadMessage(message, loadAsDraft) { if (message) { - composerController.loadMessage(message, loadAsDraft) - //Forward focus for replies directly - if (!loadAsDraft) { - subject.forceActiveFocus() + + switch(loadType) { + case Kube.ComposerController.Draft: + composerController.loadDraft(message) + break; + case Kube.ComposerController.Reply: + composerController.loadReply(message) + subject.forceActiveFocus() + break; + case Kube.ComposerController.Forward: + composerController.loadForward(message) + subject.forceActiveFocus() + break; } + } else if (newMessage) { composerController.clear() if (root.recipients) { -- cgit v1.2.3