summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-06-16 21:27:44 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-06-16 21:27:44 (GMT)
commitf1c690a5352ee77282bbbd145a3fe0137aceb160 (patch)
treeee54e5a269295f3010f906097efbf0e3a9ce8dd3 /Swift/QtUI/QtChatWindowFactory.cpp
parenta2e0cf9108081663607706f661f411a5fcf86e1d (diff)
parent73fa400641352d2f397b2e4a8589bf6ce80c7beb (diff)
downloadswift-contrib-f1c690a5352ee77282bbbd145a3fe0137aceb160.zip
swift-contrib-f1c690a5352ee77282bbbd145a3fe0137aceb160.tar.bz2
Merge branch 'tabs'
Diffstat (limited to 'Swift/QtUI/QtChatWindowFactory.cpp')
-rw-r--r--Swift/QtUI/QtChatWindowFactory.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindowFactory.cpp b/Swift/QtUI/QtChatWindowFactory.cpp
index b0b3679..c3c8f67 100644
--- a/Swift/QtUI/QtChatWindowFactory.cpp
+++ b/Swift/QtUI/QtChatWindowFactory.cpp
@@ -1,15 +1,21 @@
#include "QtChatWindowFactory.h"
+
+#include "QtChatTabs.h"
#include "QtChatWindow.h"
#include "QtSwiftUtil.h"
#include "QtTreeWidgetFactory.h"
+
namespace Swift {
QtChatWindowFactory::QtChatWindowFactory(QtTreeWidgetFactory *treeWidgetFactory) : treeWidgetFactory_(treeWidgetFactory) {
-
+ tabs_ = new QtChatTabs();
}
+
ChatWindow* QtChatWindowFactory::createChatWindow(const JID &contact) {
QtChatWindow *chatWindow = new QtChatWindow(P2QSTRING(contact.toString()), treeWidgetFactory_);
- chatWindow->show();
+ tabs_->addTab(chatWindow);
+ tabs_->show();
+ //chatWindow->show();
return chatWindow;
}