From 56d0411b0a8bce305220adbf12f6b859abf9f431 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 17 Nov 2016 12:04:41 +0100 Subject: AutocompleteLineEdit --- framework/domain/composercontroller.cpp | 106 +++++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 21 deletions(-) (limited to 'framework/domain/composercontroller.cpp') diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp index b2ad7ecc..7fd2593d 100644 --- a/framework/domain/composercontroller.cpp +++ b/framework/domain/composercontroller.cpp @@ -25,14 +25,20 @@ #include #include #include +#include +#include #include #include #include +#include #include "accountsmodel.h" #include "identitiesmodel.h" +#include "recepientautocompletionmodel.h" #include "mailtemplates.h" +SINK_DEBUG_AREA("composercontroller"); + ComposerController::ComposerController(QObject *parent) : QObject(parent) { } @@ -102,6 +108,18 @@ void ComposerController::setBody(const QString &body) } } +QString ComposerController::recepientSearchString() const +{ + return QString(); +} + +void ComposerController::setRecepientSearchString(const QString &s) +{ + if (auto model = static_cast(recepientAutocompletionModel())) { + model->setFilter(s); + } +} + QAbstractItemModel *ComposerController::identityModel() const { static auto model = new IdentitiesModel(); @@ -109,6 +127,13 @@ QAbstractItemModel *ComposerController::identityModel() const return model; } +QAbstractItemModel *ComposerController::recepientAutocompletionModel() const +{ + static auto model = new RecipientAutocompletionModel(); + QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership); + return model; +} + QStringList ComposerController::attachemts() const { return m_attachments; @@ -153,43 +178,82 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft) }).exec(); } -KMime::Message::Ptr ComposerController::assembleMessage() +void ComposerController::recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName) { - auto mail = m_msg.value(); - if (!mail) { - mail = KMime::Message::Ptr::create(); + if (auto model = static_cast(recepientAutocompletionModel())) { + model->addEntry(addrSpec, displayName); } - for (const auto &to : KEmailAddress::splitAddressList(m_to)) { +} + +void applyAddresses(const QString &list, std::function callback) +{ + for (const auto &to : KEmailAddress::splitAddressList(list)) { QByteArray displayName; QByteArray addrSpec; QByteArray comment; KEmailAddress::splitAddress(to.toUtf8(), displayName, addrSpec, comment); + callback(addrSpec, displayName); + } +} + +bool ComposerController::identityIsSet() const +{ + return (identityModel()->rowCount() > 0) && (m_currentAccountIndex >= 0); +} + +KMime::Message::Ptr ComposerController::assembleMessage() +{ + auto mail = m_msg.value(); + if (!mail) { + mail = KMime::Message::Ptr::create(); + } + applyAddresses(m_to, [&](const QByteArray &addrSpec, const QByteArray &displayName) { mail->to(true)->addAddress(addrSpec, displayName); + recordForAutocompletion(addrSpec, displayName); + }); + applyAddresses(m_cc, [&](const QByteArray &addrSpec, const QByteArray &displayName) { + mail->cc(true)->addAddress(addrSpec, displayName); + recordForAutocompletion(addrSpec, displayName); + }); + applyAddresses(m_bcc, [&](const QByteArray &addrSpec, const QByteArray &displayName) { + mail->bcc(true)->addAddress(addrSpec, displayName); + recordForAutocompletion(addrSpec, displayName); + }); + if (!identityIsSet()) { + SinkWarning() << "We don't have an identity to send the mail with."; + } else { + auto currentIndex = identityModel()->index(m_currentAccountIndex, 0); + KMime::Types::Mailbox mb; + mb.setName(currentIndex.data(IdentitiesModel::Username).toString()); + mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8()); + mail->from(true)->addAddress(mb); + mail->subject(true)->fromUnicodeString(m_subject, "utf-8"); + mail->setBody(m_body.toUtf8()); + mail->assemble(); + return mail; } - auto currentIndex = identityModel()->index(m_currentAccountIndex, 0); - KMime::Types::Mailbox mb; - mb.setName(currentIndex.data(IdentitiesModel::Username).toString()); - mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8()); - mail->from(true)->addAddress(mb); - mail->subject(true)->fromUnicodeString(m_subject, "utf-8"); - mail->setBody(m_body.toUtf8()); - mail->assemble(); - return mail; + return KMime::Message::Ptr(); } void ComposerController::send() { auto mail = assembleMessage(); - auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(IdentitiesModel::AccountId).toByteArray(); - Kube::Context context; - context.setProperty("message", QVariant::fromValue(mail)); - context.setProperty("accountId", QVariant::fromValue(currentAccountId)); + //TODO deactivate action if we don't have the identiy set + if (!identityIsSet()) { + SinkWarning() << "We don't have an identity to send the mail with."; + } else { + auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(IdentitiesModel::AccountId).toByteArray(); - qDebug() << "Current account " << currentAccountId; + Kube::Context context; + context.setProperty("message", QVariant::fromValue(mail)); + context.setProperty("accountId", QVariant::fromValue(currentAccountId)); - Kube::Action("org.kde.kube.actions.sendmail", context).execute(); - clear(); + qDebug() << "Current account " << currentAccountId; + + Kube::Action("org.kde.kube.actions.sendmail", context).execute(); + clear(); + } } void ComposerController::saveAsDraft() -- cgit v1.2.3