X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Fcoreconnectdlg.cpp;h=106103458630da3de18ce16e49865b94a0ac18b6;hp=d02d737bbf799fd8b1e193f8ad6804672b107d45;hb=5df99c1ab83baf3a6caef7e49177f84bd48d127e;hpb=ec9528b2997470953e3c4e456271e696026e9717 diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp index d02d737b..10610345 100644 --- a/src/qtopia/coreconnectdlg.cpp +++ b/src/qtopia/coreconnectdlg.cpp @@ -22,9 +22,9 @@ #include #include "coreconnectdlg.h" -#include "global.h" #include "client.h" #include "clientsettings.h" +#include "global.h" CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) { ui.setupUi(this); @@ -59,6 +59,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo ui.accountList->addItems(s.knownAccounts()); if(ui.accountList->count()) ui.accountList->item(0)->setSelected(true); setWidgetStates(); + doConnect(); // shortcut for development } CoreConnectDlg::~CoreConnectDlg() { @@ -236,7 +237,7 @@ void CoreConnectProgressDlg::coreConnected() { } void CoreConnectProgressDlg::coreConnectionError(QString err) { - QMessageBox::warning(this, tr("Connection Error"), tr("Could not connect to Quassel Core!
\n") + err, QMessageBox::Retry); + QMessageBox::warning(this, tr("Connection Error"), tr("Could not connect to Quassel Core!
\n") + err, QMessageBox::Ok); reject(); }