1 files changed, 17 insertions, 0 deletions
diff --git a/Swift/QtUI/QtConnectionSettingsWindow.cpp b/Swift/QtUI/QtConnectionSettingsWindow.cpp
index ea693cf..2da527a 100644
--- a/Swift/QtUI/QtConnectionSettingsWindow.cpp
+++ b/Swift/QtUI/QtConnectionSettingsWindow.cpp
@@ -18,5 +18,8 @@
 #include <QFile>
 #include <QTextStream>
+#include <QMessageBox>
+
 #include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtURLValidator.h>
 
 namespace Swift {
@@ -44,4 +47,9 @@ QtConnectionSettingsWindow::QtConnectionSettingsWindow(const ClientOptions& opti
 	connect(ui.manual_proxyType, SIGNAL(currentIndexChanged(int)), SLOT(handleProxyTypeChanged(int)));
 
+	connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(handleAcceptRequested()));
+
+	QtURLValidator* urlValidator = new QtURLValidator(this);
+	ui.bosh_uri->setValidator(urlValidator);
+
 	ui.manual_useTLS->setCurrentIndex(2);
 
@@ -102,4 +110,13 @@ void QtConnectionSettingsWindow::handleProxyTypeChanged(int index) {
 }
 
+void QtConnectionSettingsWindow::handleAcceptRequested() {
+	if (ui.connectionMethod->currentIndex() != 2 || ui.bosh_uri->hasAcceptableInput()) {
+		accept();
+	}
+	else {
+		QMessageBox::critical(this, tr("Configuration invalid"), tr("The provided BOSH URL is not valid."));
+	}
+}
+
 ClientOptions QtConnectionSettingsWindow::getOptions() {
 	ClientOptions options;