X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconfigwizard.h;h=72dd0aa2563c361e1d66afef0dddea70e14a71a5;hp=b6d9de8d1a6af9d74d90c5a4faed65323c2b4104;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=f8c55c528ed7e5e1fd0090b4bbd6ef30d9c0f251

diff --git a/src/qtui/coreconfigwizard.h b/src/qtui/coreconfigwizard.h
index b6d9de8d..72dd0aa2 100644
--- a/src/qtui/coreconfigwizard.h
+++ b/src/qtui/coreconfigwizard.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,150 +15,190 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef _CORECONFIGWIZARD_H_
-#define _CORECONFIGWIZARD_H_
+#pragma once
+
+#include <tuple>
+#include <vector>
 
-#include <QHash>
-#include <QWizard>
 #include <QVariantMap>
+#include <QWizard>
 
-#include "ui_coreconfigwizardintropage.h"
 #include "ui_coreconfigwizardadminuserpage.h"
+#include "ui_coreconfigwizardauthenticationselectionpage.h"
+#include "ui_coreconfigwizardintropage.h"
 #include "ui_coreconfigwizardstorageselectionpage.h"
 #include "ui_coreconfigwizardsyncpage.h"
 
 class CoreConnection;
 
 namespace CoreConfigWizardPages {
-  class SyncPage;
-  class SyncRelayPage;
-};
 
-class CoreConfigWizard : public QWizard {
-  Q_OBJECT
-
-  public:
-    enum {
-      IntroPage,
-      AdminUserPage,
-      StorageSelectionPage,
-      SyncPage,
-      SyncRelayPage,
-      StorageDetailsPage,
-      ConclusionPage
+class SyncPage;
+class SyncRelayPage;
+
+}  // namespace CoreConfigWizardPages
+
+class CoreConfigWizard : public QWizard
+{
+    Q_OBJECT
+
+public:
+    enum
+    {
+        IntroPage,
+        AdminUserPage,
+        AuthenticationSelectionPage,
+        StorageSelectionPage,
+        SyncPage,
+        SyncRelayPage,
+        StorageDetailsPage,
+        ConclusionPage
     };
 
-    CoreConfigWizard(CoreConnection *connection, const QList<QVariant> &backends, QWidget *parent = 0);
-    QHash<QString, QVariant> backends() const;
+    CoreConfigWizard(CoreConnection* connection, const QVariantList& backendInfos, const QVariantList& authInfos, QWidget* parent = nullptr);
 
-    inline CoreConnection *coreConnection() const { return _connection; }
+    inline CoreConnection* coreConnection() const { return _connection; }
 
-  signals:
-    void setupCore(const QVariant &setupData);
-    void loginToCore(const QString &user, const QString &password, bool rememberPassword);
+signals:
+    void setupCore(const QVariant& setupData);
+    void loginToCore(const QString& user, const QString& password, bool rememberPassword);
 
-  public slots:
-    void loginSuccess();
+public slots:
     void syncFinished();
 
-  private slots:
-    void prepareCoreSetup(const QString &backend, const QVariantMap &connectionProperties);
+private slots:
+    void prepareCoreSetup(const QString& backend,
+                          const QVariantMap& properties,
+                          const QString& authenticator,
+                          const QVariantMap& authProperties);
     void coreSetupSuccess();
-    void coreSetupFailed(const QString &);
+    void coreSetupFailed(const QString&);
     void startOver();
 
-  private:
-    QHash<QString, QVariant> _backends;
-    CoreConfigWizardPages::SyncPage *syncPage;
-    CoreConfigWizardPages::SyncRelayPage *syncRelayPage;
+private:
+    CoreConfigWizardPages::SyncPage* syncPage;
+    CoreConfigWizardPages::SyncRelayPage* syncRelayPage;
 
-    CoreConnection *_connection;
+    CoreConnection* _connection;
 };
 
 namespace CoreConfigWizardPages {
 
-  class IntroPage : public QWizardPage {
+class IntroPage : public QWizardPage
+{
     Q_OBJECT
 
-    public:
-      IntroPage(QWidget *parent = 0);
-      int nextId() const;
-    private:
-      Ui::CoreConfigWizardIntroPage ui;
-  };
+public:
+    IntroPage(QWidget* parent = nullptr);
+    int nextId() const override;
+
+private:
+    Ui::CoreConfigWizardIntroPage ui;
+};
 
-  class AdminUserPage : public QWizardPage {
+class AdminUserPage : public QWizardPage
+{
     Q_OBJECT
 
-    public:
-      AdminUserPage(QWidget *parent = 0);
-      int nextId() const;
-      bool isComplete() const;
-    private:
-      Ui::CoreConfigWizardAdminUserPage ui;
-  };
+public:
+    AdminUserPage(QWidget* parent = nullptr);
+    int nextId() const override;
+    bool isComplete() const override;
+
+private:
+    Ui::CoreConfigWizardAdminUserPage ui;
+};
 
-  class StorageSelectionPage : public QWizardPage {
+class AuthenticationSelectionPage : public QWizardPage
+{
     Q_OBJECT
+    using FieldInfo = std::tuple<QString, QString, QVariant>;
+
+public:
+    AuthenticationSelectionPage(const QVariantList& authInfos, QWidget* parent = nullptr);
+    int nextId() const override;
+    QString displayName() const;
+    QString authenticator() const;
+    QVariantMap authProperties() const;
+
+private slots:
+    void on_backendList_currentIndexChanged(int index);
+
+private:
+    Ui::CoreConfigWizardAuthenticationSelectionPage ui;
+    std::vector<QVariantMap> _authProperties;
+    std::vector<std::vector<FieldInfo>> _authFields;
+};
 
-    public:
-      StorageSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent = 0);
-      int nextId() const;
-      QString selectedBackend() const;
-      QVariantMap connectionProperties() const;
-
-    private slots:
-      void on_backendList_currentIndexChanged();
-    private:
-      Ui::CoreConfigWizardStorageSelectionPage ui;
-      QGroupBox *_connectionBox;
-      QHash<QString, QVariant> _backends;
-  };
-
-  class SyncPage : public QWizardPage {
+class StorageSelectionPage : public QWizardPage
+{
     Q_OBJECT
+    using FieldInfo = std::tuple<QString, QString, QVariant>;
+
+public:
+    StorageSelectionPage(const QVariantList& backendInfos, QWidget* parent = nullptr);
+    int nextId() const override;
+    QString displayName() const;
+    QString backend() const;
+    QVariantMap backendProperties() const;
+
+private slots:
+    void on_backendList_currentIndexChanged(int index);
+
+private:
+    Ui::CoreConfigWizardStorageSelectionPage ui;
+    std::vector<QVariantMap> _backendProperties;
+    std::vector<std::vector<FieldInfo>> _backendFields;
+};
 
-    public:
-      SyncPage(QWidget *parent = 0);
-      void initializePage();
-      int nextId() const;
-      bool isComplete() const;
+class SyncPage : public QWizardPage
+{
+    Q_OBJECT
 
-    public slots:
-      void setStatus(const QString &status);
-      void setError(bool);
-      void setComplete(bool);
+public:
+    SyncPage(QWidget* parent = nullptr);
+    void initializePage() override;
+    int nextId() const override;
+    bool isComplete() const override;
 
-    signals:
-      void setupCore(const QString &backend, const QVariantMap &);
+public slots:
+    void setStatus(const QString& status);
+    void setError(bool);
+    void setComplete(bool);
 
-    private:
-      Ui::CoreConfigWizardSyncPage ui;
-      bool complete;
-      bool hasError;
-  };
+signals:
+    void setupCore(const QString& backend, const QVariantMap&, const QString& authenticator, const QVariantMap&);
 
-  class SyncRelayPage : public QWizardPage {
-    Q_OBJECT
+private:
+    Ui::CoreConfigWizardSyncPage ui;
+    bool _complete{false};
+    bool _hasError{false};
+};
 
-    public:
-      SyncRelayPage(QWidget *parent = 0);
-      int nextId() const;
-      enum Mode { Success, Error };
+class SyncRelayPage : public QWizardPage
+{
+    Q_OBJECT
 
-    public slots:
-      void setMode(Mode);
+public:
+    SyncRelayPage(QWidget* parent = nullptr);
+    int nextId() const override;
+    enum Mode
+    {
+        Success,
+        Error
+    };
 
-    signals:
-      void startOver() const;
+public slots:
+    void setMode(Mode);
 
-    private:
-      Mode mode;
-  };
+signals:
+    void startOver() const;
 
-}
+private:
+    Mode mode;
+};
 
-#endif
+}  // namespace CoreConfigWizardPages