projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change NotificationsSettingsPage such that it plugs in the registered backends'
[quassel.git]
/
src
/
qtui
/
coreconnectdlg.h
diff --git
a/src/qtui/coreconnectdlg.h
b/src/qtui/coreconnectdlg.h
index
4714a01
..
99e3379
100644
(file)
--- a/
src/qtui/coreconnectdlg.h
+++ b/
src/qtui/coreconnectdlg.h
@@
-23,16
+23,19
@@
#include <QAbstractSocket>
#include <QAbstractSocket>
+#include "types.h"
+
#include "ui_coreconnectdlg.h"
#include "ui_coreaccounteditdlg.h"
class ClientSyncer;
#include "ui_coreconnectdlg.h"
#include "ui_coreaccounteditdlg.h"
class ClientSyncer;
+class CoreConfigWizard;
class CoreConnectDlg : public QDialog {
Q_OBJECT
public:
class CoreConnectDlg : public QDialog {
Q_OBJECT
public:
- CoreConnectDlg(
QWidget *parent = 0, bool = false
);
+ CoreConnectDlg(
bool = false, QWidget *parent = 0
);
~CoreConnectDlg();
private slots:
~CoreConnectDlg();
private slots:
@@
-58,42
+61,49
@@
class CoreConnectDlg : public QDialog {
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);
+ void encrypted(bool);
/*** Phase Two: Login ***/
void startLogin();
void doLogin();
/*** Phase Two: Login ***/
void startLogin();
void doLogin();
+ void doLogin(const QVariantMap &loginData);
void loginFailed(const QString &);
void loginFailed(const QString &);
+ void startCoreConfig(const QVariantList &backends);
+ void configWizardAccepted();
+ void configWizardRejected();
+ void on_launchCoreConfigWizard_clicked();
void setLoginWidgetStates();
/*** Phase Three: Sync ***/
void startSync();
void setLoginWidgetStates();
/*** Phase Three: Sync ***/
void startSync();
+ void syncFinished();
void coreSessionProgress(quint32, quint32);
void coreNetworksProgress(quint32, quint32);
void coreSessionProgress(quint32, quint32);
void coreNetworksProgress(quint32, quint32);
- void coreChannelsProgress(quint32, quint32);
- void coreIrcUsersProgress(quint32, quint32);
private:
Ui::CoreConnectDlg ui;
private:
Ui::CoreConnectDlg ui;
-
QString
autoConnectAccount;
- QHash<
QString
, QVariantMap> accounts;
- QVariantMap account;
-
QString accountName
;
+
AccountId
autoConnectAccount;
+ QHash<
AccountId
, QVariantMap> accounts;
+ QVariantMap account
Data
;
+
AccountId account
;
bool doingAutoConnect;
bool doingAutoConnect;
+ QVariantList storageBackends;
+
ClientSyncer *clientSyncer;
ClientSyncer *clientSyncer;
+ CoreConfigWizard *wizard;
};
class CoreAccountEditDlg : public QDialog {
Q_OBJECT
public:
};
class CoreAccountEditDlg : public QDialog {
Q_OBJECT
public:
- CoreAccountEditDlg(
const QString &name
, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ CoreAccountEditDlg(
AccountId id
, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
- QString accountName() const;
QVariantMap accountData();
private slots:
QVariantMap accountData();
private slots: