X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3510926dc59f37092d9c1bffc87ac999c7308267;hb=9a7ec1bc5c61aeb53bf124231d10852797b98970;hp=a8dc4820fd8b216698dc86281edaadd1412523d1;hpb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67;p=quassel.git
diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index a8dc4820..3510926d 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -38,8 +38,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
doingAutoConnect = false;
ui.stackedWidget->setCurrentWidget(ui.accountPage);
- ui.accountButtonBox->setFocus();
- ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
CoreAccountSettings s;
AccountId lastacc = s.lastAccount();
@@ -58,6 +56,9 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
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 &)));
@@ -217,8 +218,6 @@ void CoreConnectDlg::connectToCore() {
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);
}
@@ -229,7 +228,7 @@ void CoreConnectDlg::initPhaseError(const QString &error) {
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);
+ 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()));
@@ -265,15 +264,16 @@ void CoreConnectDlg::restartPhaseNull() {
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.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();
@@ -465,15 +465,15 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
}
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();
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.useInternal->isChecked() || !ui.host->text().isEmpty());
ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
}