Skip to content

Automatically add multiple selected engines at once #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alwey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Automatically add multiple selected engines at once #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions projects/gui/res/icons/icons.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
<file>toolbutton/next_16x16.png</file>
<file>toolbutton/previous_16x16.png</file>
<file>toolbutton/remove_16x16.png</file>
<file>toolbutton/autoadd_16x16.png</file>
</qresource>
</RCC>
Binary file added projects/gui/res/icons/toolbutton/autoadd_16x16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 27 additions & 3 deletions projects/gui/src/engineconfigurationdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,14 @@ void EngineConfigurationDialog::detectEngineOptions()
else
{
m_hasError = true;
QMessageBox::critical(this, tr("Engine Error"), error);
if (isVisible())
QMessageBox::critical(this, tr("Engine Error"), error);

ui->m_detectBtn->setEnabled(true);
ui->m_restoreBtn->setEnabled(true);
ui->m_progressBar->hide();
emit detectionFinished();
emit hasError();
}
}

Expand Down Expand Up @@ -343,8 +345,10 @@ void EngineConfigurationDialog::onEngineQuit()
if (m_engine->hasError())
{
m_hasError = true;
QMessageBox::critical(this, tr("Engine Error"),
m_engine->errorString());
if (isVisible())
QMessageBox::critical(this, tr("Engine Error"),
m_engine->errorString());
emit hasError();
}
m_engine->deleteLater();
m_engine = nullptr;
Expand Down Expand Up @@ -405,3 +409,23 @@ void EngineConfigurationDialog::restoreDefaults()

m_engineOptionModel->setOptions(m_options);
}

void EngineConfigurationDialog::probe(const QString& filename,
const QString& protocol)
{
setExecutable(filename);

// Handling of duplicate configuration names
int n = 2;
QString name = ui->m_nameEdit->text();
if (m_reservedNames.contains(name))
ui->m_nameEdit->setText(QString("%1 (%2)").arg(name, protocol));
while (m_reservedNames.contains(ui->m_nameEdit->text()))
ui->m_nameEdit->setText(QString("%1 (%2)(%3)").arg(name, protocol).arg(n++));

connect(this, SIGNAL(detectionFinished()),
this, SLOT(onDetectionFinished()));

ui->m_protocolCombo->setCurrentText(protocol);
detectEngineOptions();
}
7 changes: 7 additions & 0 deletions projects/gui/src/engineconfigurationdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,16 @@ class EngineConfigurationDialog : public QDialog
* warning message.
*/
void setReservedNames(const QSet<QString>& names);
/*!
* Probes the engine executable in \a filename using the
* engine interface \a protocol.
*/
void probe(const QString& filename,
const QString& protocol);

signals:
void detectionFinished();
void hasError();

private slots:
void browseCommand();
Expand Down
84 changes: 83 additions & 1 deletion projects/gui/src/enginemanagementwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@
#include <algorithm>

#include <enginemanager.h>
#include <enginefactory.h>

#include "cutechessapp.h"
#include "engineconfigurationmodel.h"
#include "engineconfigurationdlg.h"


EngineManagementWidget::EngineManagementWidget(QWidget* parent)
: QWidget(parent),
m_engineManager(CuteChessApplication::instance()->engineManager()),
m_hasChanged(false),
m_filteredModel(new QSortFilterProxyModel(this)),
m_detectionTimer(nullptr),
ui(new Ui::EngineManagementWidget)
{
ui->setupUi(this);
Expand Down Expand Up @@ -66,6 +67,9 @@ EngineManagementWidget::EngineManagementWidget(QWidget* parent)
// Configure button
connect(ui->m_configureBtn, SIGNAL(clicked(bool)), this,
SLOT(configureEngine()));

// Auto Add button
connect(ui->m_autoAddBtn, SIGNAL(clicked(bool)), this, SLOT(addEngines()));

// Remove button
connect(ui->m_removeBtn, SIGNAL(clicked(bool)), this, SLOT(removeEngine()));
Expand All @@ -79,6 +83,10 @@ EngineManagementWidget::EngineManagementWidget(QWidget* parent)
connect(ui->m_browseDefaultLocationBtn, SIGNAL(clicked()),
this, SLOT(browseDefaultLocation()));

// Auto engine detection timer
connect(&m_detectionTimer, &QTimer::timeout,
this, &EngineManagementWidget::onDetectionTimer);

updateEngineCount();
}

Expand Down Expand Up @@ -170,6 +178,80 @@ void EngineManagementWidget::configureEngine(const QModelIndex& index)
dlg->open();
}

void EngineManagementWidget::addEngines()
{
const QStringList& protocols = EngineFactory::protocols();
QString defaultDir = QSettings().value("ui/default_engine_location").toString();

// Use file extensions only on Windows
#ifdef Q_OS_WIN32
const QString filter = tr("Executables (*.exe *.bat *.cmd);;All Files (*.*)");
#else
const QString filter = tr("All Files (*)");
#endif

auto fileDlg = new QFileDialog(
this, tr("Select Engine Executables"),
defaultDir, filter);
fileDlg->setAttribute(Qt::WA_DeleteOnClose);
fileDlg->setFileMode(QFileDialog::ExistingFiles);
fileDlg->setAcceptMode(QFileDialog::AcceptOpen);

connect(fileDlg, &QFileDialog::accepted, [=]()
{
const QStringList& files = fileDlg->selectedFiles();
for (const QString& proto: protocols)
{
for (const auto& file: files)
m_detectionList.append({file, proto});
}
m_detectionTimer.start(50);
});
fileDlg->open();
}

void EngineManagementWidget::onDetectionTimer()
{
if (m_detectionList.isEmpty())
{
m_detectionTimer.stop();
return;
}
DetectionData candidate = m_detectionList.first();
detectEngine(candidate.name, candidate.protocol);
m_detectionList.removeFirst();
}

void EngineManagementWidget::detectEngine(const QString& file,
const QString& proto)
{
// Hidden EngineConfigurationDialog as worker
auto dlg = new EngineConfigurationDialog(
EngineConfigurationDialog::AddEngine, this);
dlg->setReservedNames(m_engineManager->engineNames());
dlg->setAttribute(Qt::WA_DeleteOnClose);

connect(dlg, &EngineConfigurationDialog::finished, [=](int result)
{
auto config = dlg->engineConfiguration();
if (result && config.options().count() > 0)
{
while (m_engineManager->engineNames().contains(config.name()))
config.setName( QString( "%1 (%2)[%3]")
.arg(config.name(), proto).arg(rand(), 8, 16));
m_engineManager->addEngine(config);
m_hasChanged = true;
updateEngineCount();
}
});
connect(dlg, &EngineConfigurationDialog::hasError, [=]()
{
dlg->close();
});

dlg->probe(file, proto);
}

void EngineManagementWidget::removeEngine()
{
const QItemSelection selection =
Expand Down
12 changes: 12 additions & 0 deletions projects/gui/src/enginemanagementwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <QWidget>
#include <engineconfiguration.h>
#include <QTimer>

class EngineManager;
class QSortFilterProxyModel;
Expand Down Expand Up @@ -57,18 +58,29 @@ class EngineManagementWidget : public QWidget
void updateUi();
void updateSearch(const QString& terms);
void addEngine();
void addEngines();
void configureEngine();
void configureEngine(const QModelIndex& index);
void removeEngine();
void cloneEngine();
void browseDefaultLocation();
void onDetectionTimer();

private:
void updateEngineCount();
void detectEngine(const QString& file,
const QString& proto);

EngineManager* m_engineManager;
bool m_hasChanged;
QSortFilterProxyModel* m_filteredModel;
QTimer m_detectionTimer;
struct DetectionData
{
QString name;
QString protocol;
};
QVector<DetectionData> m_detectionList;
Ui::EngineManagementWidget* ui;
};

Expand Down
14 changes: 14 additions & 0 deletions projects/gui/ui/enginemanagementwidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="m_autoAddBtn">
<property name="toolTip">
<string>Add multiple new engines</string>
</property>
<property name="text">
<string>++</string>
</property>
<property name="icon">
<iconset resource="../res/icons/icons.qrc">
<normaloff>:/icons/toolbutton/autoadd_16x16.png</normaloff>:/icons/toolbutton/autoadd_16x16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="m_addBtn">
<property name="toolTip">
Expand Down