Revert "Reset the input prior to processing it in order to prevent issues with per...

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

diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
index 3b6f584..b892a20 100644 (file)
--- a/src/qtui/coreconnectdlg.h
+++ b/src/qtui/coreconnectdlg.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2009 by the Quassel Project                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,52 +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 "ui_coreconnectdlg.h"
+#include <QDialog>
 
-class CoreConnectDlg: public QDialog {
+#include "coreaccount.h"
+
+#include "ui_coreconnectauthdlg.h"
+
+class CoreAccountSettingsPage;
+
+class CoreConnectDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    CoreConnectDlg(QWidget *parent, bool doAutoConnect = false);
-    ~CoreConnectDlg();
-    QVariant getCoreState();
+public:
+  CoreConnectDlg(QWidget *parent = 0);
+  AccountId selectedAccount() const;
+
+  void accept();
 
-    bool willDoInternalAutoConnect();
-    
-  public slots:
-    void doAutoConnect();
+private:
+  CoreAccountSettingsPage *_settingsPage;
+};
+
+class CoreConnectAuthDlg : public QDialog {
+  Q_OBJECT
 
-  private slots:
-    void createAccount();
-    void removeAccount();
-    void accountChanged(const QString & = "");
-    void setAccountEditEnabled(bool);
-    void autoConnectToggled(bool);
-    bool checkInputValid();
-    void hostEditChanged(QString);
-    void hostSelected();
-    void doConnect();
+public:
+  CoreConnectAuthDlg(CoreAccount *account, QWidget *parent = 0);
 
-    void coreConnected();
-    void coreConnectionError(QString);
-    //void coreConnectionMsg(const QString &);
-    //void coreConnectionProgress(uint partial, uint total);
-    void updateProgressBar(uint partial, uint total);
-    void recvCoreState(QVariant);
-    
-    void showConfigWizard(const QVariantMap &coredata);
+  void accept();
 
-  private:
-    Ui::CoreConnectDlg ui;
-    QVariant coreState;
+private slots:
+  void setButtonStates();
 
-    void cancelConnect();
-    void setStartState();
-    QVariantMap accountData;
-    QString curacc;
+private:
+  Ui::CoreConnectAuthDlg ui;
+  CoreAccount *_account;
 };
 
 #endif