X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.h;h=b892a20d9bbc3f262270a44dd76f95c44a254e55;hp=4714a012826cc6572add4b562ab02400c3f7fc5b;hb=a72e2b4a90ce18c58b54e111161691ba008dc47d;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
index 4714a012..b892a20d 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) 2009 by the Quassel Project                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,96 +18,44 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CORECONNECTDLG_H_
-#define _CORECONNECTDLG_H_
+#ifndef CORECONNECTDLG_H
+#define CORECONNECTDLG_H_
 
-#include <QAbstractSocket>
+#include <QDialog>
 
-#include "ui_coreconnectdlg.h"
-#include "ui_coreaccounteditdlg.h"
+#include "coreaccount.h"
 
-class ClientSyncer;
+#include "ui_coreconnectauthdlg.h"
+
+class CoreAccountSettingsPage;
 
 class CoreConnectDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    CoreConnectDlg(QWidget *parent = 0, bool = false);
-    ~CoreConnectDlg();
-
-  private slots:
-
-    /*** Phase Null: Accounts ***/
-    void restartPhaseNull();
-
-    void on_accountList_itemSelectionChanged();
-    void on_autoConnect_clicked(bool);
-
-    void on_addAccount_clicked();
-    void on_editAccount_clicked();
-    void on_deleteAccount_clicked();
-
-    void on_accountList_itemDoubleClicked(QListWidgetItem *item);
-    void on_accountButtonBox_accepted();
-
-    void setAccountWidgetStates();
-
-    /*** Phase One: Connection ***/
-    void connectToCore();
-
-    void initPhaseError(const QString &error);
-    void initPhaseMsg(const QString &msg);
-    void initPhaseSocketState(QAbstractSocket::SocketState);
+public:
+  CoreConnectDlg(QWidget *parent = 0);
+  AccountId selectedAccount() const;
 
-    /*** Phase Two: Login ***/
-    void startLogin();
-    void doLogin();
-    void loginFailed(const QString &);
+  void accept();
 
-    void setLoginWidgetStates();
-
-    /*** Phase Three: Sync ***/
-    void startSync();
-
-    void coreSessionProgress(quint32, quint32);
-    void coreNetworksProgress(quint32, quint32);
-    void coreChannelsProgress(quint32, quint32);
-    void coreIrcUsersProgress(quint32, quint32);
-
-  private:
-    Ui::CoreConnectDlg ui;
-
-    QString autoConnectAccount;
-    QHash<QString, QVariantMap> accounts;
-    QVariantMap account;
-    QString accountName;
-
-    bool doingAutoConnect;
-
-    ClientSyncer *clientSyncer;
+private:
+  CoreAccountSettingsPage *_settingsPage;
 };
 
-class CoreAccountEditDlg : public QDialog {
+class CoreConnectAuthDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    CoreAccountEditDlg(const QString &name, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
-
-    QString accountName() const;
-    QVariantMap accountData();
-
-  private slots:
-    void on_host_textChanged(const QString &);
-    void on_accountName_textChanged(const QString &);
-    void on_useRemote_toggled(bool);
+public:
+  CoreConnectAuthDlg(CoreAccount *account, QWidget *parent = 0);
 
-    void setWidgetStates();
+  void accept();
 
-  private:
-    Ui::CoreAccountEditDlg ui;
+private slots:
+  void setButtonStates();
 
-    QStringList existing;
-    QVariantMap account;
+private:
+  Ui::CoreConnectAuthDlg ui;
+  CoreAccount *_account;
 };
 
 #endif