X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.h;h=70cab9a759a513ffc400dbd4426af6e0a8fe626a;hp=7abaac9c3aa9dc933ed92a79f9e4cf85b487fc02;hb=7156691fecfbc44a67d0ec6055d2e892a7eb42de;hpb=81b7a767c2e8066ca560001c4e69073daaa77272 diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h index 7abaac9c..70cab9a7 100644 --- a/src/qtui/coreconnectdlg.h +++ b/src/qtui/coreconnectdlg.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -38,8 +38,8 @@ public: CoreConnectDlg(bool = false, QWidget *parent = 0); ~CoreConnectDlg(); -signals: - void newClientSyncer(ClientSyncer *); +// signals: +// void newClientSyncer(ClientSyncer *); private slots: /*** Phase Null: Accounts ***/ @@ -52,6 +52,8 @@ private slots: void on_editAccount_clicked(); void on_deleteAccount_clicked(); void on_useInternalCore_clicked(); + void on_viewSslCertButton_clicked(); + void on_ignoreWarningsButton_clicked(); void on_accountList_itemDoubleClicked(QListWidgetItem *item); void on_accountButtonBox_accepted(); @@ -62,9 +64,9 @@ private slots: void connectToCore(); void initPhaseError(const QString &error); + void initPhaseWarnings(const QStringList &warnings); void initPhaseMsg(const QString &msg); void initPhaseSocketState(QAbstractSocket::SocketState); - void encrypted(bool); /*** Phase Two: Login ***/ void startLogin(); @@ -86,10 +88,13 @@ private slots: void coreNetworksProgress(quint32, quint32); private: + AccountId findFreeAccountId(); + Ui::CoreConnectDlg ui; AccountId autoConnectAccount; QHash accounts; + AccountId _internalAccountId; QVariantMap accountData; AccountId account; @@ -101,6 +106,10 @@ private: CoreConfigWizard *wizard; }; + +// ======================================== +// CoreAccountEditDlg +// ======================================== class CoreAccountEditDlg : public QDialog { Q_OBJECT @@ -122,4 +131,18 @@ private: QVariantMap account; }; -#endif +// ======================================== +// SslCertDisplayDialog +// ======================================== +#ifdef HAVE_SSL +class QSslCertificate; + +class SslCertDisplayDialog : public QDialog { + Q_OBJECT + +public: + SslCertDisplayDialog(const QString &host, const QSslCertificate &cert, QWidget *parent = 0); +}; +#endif // HAVE_SSL + +#endif // CORECONNECTDLG_H