/***************************************************************************
- * 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 *
setWindowFlags(Qt::Sheet);
clientSyncer = new ClientSyncer(this);
- connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
- emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
+ Client::registerClientSyncer(clientSyncer);
+// connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
+// emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
wizard = 0;
connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
connect(clientSyncer, SIGNAL(connectionError(const QString &)), this, SLOT(initPhaseError(const QString &)));
connect(clientSyncer, SIGNAL(connectionMsg(const QString &)), this, SLOT(initPhaseMsg(const QString &)));
- connect(clientSyncer, SIGNAL(encrypted(bool)), this, SLOT(encrypted(bool)));
connect(clientSyncer, SIGNAL(startLogin()), this, SLOT(startLogin()));
connect(clientSyncer, SIGNAL(loginFailed(const QString &)), this, SLOT(loginFailed(const QString &)));
connect(clientSyncer, SIGNAL(loginSuccess()), this, SLOT(startSync()));
connect(clientSyncer, SIGNAL(sessionProgress(quint32, quint32)), this, SLOT(coreSessionProgress(quint32, quint32)));
connect(clientSyncer, SIGNAL(networksProgress(quint32, quint32)), this, SLOT(coreNetworksProgress(quint32, quint32)));
connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(syncFinished()));
+ connect(clientSyncer, SIGNAL(encrypted()), ui.secureConnection, SLOT(show()));
connect(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates()));
connect(ui.password, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates()));
}
void CoreConnectDlg::on_useInternalCore_clicked() {
- if(!_internalAccountId.isValid()) {
- _internalAccountId = findFreeAccountId();
- QVariantMap data;
- data["InternalAccount"] = true;
- CoreAccountSettings accountSettings;
- accountSettings.storeAccountData(_internalAccountId, data);
- }
- clientSyncer->useInternalCore(_internalAccountId);
+ clientSyncer->useInternalCore();
ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
- startSync();
}
/*****************************************************
ui.coreInfoLabel->setText(msg);
}
-void CoreConnectDlg::encrypted(bool useSsl) {
- if(useSsl)
- ui.secureConnection->show();
- else
- ui.secureConnection->hide();
-}
-
void CoreConnectDlg::initPhaseSocketState(QAbstractSocket::SocketState state) {
QString s;
QString host = accountData["Host"].toString();