From be7f4d42d70922608ed6898717232bd78fe528e4 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 17 Mar 2017 16:27:23 +0100
Subject: Request sent property and some others

---
 framework/domain/maillistmodel.cpp            | 6 ++++++
 framework/domain/maillistmodel.h              | 1 +
 framework/domain/settings/accountsettings.cpp | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'framework/domain')

diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index c96f6dd1..11fb9f82 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -48,6 +48,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     roles[Unread] = "unread";
     roles[Important] = "important";
     roles[Draft] = "draft";
+    roles[Sent] = "sent";
     roles[Trash] = "trash";
     roles[Id] = "id";
     roles[MimeMessage] = "mimeMessage";
@@ -105,6 +106,8 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             return mail->getProperty("importantCollected").toList().contains(true);
         case Draft:
             return mail->getDraft();
+        case Sent:
+            return mail->getSent();
         case Trash:
             return mail->getTrash();
         case Id:
@@ -162,6 +165,7 @@ void MailListModel::setParentFolder(const QVariant &parentFolder)
     query.request<Mail::Unread>();
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
+    query.request<Mail::Sent>();
     query.request<Mail::Trash>();
     query.request<Mail::Folder>();
     mFetchMails = false;
@@ -200,6 +204,8 @@ void MailListModel::setMail(const QVariant &variant)
     query.request<Mail::Unread>();
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
+    query.request<Mail::Folder>();
+    query.request<Mail::Sent>();
     query.request<Mail::Trash>();
     query.request<Mail::MimeMessage>();
     query.request<Mail::FullPayloadAvailable>();
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 96cf98f2..5526a991 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -51,6 +51,7 @@ public:
         Unread,
         Important,
         Draft,
+        Sent,
         Trash,
         Id,
         MimeMessage,
diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp
index d072ea9d..d1019e1f 100644
--- a/framework/domain/settings/accountsettings.cpp
+++ b/framework/domain/settings/accountsettings.cpp
@@ -178,7 +178,7 @@ void AccountSettings::saveAccount()
 void AccountSettings::loadAccount()
 {
     Q_ASSERT(!mAccountIdentifier.isEmpty());
-    Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier))
+    Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier).request<SinkAccount::Icon>().request<SinkAccount::Name>().request<SinkAccount::AccountType>())
         .then([this](const SinkAccount &account) {
             mAccountType = account.getAccountType().toLatin1();
             mIcon = account.getIcon();
-- 
cgit v1.2.3