2 files changed, 33 insertions, 6 deletions

diff --git a/framework/domain/folderlistmodel.cpp b/framework/domain/folderlistmodel.cpp
index 7cf5ad5d..e96488c8 100644
--- a/framework/domain/folderlistmodel.cpp
+++ b/framework/domain/folderlistmodel.cpp
@@ -25,8 +25,11 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-FolderListModel::FolderListModel(QObject *parent) : QIdentityProxyModel()
+FolderListModel::FolderListModel(QObject *parent) : QSortFilterProxyModel()
 {
+    setDynamicSortFilter(true);
+    sort(0, Qt::AscendingOrder);
+
     Query query;
     query.liveQuery = true;
     query.request<Folder::Name>().request<Folder::Icon>().request<Folder::Parent>();
@@ -64,7 +67,7 @@ QVariant FolderListModel::data(const QModelIndex &idx, int role) const
         case DomainObject:
             return srcIdx.data(Store::DomainObjectRole);
     }
-    return QIdentityProxyModel::data(idx, role);
+    return QSortFilterProxyModel::data(idx, role);
 }
 
 void FolderListModel::runQuery(const Query &query)
@@ -88,6 +91,28 @@ void FolderListModel::setAccountId(const QVariant &accountId)
     runQuery(query);
 }
 
+static int getPriority(const Sink::ApplicationDomain::Folder &folder)
+{
+    auto specialPurpose = folder.getSpecialPurpose();
+    if (specialPurpose.contains(Sink::ApplicationDomain::SpecialPurpose::Mail::inbox)) {
+        return 10;
+    }
+    if (!specialPurpose.isEmpty()) {
+        return 9;
+    }
+    return 0;
+}
+
+bool FolderListModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const auto leftFolder = left.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
+    const auto rightFolder = right.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
+    if (getPriority(*leftFolder) < getPriority(*rightFolder)) {
+        return true;
+    }
+    return leftFolder->getName() < rightFolder->getName();
+}
+
 QVariant FolderListModel::accountId() const
 {
     return QVariant();
diff --git a/framework/domain/folderlistmodel.h b/framework/domain/folderlistmodel.h
index d30393db..a2adc9a9 100644
--- a/framework/domain/folderlistmodel.h
+++ b/framework/domain/folderlistmodel.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <QObject>
-#include <QIdentityProxyModel>
+#include <QSortFilterProxyModel>
 #include <QSharedPointer>
 #include <QStringList>
 
@@ -29,7 +29,7 @@ namespace Sink {
     class Query;
 }
 
-class FolderListModel : public QIdentityProxyModel
+class FolderListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
@@ -39,7 +39,7 @@ public:
     FolderListModel(QObject *parent = Q_NULLPTR);
     ~FolderListModel();
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
     enum Roles {
         Name  = Qt::UserRole + 1,
@@ -49,10 +49,12 @@ public:
     };
     Q_ENUMS(Roles)
 
-    QHash<int, QByteArray> roleNames() const;
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
 
     void setAccountId(const QVariant &accountId);
     QVariant accountId() const;
+protected:
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
 
 private:
     void runQuery(const Sink::Query &query);