Merge pull request #4468 from ronso0/effects-pref-fixes

Effects preferences fixes
mixxxdj · Oct 22, 2021 · f6ef330 · f6ef330
2 parents 4757242 + d09fd60
commit f6ef330
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
@@ -31,6 +31,19 @@ DlgPrefEffects::DlgPrefEffects(QWidget* pParent,
     hiddenEffectsTableView->setModel(m_pHiddenEffectsModel);
     setupManifestTableView(hiddenEffectsTableView);
 
+    // Allow selection only in either of the effects lists at a time to clarify
+    // which effect/chain the info below refers to.
+    // Upon selection change, deselect items in the adjacent list (reset doesn't
+    // emit dataChanged() signal.
+    connect(visibleEffectsTableView->selectionModel(),
+            &QItemSelectionModel::currentRowChanged,
+            hiddenEffectsTableView->selectionModel(),
+            &QItemSelectionModel::reset);
+    connect(hiddenEffectsTableView->selectionModel(),
+            &QItemSelectionModel::currentRowChanged,
+            visibleEffectsTableView->selectionModel(),
+            &QItemSelectionModel::reset);
+
     setupChainListView(chainListView);
     setupChainListView(quickEffectListView);
 
@@ -66,7 +79,7 @@ void DlgPrefEffects::setupManifestTableView(QTableView* pTableView) {
     // QTableView won't remove dragged items without this??
     pTableView->setDragDropOverwriteMode(false);
     pTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    pTableView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    pTableView->setSelectionMode(QAbstractItemView::SingleSelection);
     connect(pTableView->selectionModel(),
             &QItemSelectionModel::currentRowChanged,
             this,
@@ -78,11 +91,11 @@ void DlgPrefEffects::setupChainListView(QListView* pListView) {
     pListView->setModel(pModel);
     pListView->setDropIndicatorShown(true);
     pListView->setDragDropMode(QAbstractItemView::DragDrop);
-    pListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    pListView->setSelectionMode(QAbstractItemView::SingleSelection);
     //TODO: prevent drops of duplicate items
     pListView->setDefaultDropAction(Qt::CopyAction);
-    connect(pListView,
-            &QAbstractItemView::clicked,
+    connect(pListView->selectionModel(),
+            &QItemSelectionModel::currentRowChanged,
             this,
             &DlgPrefEffects::slotChainPresetSelected);
     pListView->installEventFilter(this);
@@ -91,6 +104,11 @@ void DlgPrefEffects::setupChainListView(QListView* pListView) {
 void DlgPrefEffects::slotUpdate() {
     clear();
 
+    // Prevent emission of dataChanged() when clearing the effects lists to not
+    // call effectsTableItemSelected() with a selection that has no model.
+    visibleEffectsTableView->selectionModel()->reset();
+    hiddenEffectsTableView->selectionModel()->reset();
+
     const QList<EffectManifestPointer> visibleEffects = m_pVisibleEffectsList->getList();
     m_pVisibleEffectsModel->setList(visibleEffects);
 
@@ -282,6 +300,7 @@ bool DlgPrefEffects::eventFilter(QObject* pChainList, QEvent* event) {
             return false;
         }
         m_pFocusedChainList = pListView;
+        unfocusedChainList()->selectionModel()->reset();
     }
     return false;
 }