X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3f144a9677dd155843a083d21820c038b974e7b5;hb=12493689255317b4816000b22bccd1961dbfd8d8;hp=a8dc4820fd8b216698dc86281edaadd1412523d1;hpb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67;p=quassel.git diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index a8dc4820..3f144a96 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,8 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare setAccountWidgetStates(); + ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus(); + 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 +217,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 +227,7 @@ void CoreConnectDlg::initPhaseError(const QString &error) { ui.connectLabel->setText(tr("