6 files changed, 62 insertions, 45 deletions

diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index d3f0d050..51d1cc0d 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -31,22 +31,14 @@ Controls2.Popup {
     //Controller
     KubeFramework.ComposerController {
         id: composer
-
-        mailContext: KubeAction.Context {
-            id: mailcontext
-            property variant to
-            property variant cc
-            property variant bcc
-            property variant from
-            property variant subject
-            property variant body
-        }
-
         onDone: {
             root.close()
         }
     }
 
+    //context
+    property variant mailcontext: composer.mailContext
+
     //actions
     property variant sendAction: composer.sendAction
     property variant saveAsDraftAction: composer.saveAsDraftAction
diff --git a/framework/actions/context.cpp b/framework/actions/context.cpp
index 205b1606..8f370a0b 100644
--- a/framework/actions/context.cpp
+++ b/framework/actions/context.cpp
@@ -29,10 +29,22 @@ Context::Context(QObject *parent)
 
 }
 
+void Context::clear()
+{
+    auto meta = metaObject();
+    for (auto i = meta->propertyOffset(); i < meta->propertyCount(); i++) {
+        auto property = meta->property(i);
+        setProperty(property.name(), QVariant());
+    }
+    for (const auto &p : dynamicPropertyNames()) {
+        setProperty(p, QVariant());
+    }
+}
+
 QDebug operator<<(QDebug dbg, const Kube::Context &context)
 {
     dbg << "Kube::Context {\n";
-    auto metaObject = context.QObject::metaObject();
+    auto metaObject = context.metaObject();
     for (auto i = metaObject->propertyOffset(); i < metaObject->propertyCount(); i++) {
         auto property = metaObject->property(i);
         dbg << property.name() << context.property(property.name()) << "\n";
diff --git a/framework/actions/context.h b/framework/actions/context.h
index 562e110e..42ae3a93 100644
--- a/framework/actions/context.h
+++ b/framework/actions/context.h
@@ -20,6 +20,18 @@
 
 #include <QObject>
 
+#define KUBE_CONTEXT_PROPERTY(TYPE, NAME, LOWERCASENAME) \
+    public: Q_PROPERTY(TYPE LOWERCASENAME MEMBER m##NAME NOTIFY LOWERCASENAME##Changed) \
+    struct NAME { \
+        static constexpr const char *name = #LOWERCASENAME; \
+        typedef TYPE Type; \
+    }; \
+    void set##NAME(const TYPE &value) { setProperty(NAME::name, QVariant::fromValue(value)); } \
+    TYPE get##NAME() const { return m##NAME; } \
+    Q_SIGNALS: void LOWERCASENAME##Changed(); \
+    private: TYPE m##NAME;
+
+
 namespace Kube {
 
 class Context : public QObject {
@@ -27,6 +39,7 @@ class Context : public QObject {
 public:
     Context(QObject *parent = 0);
     virtual ~Context(){};
+    virtual void clear();
 };
 
 }
diff --git a/framework/domain/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp
index e8127ee6..fd791a91 100644
--- a/framework/domain/actions/sinkactions.cpp
+++ b/framework/domain/actions/sinkactions.cpp
@@ -118,7 +118,7 @@ static ActionHandlerHelper sendMailHandler("org.kde.kube.actions.sendmail",
     ActionHandlerHelper::JobHandler{[](Context *context) -> KAsync::Job<void> {
         auto accountId = context->property("accountId").value<QByteArray>();
         auto message = context->property("message").value<KMime::Message::Ptr>();
-        SinkLog() << "Sending a mail: ";
+        SinkLog() << "Sending a mail: " << *context;
 
         Query query;
         query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::transport);
diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp
index a47f4755..7129e342 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/domain/composercontroller.cpp
@@ -44,6 +44,7 @@ Q_DECLARE_METATYPE(KMime::Types::Mailbox)
 
 ComposerController::ComposerController(QObject *parent) : QObject(parent)
 {
+    QQmlEngine::setObjectOwnership(&mContext, QQmlEngine::CppOwnership);
 }
 
 QString ComposerController::recepientSearchString() const
@@ -51,14 +52,9 @@ QString ComposerController::recepientSearchString() const
     return QString();
 }
 
-Kube::Context* ComposerController::mailContext() const
+Kube::Context* ComposerController::mailContext()
 {
-    return mContext;
-}
-
-void ComposerController::setMailContext(Kube::Context *context)
-{
-    mContext = context;
+    return &mContext;
 }
 
 void ComposerController::setRecepientSearchString(const QString &s)
@@ -84,11 +80,11 @@ QAbstractItemModel *ComposerController::recepientAutocompletionModel() const
 
 void ComposerController::setMessage(const KMime::Message::Ptr &msg)
 {
-    mContext->setProperty("to", msg->to(true)->asUnicodeString());
-    mContext->setProperty("cc", msg->cc(true)->asUnicodeString());
-    mContext->setProperty("subject", msg->subject(true)->asUnicodeString());
-    mContext->setProperty("body", msg->body());
-    mContext->setProperty("existingMessage", QVariant::fromValue(msg));
+    mContext.setTo(msg->to(true)->asUnicodeString());
+    mContext.setCc(msg->cc(true)->asUnicodeString());
+    mContext.setSubject(msg->subject(true)->asUnicodeString());
+    mContext.setBody(msg->body());
+    mContext.setProperty("existingMessage", QVariant::fromValue(msg));
 }
 
 void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
@@ -96,7 +92,7 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
     Sink::Query query(*message.value<Sink::ApplicationDomain::Mail::Ptr>());
     query.request<Sink::ApplicationDomain::Mail::MimeMessage>();
     Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).syncThen<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) {
-        mContext->setProperty("existingMail", QVariant::fromValue(mail));
+        mContext.setProperty("existingMail", QVariant::fromValue(mail));
         const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage());
         if (!mailData.isEmpty()) {
             KMime::Message::Ptr mail(new KMime::Message);
@@ -135,11 +131,7 @@ void applyAddresses(const QString &list, std::function<void(const QByteArray &,
 
 void ComposerController::clear()
 {
-    mContext->setProperty("subject", QVariant());
-    mContext->setProperty("body", QVariant());
-    mContext->setProperty("to", QVariant());
-    mContext->setProperty("cc", QVariant());
-    mContext->setProperty("bcc", QVariant());
+    mContext.clear();
 }
 
 
@@ -155,23 +147,23 @@ Kube::ActionHandler *ComposerController::messageHandler()
             if (!mail) {
                 mail = KMime::Message::Ptr::create();
             }
-            applyAddresses(context->property("to").toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+            applyAddresses(context->property(ComposerContext::To::name).toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
                 mail->to(true)->addAddress(addrSpec, displayName);
                 recordForAutocompletion(addrSpec, displayName);
             });
-            applyAddresses(context->property("cc").toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+            applyAddresses(context->property(ComposerContext::Cc::name).toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
                 mail->cc(true)->addAddress(addrSpec, displayName);
                 recordForAutocompletion(addrSpec, displayName);
             });
-            applyAddresses(context->property("bcc").toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+            applyAddresses(context->property(ComposerContext::Bcc::name).toString(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
                 mail->bcc(true)->addAddress(addrSpec, displayName);
                 recordForAutocompletion(addrSpec, displayName);
             });
 
             mail->from(true)->addAddress(context->property("identity").value<KMime::Types::Mailbox>());
 
-            mail->subject(true)->fromUnicodeString(context->property("subject").toString(), "utf-8");
-            mail->setBody(context->property("body").toString().toUtf8());
+            mail->subject(true)->fromUnicodeString(context->property(ComposerContext::Subject::name).toString(), "utf-8");
+            mail->setBody(context->property(ComposerContext::Body::name).toString().toUtf8());
             mail->assemble();
 
             context->setProperty("message", QVariant::fromValue(mail));
@@ -181,7 +173,7 @@ Kube::ActionHandler *ComposerController::messageHandler()
 
 Kube::Action* ComposerController::saveAsDraftAction()
 {
-    auto action = new Kube::Action("org.kde.kube.actions.save-as-draft", *mContext);
+    auto action = new Kube::Action("org.kde.kube.actions.save-as-draft", mContext);
     action->addPreHandler(messageHandler());
     action->addPostHandler(new Kube::ActionHandlerHelper(
         [this](Kube::Context *context) {
@@ -192,8 +184,7 @@ Kube::Action* ComposerController::saveAsDraftAction()
 
 Kube::Action* ComposerController::sendAction()
 {
-    qWarning() << "send action";
-    auto action = new Kube::Action("org.kde.kube.actions.sendmail", *mContext);
+    auto action = new Kube::Action("org.kde.kube.actions.sendmail", mContext);
     // action->addPreHandler(identityHandler());
     action->addPreHandler(messageHandler());
     // action->addPreHandler(encryptionHandler());
@@ -214,8 +205,8 @@ void ComposerController::setCurrentIdentityIndex(int index)
         mb.setName(currentIndex.data(IdentitiesModel::Username).toString());
         mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8());
         SinkLog() << "Setting current identity: " << mb.prettyAddress() << "Account: " << currentAccountId;
-        mContext->setProperty("identity", QVariant::fromValue(mb));
-        mContext->setProperty("accountId", QVariant::fromValue(currentAccountId));
+        mContext.setProperty("identity", QVariant::fromValue(mb));
+        mContext.setProperty("accountId", QVariant::fromValue(currentAccountId));
     } else {
         SinkWarning() << "No valid identity for index: " << index << " out of available in model: " << identityModel()->rowCount();
     }
diff --git a/framework/domain/composercontroller.h b/framework/domain/composercontroller.h
index b7ff0757..11da517e 100644
--- a/framework/domain/composercontroller.h
+++ b/framework/domain/composercontroller.h
@@ -33,10 +33,20 @@ namespace KMime {
 class Message;
 }
 
+class ComposerContext : public Kube::Context {
+    Q_OBJECT
+    KUBE_CONTEXT_PROPERTY(QString, To, to)
+    KUBE_CONTEXT_PROPERTY(QString, Cc, cc)
+    KUBE_CONTEXT_PROPERTY(QString, Bcc, bcc)
+    KUBE_CONTEXT_PROPERTY(QString, From, from)
+    KUBE_CONTEXT_PROPERTY(QString, Subject, subject)
+    KUBE_CONTEXT_PROPERTY(QString, Body, body)
+};
+
 class ComposerController : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY (Kube::Context* mailContext READ mailContext WRITE setMailContext)
+    Q_PROPERTY (Kube::Context* mailContext READ mailContext CONSTANT)
     Q_PROPERTY (int currentIdentityIndex READ currentIdentityIndex WRITE setCurrentIdentityIndex)
 
     Q_PROPERTY (QString recepientSearchString READ recepientSearchString WRITE setRecepientSearchString)
@@ -49,8 +59,7 @@ class ComposerController : public QObject
 public:
     explicit ComposerController(QObject *parent = Q_NULLPTR);
 
-    Kube::Context* mailContext() const;
-    void setMailContext(Kube::Context *context);
+    Kube::Context* mailContext();
 
     QString recepientSearchString() const;
     void setRecepientSearchString(const QString &body);
@@ -78,5 +87,5 @@ private:
     void setMessage(const QSharedPointer<KMime::Message> &msg);
 
     int m_currentAccountIndex = -1;
-    Kube::Context *mContext;
+    ComposerContext mContext;
 };