summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorRémi Nicole <nicole@kolabsystems.com>2018-02-21 21:11:01 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-02-21 21:19:32 +0100
commitd3228a2899992370e3fb19609eb1433d02de0f40 (patch)
treea78d3d04de3856ad4da058d16174ef58797a43cc /views
parent6299a2fee34e53938d7c230e7e29611a6bcdb2b9 (diff)
downloadkube-d3228a2899992370e3fb19609eb1433d02de0f40.tar.gz
kube-d3228a2899992370e3fb19609eb1433d02de0f40.zip
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
Diffstat (limited to 'views')
-rw-r--r--views/composer/qml/View.qml20
1 files changed, 15 insertions, 5 deletions
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 {
30 id: root 30 id: root
31 31
32 property bool newMessage: false 32 property bool newMessage: false
33 property bool loadAsDraft: false 33 property int loadType: Kube.ComposerController.Draft
34 property variant message: {} 34 property variant message: {}
35 property variant recipients: [] 35 property variant recipients: []
36 36
@@ -58,11 +58,21 @@ Kube.View {
58 58
59 function loadMessage(message, loadAsDraft) { 59 function loadMessage(message, loadAsDraft) {
60 if (message) { 60 if (message) {
61 composerController.loadMessage(message, loadAsDraft) 61
62 //Forward focus for replies directly 62 switch(loadType) {
63 if (!loadAsDraft) { 63 case Kube.ComposerController.Draft:
64 subject.forceActiveFocus() 64 composerController.loadDraft(message)
65 break;
66 case Kube.ComposerController.Reply:
67 composerController.loadReply(message)
68 subject.forceActiveFocus()
69 break;
70 case Kube.ComposerController.Forward:
71 composerController.loadForward(message)
72 subject.forceActiveFocus()
73 break;
65 } 74 }
75
66 } else if (newMessage) { 76 } else if (newMessage) {
67 composerController.clear() 77 composerController.clear()
68 if (root.recipients) { 78 if (root.recipients) {