1 files changed, 16 insertions, 17 deletions
diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp
index 6868ca5..aaf4d65 100644
--- a/Swift/QtUI/QtHistoryWindow.cpp
+++ b/Swift/QtUI/QtHistoryWindow.cpp
@@ -7,32 +7,31 @@
 #include <QtHistoryWindow.h>
 #include <QtTabbable.h>
 
-#include <QCloseEvent>
-#include <QTextEdit>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QScrollBar>
-#include <QCheckBox>
-
 #include <QtSwiftUtil.h>
+#include <MessageSnippet.h>
 #include <string>
 
 namespace Swift {
 
 QtHistoryWindow::QtHistoryWindow() {
-	QVBoxLayout* layout = new QVBoxLayout(this);
-	layout->setSpacing(0);
-	layout->setContentsMargins(0,0,0,0);
+	ui_.setupUi(this);
+
+	QtChatTheme* theme = new QtChatTheme(""); // FIXME: leak
 
-	QWidget* bottom = new QWidget(this);
-	layout->addWidget(bottom);
-	bottom->setAutoFillBackground(true);
+	delete ui_.conversation;
+	conversation_ = new QtChatView(theme, this);
+	QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+	sizePolicy.setHorizontalStretch(80);
+	sizePolicy.setVerticalStretch(0);
+	conversation_->setSizePolicy(sizePolicy);
 
-	QHBoxLayout* buttonLayout = new QHBoxLayout(bottom);
-	buttonLayout->setContentsMargins(10,0,20,0);
-	buttonLayout->setSpacing(0);
+	ui_.conversation = conversation_;
+	ui_.bottomLayout->addWidget(conversation_);
 
-	buttonLayout->addStretch();
+	conversation_->addMessage(boost::make_shared<MessageSnippet>("hey", "Me", QDateTime::currentDateTime(), "http://swarm.cs.pub.ro/~cbadea/storage/iron_man.png", false, false, theme, "id"));
+	conversation_->addMessage(boost::make_shared<MessageSnippet>("hey", "You", QDateTime::currentDateTime(), "http://swarm.cs.pub.ro/~cbadea/storage/war_machine.png", true, false, theme, "id2"));
+	conversation_->addMessage(boost::make_shared<MessageSnippet>("knock knock", "Me", QDateTime::currentDateTime(), "http://swarm.cs.pub.ro/~cbadea/storage/iron_man.png", false, false, theme, "id"));
+	conversation_->addMessage(boost::make_shared<MessageSnippet>("who's there?", "You", QDateTime::currentDateTime(), "http://swarm.cs.pub.ro/~cbadea/storage/war_machine.png", true, false, theme, "id2"));
 
 	setWindowTitle(tr("History"));
 }