Swiftdiff options
| author | Catalin Badea <catalin.badea392@gmail.com> | 2012-07-01 21:47:54 (GMT) |
|---|---|---|
| committer | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-11 15:52:57 (GMT) |
| commit | 80d2797f246e32edce4083ed7f86389a6c358d43 (patch) | |
| tree | ef5fec2085c44572335811be0560c43b3d6401b1 /Swift/Controllers/HistoryViewController.cpp | |
| parent | 5b030224c25dcb7e0f8dabe9ba80cc6d6397320b (diff) | |
| download | swift-contrib-80d2797f246e32edce4083ed7f86389a6c358d43.zip swift-contrib-80d2797f246e32edce4083ed7f86389a6c358d43.tar.bz2 | |
update history window on new message
Diffstat (limited to 'Swift/Controllers/HistoryViewController.cpp')
| -rw-r--r-- | Swift/Controllers/HistoryViewController.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp index 9c10874..a67f6cd 100644 --- a/Swift/Controllers/HistoryViewController.cpp +++ b/Swift/Controllers/HistoryViewController.cpp @@ -29,17 +29,22 @@ HistoryViewController::HistoryViewController( nickResolver_(nickResolver), avatarManager_(avatarManager), historyWindowFactory_(historyWindowFactory), - historyWindow_(NULL) { + historyWindow_(NULL), + selectedItem_(NULL) { uiEventStream_->onUIEvent.connect(boost::bind(&HistoryViewController::handleUIEvent, this, _1)); + historyController_->onNewMessage.connect(boost::bind(&HistoryViewController::handleNewMessage, this, _1)); + + roster_ = new Roster(false, true); } HistoryViewController::~HistoryViewController() { uiEventStream_->onUIEvent.disconnect(boost::bind(&HistoryViewController::handleUIEvent, this, _1)); + historyController_->onNewMessage.disconnect(boost::bind(&HistoryViewController::handleNewMessage, this, _1)); if (historyWindow_) { historyWindow_->onSelectedContactChanged.disconnect(boost::bind(&HistoryViewController::handleSelectedContactChanged, this, _1)); delete historyWindow_; - delete roster_; } + delete roster_; } void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) { @@ -49,7 +54,6 @@ void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) { historyWindow_ = historyWindowFactory_->createHistoryWindow(uiEventStream_); historyWindow_->onSelectedContactChanged.connect(boost::bind(&HistoryViewController::handleSelectedContactChanged, this, _1)); - roster_ = new Roster(false, true); historyWindow_->setRosterModel(roster_); historyController_->getAllContacts(selfJID_, rooms_, contacts_); @@ -68,6 +72,8 @@ void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) { void HistoryViewController::handleSelectedContactChanged(RosterItem* newContact) { // FIXME: signal is triggerd twice. + selectedItem_ = dynamic_cast<ContactRosterItem*>(newContact); + if (newContact == NULL) { return; } @@ -84,4 +90,20 @@ void HistoryViewController::handleSelectedContactChanged(RosterItem* newContact) } } +void HistoryViewController::handleNewMessage(const HistoryMessage& message) { + JID contactJID = message.getFromJID().toBare() == selfJID_ ? message.getToJID() : message.getFromJID(); + + if (selectedItem_ && selectedItem_->getJID().toBare() == contactJID) { + bool senderIsSelf = message.getFromJID().toBare() == selfJID_; + std::string avatarPath = byteArrayToString(avatarManager_->getAvatar(message.getFromJID())); + historyWindow_->addMessage(message.getMessage(), nickResolver_->jidToNick(message.getFromJID()), senderIsSelf, avatarPath, message.getTime()); + } + else if (!rooms_.count(contactJID.toBare()) && message.isGroupChat()) { + roster_->addContact(contactJID.toBare(), contactJID.toBare(), nickResolver_->jidToNick(contactJID.toBare()), "MUC", byteArrayToString(avatarManager_->getAvatar(contactJID.toBare()))); + } + else if (!contacts_.count(contactJID) && !message.isGroupChat()) { + roster_->addContact(contactJID, contactJID, nickResolver_->jidToNick(contactJID), "Contacts", byteArrayToString(avatarManager_->getAvatar(contactJID))); + } +} + } |