prepared composer in stacklayout, brought back statusbar

2 files changed, 13 insertions, 15 deletions

diff --git a/framework/qml/FocusComposer.qml b/framework/qml/FocusComposer.qml
index 7330b236..a3bad1c9 100644
--- a/framework/qml/FocusComposer.qml
+++ b/framework/qml/FocusComposer.qml
@@ -20,11 +20,10 @@ import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0 as Controls2
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
-Kube.Popup {
+Item {
     id: root
 
     //Controller
@@ -32,7 +31,6 @@ Kube.Popup {
         id: composerController
         onDone: {
             clear();
-            root.close()
         }
     }
 
@@ -40,14 +38,15 @@ Kube.Popup {
     property variant sendAction: composerController.sendAction
     property variant saveAsDraftAction: composerController.saveAsDraftAction
 
-    onClosed: {
-        composerController.clear()
-        to.text = ""
-        cc.visible = false
-        cc.text = ""
-        bcc.visible = false
-        bcc.text = ""
-    }
+    //FIXME
+    // onClosed: {
+    //     composerController.clear()
+    //     to.text = ""
+    //     cc.visible = false
+    //     cc.text = ""
+    //     bcc.visible = false
+    //     bcc.text = ""
+    // }
 
     //BEGIN functions
     function loadMessage(message, loadAsDraft) {
@@ -55,9 +54,6 @@ Kube.Popup {
     }
     //END functions
 
-    //Don't close the composer due to an accidental click outside
-    closePolicy: Controls2.Popup.CloseOnEscape | Controls2.Popup.CloseOnPressOutsideParent
-
     Item {
 
         height: parent.height
@@ -226,7 +222,8 @@ Kube.Popup {
                         text: "Discard"
 
                         onClicked: {
-                            root.close()
+                            //FIXME
+                            // root.close()
                         }
                     }
 
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index 26a3ea3e..a6ca6fe0 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -39,5 +39,6 @@ Item {
     property string synchronize: "synchronize"
     property string reply: "reply"
     property string edit: "edit"
+    property string compose: "compose"
 }