5 files changed, 25 insertions, 8 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 67cd8ae..8ce4ac8 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -49,6 +49,7 @@ void QtChatTabs::handleWidgetShown() {
 	if (!widget) {
 		return;
 	}
+	checkForFirstShow();
 	if (tabs_->indexOf(widget) >= 0) {
 		return;
 	}
@@ -59,10 +60,11 @@ void QtChatTabs::handleWidgetShown() {
 void QtChatTabs::handleWantsToActivate() {
 	QtTabbable* widget = qobject_cast<QtTabbable*>(sender());
 	Q_ASSERT(widget);
-	Q_ASSERT(tabs_->indexOf(widget) >= 0);
 	//Un-minimize and bring to front.
 	setWindowState(windowState() & ~Qt::WindowMinimized);
 	setWindowState(windowState() | Qt::WindowActive);
+	show();
+	widget->show();
 	tabs_->setCurrentWidget(widget);
 	widget->setFocus();
 	activateWindow();
@@ -124,4 +126,10 @@ void QtChatTabs::moveEvent(QMoveEvent*) {
 	emit geometryChanged();	
 }
 
+void QtChatTabs::checkForFirstShow() {
+	if (!isVisible()) {
+		showMinimized();
+	}
+}
+
 }
diff --git a/Swift/QtUI/QtChatTabs.h b/Swift/QtUI/QtChatTabs.h
index 12ab3b8..1869b41 100644
--- a/Swift/QtUI/QtChatTabs.h
+++ b/Swift/QtUI/QtChatTabs.h
@@ -30,6 +30,7 @@ namespace Swift {
 			void handleWidgetShown();
 			void handleWantsToActivate();
 		private:
+			void checkForFirstShow();
 			QtTabWidget* tabs_;
 	};
 }
diff --git a/Swift/QtUI/QtChatWindowFactory.cpp b/Swift/QtUI/QtChatWindowFactory.cpp
index ff927c9..ba1719e 100644
--- a/Swift/QtUI/QtChatWindowFactory.cpp
+++ b/Swift/QtUI/QtChatWindowFactory.cpp
@@ -26,10 +26,6 @@ QtChatWindowFactory::QtChatWindowFactory(QtTreeWidgetFactory *treeWidgetFactory,
 ChatWindow* QtChatWindowFactory::createChatWindow(const JID &contact) {
 	QtChatWindow *chatWindow = new QtChatWindow(P2QSTRING(contact.toString()), treeWidgetFactory_);
 	tabs_->addTab(chatWindow);
-	if (!tabs_->isVisible()) {
-		tabs_->showMinimized();
-		//tabs_->minimise();
-	}
 	//chatWindow->show();
 	return chatWindow;
 }
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index ff2a50b..a73da52 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -98,6 +98,9 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
 	layout->addStretch();
 	remember_ = new QCheckBox(tr("Remember Password?"), this);
 	layout->addWidget(remember_);
+	loginAutomatically_ = new QCheckBox(tr("Login Automatically?"), this);
+	layout->addWidget(loginAutomatically_);
+
 	connect(loginButton_, SIGNAL(clicked()), SLOT(loginClicked()));
 	stack_->addWidget(wrapperWidget);
 #ifdef SWIFTEN_PLATFORM_MACOSX
@@ -218,10 +221,16 @@ void QtLoginWindow::loggedOut() {
 	setEnabled(true);
 }
 
+void QtLoginWindow::setIsLoggingIn(bool loggingIn) {
+	setEnabled(!loggingIn);
+}
+
 void QtLoginWindow::loginClicked() {
-	setEnabled(false);
-	message_->setText("");
-	onLoginRequest(Q2PSTRING(username_->currentText()), Q2PSTRING(password_->text()), Q2PSTRING(certificateFile_), remember_->isChecked());
+	onLoginRequest(Q2PSTRING(username_->currentText()), Q2PSTRING(password_->text()), Q2PSTRING(certificateFile_), remember_->isChecked(), loginAutomatically_->isChecked());
+}
+
+void QtLoginWindow::setLoginAutomatically(bool loginAutomatically) {
+	loginAutomatically_->setChecked(loginAutomatically);
 }
 
 void QtLoginWindow::handleCertficateChecked(bool checked) {
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 69327e9..b609b64 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -28,6 +28,8 @@ namespace Swift {
 			virtual void loggedOut();
 			virtual void setMessage(const String& message);
 			virtual void addAvailableAccount(const String& defaultJID, const String& defaultPassword, const String& defaultCertificate);
+			virtual void setLoginAutomatically(bool loginAutomatically);
+			virtual void setIsLoggingIn(bool loggingIn);
 			static QRect defaultPosition();
 			void setGentleGeometry(const QRect&);
 			void selectUser(const String& user);
@@ -56,6 +58,7 @@ namespace Swift {
 			QLineEdit* password_;
 			QPushButton* loginButton_;
 			QCheckBox* remember_;
+			QCheckBox* loginAutomatically_;
 			QStackedWidget* stack_;
 			QLabel* message_;
 			QString certificateFile_;