Moving InputLine (ex-ChannelWidgetInput) to uisupport, since we'll need

[quassel.git] / src / qtopia / coreconnectdlg.cpp

diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp
index d02d737..1061034 100644 (file)
--- a/src/qtopia/coreconnectdlg.cpp
+++ b/src/qtopia/coreconnectdlg.cpp
@@ -22,9 +22,9 @@
 #include <QSoftMenuBar>
 
 #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("<b>Could not connect to Quassel Core!</b><br>\n") + err, QMessageBox::Retry);
+  QMessageBox::warning(this, tr("Connection Error"), tr("<b>Could not connect to Quassel Core!</b><br>\n") + err, QMessageBox::Ok);
   reject();
 }