LibraryFeature: Add LibraryFeature::selectAndActivate()

src/library/library.cpp

@@ -539,12 +539,7 @@ void Library::slotSwitchToFeature(const QString& featureName) {
     }
     for (auto feature : m_features) {
         if (feature->featureName() == featureName) {
-            // 'Select' the feature (i.e. update the sidebar selection).
-            // Selecting an index does not yet activate it (see below).
-            emit feature->featureSelect(feature, QModelIndex());
-
-            // 'Activate' the feature, i.e. update the library view
-            feature->activate();
+            feature->selectAndActivate();
             return;
         }
     }

src/library/libraryfeature.cpp

@@ -34,6 +34,17 @@ LibraryFeature::LibraryFeature(
     }
 }
 
+void LibraryFeature::selectAndActivate(const QModelIndex& index) {
+    if (index.isValid()) {
+        emit featureSelect(this, index);
+        activateChild(index);
+    } else {
+        // calling featureSelect with invalid index will select the root item
+        emit featureSelect(this, QModelIndex());
+        activate();
+    }
+}
+
 QStringList LibraryFeature::getPlaylistFiles(QFileDialog::FileMode mode) const {
     QString lastPlaylistDirectory = m_pConfig->getValue(
             ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),

src/library/libraryfeature.h

@@ -109,6 +109,10 @@ class LibraryFeature : public QObject {
     const UserSettingsPointer m_pConfig;
 
   public slots:
+    /// Pretend that the user has clicked on a tree item belonging
+    /// to this LibraryFeature by updating both the library view
+    /// and the sidebar selection.
+    void selectAndActivate(const QModelIndex& index = QModelIndex());
     // called when you single click on the root item
     virtual void activate() = 0;
     // called when you single click on a child item, e.g., a concrete playlist or crate

src/library/trackset/playlistfeature.cpp

@@ -307,8 +307,7 @@ void PlaylistFeature::slotPlaylistTableChanged(int playlistId) {
         // Else (root item was selected or for some reason no index could be created)
         // there's nothing to do: either no child was selected earlier, or the root
         // was selected and will remain selected after the child model was rebuilt.
-        activateChild(newIndex);
-        emit featureSelect(this, newIndex);
+        selectAndActivate(newIndex);
     }
 }
 

src/library/trackset/setlogfeature.cpp

@@ -706,13 +706,8 @@ void SetlogFeature::slotPlaylistTableChanged(int playlistId) {
             newIndex = m_pSidebarModel->index(selectedYearIndexRow - 1, 0);
         }
     }
-    if (newIndex.isValid()) {
-        emit featureSelect(this, newIndex);
-        activateChild(newIndex);
-    } else if (rootWasSelected) {
-        // calling featureSelect with invalid index will select the root item
-        emit featureSelect(this, newIndex);
-        activate(); // to reload the new current playlist
+    if (newIndex.isValid() || rootWasSelected) {
+        selectAndActivate(newIndex);
     }
 }