6 files changed, 90 insertions, 17 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 2e640e0..8800da0 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -1,105 +1,95 @@
 #include "Swift/Controllers/MainController.h"
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 #include <stdlib.h>
 
 #include "Swiften/Application/Application.h"
 #include "Swiften/Application/ApplicationMessageDisplay.h"
 #include "Swift/Controllers/ChatController.h"
 #include "Swift/Controllers/ChatWindowFactory.h"
 #include "Swift/Controllers/EventController.h"
 #include "Swift/Controllers/UIInterfaces/LoginWindow.h"
 #include "Swift/Controllers/UIInterfaces/LoginWindowFactory.h"
 #include "Swift/Controllers/MainWindow.h"
 #include "Swift/Controllers/MainWindowFactory.h"
 #include "Swift/Controllers/MUCController.h"
 #include "Swift/Controllers/NickResolver.h"
 #include "Swift/Controllers/ProfileSettingsProvider.h"
 #include "Swift/Controllers/RosterController.h"
 #include "Swift/Controllers/SoundEventController.h"
 #include "Swift/Controllers/SoundPlayer.h"
 #include "Swift/Controllers/SystemTray.h"
 #include "Swift/Controllers/SystemTrayController.h"
 #include "Swift/Controllers/XMLConsoleController.h"
 #include "Swift/Controllers/XMPPRosterController.h"
 #include "Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h"
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swiften/Base/foreach.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/Client/Client.h"
 #include "Swiften/Presence/PresenceSender.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Elements/VCardUpdate.h"
 #include "Swiften/Queries/Responders/SoftwareVersionResponder.h"
 #include "Swiften/Roster/TreeWidgetFactory.h"
 #include "Swiften/Settings/SettingsProvider.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Queries/Responders/DiscoInfoResponder.h"
 #include "Swiften/Disco/CapsInfoGenerator.h"
 #include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
 #include "Swiften/Queries/Requests/GetVCardRequest.h"
 #include "Swiften/Avatars/AvatarFileStorage.h"
 #include "Swiften/Avatars/AvatarManager.h"
 #include "Swiften/StringCodecs/SHA1.h"
 #include "Swiften/StringCodecs/Hexify.h"
 
-namespace {
-	void printIncomingData(const Swift::String& data) {
-		std::cout << "<- " << data << std::endl;
-	}
-
-	void printOutgoingData(const Swift::String& data) {
-		std::cout << "-> " << data << std::endl;
-	}
-}
-
 namespace Swift {
 
 static const String CLIENT_NAME = "Swift";
 static const String CLIENT_VERSION = "0.3";
 static const String CLIENT_NODE = "http://swift.im";
 
 typedef std::pair<JID, ChatController*> JIDChatControllerPair;
 typedef std::pair<JID, MUCController*> JIDMUCControllerPair;
 
 MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory)
 		: timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), presenceSender_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {
 	application_ = application;
 	presenceOracle_ = NULL;
 	avatarManager_ = NULL;
 	uiEventStream_ = new UIEventStream();
 
 	avatarStorage_ = new AvatarFileStorage(application_->getAvatarDir());
 
 	eventController_ = new EventController();
 	eventController_->onEventQueueLengthChange.connect(boost::bind(&MainController::handleEventQueueLengthChange, this, _1));
 	systemTrayController_ = new SystemTrayController(eventController_, systemTray);
 	soundEventController_ = new SoundEventController(eventController_, soundPlayer, settings->getBoolSetting("playSounds", true));
 	loginWindow_ = loginWindowFactory_->createLoginWindow(uiEventStream_);
 	foreach (String profile, settings->getAvailableProfiles()) {
 		ProfileSettingsProvider* profileSettings = new ProfileSettingsProvider(profile, settings);
 		loginWindow_->addAvailableAccount(profileSettings->getStringSetting("jid"), profileSettings->getStringSetting("pass"), profileSettings->getStringSetting("certificate"));
 		delete profileSettings;
 	}
 	loginWindow_->selectUser(settings_->getStringSetting("lastLoginJID"));
 	loginWindow_->onLoginRequest.connect(boost::bind(&MainController::handleLoginRequest, this, _1, _2, _3, _4));
 	loginWindow_->onCancelLoginRequest.connect(boost::bind(&MainController::handleCancelLoginRequest, this));
 
 	idleDetector_.setIdleTimeSeconds(600);
 	idleDetector_.onIdleChanged.connect(boost::bind(&MainController::handleInputIdleChanged, this, _1));
 
 	xmlConsoleController_ = new XMLConsoleController(uiEventStream_, xmlConsoleWidgetFactory);
 }
 
 MainController::~MainController() {
 	foreach (JIDChatControllerPair controllerPair, chatControllers_) {
 		delete controllerPair.second;
 	}
 	foreach (JIDMUCControllerPair controllerPair, mucControllers_) {
 		delete controllerPair.second;
 	}
 	delete systemTrayController_;
 	delete soundEventController_;
 	delete avatarStorage_;
@@ -228,98 +218,100 @@ void MainController::sendPresence(boost::shared_ptr<Presence> presence) {
 		logout();
 	}
 }
 
 void MainController::handleInputIdleChanged(bool idle) {
 	if (!client_ || !client_->isAvailable()) {
 		return;
 	}
 	if (idle) {
 		preIdlePresence_ = lastSentPresence_;
 		boost::shared_ptr<Presence> presence(new Presence());
 		presence->setShow(StatusShow::Away);
 		presence->setStatus("Auto-away");
 		sendPresence(presence);
 	}
 	else {
 		if (client_) {
 			sendPresence(preIdlePresence_);
 		} else {
 			queuedPresence_ = preIdlePresence_;
 		}
 	}
 }
 
 void MainController::handleIncomingPresence(boost::shared_ptr<Presence> presence) {
 	//FIXME: subscribe, subscribed
 	rosterController_->handleIncomingPresence(presence);
 }
 
 void MainController::handleLoginRequest(const String &username, const String &password, const String& certificateFile, bool remember) {
 	loginWindow_->setMessage("");
 	ProfileSettingsProvider* profileSettings = new ProfileSettingsProvider(username, settings_);
 	profileSettings->storeString("jid", username);
 	profileSettings->storeString("certificate", certificateFile);
 	profileSettings->storeString("pass", remember ? password : "");
 	settings_->storeString("lastLoginJID", username);
 	loginWindow_->addAvailableAccount(profileSettings->getStringSetting("jid"), profileSettings->getStringSetting("pass"), profileSettings->getStringSetting("certificate"));
 	delete profileSettings;
 	jid_ = JID(username);
 	password_ = password;
 	certificateFile_ = certificateFile;
 	performLoginFromCachedCredentials();
 }
 
 void MainController::performLoginFromCachedCredentials() {
 	if (!client_) {
 		client_ = new Swift::Client(jid_, password_);
 		presenceSender_ = new PresenceSender(client_);
-		//client_->onDataRead.connect(&printIncomingData);
-		//client_->onDataWritten.connect(&printOutgoingData);
+		client_->onDataRead.connect(boost::bind(
+				&XMLConsoleController::handleDataRead, xmlConsoleController_, _1));
+		client_->onDataWritten.connect(boost::bind(
+				&XMLConsoleController::handleDataWritten, xmlConsoleController_, _1));
 		if (!certificateFile_.isEmpty()) {
 			client_->setCertificate(certificateFile_);
 		}
 		client_->onError.connect(boost::bind(&MainController::handleError, this, _1));
 		client_->onConnected.connect(boost::bind(&MainController::handleConnected, this));
 		client_->onMessageReceived.connect(boost::bind(&MainController::handleIncomingMessage, this, _1));
 	}
 	client_->connect();
 }
 
 void MainController::handleError(const ClientError& error) {
 	String message;
 	switch(error.getType()) {
 		case ClientError::UnknownError: message = "Unknown Error"; break;
 		case ClientError::DomainNameResolveError: message = "Unable to find server"; break;
 		case ClientError::ConnectionError: message = "Error connecting to server"; break;
 		case ClientError::ConnectionReadError: message = "Error while receiving server data"; break;
 		case ClientError::ConnectionWriteError: message = "Error while sending data to the server"; break;
 		case ClientError::XMLError: message = "Error parsing server data"; break;
 		case ClientError::AuthenticationFailedError: message = "Login/password invalid"; break;
 		case ClientError::CompressionFailedError: message = "Error while compressing stream"; break;
 		case ClientError::ServerVerificationFailedError: message = "Server verification failed"; break;
 		case ClientError::NoSupportedAuthMechanismsError: message = "Authentication mechanisms not supported"; break;
 		case ClientError::UnexpectedElementError: message = "Unexpected response"; break;
 		case ClientError::ResourceBindError: message = "Error binding resource"; break;
 		case ClientError::SessionStartError: message = "Error starting session"; break;
 		case ClientError::TLSError: message = "Encryption error"; break;
 		case ClientError::ClientCertificateLoadError: message = "Error loading certificate (Invalid password?)"; break;
 		case ClientError::ClientCertificateError: message = "Certificate not authorized"; break;
 	}
 	if (!rosterController_) { //hasn't been logged in yet
 		signOut();
 		loginWindow_->setMessage(message);
 	}
 	logout();
 	if (rosterController_) {
 		//reconnectAfterError();
 	}
 }
 
 void MainController::handleCancelLoginRequest() {
 	signOut();
 }
 
 void MainController::signOut() {
 	logout();
 	loginWindow_->loggedOut();
 	foreach (JIDChatControllerPair controllerPair, chatControllers_) {
diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
index e333d97..eab29a8 100644
--- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
+++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
@@ -1,11 +1,16 @@
 #pragma once
 
 namespace Swift {
+	class String;
+
 	class XMLConsoleWidget {
 		public:
 			virtual ~XMLConsoleWidget();
 
+			virtual void handleDataRead(const String& data) = 0;
+			virtual void handleDataWritten(const String& data) = 0;
+
 			virtual void show() = 0;
 			virtual void activate() = 0;
 	};
 }
diff --git a/Swift/Controllers/XMLConsoleController.cpp b/Swift/Controllers/XMLConsoleController.cpp
index 4629573..7de5b94 100644
--- a/Swift/Controllers/XMLConsoleController.cpp
+++ b/Swift/Controllers/XMLConsoleController.cpp
@@ -1,27 +1,39 @@
 #include "Swift/Controllers/XMLConsoleController.h"
 
 #include "Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h"
 #include "Swift/Controllers/UIEvents/RequestXMLConsoleUIEvent.h"
 
 namespace Swift {
 
 XMLConsoleController::XMLConsoleController(UIEventStream* uiEventStream, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory) : xmlConsoleWidgetFactory(xmlConsoleWidgetFactory), xmlConsoleWidget(NULL) {
 	uiEventStream->onUIEvent.connect(boost::bind(&XMLConsoleController::handleUIEvent, this, _1));
 }
 
 XMLConsoleController::~XMLConsoleController() {
 	delete xmlConsoleWidget;
 }
 
 void XMLConsoleController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) {
 	boost::shared_ptr<RequestXMLConsoleUIEvent> event = boost::dynamic_pointer_cast<RequestXMLConsoleUIEvent>(rawEvent);
 	if (event != NULL) {
 		if (xmlConsoleWidget == NULL) {
 			xmlConsoleWidget = xmlConsoleWidgetFactory->createXMLConsoleWidget();
 		}
 		xmlConsoleWidget->show();
 		xmlConsoleWidget->activate();
 	}
 }
 
+void XMLConsoleController::handleDataRead(const String& data) {
+	if (xmlConsoleWidget) {
+		xmlConsoleWidget->handleDataRead(data);
+	}
+}
+
+void XMLConsoleController::handleDataWritten(const String& data) {
+	if (xmlConsoleWidget) {
+		xmlConsoleWidget->handleDataWritten(data);
+	}
+}
+
 }
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index 52a8269..134bf0d 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -1,24 +1,30 @@
 #pragma once
 
 #include <boost/signals.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 
 namespace Swift {
+	class String;
 	class XMLConsoleWidgetFactory;
 	class XMLConsoleWidget;
+
 	class XMLConsoleController {
 		public:
 			XMLConsoleController(UIEventStream* uiEventStream, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory);
 			~XMLConsoleController();
 
+		public:
+			void handleDataRead(const String& data);
+			void handleDataWritten(const String& data);
+
 		private:
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
 
 		private:
 			XMLConsoleWidgetFactory* xmlConsoleWidgetFactory;
 			XMLConsoleWidget* xmlConsoleWidget;
 	};
 }
diff --git a/Swift/QtUI/QtXMLConsoleWidget.cpp b/Swift/QtUI/QtXMLConsoleWidget.cpp
index 7553d06..662f070 100644
--- a/Swift/QtUI/QtXMLConsoleWidget.cpp
+++ b/Swift/QtUI/QtXMLConsoleWidget.cpp
@@ -1,29 +1,75 @@
 #include "QtXMLConsoleWidget.h"
 
 #include <QCloseEvent>
+#include <QTextEdit>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QScrollBar>
+
+#include "QtSwiftUtil.h"
+#include "Swiften/Base/String.h"
 
 namespace Swift {
+
 QtXMLConsoleWidget::QtXMLConsoleWidget() {
+	setWindowTitle("Console");
+
+	QVBoxLayout* layout = new QVBoxLayout(this);
+	layout->setSpacing(0);
+	layout->setContentsMargins(0,0,0,0);
 
+	textEdit = new QTextEdit(this);
+	textEdit->setReadOnly(true);
+	layout->addWidget(textEdit);
+
+	QWidget* bottom = new QWidget(this);
+	layout->addWidget(bottom);
+
+	QHBoxLayout* buttonLayout = new QHBoxLayout(bottom);
+	buttonLayout->setContentsMargins(0,0,20,0);
+	buttonLayout->setSpacing(0);
+	buttonLayout->addStretch();
+	QPushButton* clearButton = new QPushButton("Clear", bottom);
+	connect(clearButton, SIGNAL(clicked()), textEdit, SLOT(clear()));
+	buttonLayout->addWidget(clearButton);
 }
 
 void QtXMLConsoleWidget::showEvent(QShowEvent* event) {
 	emit windowOpening();
 	QWidget::showEvent(event);
 }
 
 void QtXMLConsoleWidget::show() {
 	QWidget::show();
 	emit windowOpening();
 }
 
 void QtXMLConsoleWidget::activate() {
 	emit wantsToActivate();
 }
 
 void QtXMLConsoleWidget::closeEvent(QCloseEvent* event) {
 	emit windowClosing();
 	event->accept();
 }
 
+void QtXMLConsoleWidget::handleDataRead(const String& data) {
+	textEdit->setTextColor(QColor(33,98,33));
+	appendText(data);
+}
+
+void QtXMLConsoleWidget::handleDataWritten(const String& data) {
+	textEdit->setTextColor(QColor(155,1,0));
+	appendText(data);
+}
+
+void QtXMLConsoleWidget::appendText(const String& data) {
+	QScrollBar* scrollBar = textEdit->verticalScrollBar();
+	bool scrollToBottom = (!scrollBar || scrollBar->value() == scrollBar->maximum());
+	textEdit->append(P2QSTRING(data));
+	if (scrollToBottom) {
+		textEdit->ensureCursorVisible();
+	}
+}
+
 }
diff --git a/Swift/QtUI/QtXMLConsoleWidget.h b/Swift/QtUI/QtXMLConsoleWidget.h
index 50b53f2..0d5a10d 100644
--- a/Swift/QtUI/QtXMLConsoleWidget.h
+++ b/Swift/QtUI/QtXMLConsoleWidget.h
@@ -1,18 +1,30 @@
 #pragma once
 
 #include "Swift/Controllers/UIInterfaces/XMLConsoleWidget.h"
 #include "QtTabbable.h"
 
+class QTextEdit;
+
 namespace Swift {
 	class QtXMLConsoleWidget : public QtTabbable, public XMLConsoleWidget {
-		Q_OBJECT
+			Q_OBJECT
+
 		public:
 			QtXMLConsoleWidget();
+
 			void show();
 			void activate();
-		protected slots:
-			void closeEvent(QCloseEvent* event);
-		protected:
-			void showEvent(QShowEvent* event);
+
+			virtual void handleDataRead(const String& data);
+			virtual void handleDataWritten(const String& data);
+
+		private:
+			virtual void closeEvent(QCloseEvent* event);
+			virtual void showEvent(QShowEvent* event);
+
+			void appendText(const String& data);
+
+		private:
+			QTextEdit* textEdit;
 	};
 }