3 files changed, 69 insertions, 12 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
new file mode 100644
index 00000000..12b78544
--- /dev/null
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *  Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+import QtQuick 2.7
+import org.kube.framework 1.0 as Kube
+
+Item {
+    id:root
+    signal done
+
+    Kube.FocusComposer {
+        id: composer
+        anchors {
+            fill: parent
+            margins: Kube.Units.smallSpacing
+        }
+        onDone: root.done()
+    }
+}
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 2d2ff4f5..54b18b7e 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -64,7 +64,7 @@ Controls2.ApplicationWindow {
     Kube.Listener {
         filter: Kube.Messages.compose
         onMessageReceived: {
-            composer.open()
+            kubeViews.currentIndex = 2
         }
     }
 
@@ -159,7 +159,25 @@ Controls2.ApplicationWindow {
         }
         StackLayout {
             id: kubeViews
+
+            property var stack: [0]
+
+            function goToPreviousView()
+            {
+                //Pop off current view
+                stack.pop()
+                //Then go to the previous view
+                kubeViews.currentIndex = stack.pop()
+            }
+
             currentIndex: 0
+            onCurrentIndexChanged: {
+                if (stack.length > 100) {
+                    //Cut off the first 50 once we grow to 100 (so we don't grow forever)
+                    stack = stack.slice(50);
+                }
+                stack.push(currentIndex)
+            }
             anchors {
                 top: mainContent.top
                 bottom: mainContent.bottom
@@ -173,6 +191,7 @@ Controls2.ApplicationWindow {
             }
             ComposerView {
                 id: composerView
+                onDone: kubeViews.goToPreviousView()
             }
         }
     }
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
 Item {
     id: root
 
+    signal done
+
     //Controller
     Kube.ComposerController {
         id: composerController
         onDone: {
             clear();
+            root.done()
         }
     }
 
@@ -38,15 +41,15 @@ Item {
     property variant sendAction: composerController.sendAction
     property variant saveAsDraftAction: composerController.saveAsDraftAction
 
-    //FIXME
-    // onClosed: {
-    //     composerController.clear()
-    //     to.text = ""
-    //     cc.visible = false
-    //     cc.text = ""
-    //     bcc.visible = false
-    //     bcc.text = ""
-    // }
+    onDone: {
+        console.warn("focus composer done")
+        composerController.clear()
+        to.text = ""
+        cc.visible = false
+        cc.text = ""
+        bcc.visible = false
+        bcc.text = ""
+    }
 
     //BEGIN functions
     function loadMessage(message, loadAsDraft) {
@@ -222,8 +225,7 @@ Item {
                         text: "Discard"
 
                         onClicked: {
-                            //FIXME
-                            // root.close()
+                            root.done()
                         }
                     }