X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=a3585f780618600b1b0b2e3aab00f4d0770fe163;hp=3b4a21a66fda2c17b2c3571b9bce72e11ec1b2df;hb=e5ef65b239e9a128a5cf86e6eef9bce1fd098448;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 3b4a21a6..a3585f78 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -37,6 +37,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
 
   ui.stackedWidget->setCurrentWidget(ui.accountPage);
   ui.accountButtonBox->setFocus();
+  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
   CoreAccountSettings s;
   QString lastacc = s.lastAccount();
@@ -186,6 +187,7 @@ void CoreConnectDlg::connectToCore() {
   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()));
@@ -202,6 +204,7 @@ void CoreConnectDlg::initPhaseError(const QString &error) {
   ui.connectLabel->setText(tr("<div style=color:red;>Connection to %1 failed!</div>").arg(account["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()));
@@ -239,11 +242,13 @@ void CoreConnectDlg::startLogin() {
   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(!account["User"].toString().isEmpty()) {
     ui.user->setText(account["User"].toString());
     if(account["RememberPasswd"].toBool()) {
       ui.password->setText(account["Password"].toString());
       ui.rememberPasswd->setChecked(true);
+      ui.loginButtonBox->setFocus();
     } else {
       ui.rememberPasswd->setChecked(false);
       ui.password->setFocus();
@@ -267,7 +272,7 @@ void CoreConnectDlg::doLogin() {
   else account.remove("Password");
   CoreAccountSettings s;
   s.storeAccount(accountName, account);
-  clientSyncer->loginToCore(account["User"].toString(), account["Password"].toString());
+  clientSyncer->loginToCore(ui.user->text(), ui.password->text());
 }
 
 void CoreConnectDlg::setLoginWidgetStates() {