X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=220e28f3c89fe9949018f6994c970fbf639d6c49;hp=250c0085e71fcf44f51f7bebd2d742695d7ca560;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=ee6e4f90ce63d7eb3a54937cffb33510398d2349 diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 250c0085..220e28f3 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,413 +15,93 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include - #include "coreconnectdlg.h" -#include "clientsettings.h" -#include "clientsyncer.h" - -CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(parent) { - ui.setupUi(this); - - clientSyncer = new ClientSyncer(this); - - setAttribute(Qt::WA_DeleteOnClose); - - doingAutoConnect = false; - - ui.stackedWidget->setCurrentWidget(ui.accountPage); - ui.accountButtonBox->setFocus(); - ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true); - - CoreAccountSettings s; - AccountId lastacc = s.lastAccount(); - autoConnectAccount = s.autoConnectAccount(); - QListWidgetItem *currentItem = 0; - foreach(AccountId id, s.knownAccounts()) { - if(!id.isValid()) continue; - QVariantMap data = s.retrieveAccountData(id); - accounts[id] = data; - QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList); - item->setData(Qt::UserRole, QVariant::fromValue(id)); - if(id == lastacc) currentItem = item; - } - if(currentItem) ui.accountList->setCurrentItem(currentItem); - else ui.accountList->setCurrentRow(0); +#include +#include - setAccountWidgetStates(); - - 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(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(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates())); - connect(ui.password, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates())); +#include "clientsettings.h" +#include "coreaccountsettingspage.h" +#include "icon.h" - connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull())); - connect(ui.syncButtonBox->button(QDialogButtonBox::Abort), SIGNAL(clicked()), this, SLOT(restartPhaseNull())); +CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent) +{ + _settingsPage = new CoreAccountSettingsPage(this); + _settingsPage->setStandAlone(true); + _settingsPage->load(); - if(autoconnect && ui.accountList->count() && autoConnectAccount.isValid() - && autoConnectAccount == ui.accountList->currentItem()->data(Qt::UserRole).value()) { - doingAutoConnect = true; - on_accountButtonBox_accepted(); - } -} - -CoreConnectDlg::~CoreConnectDlg() { - if(ui.accountList->selectedItems().count()) { CoreAccountSettings s; - s.setLastAccount(ui.accountList->selectedItems()[0]->data(Qt::UserRole).value()); - } -} - - -/**************************************************** - * Account Management - ***************************************************/ - -void CoreConnectDlg::on_accountList_itemSelectionChanged() { - setAccountWidgetStates(); -} - -void CoreConnectDlg::setAccountWidgetStates() { - QList selectedItems = ui.accountList->selectedItems(); - ui.editAccount->setEnabled(selectedItems.count()); - ui.deleteAccount->setEnabled(selectedItems.count()); - ui.autoConnect->setEnabled(selectedItems.count()); - if(selectedItems.count()) { - ui.autoConnect->setChecked(selectedItems[0]->data(Qt::UserRole).value() == autoConnectAccount); - } - ui.accountButtonBox->button(QDialogButtonBox::Ok)->setEnabled(ui.accountList->count()); -} - -void CoreConnectDlg::on_autoConnect_clicked(bool state) { - if(!state) { - autoConnectAccount = 0; - } else { - if(ui.accountList->selectedItems().count()) { - autoConnectAccount = ui.accountList->selectedItems()[0]->data(Qt::UserRole).value(); - } else { - qWarning() << "Checked auto connect without an enabled item!"; // should never happen! - autoConnectAccount = 0; - } - } - setAccountWidgetStates(); -} - -void CoreConnectDlg::on_addAccount_clicked() { - QStringList existing; - 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; - } - } - QVariantMap data = dlg.accountData(); - data["AccountId"] = QVariant::fromValue(id); - accounts[id] = data; - QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList); - item->setData(Qt::UserRole, QVariant::fromValue(id)); - ui.accountList->setCurrentItem(item); - } -} - -void CoreConnectDlg::on_editAccount_clicked() { - QStringList existing; - for(int i = 0; i < ui.accountList->count(); i++) existing << ui.accountList->item(i)->text(); - AccountId id = ui.accountList->currentItem()->data(Qt::UserRole).value(); - QVariantMap acct = accounts[id]; - CoreAccountEditDlg dlg(id, acct, existing, this); - if(dlg.exec() == QDialog::Accepted) { - QVariantMap data = dlg.accountData(); - ui.accountList->currentItem()->setText(data["AccountName"].toString()); - accounts[id] = data; - } -} - -void CoreConnectDlg::on_deleteAccount_clicked() { - AccountId id = ui.accountList->currentItem()->data(Qt::UserRole).value(); - int ret = QMessageBox::question(this, tr("Remove Account Settings"), - tr("Do you really want to remove your local settings for this Quassel Core account?
" - "Note: This will not remove or change any data on the Core itself!"), - QMessageBox::Yes|QMessageBox::No, QMessageBox::No); - if(ret == QMessageBox::Yes) { - int idx = ui.accountList->currentRow(); - delete ui.accountList->takeItem(idx); - ui.accountList->setCurrentRow(qMin(idx, ui.accountList->count()-1)); - accounts[id]["Delete"] = true; // we only flag this here, actual deletion happens on accept! - setAccountWidgetStates(); - } -} - -void CoreConnectDlg::on_accountList_itemDoubleClicked(QListWidgetItem *item) { - Q_UNUSED(item); - on_accountButtonBox_accepted(); -} - -void CoreConnectDlg::on_accountButtonBox_accepted() { - // save accounts - CoreAccountSettings s; - foreach(QVariantMap acct, accounts.values()) { - AccountId id = acct["AccountId"].value(); - if(acct.contains("Delete")) { - s.removeAccount(id); - } else { - s.storeAccountData(id, acct); - } - } - s.setAutoConnectAccount(autoConnectAccount); - - ui.stackedWidget->setCurrentWidget(ui.loginPage); - account = ui.accountList->currentItem()->data(Qt::UserRole).value(); - accountData = accounts[account]; - s.setLastAccount(account); - connectToCore(); -} + AccountId lastAccount = s.lastAccount(); + if (lastAccount.isValid()) + _settingsPage->setSelectedAccount(lastAccount); -/***************************************************** - * Connecting to the Core - ****************************************************/ + setWindowTitle(tr("Connect to Core")); + setWindowIcon(icon::get("network-disconnect")); -/*** Phase One: initializing the core connection ***/ + auto *layout = new QVBoxLayout(this); + layout->addWidget(_settingsPage); -void CoreConnectDlg::connectToCore() { - ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-disconnect"))); - ui.connectLabel->setText(tr("Connect to %1").arg(accountData["Host"].toString())); - ui.coreInfoLabel->setText(""); - ui.loginStack->setCurrentWidget(ui.loginEmptyPage); - ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true); - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDisabled(true); - disconnect(ui.loginButtonBox, 0, this, 0); - connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull())); + auto *buttonBox = new QDialogButtonBox(this); + buttonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); + layout->addWidget(buttonBox); - - //connect(Client::instance(), SIGNAL(coreConnectionPhaseOne(const QVariantMap &)), this, SLOT(phaseOneFinished - clientSyncer->connectToCore(accountData); + connect(_settingsPage, SIGNAL(connectToCore(AccountId)), SLOT(accept())); + connect(buttonBox, SIGNAL(accepted()), SLOT(accept())); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } -void CoreConnectDlg::initPhaseError(const QString &error) { - doingAutoConnect = false; - ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/status/dialog-error"))); - //ui.connectLabel->setBrush(QBrush("red")); - ui.connectLabel->setText(tr("
Connection to %1 failed!
").arg(accountData["Host"].toString())); - ui.coreInfoLabel->setText(error); - ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Retry|QDialogButtonBox::Cancel); - ui.loginButtonBox->button(QDialogButtonBox::Retry)->setDefault(true); - disconnect(ui.loginButtonBox, 0, this, 0); - connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(restartPhaseNull())); - connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(reject())); -} -void CoreConnectDlg::initPhaseMsg(const QString &msg) { - ui.coreInfoLabel->setText(msg); +AccountId CoreConnectDlg::selectedAccount() const +{ + return _settingsPage->selectedAccount(); } -void CoreConnectDlg::initPhaseSocketState(QAbstractSocket::SocketState state) { - QString s; - QString host = accountData["Host"].toString(); - switch(state) { - case QAbstractSocket::UnconnectedState: s = tr("Not connected to %1.").arg(host); break; - case QAbstractSocket::HostLookupState: s = tr("Looking up %1...").arg(host); break; - case QAbstractSocket::ConnectingState: s = tr("Connecting to %1...").arg(host); break; - case QAbstractSocket::ConnectedState: s = tr("Connected to %1").arg(host); break; - default: s = tr("Unknown connection state to %1"); break; - } - ui.connectLabel->setText(s); -} -void CoreConnectDlg::restartPhaseNull() { - doingAutoConnect = false; - ui.stackedWidget->setCurrentWidget(ui.accountPage); - clientSyncer->disconnectFromCore(); +void CoreConnectDlg::accept() +{ + _settingsPage->save(); + QDialog::accept(); } -/********************************************************* - * Phase Two: Login - *********************************************************/ -void CoreConnectDlg::startLogin() { - ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-connect"))); - ui.loginStack->setCurrentWidget(ui.loginCredentialsPage); - ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry(); - ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true); - 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(); - } else { - ui.rememberPasswd->setChecked(false); - ui.password->setFocus(); - } - } else ui.user->setFocus(); - disconnect(ui.loginButtonBox, 0, this, 0); - connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(doLogin())); - connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull())); - if(doingAutoConnect) doLogin(); -} +/******** CoreConnectAuthDlg ****************************************************************/ -void CoreConnectDlg::doLogin() { - 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(); - else accountData.remove("Password"); - CoreAccountSettings s; - s.storeAccountData(account, accountData); - clientSyncer->loginToCore(ui.user->text(), ui.password->text()); -} - -void CoreConnectDlg::setLoginWidgetStates() { - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.user->text().isEmpty() || ui.password->text().isEmpty()); -} +CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount *account, QWidget *parent) + : QDialog(parent), + _account(account) +{ + ui.setupUi(this); -void CoreConnectDlg::loginFailed(const QString &error) { - ui.loginGroup->setTitle(tr("Login")); - ui.user->setEnabled(true); - ui.password->setEnabled(true); - ui.rememberPasswd->setEnabled(true); - ui.coreInfoLabel->setText(error); - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - ui.password->setFocus(); - doingAutoConnect = false; -} + connect(ui.user, &QLineEdit::textChanged, this, &CoreConnectAuthDlg::setButtonStates); + connect(ui.password, &QLineEdit::textChanged, this, &CoreConnectAuthDlg::setButtonStates); -/************************************************************ - * Phase Three: Syncing - ************************************************************/ + ui.label->setText(tr("Please enter your credentials for %1:").arg(account->accountName())); + ui.user->setText(account->user()); + ui.password->setText(account->password()); + ui.rememberPasswd->setChecked(account->storePassword()); -void CoreConnectDlg::startSync() { - ui.sessionProgress->setRange(0, 1); - 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.loginGroup->setTitle(tr("Login")); - ui.user->setEnabled(true); - ui.password->setEnabled(true); - ui.rememberPasswd->setEnabled(true); - ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true); + if (ui.user->text().isEmpty()) + ui.user->setFocus(); + else + ui.password->setFocus(); } -void CoreConnectDlg::coreSessionProgress(quint32 val, quint32 max) { - ui.sessionProgress->setRange(0, max); - ui.sessionProgress->setValue(val); - -} +void CoreConnectAuthDlg::accept() +{ + _account->setUser(ui.user->text()); + _account->setPassword(ui.password->text()); + _account->setStorePassword(ui.rememberPasswd->isChecked()); -void CoreConnectDlg::coreNetworksProgress(quint32 val, quint32 max) { - if(max == 0) { - ui.networksProgress->setFormat("0/0"); - ui.networksProgress->setRange(0, 1); - ui.networksProgress->setValue(1); - } else { - ui.networksProgress->setFormat("%v/%m"); - ui.networksProgress->setRange(0, max); - ui.networksProgress->setValue(val); - } + QDialog::accept(); } -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::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); - } -} - -/***************************************************************************************** - * CoreAccountEditDlg - *****************************************************************************************/ - -CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent) : QDialog(parent) { - ui.setupUi(this); - existing = _existing; - account = acct; - if(id.isValid()) { - 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()); - } else { - setWindowTitle(tr("Add Core Account")); - } -} - -QVariantMap CoreAccountEditDlg::accountData() { - account["AccountName"] = ui.accountName->text(); - account["Host"] = ui.host->text(); - account["Port"] = ui.port->value(); - account["UseInternal"] = ui.useInternal->isChecked(); - return account; -} - -void CoreAccountEditDlg::setWidgetStates() { - bool ok = !ui.accountName->text().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty()); - ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok); -} - -void CoreAccountEditDlg::on_host_textChanged(const QString &text) { - Q_UNUSED(text); - setWidgetStates(); -} - -void CoreAccountEditDlg::on_accountName_textChanged(const QString &text) { - Q_UNUSED(text); - setWidgetStates(); -} -void CoreAccountEditDlg::on_useRemote_toggled(bool state) { - Q_UNUSED(state); - setWidgetStates(); +void CoreConnectAuthDlg::setButtonStates() +{ + bool valid = !(ui.user->text().isEmpty() || ui.password->text().isEmpty()); + ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid); }