#include "client.h"
-CoreConfigWizard::CoreConfigWizard(CoreConnection *connection, const QList<QVariant> &backends, const QList<QVariant> &authenticators, QWidget *parent)
+namespace {
+
+template<typename FieldInfo>
+void createFieldWidgets(QGroupBox *fieldBox, const std::vector<FieldInfo> &fieldInfos)
+{
+ // Create a config UI based on the field types sent from the backend
+ // We make some assumptions here (like integer range and password field names) that may not
+ // hold true for future authenticator types - but the only way around it for now would be to
+ // provide specialized config widgets for those (which may be a good idea anyway, e.g. if we
+ // think about client-side translations...)
+
+ QFormLayout *formLayout = new QFormLayout;
+ for (auto &&fieldInfo : fieldInfos) {
+ QWidget *widget {nullptr};
+ switch (std::get<2>(fieldInfo).type()) {
+ case QVariant::Int:
+ widget = new QSpinBox(fieldBox);
+ // Here we assume that int fields are always in 16 bit range, like ports
+ static_cast<QSpinBox *>(widget)->setMinimum(0);
+ static_cast<QSpinBox *>(widget)->setMaximum(65535);
+ static_cast<QSpinBox *>(widget)->setValue(std::get<2>(fieldInfo).toInt());
+ break;
+ case QVariant::String:
+ widget = new QLineEdit(std::get<2>(fieldInfo).toString(), fieldBox);
+ // Here we assume that fields named something with "password" are actual password inputs
+ if (std::get<0>(fieldInfo).toLower().contains("password"))
+ static_cast<QLineEdit *>(widget)->setEchoMode(QLineEdit::Password);
+ break;
+ default:
+ qWarning() << "Unsupported type for backend property" << std::get<0>(fieldInfo);
+ }
+ if (widget) {
+ widget->setObjectName(std::get<0>(fieldInfo));
+ formLayout->addRow(std::get<1>(fieldInfo) + ":", widget);
+ }
+ }
+ fieldBox->setLayout(formLayout);
+}
+
+
+template<typename FieldInfo>
+QVariantMap propertiesFromFieldWidgets(QGroupBox *fieldBox, const std::vector<FieldInfo> &fieldInfos)
+{
+ QVariantMap properties;
+ if (!fieldBox)
+ return properties;
+
+ for (auto &&fieldInfo : fieldInfos) {
+ QString key = std::get<0>(fieldInfo);
+ QVariant value;
+ switch (std::get<2>(fieldInfo).type()) {
+ case QVariant::Int: {
+ QSpinBox *spinBox = fieldBox->findChild<QSpinBox *>(key);
+ if (spinBox)
+ value = spinBox->value();
+ else
+ qWarning() << "Could not find child widget for field" << key;
+ break;
+ }
+ case QVariant::String: {
+ QLineEdit *lineEdit = fieldBox->findChild<QLineEdit *>(key);
+ if (lineEdit)
+ value = lineEdit->text();
+ else
+ qWarning() << "Could not find child widget for field" << key;
+ break;
+ }
+ default:
+ qWarning() << "Unsupported type for backend property" << key;
+ }
+ properties[key] = std::move(value);
+ }
+ return properties;
+}
+
+} // anon
+
+
+CoreConfigWizard::CoreConfigWizard(CoreConnection *connection, const QVariantList &backendInfos, const QVariantList &authInfos, QWidget *parent)
: QWizard(parent),
- _connection(connection)
+ _connection{connection}
{
setModal(true);
setAttribute(Qt::WA_DeleteOnClose);
- foreach(const QVariant &v, backends)
- _backends[v.toMap()["DisplayName"].toString()] = v;
-
- foreach(const QVariant &v, authenticators)
- _authenticators[v.toMap()["BackendId"].toString()] = v;
-
setPage(IntroPage, new CoreConfigWizardPages::IntroPage(this));
setPage(AdminUserPage, new CoreConfigWizardPages::AdminUserPage(this));
- setPage(AuthenticationSelectionPage, new CoreConfigWizardPages::AuthenticationSelectionPage(_authenticators, this));
- setPage(StorageSelectionPage, new CoreConfigWizardPages::StorageSelectionPage(_backends, this));
+ setPage(AuthenticationSelectionPage, new CoreConfigWizardPages::AuthenticationSelectionPage(authInfos, this));
+ setPage(StorageSelectionPage, new CoreConfigWizardPages::StorageSelectionPage(backendInfos, this));
syncPage = new CoreConfigWizardPages::SyncPage(this);
connect(syncPage, SIGNAL(setupCore(const QString &, const QVariantMap &, const QString &, const QVariantMap &)),
SLOT(prepareCoreSetup(const QString &, const QVariantMap &, const QString &, const QVariantMap &)));
}
-QHash<QString, QVariant> CoreConfigWizard::backends() const
-{
- return _backends;
-}
-
-
-QHash<QString, QVariant> CoreConfigWizard::authenticators() const
-{
- return _authenticators;
-}
-
-
void CoreConfigWizard::prepareCoreSetup(const QString &backend, const QVariantMap &properties, const QString &authenticator, const QVariantMap &authProperties)
{
// Prevent the user from changing any settings he already specified...
{
syncPage->setStatus(tr("Your core has been successfully configured. Logging you in..."));
syncPage->setError(false);
- syncRelayPage->setMode(CoreConfigWizardPages::SyncRelayPage::Error);
+ syncRelayPage->setMode(CoreConfigWizardPages::SyncRelayPage::Success);
coreConnection()->loginToCore(field("adminUser.user").toString(), field("adminUser.password").toString(), field("adminUser.rememberPasswd").toBool());
}
registerField("adminUser.password*", ui.password);
registerField("adminUser.password2*", ui.password2);
registerField("adminUser.rememberPasswd", ui.rememberPasswd);
-
- //ui.user->setText("foo");
- //ui.password->setText("foo");
- //ui.password2->setText("foo");
}
/*** Authentication Selection Page ***/
-AuthenticationSelectionPage::AuthenticationSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent)
- : QWizardPage(parent),
- _connectionBox(0),
- _backends(backends)
+AuthenticationSelectionPage::AuthenticationSelectionPage(const QVariantList &authInfos, QWidget *parent)
+ : QWizardPage(parent)
{
ui.setupUi(this);
registerField("authentication.backend", ui.backendList);
- foreach(QString key, _backends.keys()) {
- ui.backendList->addItem(_backends[key].toMap()["DisplayName"].toString(), key);
+ for (auto &&authInfo : authInfos) {
+ auto props = authInfo.toMap();
+ // Extract field infos to avoid having to reparse the list
+ std::vector<FieldInfo> fields;
+ const auto &list = props["SetupData"].toList();
+ for (int i = 0; i + 2 < list.size(); i += 3) {
+ fields.emplace_back(std::make_tuple(list[i].toString(), list[i+1].toString(), list[i+2]));
+ }
+ props.remove("SetupData");
+
+ _authProperties.emplace_back(props);
+ _authFields.emplace_back(std::move(fields));
+
+ // Create entry in authenticator selector
+ ui.backendList->addItem(props["DisplayName"].toString(), props["BackendId"].toString());
}
- on_backendList_currentIndexChanged();
+ ui.backendList->setCurrentIndex(0);
}
}
-QString AuthenticationSelectionPage::selectedBackend() const
+QString AuthenticationSelectionPage::displayName() const
{
return ui.backendList->currentText();
}
-QVariantMap AuthenticationSelectionPage::authProperties() const
+QString AuthenticationSelectionPage::authenticator() const
{
- QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
+#if QT_VERSION >= 0x050200
+ return ui.backendList->currentData().toString();
+#else
+ return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
+#endif
+}
- QVariantMap properties;
- QStringList setupKeys = _backends[backend].toMap()["SetupKeys"].toStringList();
- if (!setupKeys.isEmpty()) {
- QVariantMap defaults = _backends[backend].toMap()["SetupDefaults"].toMap();
- foreach(QString key, setupKeys) {
- QWidget *widget = _connectionBox->findChild<QWidget *>(key);
- QVariant def;
- if (defaults.contains(key)) {
- def = defaults[key];
- }
- switch (def.type()) {
- case QVariant::Int:
- {
- QSpinBox *spinbox = qobject_cast<QSpinBox *>(widget);
- Q_ASSERT(spinbox);
- def = QVariant(spinbox->value());
- }
- break;
- default:
- {
- QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget);
- Q_ASSERT(lineEdit);
- def = QVariant(lineEdit->text());
- }
- }
- properties[key] = def;
- }
- }
- return properties;
+
+QVariantMap AuthenticationSelectionPage::authProperties() const
+{
+ return propertiesFromFieldWidgets(_fieldBox, _authFields[ui.backendList->currentIndex()]);
}
-void AuthenticationSelectionPage::on_backendList_currentIndexChanged()
+void AuthenticationSelectionPage::on_backendList_currentIndexChanged(int index)
{
- QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
- ui.description->setText(_backends[backend].toMap()["Description"].toString());
+ ui.description->setText(_authProperties[index]["Description"].toString());
- if (_connectionBox) {
- layout()->removeWidget(_connectionBox);
- _connectionBox->deleteLater();
- _connectionBox = 0;
+ if (_fieldBox) {
+ layout()->removeWidget(_fieldBox);
+ _fieldBox->deleteLater();
+ _fieldBox = nullptr;
}
-
- QStringList setupKeys = _backends[backend].toMap()["SetupKeys"].toStringList();
- if (!setupKeys.isEmpty()) {
- QVariantMap defaults = _backends[backend].toMap()["SetupDefaults"].toMap();
- QGroupBox *propertyBox = new QGroupBox(this);
- propertyBox->setTitle(tr("Connection Properties"));
- QFormLayout *formlayout = new QFormLayout;
-
- foreach(QString key, setupKeys) {
- QWidget *widget = 0;
- QVariant def;
- if (defaults.contains(key)) {
- def = defaults[key];
- }
- switch (def.type()) {
- case QVariant::Int:
- {
- QSpinBox *spinbox = new QSpinBox(propertyBox);
- spinbox->setMaximum(64000);
- spinbox->setValue(def.toInt());
- widget = spinbox;
- }
- break;
- default:
- {
- QLineEdit *lineEdit = new QLineEdit(def.toString(), propertyBox);
- if (key.toLower().contains("password")) {
- lineEdit->setEchoMode(QLineEdit::Password);
- }
- widget = lineEdit;
- }
- }
- widget->setObjectName(key);
- formlayout->addRow(key + ":", widget);
- }
- propertyBox->setLayout(formlayout);
- static_cast<QVBoxLayout *>(layout())->insertWidget(layout()->indexOf(ui.descriptionBox) + 1, propertyBox);
- _connectionBox = propertyBox;
+ if (!_authFields[index].empty()) {
+ _fieldBox = new QGroupBox(this);
+ _fieldBox->setTitle(tr("Authentication Settings"));
+ createFieldWidgets(_fieldBox, _authFields[index]);
+ static_cast<QVBoxLayout *>(layout())->insertWidget(layout()->indexOf(ui.descriptionBox) + 1, _fieldBox);
}
}
/*** Storage Selection Page ***/
-StorageSelectionPage::StorageSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent)
- : QWizardPage(parent),
- _connectionBox(0),
- _backends(backends)
+StorageSelectionPage::StorageSelectionPage(const QVariantList &backendInfos, QWidget *parent)
+ : QWizardPage(parent)
{
ui.setupUi(this);
setTitle(tr("Select Storage Backend"));
- setSubTitle(tr("Please select a database backend for the Quassel Core storage to store the backlog and other data in."));
+ setSubTitle(tr("Please select a storage backend for Quassel Core."));
setCommitPage(true);
registerField("storage.backend", ui.backendList);
- int defaultIndex = 0;
- foreach(QString key, _backends.keys()) {
- ui.backendList->addItem(_backends[key].toMap()["DisplayName"].toString(), key);
- if (_backends[key].toMap()["IsDefault"].toBool()) {
- defaultIndex = ui.backendList->count() - 1;
+ int defaultIndex {0}; // Legacy cores send backend infos in arbitrary order
+
+ for (auto &&backendInfo : backendInfos) {
+ auto props = backendInfo.toMap();
+ // Extract field infos to avoid having to reparse the list
+ std::vector<FieldInfo> fields;
+
+ // Legacy cores (prior to 0.13) didn't send SetupData for storage backends; deal with this
+ if (!props.contains("SetupData")) {
+ const auto &defaultValues = props["SetupDefaults"].toMap();
+ for (auto &&key : props["SetupKeys"].toStringList()) {
+ fields.emplace_back(std::make_tuple(key, key, defaultValues.value(key, QString{})));
+ }
+ if (props.value("IsDefault", false).toBool()) {
+ defaultIndex = ui.backendList->count();
+ }
}
+ else {
+ const auto &list = props["SetupData"].toList();
+ for (int i = 0; i + 2 < list.size(); i += 3) {
+ fields.emplace_back(std::make_tuple(list[i].toString(), list[i+1].toString(), list[i+2]));
+ }
+ props.remove("SetupData");
+ }
+ props.remove("SetupKeys");
+ props.remove("SetupDefaults");
+ // Legacy cores (prior to 0.13) don't send the BackendId property
+ if (!props.contains("BackendId"))
+ props["BackendId"] = props["DisplayName"];
+ _backendProperties.emplace_back(props);
+ _backendFields.emplace_back(std::move(fields));
+
+ // Create entry in backend selector
+ ui.backendList->addItem(props["DisplayName"].toString(), props["BackendId"].toString());
}
ui.backendList->setCurrentIndex(defaultIndex);
-
- on_backendList_currentIndexChanged();
}
}
-QString StorageSelectionPage::selectedBackend() const
+QString StorageSelectionPage::displayName() const
{
return ui.backendList->currentText();
}
-QVariantMap StorageSelectionPage::connectionProperties() const
+QString StorageSelectionPage::backend() const
{
- QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
+#if QT_VERSION >= 0x050200
+ return ui.backendList->currentData().toString();
+#else
+ return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
+#endif
+}
- QVariantMap properties;
- QStringList setupKeys = _backends[backend].toMap()["SetupKeys"].toStringList();
- if (!setupKeys.isEmpty()) {
- QVariantMap defaults = _backends[backend].toMap()["SetupDefaults"].toMap();
- foreach(QString key, setupKeys) {
- QWidget *widget = _connectionBox->findChild<QWidget *>(key);
- QVariant def;
- if (defaults.contains(key)) {
- def = defaults[key];
- }
- switch (def.type()) {
- case QVariant::Int:
- {
- QSpinBox *spinbox = qobject_cast<QSpinBox *>(widget);
- Q_ASSERT(spinbox);
- def = QVariant(spinbox->value());
- }
- break;
- default:
- {
- QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget);
- Q_ASSERT(lineEdit);
- def = QVariant(lineEdit->text());
- }
- }
- properties[key] = def;
- }
- }
- qDebug() << properties;
-
-// QVariantMap properties = _backends[backend].toMap()["ConnectionProperties"].toMap();
-// if(!properties.isEmpty() && _connectionBox) {
-// QVariantMap::iterator propertyIter = properties.begin();
-// while(propertyIter != properties.constEnd()) {
-// QWidget *widget = _connectionBox->findChild<QWidget *>(propertyIter.key());
-// switch(propertyIter.value().type()) {
-// case QVariant::Int:
-// {
-// QSpinBox *spinbox = qobject_cast<QSpinBox *>(widget);
-// Q_ASSERT(spinbox);
-// propertyIter.value() = QVariant(spinbox->value());
-// }
-// break;
-// default:
-// {
-// QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget);
-// Q_ASSERT(lineEdit);
-// propertyIter.value() = QVariant(lineEdit->text());
-// }
-// }
-// propertyIter++;
-// }
-// }
- return properties;
+
+QVariantMap StorageSelectionPage::backendProperties() const
+{
+ return propertiesFromFieldWidgets(_fieldBox, _backendFields[ui.backendList->currentIndex()]);
}
-void StorageSelectionPage::on_backendList_currentIndexChanged()
+void StorageSelectionPage::on_backendList_currentIndexChanged(int index)
{
- QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
- ui.description->setText(_backends[backend].toMap()["Description"].toString());
+ ui.description->setText(_backendProperties[index]["Description"].toString());
- if (_connectionBox) {
- layout()->removeWidget(_connectionBox);
- _connectionBox->deleteLater();
- _connectionBox = 0;
+ if (_fieldBox) {
+ layout()->removeWidget(_fieldBox);
+ _fieldBox->deleteLater();
+ _fieldBox = nullptr;
}
-
- QStringList setupKeys = _backends[backend].toMap()["SetupKeys"].toStringList();
- if (!setupKeys.isEmpty()) {
- QVariantMap defaults = _backends[backend].toMap()["SetupDefaults"].toMap();
- QGroupBox *propertyBox = new QGroupBox(this);
- propertyBox->setTitle(tr("Connection Properties"));
- QFormLayout *formlayout = new QFormLayout;
-
- foreach(QString key, setupKeys) {
- QWidget *widget = 0;
- QVariant def;
- if (defaults.contains(key)) {
- def = defaults[key];
- }
- switch (def.type()) {
- case QVariant::Int:
- {
- QSpinBox *spinbox = new QSpinBox(propertyBox);
- spinbox->setMaximum(64000);
- spinbox->setValue(def.toInt());
- widget = spinbox;
- }
- break;
- default:
- {
- QLineEdit *lineEdit = new QLineEdit(def.toString(), propertyBox);
- if (key.toLower().contains("password")) {
- lineEdit->setEchoMode(QLineEdit::Password);
- }
- widget = lineEdit;
- }
- }
- widget->setObjectName(key);
- formlayout->addRow(key + ":", widget);
- }
- propertyBox->setLayout(formlayout);
- static_cast<QVBoxLayout *>(layout())->insertWidget(layout()->indexOf(ui.descriptionBox) + 1, propertyBox);
- _connectionBox = propertyBox;
+ if (!_backendFields[index].empty()) {
+ _fieldBox = new QGroupBox(this);
+ _fieldBox->setTitle(tr("Storage Settings"));
+ createFieldWidgets(_fieldBox, _backendFields[index]);
+ static_cast<QVBoxLayout *>(layout())->insertWidget(layout()->indexOf(ui.descriptionBox) + 1, _fieldBox);
}
}
{
ui.setupUi(this);
setTitle(tr("Storing Your Settings"));
- setSubTitle(tr("Your settings are now stored in the core, and you will be logged in automatically."));
+ setSubTitle(tr("Your settings are now being stored in the core, and you will be logged in automatically."));
}
void SyncPage::initializePage()
{
- complete = false;
- hasError = false;
+ _complete = false;
+ _hasError = false;
+ emit completeChanged();
// Fill in sync info about the storage layer.
StorageSelectionPage *storagePage = qobject_cast<StorageSelectionPage *>(wizard()->page(CoreConfigWizard::StorageSelectionPage));
- QString backend = storagePage->selectedBackend();
- QVariantMap properties = storagePage->connectionProperties();
- Q_ASSERT(!backend.isEmpty());
- ui.backend->setText(backend);
+ QString backend = storagePage->backend();
+ QVariantMap backendProperties = storagePage->backendProperties();
+ ui.backend->setText(storagePage->displayName());
// Fill in sync info about the authentication layer.
AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
- QString authenticator = authPage->selectedBackend();
+ QString authenticator = authPage->authenticator();
QVariantMap authProperties = authPage->authProperties();
- Q_ASSERT(!authenticator.isEmpty());
- ui.authenticator->setText(authenticator);
+ ui.authenticator->setText(authPage->displayName());
ui.user->setText(wizard()->field("adminUser.user").toString());
- emit setupCore(backend, properties, authenticator, authProperties);
+ emit setupCore(backend, backendProperties, authenticator, authProperties);
}
int SyncPage::nextId() const
{
- if (!hasError) return -1;
+ if (!_hasError)
+ return -1;
return CoreConfigWizard::SyncRelayPage;
}
bool SyncPage::isComplete() const
{
- return complete;
+ return _complete || _hasError;
}
void SyncPage::setError(bool e)
{
- hasError = e;
+ _hasError = e;
+ setFinalPage(!e);
+ emit completeChanged();
}
void SyncPage::setComplete(bool c)
{
- complete = c;
+ _complete = c;
completeChanged();
}
mode = m;
}
-
-/*
-void SyncRelayPage::initializePage() {
- return;
- if(mode == Success) {
- wizard()->accept();
- } else {
- emit startOver();
- }
-}
-*/
-
int SyncRelayPage::nextId() const
{
emit startOver();
projects / quassel.git / blobdiff