X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3510926dc59f37092d9c1bffc87ac999c7308267;hb=d69da0b56103c347107fb490008b5c6b0d59e3df;hp=b9f498a1312b2ca43e2c6b5af1228c50be5eac45;hpb=b833d421907118038b8680f6184bb2dea444cc74;p=quassel.git

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index b9f498a1..3510926d 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -55,8 +55,8 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
   else ui.accountList->setCurrentRow(0);
 
   setAccountWidgetStates();
-  //ui.accountButtonBox->setFocus();
-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+
+  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus();
   //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
 
   connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
@@ -110,7 +110,6 @@ void CoreConnectDlg::setAccountWidgetStates() {
     ui.autoConnect->setChecked(selectedItems[0]->data(Qt::UserRole).value<AccountId>() == autoConnectAccount);
   }
   ui.accountButtonBox->button(QDialogButtonBox::Ok)->setEnabled(ui.accountList->count());
-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 }
 
 void CoreConnectDlg::on_autoConnect_clicked(bool state) {
@@ -229,7 +228,7 @@ void CoreConnectDlg::initPhaseError(const QString &error) {
   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()));
@@ -268,12 +267,13 @@ void CoreConnectDlg::startLogin() {
   //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);
 }