1 files changed, 227 insertions, 27 deletions

diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index 9129dba9..c22983f5 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -17,25 +17,48 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.4 as Controls
+import QtQuick.Controls 2.0 as Controls2
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.components 1.0 as KubeComponents
+import org.kube.framework.domain 1.0 as KubeFramework
 
-KubeComponents.OverlayDialog {
+Controls2.Popup {
     id: root
 
+    //Controler
+    KubeFramework.ComposerController {
+        id: composer
+    }
+
+    //BEGIN functions
     function loadMessage(message, loadAsDraft) {
-        composer.loadMessage(message, loadAsDraft);
+        composer.loadMessage(message, loadAsDraft)
+    }
+
+    function send() {
+        composer.send()
+    }
+
+    function saveAsDraft() {
+        composer.saveAsDraft()
     }
 
+    function clear() {
+        composer.clear();
+    }
+    //END functions
+
+    modal: true
+    focus: true
+    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+
     Item {
-        anchors.centerIn: parent
 
-        height: root.height * 0.8
-        width: root.width * 0.8
+        height: parent.height
+        width: parent.width
 
         ColumnLayout {
 
@@ -44,45 +67,222 @@ KubeComponents.OverlayDialog {
                 margins: Kirigami.Units.largeSpacing
             }
 
-            Composer {
-                id: composer
+            ColumnLayout {
 
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-            }
+                anchors.fill: parent
+
+                Controls.TextField {
+                    id: subject
 
-            RowLayout {
+                    Layout.fillWidth: true
 
-                Button {
+                    placeholderText: "Enter Subject..."
 
-                    text: "Discard"
+                    text: composer.subject
 
-                    onClicked: {
-                        root.destroy()
+                    onTextChanged: {
+                        composer.subject = text;
+                    }
+                }
+
+                GridLayout {
+
+                    columns: 2
+
+                    Kirigami.Label {
+                        text: "To"
+                    }
+
+                    RowLayout {
+                        Layout.fillWidth: true
+
+                        Controls.TextField {
+                            id: to
+
+                            Layout.fillWidth: true
+
+                            text: composer.to
+
+                            onTextChanged: {
+                                composer.to = text;
+                            }
+                        }
+                    }
+
+                    Kirigami.Label {
+                        text: "Cc"
+
+                        visible: cc.visible
+                    }
+
+                    Controls.TextField {
+                        id: cc
+
+                        Layout.fillWidth: true
+
+                        visible: false
+
+                        text: composer.cc
+
+                        onTextChanged: {
+                            composer.cc = text;
+                        }
+                    }
+
+                    Kirigami.Label {
+                        text: "Bcc"
+
+                        visible: bcc.visible
+                    }
+
+                    Controls.TextField {
+                        id: bcc
+
+                        Layout.fillWidth: true
+
+                        visible : false
+
+                        text: composer.bcc
+
+                        onTextChanged: {
+                            composer.bcc = text;
+                        }
+                    }
+                }
+
+                RowLayout {
+                    Kirigami.Label {
+                        text: "Sending as"
+                    }
+
+                    Controls.ComboBox {
+                        id: identityCombo
+                        model: composer.identityModel
+                        textRole: "displayName"
+
+                        Layout.fillWidth: true
+
+                        onCurrentIndexChanged: {
+                            composer.currentIdentityIndex = currentIndex
+                        }
+                    }
+
+                    Controls.Button {
+                        id: ccButton
+
+                        text: "Cc"
+
+                        onClicked: {
+                            cc.visible = true
+                            ccButton.visible = false
+                        }
+                    }
+
+                    Controls.Button {
+                        id: bccButton
+
+                        text: "Bcc"
+
+                        onClicked: {
+                            bcc.visible = true
+                            bccButton.visible = false
+                        }
                     }
                 }
 
                 Item {
+
                     Layout.fillWidth: true
+
+                    height: subject.height * 1.5
+
+                    Controls.Button {
+
+                        anchors {
+                            bottom: parent.bottom
+                            right: parent.right
+                        }
+
+                        text: "Attach"
+
+                        onClicked: {
+                            fileDialog.open();
+                        }
+                    }
                 }
 
+                RowLayout {
+
+                    Layout.fillWidth: true
+
+                    Repeater {
+
+                        model: composer.attachments
 
-                Button {
+                        delegate: Kirigami.Label {
+                            id: name
 
-                    text: "Save as Draft"
+                            text: modelData
 
-                    onClicked: {
-                        composer.saveAsDraft()
-                        root.destroy()
+                            Rectangle {
+
+                                anchors.fill: parent
+
+                                color: "lightsteelblue"
+                            }
+                        }
                     }
                 }
 
-                Button {
-                    text: "Send"
+                Controls.TextArea {
+                    id: content
+
+                    text: composer.body
+
+                    onTextChanged: {
+                        composer.body = text;
+                    }
+
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                }
+
+                RowLayout {
+                    id: bottomBar
+
+                    width: parent.width
+
+                    Controls.Button {
+
+                        text: "Discard"
+
+                        onClicked: {
+                            root.close()
+                        }
+                    }
+
+                    Item {
+                        Layout.fillWidth: true
+                    }
+
+
+                    Controls.Button {
+
+                        text: "Save as Draft"
+
+                        onClicked: {
+                            saveAsDraft()
+                            root.close()
+                        }
+                    }
+
+                    Controls.Button {
+                        text: "Send"
 
-                    onClicked: {
-                        composer.send()
-                        root.destroy()
+                        onClicked: {
+                            send()
+                            root.close()
+                        }
                     }
                 }
             }