/***************************************************************************
- * 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 *
#include <QDebug>
#include <QMessageBox>
+#include <QNetworkProxy>
#include "coreconnectdlg.h"
+#include "client.h"
#include "clientsettings.h"
#include "clientsyncer.h"
-
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(parent) {
+#include "coreconfigwizard.h"
+#include "iconloader.h"
+#include "quassel.h"
+
+CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
+ : QDialog(parent),
+ _internalAccountId(0)
+{
ui.setupUi(this);
+ ui.editAccount->setIcon(SmallIcon("document-properties"));
+ ui.addAccount->setIcon(SmallIcon("list-add"));
+ ui.deleteAccount->setIcon(SmallIcon("list-remove"));
+ ui.connectIcon->setPixmap(BarIcon("network-disconnect"));
+ ui.secureConnection->setPixmap(SmallIcon("document-encrypt"));
+
+ if(Quassel::runMode() != Quassel::Monolithic) {
+ ui.useInternalCore->hide();
+ }
+
+ // make it look more native under Mac OS X:
+ setWindowFlags(Qt::Sheet);
clientSyncer = new ClientSyncer(this);
+ Client::registerClientSyncer(clientSyncer);
+// connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
+// emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
- setAttribute(Qt::WA_DeleteOnClose);
+ wizard = 0;
doingAutoConnect = false;
ui.stackedWidget->setCurrentWidget(ui.accountPage);
- ui.accountButtonBox->setFocus();
- ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
CoreAccountSettings s;
AccountId lastacc = s.lastAccount();
foreach(AccountId id, s.knownAccounts()) {
if(!id.isValid()) continue;
QVariantMap data = s.retrieveAccountData(id);
+ if(data.contains("InternalAccount") && data["InternalAccount"].toBool()) {
+ _internalAccountId = id;
+ continue;
+ }
+ data["AccountId"] = QVariant::fromValue<AccountId>(id);
accounts[id] = data;
QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));
setAccountWidgetStates();
+ ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus();
+ //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
+
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(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(startCoreSetup(const QVariantList &)), this, SLOT(startCoreConfig(const QVariantList &)));
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(channelsProgress(quint32, quint32)), this, SLOT(coreChannelsProgress(quint32, quint32)));
- connect(clientSyncer, SIGNAL(ircUsersProgress(quint32, quint32)), this, SLOT(coreIrcUsersProgress(quint32, quint32)));
- connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(accept()));
+ 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()));
for(int i = 0; i < ui.accountList->count(); i++) existing << ui.accountList->item(i)->text();
CoreAccountEditDlg dlg(0, QVariantMap(), existing, this);
if(dlg.exec() == QDialog::Accepted) {
- // find free ID
- AccountId id = accounts.count() + 1;
- for(AccountId i = 1; i <= accounts.count(); i++) {
- if(!accounts.keys().contains(i)) {
- id = i;
- break;
- }
- }
+ AccountId id = findFreeAccountId();
QVariantMap data = dlg.accountData();
data["AccountId"] = QVariant::fromValue<AccountId>(id);
accounts[id] = data;
connectToCore();
}
+void CoreConnectDlg::on_useInternalCore_clicked() {
+ clientSyncer->useInternalCore();
+ ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
+}
+
/*****************************************************
* Connecting to the Core
****************************************************/
/*** Phase One: initializing the core connection ***/
void CoreConnectDlg::connectToCore() {
- ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-disconnect")));
+ ui.secureConnection->hide();
+ ui.connectIcon->setPixmap(BarIcon("network-disconnect"));
ui.connectLabel->setText(tr("Connect to %1").arg(accountData["Host"].toString()));
ui.coreInfoLabel->setText("");
ui.loginStack->setCurrentWidget(ui.loginEmptyPage);
disconnect(ui.loginButtonBox, 0, this, 0);
connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull()));
-
- //connect(Client::instance(), SIGNAL(coreConnectionPhaseOne(const QVariantMap &)), this, SLOT(phaseOneFinished
clientSyncer->connectToCore(accountData);
}
void CoreConnectDlg::initPhaseError(const QString &error) {
doingAutoConnect = false;
- ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/status/dialog-error")));
+ ui.secureConnection->hide();
+ ui.connectIcon->setPixmap(BarIcon("dialog-error"));
//ui.connectLabel->setBrush(QBrush("red"));
ui.connectLabel->setText(tr("<div style=color:red;>Connection to %1 failed!</div>").arg(accountData["Host"].toString()));
ui.coreInfoLabel->setText(error);
ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Retry|QDialogButtonBox::Cancel);
- ui.loginButtonBox->button(QDialogButtonBox::Retry)->setDefault(true);
+ ui.loginButtonBox->button(QDialogButtonBox::Retry)->setFocus();
disconnect(ui.loginButtonBox, 0, this, 0);
connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(restartPhaseNull()));
connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
*********************************************************/
void CoreConnectDlg::startLogin() {
- ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-connect")));
+ ui.connectIcon->setPixmap(BarIcon("network-connect"));
ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
- ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
+ //ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+ ui.loginButtonBox->button(QDialogButtonBox::Ok)->setFocus();
if(!accountData["User"].toString().isEmpty()) {
ui.user->setText(accountData["User"].toString());
if(accountData["RememberPasswd"].toBool()) {
ui.password->setText(accountData["Password"].toString());
ui.rememberPasswd->setChecked(true);
- ui.loginButtonBox->setFocus();
+ ui.loginButtonBox->button(QDialogButtonBox::Ok)->setFocus();
} else {
ui.rememberPasswd->setChecked(false);
ui.password->setFocus();
}
void CoreConnectDlg::doLogin() {
+ QVariantMap loginData;
+ loginData["User"] = ui.user->text();
+ loginData["Password"] = ui.password->text();
+ loginData["RememberPasswd"] = ui.rememberPasswd->isChecked();
+ doLogin(loginData);
+}
+
+void CoreConnectDlg::doLogin(const QVariantMap &loginData) {
+ disconnect(ui.loginButtonBox, 0, this, 0);
+ connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(doLogin()));
+ connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull()));
+ ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
ui.loginGroup->setTitle(tr("Logging in..."));
ui.user->setDisabled(true);
ui.password->setDisabled(true);
ui.rememberPasswd->setDisabled(true);
ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
- accountData["User"] = ui.user->text();
- accountData["RememberPasswd"] = ui.rememberPasswd->isChecked();
- if(ui.rememberPasswd->isChecked()) accountData["Password"] = ui.password->text();
+ accountData["User"] = loginData["User"];
+ accountData["RememberPasswd"] = loginData["RememberPasswd"];
+ if(loginData["RememberPasswd"].toBool()) accountData["Password"] = loginData["Password"];
else accountData.remove("Password");
+ ui.user->setText(loginData["User"].toString());
+ ui.password->setText(loginData["Password"].toString());
+ ui.rememberPasswd->setChecked(loginData["RememberPasswd"].toBool());
CoreAccountSettings s;
s.storeAccountData(account, accountData);
- clientSyncer->loginToCore(ui.user->text(), ui.password->text());
+ clientSyncer->loginToCore(loginData["User"].toString(), loginData["Password"].toString());
}
void CoreConnectDlg::setLoginWidgetStates() {
}
void CoreConnectDlg::loginFailed(const QString &error) {
+ if(wizard) {
+ wizard->reject();
+ }
+ ui.connectIcon->setPixmap(BarIcon("dialog-error"));
+ ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
ui.loginGroup->setTitle(tr("Login"));
ui.user->setEnabled(true);
ui.password->setEnabled(true);
doingAutoConnect = false;
}
+void CoreConnectDlg::startCoreConfig(const QVariantList &backends) {
+ storageBackends = backends;
+ ui.loginStack->setCurrentWidget(ui.coreConfigPage);
+
+ //on_launchCoreConfigWizard_clicked();
+
+}
+
+void CoreConnectDlg::on_launchCoreConfigWizard_clicked() {
+ Q_ASSERT(!wizard);
+ wizard = new CoreConfigWizard(storageBackends, this);
+ connect(wizard, SIGNAL(setupCore(const QVariant &)), clientSyncer, SLOT(doCoreSetup(const QVariant &)));
+ connect(wizard, SIGNAL(loginToCore(const QVariantMap &)), this, SLOT(doLogin(const QVariantMap &)));
+ connect(clientSyncer, SIGNAL(coreSetupSuccess()), wizard, SLOT(coreSetupSuccess()));
+ connect(clientSyncer, SIGNAL(coreSetupFailed(const QString &)), wizard, SLOT(coreSetupFailed(const QString &)));
+ connect(wizard, SIGNAL(accepted()), this, SLOT(configWizardAccepted()));
+ connect(wizard, SIGNAL(rejected()), this, SLOT(configWizardRejected()));
+ connect(clientSyncer, SIGNAL(loginSuccess()), wizard, SLOT(loginSuccess()));
+ connect(clientSyncer, SIGNAL(syncFinished()), wizard, SLOT(syncFinished()));
+ wizard->show();
+}
+
+void CoreConnectDlg::configWizardAccepted() {
+
+ wizard->deleteLater();
+ wizard = 0;
+}
+
+void CoreConnectDlg::configWizardRejected() {
+
+ wizard->deleteLater();
+ wizard = 0;
+ //exit(1); // FIXME
+}
+
+
/************************************************************
* Phase Three: Syncing
************************************************************/
ui.sessionProgress->setValue(0);
ui.networksProgress->setRange(0, 1);
ui.networksProgress->setValue(0);
- ui.channelsProgress->setRange(0, 1);
- ui.channelsProgress->setValue(0);
- ui.ircUsersProgress->setRange(0, 1);
- ui.ircUsersProgress->setValue(0);
ui.stackedWidget->setCurrentWidget(ui.syncPage);
// clean up old page
ui.user->setEnabled(true);
ui.password->setEnabled(true);
ui.rememberPasswd->setEnabled(true);
- ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+ if(ui.loginButtonBox->standardButtons() & QDialogButtonBox::Ok) // in mono mode we don't show an Ok Button
+ ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
}
-
void CoreConnectDlg::coreSessionProgress(quint32 val, quint32 max) {
ui.sessionProgress->setRange(0, max);
ui.sessionProgress->setValue(val);
}
}
-void CoreConnectDlg::coreChannelsProgress(quint32 val, quint32 max) {
- if(max == 0) {
- ui.channelsProgress->setFormat("0/0");
- ui.channelsProgress->setRange(0, 1);
- ui.channelsProgress->setValue(1);
- } else {
- ui.channelsProgress->setFormat("%v/%m");
- ui.channelsProgress->setRange(0, max);
- ui.channelsProgress->setValue(val);
+void CoreConnectDlg::syncFinished() {
+ if(!wizard) accept();
+ else {
+ hide();
+ disconnect(wizard, 0, this, 0);
+ connect(wizard, SIGNAL(finished(int)), this, SLOT(accept()));
}
}
-void CoreConnectDlg::coreIrcUsersProgress(quint32 val, quint32 max) {
- if(max == 0) {
- ui.ircUsersProgress->setFormat("0/0");
- ui.ircUsersProgress->setRange(0, 1);
- ui.ircUsersProgress->setValue(1);
- } else {
- if(val % 100) return;
- ui.ircUsersProgress->setFormat("%v/%m");
- ui.ircUsersProgress->setRange(0, max);
- ui.ircUsersProgress->setValue(val);
+AccountId CoreConnectDlg::findFreeAccountId() {
+ for(AccountId i = 1;; i++) {
+ if(!accounts.contains(i) && i != _internalAccountId)
+ return i;
}
}
/*****************************************************************************************
* CoreAccountEditDlg
*****************************************************************************************/
-
-CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent) : QDialog(parent) {
+CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent)
+ : QDialog(parent)
+{
ui.setupUi(this);
+ ui.useSsl->setIcon(SmallIcon("document-encrypt"));
+
existing = _existing;
- account = acct;
if(id.isValid()) {
+ account = acct;
+
existing.removeAll(acct["AccountName"].toString());
ui.host->setText(acct["Host"].toString());
ui.port->setValue(acct["Port"].toUInt());
- ui.useInternal->setChecked(acct["UseInternal"].toBool());
ui.accountName->setText(acct["AccountName"].toString());
+#ifdef HAVE_SSL
+ ui.useSsl->setChecked(acct["useSsl"].toBool());
+#else
+ ui.useSsl->setChecked(false);
+ ui.useSsl->setEnabled(false);
+#endif
+ ui.useProxy->setChecked(acct["useProxy"].toBool());
+ ui.proxyHost->setText(acct["proxyHost"].toString());
+ ui.proxyPort->setValue(acct["proxyPort"].toUInt());
+ ui.proxyType->setCurrentIndex(acct["proxyType"].toInt() == QNetworkProxy::Socks5Proxy ? 0 : 1);
+ ui.proxyUser->setText(acct["proxyUser"].toString());
+ ui.proxyPassword->setText(acct["proxyPassword"].toString());
} else {
setWindowTitle(tr("Add Core Account"));
+#ifndef HAVE_SSL
+ ui.useSsl->setChecked(false);
+ ui.useSsl->setEnabled(false);
+#endif
}
}
QVariantMap CoreAccountEditDlg::accountData() {
- account["AccountName"] = ui.accountName->text();
- account["Host"] = ui.host->text();
+ account["AccountName"] = ui.accountName->text().trimmed();
+ account["Host"] = ui.host->text().trimmed();
account["Port"] = ui.port->value();
- account["UseInternal"] = ui.useInternal->isChecked();
+ account["useSsl"] = ui.useSsl->isChecked();
+ account["useProxy"] = ui.useProxy->isChecked();
+ account["proxyHost"] = ui.proxyHost->text().trimmed();
+ account["proxyPort"] = ui.proxyPort->value();
+ account["proxyType"] = ui.proxyType->currentIndex() == 0 ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
+ account["proxyUser"] = ui.proxyUser->text().trimmed();
+ account["proxyPassword"] = ui.proxyPassword->text().trimmed();
return account;
}
void CoreAccountEditDlg::setWidgetStates() {
- bool ok = !ui.accountName->text().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty());
+ bool ok = !ui.accountName->text().trimmed().isEmpty() && !existing.contains(ui.accountName->text()) && !ui.host->text().isEmpty();
ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
}
Q_UNUSED(text);
setWidgetStates();
}
-
-void CoreAccountEditDlg::on_useRemote_toggled(bool state) {
- Q_UNUSED(state);
- setWidgetStates();
-}
projects / quassel.git / blobdiff