/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "coreconfigwizard.h"
+
#include <QDebug>
#include <QAbstractButton>
#include <QCoreApplication>
#include <QFormLayout>
-#include <QIcon>
#include <QSpinBox>
-#include "coreconfigwizard.h"
-#include "coreconnection.h"
-
#include "client.h"
+#include "coreconnection.h"
+#include "icon.h"
namespace {
// provide specialized config widgets for those (which may be a good idea anyway, e.g. if we
// think about client-side translations...)
- QGroupBox *fieldBox = new QGroupBox;
+ auto *fieldBox = new QGroupBox;
fieldBox->setTitle(title);
+ auto *formLayout = new QFormLayout;
+ fieldBox->setLayout(formLayout);
- QFormLayout *formLayout = new QFormLayout(fieldBox);
for (auto &&fieldInfo : fieldInfos) {
QWidget *widget {nullptr};
switch (std::get<2>(fieldInfo).type()) {
setModal(true);
setWindowTitle(CoreConfigWizard::tr("Core Configuration Wizard"));
- setPixmap(QWizard::LogoPixmap, QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")).pixmap(48));
+ setPixmap(QWizard::LogoPixmap, icon::get("quassel").pixmap(48));
connect(connection, SIGNAL(coreSetupSuccess()), SLOT(coreSetupSuccess()));
connect(connection, SIGNAL(coreSetupFailed(QString)), SLOT(coreSetupFailed(QString)));
// 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::Authenticators)) {
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::Authenticators)) {
coreConnection()->setupCore(Protocol::SetupData(field("adminUser.user").toString(), field("adminUser.password").toString(), backend, properties));
}
else {
int AdminUserPage::nextId() const
{
// If the core doesn't support auth backends, skip that page!
- if (!(Client::coreFeatures() & Quassel::Authenticators)) {
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::Authenticators)) {
return CoreConfigWizard::StorageSelectionPage;
}
else {
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
sp.setRetainSizeWhenHidden(true);
-#else
- ui.authSettingsStack->setVisible(true); // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
ui.descriptionStack->setSizePolicy(sp);
ui.authSettingsStack->setSizePolicy(sp);
QString AuthenticationSelectionPage::authenticator() const
{
-#if QT_VERSION >= 0x050200
return ui.backendList->currentData().toString();
-#else
- return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
}
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
sp.setRetainSizeWhenHidden(true);
-#else
- ui.storageSettingsStack->setVisible(true); // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
ui.descriptionStack->setSizePolicy(sp);
ui.storageSettingsStack->setSizePolicy(sp);
QString StorageSelectionPage::backend() const
{
-#if QT_VERSION >= 0x050200
return ui.backendList->currentData().toString();
-#else
- return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
}
emit startOver();
return 0;
}
-}; /* namespace CoreConfigWizardPages */
+} /* namespace CoreConfigWizardPages */