3 files changed, 31 insertions, 20 deletions

diff --git a/applications/kmail-quick/package/contents/ui/FolderListView.qml b/applications/kmail-quick/package/contents/ui/FolderListView.qml
index f451eaee..b7d91253 100644
--- a/applications/kmail-quick/package/contents/ui/FolderListView.qml
+++ b/applications/kmail-quick/package/contents/ui/FolderListView.qml
@@ -67,7 +67,7 @@ Item {
                 enabled: true
 
                 onClicked: {
-                    mailList.folderId = model.id
+                    mailList.folderId.loadMailFolder(model.id)
                 }
 
                 PlasmaCore.IconItem {
diff --git a/framework/mail/maillistcontroller.cpp b/framework/mail/maillistcontroller.cpp
index ea7d1661..859aed91 100644
--- a/framework/mail/maillistcontroller.cpp
+++ b/framework/mail/maillistcontroller.cpp
@@ -16,17 +16,18 @@ MailListModel *MailListController::model() const
 
 }
 
-QString MailListController::folderId() const
+void MailListController::loadAllMail()
 {
-    return m_folderId;
+        Akonadi2::Query query;
+        query.syncOnDemand = false;
+        query.processAll = false;
+        query.liveQuery = true;
+        query.requestedProperties << "subject" << "sender" << "senderName" << "date" << "unread" << "important";
+        m_model->runQuery(query);
 }
 
-void MailListController::setFolderId(const QString &folderId)
+void MailListController::loadMailFolder(const QString &folderId)
 {
-    if (m_folderId != folderId) {
-        m_folderId = folderId;
-
-
         Akonadi2::Query query;
         query.syncOnDemand = false;
         query.processAll = false;
@@ -34,12 +35,26 @@ void MailListController::setFolderId(const QString &folderId)
         query.requestedProperties << "subject" << "sender" << "senderName" << "date" << "unread" << "important" << "folder";
         query.propertyFilter.insert("folder", folderId.toLatin1());
         m_model->runQuery(query);
+}
 
-        emit folderIdChanged();
-    }
+void MailListController::loadUnreadMail()
+{
+        Akonadi2::Query query;
+        query.syncOnDemand = false;
+        query.processAll = false;
+        query.liveQuery = true;
+        query.requestedProperties << "subject" << "sender" << "senderName" << "date" << "unread" << "important";
+        query.propertyFilter.insert("unread", true);
+        m_model->runQuery(query);
 }
 
-void MailListController::addMail(QString subject)
+void MailListController::loadImportantMail()
 {
-    qDebug() << "add mail";
+        Akonadi2::Query query;
+        query.syncOnDemand = false;
+        query.processAll = false;
+        query.liveQuery = true;
+        query.requestedProperties << "subject" << "sender" << "senderName" << "date" << "unread" << "important";
+        query.propertyFilter.insert("important", true);
+        m_model->runQuery(query);
 }
diff --git a/framework/mail/maillistcontroller.h b/framework/mail/maillistcontroller.h
index 9e972e18..ebdc990b 100644
--- a/framework/mail/maillistcontroller.h
+++ b/framework/mail/maillistcontroller.h
@@ -10,23 +10,19 @@
 class MailListController : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY (QString folderId READ folderId WRITE setFolderId NOTIFY folderIdChanged)
     Q_PROPERTY (MailListModel *model READ model CONSTANT)
 
 public:
     explicit MailListController(QObject *parent = Q_NULLPTR);
 
-    QString folderId() const;
-    void setFolderId(const QString &query);
     MailListModel *model() const;
 
-signals:
-    void folderIdChanged();
-
 public slots:
-    void addMail(QString subject);
+    void loadAllMail();
+    void loadUnreadMail();
+    void loadImportantMail();
+    void loadMailFolder(const QString &folderId);
 
 private:
-    QString m_folderId;
     QScopedPointer<MailListModel> m_model;
 };