4 files changed, 195 insertions, 76 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 576a1590..49a59024 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -287,55 +287,59 @@ Kube.View {
             height: parent.height
 
             ColumnLayout {
-            anchors {
-                top: parent.top
-                bottom: bottomButtons.top
-                left: parent.left
-                right: parent.right
-                margins: Kube.Units.largeSpacing
-            }
+                anchors {
+                    top: parent.top
+                    bottom: bottomButtons.top
+                    left: parent.left
+                    right: parent.right
+                    margins: Kube.Units.largeSpacing
+                }
 
-            Kube.Label {
-                text: "Sending Email to:"
-            }
-            Kube.AutocompleteLineEdit {
-                id: to
-                Layout.fillWidth: true
-                text: composerController.to
-                onTextChanged: composerController.to = text
-                model: composerController.recipientCompleter.model
-                onSearchTermChanged: composerController.recipientCompleter.searchString = searchTerm
-            }
+                Kube.Label {
+                    text: "Sending Email to:"
+                }
 
-            Kube.Label {
-                text: "Sending Copy to (CC):"
-            }
-            Kube.AutocompleteLineEdit {
-                id: cc
-                Layout.fillWidth: true
-                text: composerController.cc
-                onTextChanged: composerController.cc = text
-                model: composerController.recipientCompleter.model
-                onSearchTermChanged: composerController.recipientCompleter.searchString = searchTerm
-            }
+                AddresseeListEditor {
+                    id: to
+                    Layout.preferredHeight: to.implicitHeight
+                    Layout.fillWidth: true
+                    completer: composerController.recipientCompleter
+                    model: composerController.toModel
+                    onAdded: composerController.addTo(text)
+                    onRemoved: composerController.removeTo(text)
+                }
 
-            Kube.Label {
-                text: "Sending Secret Copy to (Bcc):"
-            }
-            Kube.AutocompleteLineEdit {
-                id: bcc
-                Layout.fillWidth: true
-                text: composerController.bcc
-                onTextChanged: composerController.bcc = text;
-                model: composerController.recipientCompleter.model
-                onSearchTermChanged: composerController.recipientCompleter.searchString = searchTerm
-            }
+                Kube.Label {
+                    text: "Sending Copy to (CC):"
+                }
+                AddresseeListEditor {
+                    id: cc
+                    Layout.preferredHeight: cc.implicitHeight
+                    Layout.fillWidth: true
+                    completer: composerController.recipientCompleter
+                    model: composerController.ccModel
+                    onAdded: composerController.addCc(text)
+                    onRemoved: composerController.removeCc(text)
+                }
 
-            Item {
-                width: parent.width
-                Layout.fillHeight: true
+                Kube.Label {
+                    text: "Sending Secret Copy to (Bcc):"
+                }
+                AddresseeListEditor {
+                    id: bcc
+                    Layout.preferredHeight: bcc.implicitHeight
+                    Layout.fillWidth: true
+                    completer: composerController.recipientCompleter
+                    model: composerController.bccModel
+                    onAdded: composerController.addBcc(text)
+                    onRemoved: composerController.removeBcc(text)
+                }
+
+                Item {
+                    width: parent.width
+                    Layout.fillHeight: true
+                }
             }
-        }
 
 
             Item {
diff --git a/framework/qml/AutocompleteLineEdit.qml b/framework/qml/AutocompleteLineEdit.qml
index dbe00421..e7518867 100644
--- a/framework/qml/AutocompleteLineEdit.qml
+++ b/framework/qml/AutocompleteLineEdit.qml
@@ -24,10 +24,13 @@ import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 Kube.TextField {
-    id: textField
+    id: root
 
     property string searchTerm
     property variant model
+
+    selectByMouse: true
+
     onTextChanged: {
         if (text.length >= 2) {
             searchTerm = text
@@ -68,8 +71,11 @@ Kube.TextField {
     }
 
     function accept() {
-        textField.text = listView.currentItem.text;
+        if (listView.currentItem) {
+            root.text = listView.currentItem.text;
+        }
         popup.close()
+        root.accepted();
     }
 
     function abort() {
@@ -79,9 +85,9 @@ Kube.TextField {
     Controls2.Popup {
         id: popup
         x: 0
-        y: textField.y + textField.height
+        y: root.height
         padding: 0
-        contentWidth: rect.width
+        width: root.width
         contentHeight: rect.height
 
         Rectangle {
@@ -91,7 +97,7 @@ Kube.TextField {
             anchors.left: popup.left
 
             height: listView.contentHeight
-            width: textField.width
+            width: popup.width
 
             border.color: Kube.Colors.textColor
             color: Kube.Colors.backgroundColor
@@ -99,16 +105,16 @@ Kube.TextField {
             radius: 5
             ListView {
                 id: listView
-                height: childrenRect.height
+                height: contentHeight
                 width: parent.width
                 interactive: true
-                model: textField.model
+                model: root.model
                 delegate: Kirigami.AbstractListItem {
                     id: listDelegate
                     property string text: model.text
 
                     width: listView.width
-                    height: textField.height
+                    height: root.height
 
                     enabled: true
                     supportsMouseEvents: true
@@ -128,11 +134,17 @@ Kube.TextField {
                             anchors {
                                 verticalCenter: parent.verticalCenter
                                 left: parent.left
+                                right: parent.right
                             }
 
                             Kube.Label{
+                                anchors {
+                                    left: parent.left
+                                    right: parent.right
+                                }
                                 text: model.text
                                 color: listDelegate.checked ? Kube.Colors.highlightedTextColor : Kube.Colors.textColor
+                                elide: Text.ElideRight
                             }
                         }
                     }
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 332101ac..cbc43afe 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -27,7 +27,6 @@
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QDebug>
-#include <QQmlEngine>
 #include <sink/store.h>
 #include <sink/log.h>
 
@@ -82,7 +81,10 @@ ComposerController::ComposerController()
     action_send{new Kube::ControllerAction{this, &ComposerController::send}},
     action_saveAsDraft{new Kube::ControllerAction{this, &ComposerController::saveAsDraft}},
     mRecipientCompleter{new RecipientCompleter},
-    mIdentitySelector{new IdentitySelector{*this}}
+    mIdentitySelector{new IdentitySelector{*this}},
+    mToModel{new QStringListModel},
+    mCcModel{new QStringListModel},
+    mBccModel{new QStringListModel}
 {
     updateSaveAsDraftAction();
     // mSendAction->monitorProperty<To>();
@@ -93,10 +95,8 @@ ComposerController::ComposerController()
     // actionDepends<ControllerAction, To, Subject>();
     // TODO do in constructor
 
-    QObject::connect(this, &ComposerController::toChanged, &ComposerController::updateSendAction);
     QObject::connect(this, &ComposerController::subjectChanged, &ComposerController::updateSendAction);
     QObject::connect(this, &ComposerController::accountIdChanged, &ComposerController::updateSendAction);
-    QObject::connect(this, &ComposerController::toChanged, &ComposerController::updateSaveAsDraftAction);
     QObject::connect(this, &ComposerController::subjectChanged, &ComposerController::updateSaveAsDraftAction);
     QObject::connect(this, &ComposerController::accountIdChanged, &ComposerController::updateSaveAsDraftAction);
     updateSendAction();
@@ -107,6 +107,72 @@ void ComposerController::clear()
     Controller::clear();
     //Reapply account and identity from selection
     mIdentitySelector->reapplyCurrentIndex();
+    mToModel->setStringList({});
+    mCcModel->setStringList({});
+    mBccModel->setStringList({});
+}
+
+QAbstractItemModel *ComposerController::toModel() const
+{
+    return mToModel.data();
+}
+
+void ComposerController::addTo(const QString &s)
+{
+    auto list = mToModel->stringList();
+    list.append(s);
+    mToModel->setStringList(list);
+    updateSendAction();
+}
+
+void ComposerController::removeTo(const QString &s)
+{
+    auto list = mToModel->stringList();
+    list.removeAll(s);
+    mToModel->setStringList(list);
+    updateSendAction();
+}
+
+QAbstractItemModel *ComposerController::ccModel() const
+{
+    return mCcModel.data();
+}
+
+void ComposerController::addCc(const QString &s)
+{
+    auto list = mCcModel->stringList();
+    list.append(s);
+    mCcModel->setStringList(list);
+    updateSendAction();
+}
+
+void ComposerController::removeCc(const QString &s)
+{
+    auto list = mCcModel->stringList();
+    list.removeAll(s);
+    mCcModel->setStringList(list);
+    updateSendAction();
+}
+
+QAbstractItemModel *ComposerController::bccModel() const
+{
+    return mBccModel.data();
+}
+
+void ComposerController::addBcc(const QString &s)
+{
+    auto list = mBccModel->stringList();
+    list.append(s);
+    mBccModel->setStringList(list);
+    updateSendAction();
+}
+
+void ComposerController::removeBcc(const QString &s)
+{
+    auto list = mBccModel->stringList();
+    list.removeAll(s);
+    mBccModel->setStringList(list);
+    updateSendAction();
 }
 
 Completer *ComposerController::recipientCompleter() const
@@ -119,10 +185,42 @@ Selector *ComposerController::identitySelector() const
     return mIdentitySelector.data();
 }
 
+static void applyAddresses(const QStringList &list, std::function<void(const QByteArray &, const QByteArray &)> callback)
+{
+    for (const auto &to : list) {
+        QByteArray displayName;
+        QByteArray addrSpec;
+        QByteArray comment;
+        KEmailAddress::splitAddress(to.toUtf8(), displayName, addrSpec, comment);
+        callback(addrSpec, displayName);
+    }
+}
+
+static void applyAddresses(const QString &list, std::function<void(const QByteArray &, const QByteArray &)> callback)
+{
+    applyAddresses(KEmailAddress::splitAddressList(list), callback);
+}
+
+
+static QStringList getStringListFromAddresses(const QString &s)
+{
+    QStringList list;
+    applyAddresses(s, [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+        if (displayName.isEmpty()) {
+            list << QString{addrSpec};
+        } else {
+            list << QString("%1 <%2>").arg(QString{displayName}).arg(QString{addrSpec});
+        }
+    });
+    return list;
+}
+
 void ComposerController::setMessage(const KMime::Message::Ptr &msg)
 {
-    setTo(msg->to(true)->asUnicodeString());
-    setCc(msg->cc(true)->asUnicodeString());
+    mToModel->setStringList(getStringListFromAddresses(msg->to(true)->asUnicodeString()));
+    mCcModel->setStringList(getStringListFromAddresses(msg->cc(true)->asUnicodeString()));
+    mBccModel->setStringList(getStringListFromAddresses(msg->bcc(true)->asUnicodeString()));
+
     setSubject(msg->subject(true)->asUnicodeString());
     setBody(msg->body());
     setExistingMessage(msg);
@@ -165,32 +263,21 @@ void ComposerController::recordForAutocompletion(const QByteArray &addrSpec, con
     }
 }
 
-void applyAddresses(const QString &list, std::function<void(const QByteArray &, const QByteArray &)> callback)
-{
-    for (const auto &to : KEmailAddress::splitAddressList(list)) {
-        QByteArray displayName;
-        QByteArray addrSpec;
-        QByteArray comment;
-        KEmailAddress::splitAddress(to.toUtf8(), displayName, addrSpec, comment);
-        callback(addrSpec, displayName);
-    }
-}
-
 KMime::Message::Ptr ComposerController::assembleMessage()
 {
     auto mail = mExistingMessage;
     if (!mail) {
         mail = KMime::Message::Ptr::create();
     }
-    applyAddresses(getTo(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+    applyAddresses(mToModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->to(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);
     });
-    applyAddresses(getCc(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+    applyAddresses(mCcModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->cc(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);
     });
-    applyAddresses(getBcc(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+    applyAddresses(mBccModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->bcc(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);
     });
@@ -212,7 +299,7 @@ KMime::Message::Ptr ComposerController::assembleMessage()
 
 void ComposerController::updateSendAction()
 {
-    auto enabled = !getTo().isEmpty() && !getSubject().isEmpty() && !getAccountId().isEmpty();
+    auto enabled = !mToModel->stringList().isEmpty() && !getSubject().isEmpty() && !getAccountId().isEmpty();
     sendAction()->setEnabled(enabled);
 }
 
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index 92467d05..87349d0c 100644
--- a/framework/src/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+#include <QStringListModel>
 #include <QVariant>
 #include <sink/applicationdomaintype.h>
 #include <KMime/Message>
@@ -47,9 +48,6 @@ class ComposerController : public Kube::Controller
     Q_OBJECT
 
     //Interface properties
-    KUBE_CONTROLLER_PROPERTY(QString, To, to)
-    KUBE_CONTROLLER_PROPERTY(QString, Cc, cc)
-    KUBE_CONTROLLER_PROPERTY(QString, Bcc, bcc)
     KUBE_CONTROLLER_PROPERTY(QString, Subject, subject)
     KUBE_CONTROLLER_PROPERTY(QString, Body, body)
 
@@ -65,6 +63,10 @@ class ComposerController : public Kube::Controller
     Q_PROPERTY (Selector* identitySelector READ identitySelector CONSTANT)
     //Q_PROPERTY (QValidator* subjectValidator READ subjectValidator CONSTANT)
 
+    Q_PROPERTY (QAbstractItemModel* toModel READ toModel CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* ccModel READ ccModel CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* bccModel READ bccModel CONSTANT)
+
     KUBE_CONTROLLER_ACTION(send)
     KUBE_CONTROLLER_ACTION(saveAsDraft)
 
@@ -76,6 +78,17 @@ public:
 
     Q_INVOKABLE void loadMessage(const QVariant &draft, bool loadAsDraft);
 
+    QAbstractItemModel *toModel() const;
+    QAbstractItemModel *ccModel() const;
+    QAbstractItemModel *bccModel() const;
+
+    Q_INVOKABLE void addTo(const QString &);
+    Q_INVOKABLE void removeTo(const QString &);
+    Q_INVOKABLE void addCc(const QString &);
+    Q_INVOKABLE void removeCc(const QString &);
+    Q_INVOKABLE void addBcc(const QString &);
+    Q_INVOKABLE void removeBcc(const QString &);
+
 public slots:
     virtual void clear() Q_DECL_OVERRIDE;
 
@@ -90,4 +103,7 @@ private:
 
     QScopedPointer<Completer> mRecipientCompleter;
     QScopedPointer<Selector> mIdentitySelector;
+    QScopedPointer<QStringListModel> mToModel;
+    QScopedPointer<QStringListModel> mCcModel;
+    QScopedPointer<QStringListModel> mBccModel;
 };