From 8c0906e8fb632b82135a843657a1df9216a93c60 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Tue, 1 Oct 2019 16:47:45 +0200
Subject: [PATCH] ProjectExplorer: Make the session list in the management
 dialog sortable

Fixes: QTCREATORBUG-22911
Change-Id: I2110e00428d65f347fa83cd7b11f54084517be9a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/sessionmodel.cpp | 28 +++++++++++++++++---
 src/plugins/projectexplorer/sessionmodel.h   |  3 +++
 src/plugins/projectexplorer/sessionview.cpp  |  2 ++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp
index bcf13e96ddf..094a7bbc5f9 100644
--- a/src/plugins/projectexplorer/sessionmodel.cpp
+++ b/src/plugins/projectexplorer/sessionmodel.cpp
@@ -46,18 +46,19 @@ namespace Internal {
 SessionModel::SessionModel(QObject *parent)
     : QAbstractTableModel(parent)
 {
+    m_sortedSessions = SessionManager::sessions();
     connect(SessionManager::instance(), &SessionManager::sessionLoaded,
             this, &SessionModel::resetSessions);
 }
 
 int SessionModel::indexOfSession(const QString &session)
 {
-    return SessionManager::sessions().indexOf(session);
+    return m_sortedSessions.indexOf(session);
 }
 
 QString SessionModel::sessionAt(int row) const
 {
-    return SessionManager::sessions().value(row, QString());
+    return m_sortedSessions.value(row, QString());
 }
 
 QVariant SessionModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -92,7 +93,7 @@ int SessionModel::columnCount(const QModelIndex &) const
 
 int SessionModel::rowCount(const QModelIndex &) const
 {
-    return SessionManager::sessions().count();
+    return m_sortedSessions.count();
 }
 
 QStringList pathsToBaseNames(const QStringList &paths)
@@ -113,7 +114,7 @@ QVariant SessionModel::data(const QModelIndex &index, int role) const
 {
     QVariant result;
     if (index.isValid()) {
-        QString sessionName = SessionManager::sessions().at(index.row());
+        QString sessionName = m_sortedSessions.at(index.row());
 
         switch (role) {
         case Qt::DisplayRole:
@@ -175,6 +176,23 @@ QHash<int, QByteArray> SessionModel::roleNames() const
     return QAbstractTableModel::roleNames().unite(extraRoles);
 }
 
+void SessionModel::sort(int column, Qt::SortOrder order)
+{
+    beginResetModel();
+    const auto cmp = [column, order](const QString &s1, const QString &s2) {
+        bool isLess;
+        if (column == 0)
+            isLess = s1 < s2;
+        else
+            isLess = SessionManager::sessionDateTime(s1) < SessionManager::sessionDateTime(s2);
+        if (order == Qt::DescendingOrder)
+            isLess = !isLess;
+        return isLess;
+    };
+    Utils::sort(m_sortedSessions, cmp);
+    endResetModel();
+}
+
 bool SessionModel::isDefaultVirgin() const
 {
     return SessionManager::isDefaultVirgin();
@@ -183,6 +201,7 @@ bool SessionModel::isDefaultVirgin() const
 void SessionModel::resetSessions()
 {
     beginResetModel();
+    m_sortedSessions = SessionManager::sessions();
     endResetModel();
 }
 
@@ -244,6 +263,7 @@ void SessionModel::runSessionNameInputDialog(SessionNameInputDialog *sessionInpu
             return;
         beginResetModel();
         createSession(newSession);
+        m_sortedSessions = SessionManager::sessions();
         endResetModel();
 
         if (sessionInputDialog->isSwitchToRequested())
diff --git a/src/plugins/projectexplorer/sessionmodel.h b/src/plugins/projectexplorer/sessionmodel.h
index 63f99842150..a4c09132f82 100644
--- a/src/plugins/projectexplorer/sessionmodel.h
+++ b/src/plugins/projectexplorer/sessionmodel.h
@@ -61,6 +61,7 @@ public:
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
     QVariant data(const QModelIndex &index, int role) const override;
     QHash<int, QByteArray> roleNames() const override;
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
 
     Q_SCRIPTABLE bool isDefaultVirgin() const;
 
@@ -78,6 +79,8 @@ public slots:
 
 private:
     void runSessionNameInputDialog(ProjectExplorer::Internal::SessionNameInputDialog *sessionInputDialog, std::function<void(const QString &)> createSession);
+
+    QStringList m_sortedSessions;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/sessionview.cpp b/src/plugins/projectexplorer/sessionview.cpp
index 07d918ca779..ab92ce16b8d 100644
--- a/src/plugins/projectexplorer/sessionview.cpp
+++ b/src/plugins/projectexplorer/sessionview.cpp
@@ -63,8 +63,10 @@ SessionView::SessionView(QWidget *parent)
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setWordWrap(false);
     setRootIsDecorated(false);
+    setSortingEnabled(true);
 
     setModel(&m_sessionModel);
+    sortByColumn(0, Qt::AscendingOrder);
 
     // Ensure that the full session name is visible.
     header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);