2 files changed, 108 insertions, 29 deletions

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
new file mode 100644
index 00000000..d32ee7c6
--- /dev/null
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+ *
+ *   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 3 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.
+ *
+//import org.kde.kube.mail 1.0 as Mail
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 1.3
+import QtQuick.Layouts 1.1
+
+Item {
+    id: root
+
+    ColumnLayout {
+
+        anchors.fill: parent
+
+        GridLayout {
+
+            columns: 2
+
+            Label {
+                text: "To"
+            }
+
+            TextField {
+                id: to
+
+                Layout.fillWidth: true
+            }
+
+            Label {
+                text: "Cc"
+            }
+
+            TextField {
+                id: cc
+
+                Layout.fillWidth: true
+            }
+
+            Label {
+                text: "Bcc"
+            }
+
+            TextField {
+                id: bcc
+
+                Layout.fillWidth: true
+            }
+        }
+
+        TextField {
+            id: subject
+
+            Layout.fillWidth: true
+
+            placeholderText: "Subject"
+        }
+
+        TextArea {
+            id: content
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+        }
+
+        RowLayout {
+            Button {
+                text: "Send"
+            }
+        }
+    }
+}
diff --git a/applications/kube-mail/package/contents/ui/main.qml b/applications/kube-mail/package/contents/ui/main.qml
index 33744157..ef37ae19 100644
--- a/applications/kube-mail/package/contents/ui/main.qml
+++ b/applications/kube-mail/package/contents/ui/main.qml
@@ -32,16 +32,16 @@ ApplicationWindow {
 
     visible: true
 
-    Action.ActionHandler {
-        actionId: "org.kde.kube.actions.mark-as-read"
-        function isReady(context) {
-            return context.mail ? true : false;
-        }
-
-        function handler(context) {
-            console.warn("Got message:", context.mail)
-        }
-    }
+    // Action.ActionHandler {
+    //     actionId: "org.kde.kube.actions.mark-as-read"
+    //     function isReady(context) {
+    //         return context.mail ? true : false;
+    //     }
+    //
+    //     function handler(context) {
+    //         console.warn("Got message:", context.mail)
+    //     }
+    // }
 
     Action.Context {
         id: "maillistcontext"
@@ -55,6 +55,12 @@ ApplicationWindow {
         context: maillistcontext
     }
 
+    Action.Action {
+        id: "deleteAction"
+        actionId: "org.kde.kube.actions.delete"
+        context: maillistcontext
+    }
+
     //UI
     toolBar: ToolBar {
 
@@ -62,48 +68,38 @@ ApplicationWindow {
             anchors.fill: parent
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-message-new"
-
                 text: "Compose"
+                enabled: false
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-mark-unread"
-                text: "Mark Unread"
+                text: "Mark As Read"
                 enabled: markAsReadAction.ready
-
                 onClicked: {
                     markAsReadAction.execute()
                 }
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-mark-important"
                 text: "Mark Important"
-
+                enabled: false
                 onClicked: {
-                    mailList.markMailImportant(true)
                 }
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "edit-delete"
                 text: "Delete Mail"
-
+                enabled: deleteAction.ready
                 onClicked: {
-                    mailList.deleteMail()
+                    deleteAction.execute()
                 }
             }
         }
@@ -114,7 +110,6 @@ ApplicationWindow {
 
         FolderListView {
             id: folderListView
-
             width: unit.size * 55
             Layout.maximumWidth: unit.size * 150
             Layout.minimumWidth: unit.size * 30
@@ -123,7 +118,6 @@ ApplicationWindow {
         MailListView  {
             id: mailListView
             parentFolder: folderListView.currentFolder
-
             width: unit.size * 80
             Layout.maximumWidth: unit.size * 250
             Layout.minimumWidth: unit.size * 50
@@ -132,7 +126,6 @@ ApplicationWindow {
         SingleMailView {
             id: mailView
             mail: mailListView.currentMail
-
             Layout.fillWidth: true
         }
 
@@ -141,7 +134,6 @@ ApplicationWindow {
     //TODO find a better way to scale UI
     Item {
         id: unit
-
         property int size: 5
     }