setAttribute(Qt::WA_DeleteOnClose);
foreach(const QVariant &v, backends)
- _backends[v.toMap()["DisplayName"].toString()] = v;
+ _backends[v.toMap()["DisplayName"].toString()] = v;
foreach(const QVariant &v, authenticators)
- _authenticators[v.toMap()["DisplayName"].toString()] = v;
+ _authenticators[v.toMap()["DisplayName"].toString()] = v;
setPage(IntroPage, new CoreConfigWizardPages::IntroPage(this));
setPage(AdminUserPage, new CoreConfigWizardPages::AdminUserPage(this));
return _backends;
}
+
QHash<QString, QVariant> CoreConfigWizard::authenticators() const
{
return _authenticators;
}
-void CoreConfigWizard::prepareCoreSetup(const QString &backend, const QVariantMap &properties, const QString &authBackend, const QVariantMap &authProperties)
+
+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...
foreach(int idx, visitedPages())
// FIXME? We need to be able to set up older cores that don't have auth backend support.
// So if the core doesn't support that feature, don't pass those parameters.
- if (!(Client::coreFeatures() & Quassel::AuthBackends))
- {
+ if (!(Client::coreFeatures() & Quassel::Authenticators)) {
coreConnection()->setupCore(Protocol::SetupData(field("adminUser.user").toString(), field("adminUser.password").toString(), backend, properties));
- } else {
- coreConnection()->setupCore(Protocol::SetupData(field("adminUser.user").toString(), field("adminUser.password").toString(), backend, properties, authBackend, authProperties));
+ }
+ else {
+ coreConnection()->setupCore(Protocol::SetupData(field("adminUser.user").toString(), field("adminUser.password").toString(), backend, properties, authenticator, authProperties));
}
}
int AdminUserPage::nextId() const
{
// If the core doesn't support auth backends, skip that page!
- if (!(Client::coreFeatures() & Quassel::AuthBackends))
- {
+ if (!(Client::coreFeatures() & Quassel::Authenticators)) {
return CoreConfigWizard::StorageSelectionPage;
- } else {
+ }
+ else {
return CoreConfigWizard::AuthenticationSelectionPage;
}
}
}
-QVariantMap AuthenticationSelectionPage::connectionProperties() const
+QVariantMap AuthenticationSelectionPage::authProperties() const
{
QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
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;
}
// Fill in sync info about the authentication layer.
AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
- QString authBackend = authPage->selectedBackend();
- QVariantMap authProperties = authPage->connectionProperties();
- Q_ASSERT(!authBackend.isEmpty());
- ui.authBackend->setText(authBackend);
+ QString authenticator = authPage->selectedBackend();
+ QVariantMap authProperties = authPage->authProperties();
+ Q_ASSERT(!authenticator.isEmpty());
+ ui.authenticator->setText(authenticator);
ui.user->setText(wizard()->field("adminUser.user").toString());
- emit setupCore(backend, properties, authBackend, authProperties);
+ emit setupCore(backend, properties, authenticator, authProperties);
}