2 files changed, 71 insertions, 13 deletions

diff --git a/components/package/contents/ui/Outbox.qml b/components/package/contents/ui/Outbox.qml
index 4da5feb8..5330cd4e 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/components/package/contents/ui/Outbox.qml
@@ -19,9 +19,11 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0 as Controls2
 
 import org.kde.kirigami 1.0 as Kirigami
 
+import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.domain 1.0 as KubeFramework
 import org.kube.components 1.0 as KubeComponents
 
@@ -35,6 +37,13 @@ ToolButton {
         dialog.visible = dialog.visible ? false : true
     }
 
+    KubeAction.Action {
+        id: sendNowAction
+        actionId: "org.kde.kube.actions.sendOutbox"
+        context: KubeAction.Context {
+        }
+    }
+
     //BEGIN Dialog
     Rectangle {
         id: dialog
@@ -46,8 +55,16 @@ ToolButton {
             horizontalCenter: parent.horizontalCenter
         }
 
-       height: modelCount * Kirigami.Units.gridUnit * 3 + 10//scrollView.height  height: Kirigami.Units.gridUnit * 15
-       width: Kirigami.Units.gridUnit * 20
+        function calculateHeight() {
+            if (modelCount == 0) {
+                return Kirigami.Units.gridUnit * 3 + 10
+            } else {
+                return modelCount * Kirigami.Units.gridUnit * 3 + 10 + sendNowButton.height
+            }
+        }
+
+        height: calculateHeight()
+        width: Kirigami.Units.gridUnit * 20
 
         color: Kirigami.Theme.backgroundColor
         border.width: 1
@@ -57,33 +74,59 @@ ToolButton {
         visible: false
 
         //BEGIN Dialog Content
-        ScrollView {
-            id: scrollView
-
+        Column {
             anchors {
                 fill: parent
                 margins: 5
             }
 
-            ListView {
-                id: listView
+            visible: dialog.modelCount != 0
 
-                model: KubeFramework.OutboxModel {
+            Controls2.Button {
+                id: sendNowButton
+                anchors.horizontalCenter: parent.horizontalCenter
+                height: Kirigami.Units.gridUnit * 2
+                text: qsTr("Send now.")
+                onClicked: {
+                    sendNowAction.execute()
                 }
+            }
 
-                delegate: Kirigami.AbstractListItem {
+            ScrollView {
+                id: scrollView
 
-                    height: Kirigami.Units.gridUnit * 3
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: 5
+                }
+
+                ListView {
+                    id: listView
 
-                    Kirigami.Label {
+                    model: KubeFramework.OutboxModel {
+                    }
 
-                        anchors.verticalCenter: parent.verticalCenter
+                    delegate: Kirigami.AbstractListItem {
+                        height: Kirigami.Units.gridUnit * 3
 
-                        text: model.subject
+                        Kirigami.Label {
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: model.subject
+                        }
                     }
                 }
             }
         }
+        Kirigami.Label {
+            anchors {
+                fill: parent
+                margins: 5
+                verticalCenter: parent.verticalCenter
+            }
+            visible: dialog.modelCount == 0
+            text: qsTr("No pending messages.")
+        }
         //END Dialog Content
     }
     //END Dialog
diff --git a/framework/domain/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp
index 39b39a0a..e8127ee6 100644
--- a/framework/domain/actions/sinkactions.cpp
+++ b/framework/domain/actions/sinkactions.cpp
@@ -95,6 +95,21 @@ static ActionHandlerHelper synchronizeHandler("org.kde.kube.actions.synchronize"
     }
 );
 
+static ActionHandlerHelper sendOutboxHandler("org.kde.kube.actions.sendOutbox",
+    [](Context *context) -> bool {
+        return true;
+    },
+    ActionHandlerHelper::JobHandler{[](Context *context) -> KAsync::Job<void> {
+        using namespace Sink::ApplicationDomain;
+        Query query;
+        query.containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::transport);
+        return Store::fetchAll<SinkResource>(query)
+            .each([=](const SinkResource::Ptr &resource) -> KAsync::Job<void> {
+                return Store::synchronize(SyncScope{}.resourceFilter(resource->identifier()));
+            });
+    }}
+);
+
 static ActionHandlerHelper sendMailHandler("org.kde.kube.actions.sendmail",
     [](Context *context) -> bool {
         auto accountId = context->property("accountId").value<QByteArray>();