Ctrl-A should select each engine only once in EngineSelectionDialog (fix #832)

ilaripih · ilaripih · commit 14c2e41b223e · 2025-06-06T14:35:10.000+03:00
diff --git a/projects/gui/src/engineconfigproxymodel.cpp b/projects/gui/src/engineconfigproxymodel.cpp
@@ -33,11 +33,14 @@ void EngineConfigurationProxyModel::setFilterVariant(const QString& variant)
 bool EngineConfigurationProxyModel::filterAcceptsRow(int sourceRow,
 						     const QModelIndex& sourceParent) const
 {
-	QModelIndex variantsIndex = sourceModel()->index(sourceRow, 4, sourceParent);
-	QStringList variants(sourceModel()->data(variantsIndex).toStringList());
-
-	if (!m_filterVariant.isEmpty() && !variants.contains(m_filterVariant))
-		return false;
+	if (!m_filterVariant.isEmpty())
+	{
+		QModelIndex variantsIndex = sourceModel()->index(sourceRow, 4, sourceParent);
+		QStringList variants(sourceModel()->data(variantsIndex).toStringList());
+
+		if (!variants.contains(m_filterVariant))
+			return false;
+	}
 
 	return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
 }
diff --git a/projects/gui/src/engineselectiondlg.cpp b/projects/gui/src/engineselectiondlg.cpp
@@ -46,6 +46,19 @@ QItemSelection EngineSelectionDialog::selection() const
 	return m_model->mapSelectionToSource(ui->m_enginesList->selectionModel()->selection());
 }
 
+QModelIndexList EngineSelectionDialog::selectedRows(int column) const
+{
+	const auto sel = selection();
+	QModelIndexList ret;
+	for (const QModelIndex &index : sel.indexes())
+	{
+		if (index.column() == column)
+			ret.append(index);
+	}
+
+	return ret;
+}
+
 QListView* EngineSelectionDialog::enginesList() const
 {
 	return ui->m_enginesList;
diff --git a/projects/gui/src/engineselectiondlg.h b/projects/gui/src/engineselectiondlg.h
@@ -39,6 +39,7 @@ class EngineSelectionDialog : public QDialog
 		virtual ~EngineSelectionDialog();
 
 		QItemSelection selection() const;
+		QModelIndexList selectedRows(int column = 0) const;
 		QListView * enginesList() const;
 
 	private:
diff --git a/projects/gui/src/newtournamentdialog.cpp b/projects/gui/src/newtournamentdialog.cpp
@@ -160,7 +160,7 @@ void NewTournamentDialog::addEngine()
 	if (value != QDialog::Accepted)
 		return;
 
-	const QModelIndexList list(dlg.selection().indexes());
+	const QModelIndexList list(dlg.selectedRows());
 	for (const QModelIndex& index : list)
 	{
 		m_addedEnginesManager->addEngine(m_srcEngineManager->engineAt(index.row()));
diff --git a/projects/gui/ui/engineselectiondlg.ui b/projects/gui/ui/engineselectiondlg.ui
@@ -69,7 +69,7 @@
       <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
      <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectItems</enum>
+      <enum>QAbstractItemView::SelectRows</enum>
      </property>
     </widget>
    </item>

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void NewTournamentDialog::addEngine()`
`160`	`160`	`if (value != QDialog::Accepted)`
`161`	`161`	`return;`
`162`	`162`
`163`		`- const QModelIndexList list(dlg.selection().indexes());`
	`163`	`+ const QModelIndexList list(dlg.selectedRows());`
`164`	`164`	`for (const QModelIndex& index : list)`
`165`	`165`	`{`
`166`	`166`	`m_addedEnginesManager->addEngine(m_srcEngineManager->engineAt(index.row()));`