fixes #484 - issues with ssl status indicator

[quassel.git] / src / qtui / coreconnectdlg.h

diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
index 42638e5..cac4721 100644 (file)
--- 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  *
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CORECONNECTDLG_H_
-#define _CORECONNECTDLG_H_
+#ifndef CORECONNECTDLG_H
+#define CORECONNECTDLG_H
 
 #include <QAbstractSocket>
 
@@ -34,91 +34,94 @@ class CoreConfigWizard;
 class CoreConnectDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    CoreConnectDlg(QWidget *parent = 0, bool = false);
-    ~CoreConnectDlg();
+public:
+  CoreConnectDlg(bool = false, QWidget *parent = 0);
+  ~CoreConnectDlg();
 
-  private slots:
+// signals:
+//   void newClientSyncer(ClientSyncer *);
 
-    /*** Phase Null: Accounts ***/
-    void restartPhaseNull();
+private slots:
+  /*** Phase Null: Accounts ***/
+  void restartPhaseNull();
 
-    void on_accountList_itemSelectionChanged();
-    void on_autoConnect_clicked(bool);
+  void on_accountList_itemSelectionChanged();
+  void on_autoConnect_clicked(bool);
 
-    void on_addAccount_clicked();
-    void on_editAccount_clicked();
-    void on_deleteAccount_clicked();
+  void on_addAccount_clicked();
+  void on_editAccount_clicked();
+  void on_deleteAccount_clicked();
+  void on_useInternalCore_clicked();
 
-    void on_accountList_itemDoubleClicked(QListWidgetItem *item);
-    void on_accountButtonBox_accepted();
+  void on_accountList_itemDoubleClicked(QListWidgetItem *item);
+  void on_accountButtonBox_accepted();
 
-    void setAccountWidgetStates();
+  void setAccountWidgetStates();
 
-    /*** Phase One: Connection ***/
-    void connectToCore();
+  /*** Phase One: Connection ***/
+  void connectToCore();
 
-    void initPhaseError(const QString &error);
-    void initPhaseMsg(const QString &msg);
-    void initPhaseSocketState(QAbstractSocket::SocketState);
+  void initPhaseError(const QString &error);
+  void initPhaseMsg(const QString &msg);
+  void initPhaseSocketState(QAbstractSocket::SocketState);
 
-    /*** Phase Two: Login ***/
-    void startLogin();
-    void doLogin();
-    void doLogin(const QVariantMap &loginData);
-    void loginFailed(const QString &);
-    void startCoreConfig(const QVariantList &backends);
-    void configWizardAccepted();
-    void configWizardRejected();
-    void on_launchCoreConfigWizard_clicked();
+  /*** Phase Two: Login ***/
+  void startLogin();
+  void doLogin();
+  void doLogin(const QVariantMap &loginData);
+  void loginFailed(const QString &);
+  void startCoreConfig(const QVariantList &backends);
+  void configWizardAccepted();
+  void configWizardRejected();
+  void on_launchCoreConfigWizard_clicked();
 
-    void setLoginWidgetStates();
+  void setLoginWidgetStates();
 
-    /*** Phase Three: Sync ***/
-    void startSync();
-    void syncFinished();
+  /*** Phase Three: Sync ***/
+  void startSync();
+  void syncFinished();
 
-    void coreSessionProgress(quint32, quint32);
-    void coreNetworksProgress(quint32, quint32);
-    void coreChannelsProgress(quint32, quint32);
-    void coreIrcUsersProgress(quint32, quint32);
+  void coreSessionProgress(quint32, quint32);
+  void coreNetworksProgress(quint32, quint32);
 
-  private:
-    Ui::CoreConnectDlg ui;
+private:
+  AccountId findFreeAccountId();
 
-    AccountId autoConnectAccount;
-    QHash<AccountId, QVariantMap> accounts;
-    QVariantMap accountData;
-    AccountId account;
+  Ui::CoreConnectDlg ui;
 
-    bool doingAutoConnect;
+  AccountId autoConnectAccount;
+  QHash<AccountId, QVariantMap> accounts;
+  AccountId _internalAccountId;
+  QVariantMap accountData;
+  AccountId account;
 
-    QVariantList storageBackends;
+  bool doingAutoConnect;
 
-    ClientSyncer *clientSyncer;
-    CoreConfigWizard *wizard;
+  QVariantList storageBackends;
+
+  ClientSyncer *clientSyncer;
+  CoreConfigWizard *wizard;
 };
 
 class CoreAccountEditDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    CoreAccountEditDlg(AccountId id, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
+public:
+  CoreAccountEditDlg(AccountId id, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
 
-    QVariantMap accountData();
+  QVariantMap accountData();
 
-  private slots:
-    void on_host_textChanged(const QString &);
-    void on_accountName_textChanged(const QString &);
-    void on_useRemote_toggled(bool);
+private slots:
+  void on_host_textChanged(const QString &);
+  void on_accountName_textChanged(const QString &);
 
-    void setWidgetStates();
+  void setWidgetStates();
 
-  private:
-    Ui::CoreAccountEditDlg ui;
+private:
+  Ui::CoreAccountEditDlg ui;
 
-    QStringList existing;
-    QVariantMap account;
+  QStringList existing;
+  QVariantMap account;
 };
 
 #endif