Fix library selection, save header configuration per crate/playlist

src/library/autodj/dlgautodj.h

@@ -12,10 +12,10 @@
 #include "library/trackcollection.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
+#include "widget/wtracktableview.h"
 
 class PlaylistTableModel;
 class WLibrary;
-class WTrackTableView;
 
 class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     Q_OBJECT
@@ -33,6 +33,12 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void loadSelectedTrack() override;
     void loadSelectedTrackToGroup(const QString& group, bool play) override;
     void moveSelection(int delta) override;
+    void saveCurrentViewState() override {
+        m_pTrackTableView->saveCurrentViewState();
+    };
+    void restoreCurrentViewState() override {
+        m_pTrackTableView->restoreCurrentViewState();
+    };
 
   public slots:
     void shufflePlaylistButton(bool buttonChecked);

src/library/baseexternalplaylistmodel.cpp

@@ -9,16 +9,16 @@
 #include "track/track.h"
 
 BaseExternalPlaylistModel::BaseExternalPlaylistModel(QObject* parent,
-                                                     TrackCollectionManager* pTrackCollectionManager,
-                                                     const char* settingsNamespace,
-                                                     const QString& playlistsTable,
-                                                     const QString& playlistTracksTable,
-                                                     QSharedPointer<BaseTrackCache> trackSource)
-        : BaseSqlTableModel(parent, pTrackCollectionManager,
-                            settingsNamespace),
+        TrackCollectionManager* pTrackCollectionManager,
+        const char* settingsNamespace,
+        const QString& playlistsTable,
+        const QString& playlistTracksTable,
+        QSharedPointer<BaseTrackCache> trackSource)
+        : BaseSqlTableModel(parent, pTrackCollectionManager, settingsNamespace),
           m_playlistsTable(playlistsTable),
           m_playlistTracksTable(playlistTracksTable),
-          m_trackSource(trackSource) {
+          m_trackSource(trackSource),
+          m_currentPlaylistId(-1) {
 }
 
 BaseExternalPlaylistModel::~BaseExternalPlaylistModel() {
@@ -140,6 +140,7 @@ void BaseExternalPlaylistModel::setPlaylist(const QString& playlist_path) {
         return;
     }
 
+    m_currentPlaylistId = playlistId;
     columns[2] = LIBRARYTABLE_PREVIEW;
     setTable(playlistViewTable, columns[0], columns, m_trackSource);
     setDefaultSort(fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_POSITION),

src/library/baseexternalplaylistmodel.h

@@ -1,16 +1,18 @@
 #pragma once
 
-#include <QtSql>
 #include <QItemDelegate>
-#include <QString>
-#include <QObject>
 #include <QModelIndex>
+#include <QObject>
+#include <QString>
+#include <QStringBuilder>
+#include <QtSql>
 
-#include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
-#include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
+#include "library/librarytablemodel.h"
+#include "library/trackmodel.h"
+#include "util/string.h"
 
 class BaseExternalPlaylistModel : public BaseSqlTableModel {
     Q_OBJECT
@@ -28,11 +30,18 @@ class BaseExternalPlaylistModel : public BaseSqlTableModel {
     bool isColumnInternal(int column) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     CapabilitiesFlags getCapabilities() const override;
+    QString modelKey() const override {
+        return QLatin1String("external/") +
+                QString::number(m_currentPlaylistId) +
+                QLatin1String("#") +
+                currentSearch();
+    }
 
   private:
     TrackId doGetTrackId(const TrackPointer& pTrack) const override;
 
     QString m_playlistsTable;
     QString m_playlistTracksTable;
     QSharedPointer<BaseTrackCache> m_trackSource;
+    int m_currentPlaylistId;
 };

src/library/baseplaylistfeature.cpp

@@ -156,6 +156,7 @@ void BasePlaylistFeature::activateChild(const QModelIndex& index) {
     //qDebug() << "BasePlaylistFeature::activateChild()" << index;
     int playlistId = playlistIdFromIndex(index);
     if (playlistId != -1) {
+        emit saveModelState();
         m_pPlaylistTableModel->setTableModel(playlistId);
         emit showTrackModel(m_pPlaylistTableModel);
         emit enableCoverArtDisplay(true);
@@ -166,6 +167,7 @@ void BasePlaylistFeature::activatePlaylist(int playlistId) {
     //qDebug() << "BasePlaylistFeature::activatePlaylist()" << playlistId;
     QModelIndex index = indexFromPlaylistId(playlistId);
     if (playlistId != -1 && index.isValid()) {
+        emit saveModelState();
         m_pPlaylistTableModel->setTableModel(playlistId);
         emit showTrackModel(m_pPlaylistTableModel);
         emit enableCoverArtDisplay(true);
@@ -433,6 +435,7 @@ void BasePlaylistFeature::slotCreateImportPlaylist() {
 
         lastPlaylistId = m_playlistDao.createPlaylist(name);
         if (lastPlaylistId != -1) {
+            emit saveModelState();
             m_pPlaylistTableModel->setTableModel(lastPlaylistId);
         } else {
             QMessageBox::warning(nullptr,
@@ -487,7 +490,7 @@ void BasePlaylistFeature::slotExportPlaylist() {
     // This will only export songs that we think exist on default
     QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
             new PlaylistTableModel(this, m_pLibrary->trackCollections(), "mixxx.db.model.playlist_export"));
-
+    emit saveModelState();
     pPlaylistTableModel->setTableModel(m_pPlaylistTableModel->getPlaylist());
     pPlaylistTableModel->setSort(pPlaylistTableModel->fieldIndex(
                                          ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_POSITION),
@@ -525,6 +528,7 @@ void BasePlaylistFeature::slotExportTrackFiles() {
     QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
             new PlaylistTableModel(this, m_pLibrary->trackCollections(), "mixxx.db.model.playlist_export"));
 
+    emit saveModelState();
     pPlaylistTableModel->setTableModel(m_pPlaylistTableModel->getPlaylist());
     pPlaylistTableModel->setSort(pPlaylistTableModel->fieldIndex(
                                          ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_POSITION),

src/library/basesqltablemodel.h

@@ -71,6 +71,12 @@ class BaseSqlTableModel : public BaseTrackTableModel {
     int fieldIndex(
             ColumnCache::Column column) const final;
 
+    virtual QString modelKey() const override {
+        return QLatin1String("table:") + m_tableName +
+                QLatin1String("#") +
+                currentSearch();
+    }
+
   protected:
     ///////////////////////////////////////////////////////////////////////////
     // Inherited from BaseTrackTableModel
@@ -96,6 +102,7 @@ class BaseSqlTableModel : public BaseTrackTableModel {
     QList<TrackRef> getTrackRefs(const QModelIndexList& indices) const;
 
     QSqlDatabase m_database;
+    QString m_tableName;
 
     QString m_tableOrderBy;
     int m_columnIndexBySortColumnId[static_cast<int>(TrackModel::SortColumnId::IdMax)];
@@ -138,7 +145,6 @@ class BaseSqlTableModel : public BaseTrackTableModel {
 
     QVector<RowInfo> m_rowInfo;
 
-    QString m_tableName;
     QString m_idColumn;
     QSharedPointer<BaseTrackCache> m_trackSource;
     QStringList m_tableColumns;

src/library/browse/browsefeature.cpp

@@ -41,6 +41,10 @@ BrowseFeature::BrowseFeature(
             &BrowseFeature::requestAddDir,
             pLibrary,
             &Library::slotRequestAddDir);
+    connect(&m_browseModel,
+            &BrowseTableModel::restoreModelState,
+            this,
+            &LibraryFeature::restoreModelState);
 
     m_pAddQuickLinkAction = new QAction(tr("Add to Quick Links"),this);
     connect(m_pAddQuickLinkAction,
@@ -249,6 +253,7 @@ void BrowseFeature::activateChild(const QModelIndex& index) {
 
     QString path = item->getData().toString();
     if (path == QUICK_LINK_NODE || path == DEVICE_NODE) {
+        emit saveModelState();
         m_browseModel.setPath(MDir());
     } else {
         // Open a security token for this path and if we do not have access, ask
@@ -263,6 +268,7 @@ void BrowseFeature::activateChild(const QModelIndex& index) {
                 return;
             }
         }
+        emit saveModelState();
         m_browseModel.setPath(dir);
     }
     emit showTrackModel(&m_proxyModel);

src/library/browse/browsetablemodel.cpp

@@ -326,6 +326,7 @@ void BrowseTableModel::slotInsert(const QList< QList<QStandardItem*> >& rows,
             appendRow(rows.at(i));
         }
     }
+    emit restoreModelState();
 }
 
 TrackModel::CapabilitiesFlags BrowseTableModel::getCapabilities() const {

src/library/browse/browsetablemodel.h

@@ -72,6 +72,14 @@ class BrowseTableModel final : public QStandardItemModel, public virtual TrackMo
     bool isColumnSortable(int column) override;
     TrackModel::SortColumnId sortColumnIdFromColumnIndex(int index) override;
     int columnIndexFromSortColumnId(TrackModel::SortColumnId sortColumn) override;
+    QString modelKey() const override {
+        return QLatin1String("browse/") +
+                m_current_directory.dir().path() +
+                QLatin1String("#") +
+                currentSearch();
+    }
+  signals:
+    void restoreModelState();
 
   public slots:
     void slotClear(BrowseTableModel*);

src/library/crate/cratefeature.cpp

@@ -283,6 +283,7 @@ void CrateFeature::activateChild(const QModelIndex& index) {
     VERIFY_OR_DEBUG_ASSERT(crateId.isValid()) {
         return;
     }
+    emit saveModelState();
     m_crateTableModel.selectCrate(crateId);
     emit showTrackModel(&m_crateTableModel);
     emit enableCoverArtDisplay(true);
@@ -297,6 +298,7 @@ bool CrateFeature::activateCrate(CrateId crateId) {
     VERIFY_OR_DEBUG_ASSERT(index.isValid()) {
         return false;
     }
+    emit saveModelState();
     m_lastRightClickedIndex = index;
     m_crateTableModel.selectCrate(crateId);
     emit showTrackModel(&m_crateTableModel);

src/library/crate/cratetablemodel.cpp

@@ -1,5 +1,6 @@
 #include "library/crate/cratetablemodel.h"
 
+#include <QStringBuilder>
 #include <QtDebug>
 
 #include "library/dao/trackschema.h"
@@ -9,6 +10,7 @@
 #include "moc_cratetablemodel.cpp"
 #include "track/track.h"
 #include "util/db/fwdsqlquery.h"
+#include "util/string.h"
 
 CrateTableModel::CrateTableModel(QObject* pParent,
                                  TrackCollectionManager* pTrackCollectionManager)
@@ -191,3 +193,15 @@ void CrateTableModel::removeTracks(const QModelIndexList& indices) {
 
     select();
 }
+
+QString CrateTableModel::modelKey() const {
+    if (this->m_selectedCrate.isValid()) {
+        return QLatin1String("crate/") +
+                QString::number(m_selectedCrate.value()) +
+                QLatin1String("#") +
+                currentSearch();
+    } else {
+        return QLatin1String("crate#") +
+                currentSearch();
+    }
+}

src/library/crate/cratetablemodel.h

@@ -27,6 +27,7 @@ class CrateTableModel final : public BaseSqlTableModel {
     // Returns the number of unsuccessful track additions
     int addTracks(const QModelIndex& index, const QList<QString>& locations) final;
     CapabilitiesFlags getCapabilities() const final;
+    QString modelKey() const override;
 
   private:
     CrateId m_selectedCrate;

src/library/dlganalysis.h

@@ -3,14 +3,14 @@
 #include <QButtonGroup>
 #include <QItemSelection>
 
-#include "preferences/usersettings.h"
+#include "analyzer/analyzerprogress.h"
 #include "library/analysislibrarytablemodel.h"
 #include "library/libraryview.h"
 #include "library/ui_dlganalysis.h"
-#include "analyzer/analyzerprogress.h"
+#include "preferences/usersettings.h"
+#include "widget/wanalysislibrarytableview.h"
 
 class AnalysisLibraryTableModel;
-class WAnalysisLibraryTableView;
 class Library;
 class WLibrary;
 
@@ -34,6 +34,12 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra
     inline const QString currentSearch() {
         return m_pAnalysisLibraryTableModel->currentSearch();
     }
+    void saveCurrentViewState() override {
+        m_pAnalysisLibraryTableView->saveCurrentViewState();
+    };
+    void restoreCurrentViewState() override {
+        m_pAnalysisLibraryTableView->restoreCurrentViewState();
+    };
 
   public slots:
     void tableSelectionChanged(const QItemSelection& selected,

src/library/dlghidden.h

@@ -2,14 +2,14 @@
 
 #include <QItemSelection>
 
-#include "library/ui_dlghidden.h"
-#include "preferences/usersettings.h"
+#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
 #include "library/libraryview.h"
-#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/ui_dlghidden.h"
+#include "preferences/usersettings.h"
+#include "widget/wtracktableview.h"
 
 class WLibrary;
-class WTrackTableView;
 class HiddenTableModel;
 
 class DlgHidden : public QWidget, public Ui::DlgHidden, public LibraryView {
@@ -25,6 +25,12 @@ class DlgHidden : public QWidget, public Ui::DlgHidden, public LibraryView {
     bool hasFocus() const override;
     void onSearch(const QString& text) override;
     QString currentSearch();
+    void saveCurrentViewState() override {
+        m_pTrackTableView->saveCurrentViewState();
+    };
+    void restoreCurrentViewState() override {
+        m_pTrackTableView->restoreCurrentViewState();
+    };
 
   public slots:
     void clicked();

src/library/dlgmissing.h

@@ -2,14 +2,14 @@
 
 #include <QItemSelection>
 
-#include "library/ui_dlgmissing.h"
-#include "preferences/usersettings.h"
+#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
 #include "library/libraryview.h"
-#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/ui_dlgmissing.h"
+#include "preferences/usersettings.h"
+#include "widget/wtracktableview.h"
 
 class WLibrary;
-class WTrackTableView;
 class MissingTableModel;
 
 class DlgMissing : public QWidget, public Ui::DlgMissing, public LibraryView {
@@ -25,6 +25,12 @@ class DlgMissing : public QWidget, public Ui::DlgMissing, public LibraryView {
     bool hasFocus() const override;
     void onSearch(const QString& text) override;
     QString currentSearch();
+    void saveCurrentViewState() override {
+        m_pTrackTableView->saveCurrentViewState();
+    };
+    void restoreCurrentViewState() override {
+        m_pTrackTableView->restoreCurrentViewState();
+    };
 
   public slots:
     void clicked();

src/library/hiddentablemodel.h

@@ -15,4 +15,10 @@ class HiddenTableModel final : public BaseSqlTableModel {
     void unhideTracks(const QModelIndexList& indices) final;
     Qt::ItemFlags flags(const QModelIndex &index) const final;
     CapabilitiesFlags getCapabilities() const final;
+
+    virtual QString modelKey() const override {
+        return QLatin1String("hidden:") + m_tableName +
+                QLatin1String("#") +
+                currentSearch();
+    }
 };