Merge branch 'develop' into dev/mimetreeinterface

13 files changed, 200 insertions, 20 deletions

diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index d867c264..a5d35d5c 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -24,7 +24,6 @@ import QtQuick.Dialogs 1.0
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.settings 1.0 as KubeSettings
-import org.kube.framework.theme 1.0
 import org.kube.accounts.maildir 1.0 as MaildirAccount
 
 
diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index ef167bbe..279e280d 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -25,7 +25,6 @@ import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 import org.kube.components 1.0 as KubeComponents
 
 ApplicationWindow {
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index bf4263c4..41f152de 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -24,7 +24,6 @@ import QtQuick.Layouts 1.1
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root
diff --git a/components/package/contents/ui/ListItem.qml b/components/package/contents/ui/ListItem.qml
index 0f3b7af9..165ac3ab 100644
--- a/components/package/contents/ui/ListItem.qml
+++ b/components/package/contents/ui/ListItem.qml
@@ -17,7 +17,6 @@
 */
 
 import QtQuick 2.4
-import org.kube.framework.theme 1.0
 
 Item {
     id: delegateRoot
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index ff71e43e..cda8bbda 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -24,7 +24,6 @@ import QtQml 2.2 as QtQml
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Controls.ScrollView {
     id: root
@@ -127,6 +126,13 @@ Controls.ScrollView {
                             color: Kirigami.Theme.textColor
                         }
                     }
+                    Text {
+                        text: model.threadSize
+
+                        renderType: Text.NativeRendering
+                        font.weight: Font.Light
+                        color:  Kirigami.Theme.textColor
+                    }
                 }
             }
         }
diff --git a/components/package/contents/ui/Outbox.qml b/components/package/contents/ui/Outbox.qml
index 01501410..c7b1f7b0 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/components/package/contents/ui/Outbox.qml
@@ -39,7 +39,7 @@ ToolButton {
     Rectangle {
         id: dialog
 
-        property int modelCount: 5 //FIXME replace with actual model
+        property int modelCount: listView.count
 
         anchors {
             top: parent.bottom
@@ -68,7 +68,8 @@ ToolButton {
             ListView {
                 id: listView
 
-                model: 5
+                model: KubeFramework.OutboxModel {
+                }
 
                 delegate: Kirigami.AbstractListItem {
 
@@ -76,7 +77,7 @@ ToolButton {
 
                     Kirigami.Label {
                         anchors.centerIn: parent
-                        text: "Subjext subxetson"
+                        text: model.subject
                     }
                 }
             }
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index b06216dd..73dedc7e 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -24,7 +24,6 @@ import org.kde.kirigami 1.0 as Kirigami
 import QtQml 2.2 as QtQml
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index c41da377..55bc2f24 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -14,6 +14,7 @@ set(mailplugin_SRCS
     accountfactory.cpp
     accountscontroller.cpp
     accountsmodel.cpp
+    outboxmodel.cpp
     identitiesmodel.cpp
     settings/accountsettings.cpp
 )
diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index 9afb6408..746f3523 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -23,6 +23,7 @@
 #include <QFile>
 #include <QDateTime>
 
+#include <sink/standardqueries.h>
 
 MailListModel::MailListModel(QObject *parent)
     : QSortFilterProxyModel()
@@ -50,6 +51,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     roles[Id] = "id";
     roles[MimeMessage] = "mimeMessage";
     roles[DomainObject] = "domainObject";
+    roles[ThreadSize] = "threadSize";
 
     return roles;
 }
@@ -68,18 +70,19 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
         case Date:
             return mail->getDate();
         case Unread:
-            return mail->getUnread();
+            return mail->getProperty("unreadCollected").toList().contains(true);
         case Important:
-            return mail->getImportant();
+            return mail->getProperty("importantCollected").toList().contains(true);
         case Draft:
             return mail->getDraft();
         case Id:
             return mail->identifier();
         case DomainObject:
             return QVariant::fromValue(mail);
-        case MimeMessage: {
+        case MimeMessage:
             return mail->getMimeMessage();
-        }
+        case ThreadSize:
+            return mail->getProperty("count").toInt();
     }
     return QSortFilterProxyModel::data(idx, role);
 }
@@ -105,10 +108,8 @@ void MailListModel::setParentFolder(const QVariant &parentFolder)
         qWarning() << "No folder: " << parentFolder;
         return;
     }
-    Sink::Query query;
+    Sink::Query query = Sink::StandardQueries::threadLeaders(*folder);
     query.liveQuery = true;
-    query.resourceFilter(folder->resourceInstanceIdentifier());
-    query.sort<Mail::Date>();
     query.limit = 100;
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
@@ -118,7 +119,6 @@ void MailListModel::setParentFolder(const QVariant &parentFolder)
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
     query.request<Mail::Folder>();
-    query.filter<Mail::Folder>(*folder);
     qWarning() << "Running folder query: " << folder->resourceInstanceIdentifier() << folder->identifier();
     runQuery(query);
 }
@@ -136,7 +136,7 @@ void MailListModel::setMail(const QVariant &variant)
         qWarning() << "No mail: " << mail;
         return;
     }
-    Sink::Query query(*mail);
+    Sink::Query query = Sink::StandardQueries::completeThread(*mail);
     query.liveQuery = false;
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 13662a17..a7cb5d84 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -50,10 +50,11 @@ public:
         Draft,
         Id,
         MimeMessage,
-        DomainObject
+        DomainObject,
+        ThreadSize
     };
 
-    QHash<int, QByteArray> roleNames() const;
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
 
     void runQuery(const Sink::Query &query);
 
diff --git a/framework/domain/mailplugin.cpp b/framework/domain/mailplugin.cpp
index 9f06fd5f..c7023bde 100644
--- a/framework/domain/mailplugin.cpp
+++ b/framework/domain/mailplugin.cpp
@@ -28,6 +28,7 @@
 #include "accountfactory.h"
 #include "accountscontroller.h"
 #include "accountsmodel.h"
+#include "outboxmodel.h"
 
 #include <QtQml>
 
@@ -43,4 +44,5 @@ void MailPlugin::registerTypes (const char *uri)
     qmlRegisterType<AccountFactory>(uri, 1, 0, "AccountFactory");
     qmlRegisterType<AccountsController>(uri, 1, 0, "AccountsController");
     qmlRegisterType<AccountsModel>(uri, 1, 0, "AccountsModel");
+    qmlRegisterType<OutboxModel>(uri, 1, 0, "OutboxModel");
 }
diff --git a/framework/domain/outboxmodel.cpp b/framework/domain/outboxmodel.cpp
new file mode 100644
index 00000000..b3533976
--- /dev/null
+++ b/framework/domain/outboxmodel.cpp
@@ -0,0 +1,114 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "outboxmodel.h"
+
+#include <QFile>
+#include <QDateTime>
+
+#include <sink/standardqueries.h>
+
+
+OutboxModel::OutboxModel(QObject *parent)
+    : QSortFilterProxyModel()
+{
+    setDynamicSortFilter(true);
+    sort(0, Qt::DescendingOrder);
+
+    using namespace Sink::ApplicationDomain;
+    auto query = Sink::StandardQueries::outboxMails();
+    query.liveQuery = true;
+    query.request<Mail::Subject>();
+    query.request<Mail::Sender>();
+    query.request<Mail::SenderName>();
+    query.request<Mail::Date>();
+    query.request<Mail::Unread>();
+    query.request<Mail::Important>();
+    query.request<Mail::Draft>();
+    query.request<Mail::Folder>();
+    runQuery(query);
+}
+
+OutboxModel::~OutboxModel()
+{
+
+}
+
+QHash< int, QByteArray > OutboxModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[Subject] = "subject";
+    roles[Sender] = "sender";
+    roles[SenderName] = "senderName";
+    roles[Date] = "date";
+    roles[Unread] = "unread";
+    roles[Important] = "important";
+    roles[Draft] = "draft";
+    roles[Id] = "id";
+    roles[MimeMessage] = "mimeMessage";
+    roles[DomainObject] = "domainObject";
+
+    return roles;
+}
+
+QVariant OutboxModel::data(const QModelIndex &idx, int role) const
+{
+    auto srcIdx = mapToSource(idx);
+    auto mail = srcIdx.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>();
+    switch (role) {
+        case Subject:
+            return mail->getSubject();
+        case Sender:
+            return mail->getSender();
+        case SenderName:
+            return mail->getSenderName();
+        case Date:
+            return mail->getDate();
+        case Unread:
+            return mail->getUnread();
+        case Important:
+            return mail->getImportant();
+        case Draft:
+            return mail->getDraft();
+        case Id:
+            return mail->identifier();
+        case DomainObject:
+            return QVariant::fromValue(mail);
+        case MimeMessage: {
+            return mail->getMimeMessage();
+        }
+    }
+    return QSortFilterProxyModel::data(idx, role);
+}
+
+bool OutboxModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const auto leftDate = left.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>()->getDate();
+    const auto rightDate = right.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>()->getDate();
+    return leftDate < rightDate;
+}
+
+void OutboxModel::runQuery(const Sink::Query &query)
+{
+    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+    setSourceModel(m_model.data());
+}
+
diff --git a/framework/domain/outboxmodel.h b/framework/domain/outboxmodel.h
new file mode 100644
index 00000000..d2fa17ac
--- /dev/null
+++ b/framework/domain/outboxmodel.h
@@ -0,0 +1,60 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#pragma once
+
+#include <sink/store.h>
+
+#include <QSortFilterProxyModel>
+#include <QSharedPointer>
+#include <QStringList>
+
+class OutboxModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    OutboxModel(QObject *parent = Q_NULLPTR);
+    ~OutboxModel();
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
+
+    enum Roles {
+        Subject  = Qt::UserRole + 1,
+        Sender,
+        SenderName,
+        Date,
+        Unread,
+        Important,
+        Draft,
+        Id,
+        MimeMessage,
+        DomainObject
+    };
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+
+    void runQuery(const Sink::Query &query);
+
+private:
+    QSharedPointer<QAbstractItemModel> m_model;
+};