2 files changed, 28 insertions, 14 deletions

diff --git a/framework/src/domain/outboxcontroller.cpp b/framework/src/domain/outboxcontroller.cpp
index 590b6c49..51b481fe 100644
--- a/framework/src/domain/outboxcontroller.cpp
+++ b/framework/src/domain/outboxcontroller.cpp
@@ -21,21 +21,19 @@
 #include <sink/store.h>
 #include <sink/log.h>
 
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
 OutboxController::OutboxController()
     : Kube::Controller(),
-    mSynchronizeOutboxAction{new Kube::ControllerAction{this, &OutboxController::sendOutbox}}
+    action_sendOutbox{new Kube::ControllerAction{this, &OutboxController::sendOutbox}},
+    action_edit{new Kube::ControllerAction{this, &OutboxController::edit}},
+    action_moveToTrash{new Kube::ControllerAction{this, &OutboxController::moveToTrash}}
 {
 }
 
-Kube::ControllerAction* OutboxController::sendOutboxAction() const
-{
-    return mSynchronizeOutboxAction.data();
-}
-
 void OutboxController::sendOutbox()
 {
-    using namespace Sink;
-    using namespace Sink::ApplicationDomain;
     Query query;
     query.containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::transport);
     auto job = Store::fetchAll<SinkResource>(query)
@@ -45,3 +43,18 @@ void OutboxController::sendOutbox()
     run(job);
 }
 
+void OutboxController::moveToTrash()
+{
+    auto mail = getMail();
+    mail->setTrash(true);
+    run(Store::modify(*mail));
+}
+
+void OutboxController::edit()
+{
+    auto mail = getMail();
+    mail->setDraft(true);
+    run(Store::modify(*mail));
+    //TODO trigger edit when item has been moved
+}
+
diff --git a/framework/src/domain/outboxcontroller.h b/framework/src/domain/outboxcontroller.h
index 4c24ad59..0d33956a 100644
--- a/framework/src/domain/outboxcontroller.h
+++ b/framework/src/domain/outboxcontroller.h
@@ -20,20 +20,21 @@
 
 #include <QObject>
 #include "controller.h"
+#include "sink/applicationdomaintype.h"
 
 class OutboxController : public Kube::Controller
 {
     Q_OBJECT
-    Q_PROPERTY (Kube::ControllerAction* sendOutboxAction READ sendOutboxAction CONSTANT)
+
+    KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail::Ptr, Mail, mail)
+    KUBE_CONTROLLER_ACTION(sendOutbox)
+    //Trigger a move to drafts and then trigger an edit
+    KUBE_CONTROLLER_ACTION(edit)
+    KUBE_CONTROLLER_ACTION(moveToTrash)
 
 public:
     explicit OutboxController();
 
-    Kube::ControllerAction* sendOutboxAction() const;
-
-private slots:
-    void sendOutbox();
-
 private:
     QScopedPointer<Kube::ControllerAction> mSynchronizeOutboxAction;
 };