diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-02 16:01:15 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-02 16:01:15 +0200 |
commit | 74ef34dd42c2a780fbb7577a43e67f2b780d1b2c (patch) | |
tree | 294bb28ca182a541aeb0038e813649c188ebf673 /framework | |
parent | d2b8c06df6d860a529bb37f5e6f4516d31f86fc2 (diff) | |
download | kube-74ef34dd42c2a780fbb7577a43e67f2b780d1b2c.tar.gz kube-74ef34dd42c2a780fbb7577a43e67f2b780d1b2c.zip |
Track the views and allow to go back to the view.
...also added the ComposerView that was forgotten
Diffstat (limited to 'framework')
-rw-r--r-- | framework/qml/FocusComposer.qml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/framework/qml/FocusComposer.qml b/framework/qml/FocusComposer.qml index a3bad1c9..2848711b 100644 --- a/framework/qml/FocusComposer.qml +++ b/framework/qml/FocusComposer.qml | |||
@@ -26,11 +26,14 @@ import org.kube.framework 1.0 as Kube | |||
26 | Item { | 26 | Item { |
27 | id: root | 27 | id: root |
28 | 28 | ||
29 | signal done | ||
30 | |||
29 | //Controller | 31 | //Controller |
30 | Kube.ComposerController { | 32 | Kube.ComposerController { |
31 | id: composerController | 33 | id: composerController |
32 | onDone: { | 34 | onDone: { |
33 | clear(); | 35 | clear(); |
36 | root.done() | ||
34 | } | 37 | } |
35 | } | 38 | } |
36 | 39 | ||
@@ -38,15 +41,15 @@ Item { | |||
38 | property variant sendAction: composerController.sendAction | 41 | property variant sendAction: composerController.sendAction |
39 | property variant saveAsDraftAction: composerController.saveAsDraftAction | 42 | property variant saveAsDraftAction: composerController.saveAsDraftAction |
40 | 43 | ||
41 | //FIXME | 44 | onDone: { |
42 | // onClosed: { | 45 | console.warn("focus composer done") |
43 | // composerController.clear() | 46 | composerController.clear() |
44 | // to.text = "" | 47 | to.text = "" |
45 | // cc.visible = false | 48 | cc.visible = false |
46 | // cc.text = "" | 49 | cc.text = "" |
47 | // bcc.visible = false | 50 | bcc.visible = false |
48 | // bcc.text = "" | 51 | bcc.text = "" |
49 | // } | 52 | } |
50 | 53 | ||
51 | //BEGIN functions | 54 | //BEGIN functions |
52 | function loadMessage(message, loadAsDraft) { | 55 | function loadMessage(message, loadAsDraft) { |
@@ -222,8 +225,7 @@ Item { | |||
222 | text: "Discard" | 225 | text: "Discard" |
223 | 226 | ||
224 | onClicked: { | 227 | onClicked: { |
225 | //FIXME | 228 | root.done() |
226 | // root.close() | ||
227 | } | 229 | } |
228 | } | 230 | } |
229 | 231 | ||