1 files changed, 9 insertions, 2 deletions
diff --git a/Swift/QtUI/QtXMLConsoleWidget.cpp b/Swift/QtUI/QtXMLConsoleWidget.cpp
index b0c0385..0c88ce6 100644
--- a/Swift/QtUI/QtXMLConsoleWidget.cpp
+++ b/Swift/QtUI/QtXMLConsoleWidget.cpp
@@ -1,17 +1,19 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "QtXMLConsoleWidget.h"
 
+#include <Swiften/Client/XMLBeautifier.h>
+
 #include <QCloseEvent>
 #include <QTextEdit>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QScrollBar>
 #include <QCheckBox>
 
 #include "QtSwiftUtil.h"
 #include <string>
@@ -43,18 +45,23 @@ QtXMLConsoleWidget::QtXMLConsoleWidget() {
 
 	buttonLayout->addStretch();
 
 	QPushButton* clearButton = new QPushButton(tr("Clear"), bottom);
 	connect(clearButton, SIGNAL(clicked()), textEdit, SLOT(clear()));
 	buttonLayout->addWidget(clearButton);
 
 	setWindowTitle(tr("Debug Console"));
 	emit titleUpdated();
+	beautifier = new XMLBeautifier(true, false);
+}
+
+QtXMLConsoleWidget::~QtXMLConsoleWidget() {
+	delete beautifier;
 }
 
 void QtXMLConsoleWidget::showEvent(QShowEvent* event) {
 	emit windowOpening();
 	emit titleUpdated(); /* This just needs to be somewhere after construction */
 	QWidget::showEvent(event);
 }
 
 void QtXMLConsoleWidget::show() {
@@ -66,23 +73,23 @@ void QtXMLConsoleWidget::activate() {
 	emit wantsToActivate();
 }
 
 void QtXMLConsoleWidget::closeEvent(QCloseEvent* event) {
 	emit windowClosing();
 	event->accept();
 }
 
 void QtXMLConsoleWidget::handleDataRead(const SafeByteArray& data) {
-	appendTextIfEnabled(std::string(tr("<!-- IN -->").toUtf8()) + "\n" + safeByteArrayToString(data) + "\n", QColor(33,98,33));
+	appendTextIfEnabled(std::string(tr("<!-- IN -->").toUtf8()) + "\n" + beautifier->beautify(safeByteArrayToString(data)) + "\n", QColor(33,98,33));
 }
 
 void QtXMLConsoleWidget::handleDataWritten(const SafeByteArray& data) {
-	appendTextIfEnabled(std::string(tr("<!-- OUT -->").toUtf8()) + "\n" + safeByteArrayToString(data) + "\n", QColor(155,1,0));
+	appendTextIfEnabled(std::string(tr("<!-- OUT -->").toUtf8()) + "\n" + beautifier->beautify(safeByteArrayToString(data)) + "\n", QColor(155,1,0));
 }
 
 void QtXMLConsoleWidget::appendTextIfEnabled(const std::string& data, const QColor& color) {
 	if (enabled->isChecked()) {
 		QScrollBar* scrollBar = textEdit->verticalScrollBar();
 		bool scrollToBottom = (!scrollBar || scrollBar->value() == scrollBar->maximum());
 
 		QTextCursor cursor(textEdit->document());
 		cursor.beginEditBlock();