summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-07-07 20:29:10 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-07-07 20:29:10 (GMT)
commit3ef9dabfc62cb3daf0b88543a5d65d31e8eb5977 (patch)
tree980de61384d9cb924d130eedb051245f02434776 /Swift/Controllers/Chat/ChatsManager.cpp
parentebda58fd30c7a4aec8f04e3751de869579b71cac (diff)
downloadswift-3ef9dabfc62cb3daf0b88543a5d65d31e8eb5977.zip
swift-3ef9dabfc62cb3daf0b88543a5d65d31e8eb5977.tar.bz2
Add setUnreadCount to ChatListView
Resolves: #904
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp27
1 files changed, 25 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 9d6d9c8..66817aa 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -132,7 +132,7 @@ void ChatsManager::loadRecents() {
std::string activity(recent[1]);
bool isMUC = recent[2] == "true";
std::string nick(recent[3]);
- ChatListWindow::Chat chat(jid, nickResolver_->jidToNick(jid), activity, isMUC, nick);
+ ChatListWindow::Chat chat(jid, nickResolver_->jidToNick(jid), activity, 0, isMUC, nick);
prependRecent(chat);
}
chatListWindow_->setRecents(recentChats_);
@@ -171,15 +171,37 @@ void ChatsManager::handleMUCBookmarkRemoved(const MUCBookmark& bookmark) {
chatListWindow_->removeMUCBookmark(bookmark);
}
+ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const std::string& activity) {
+ int unreadCount = 0;
+ ChatController* controller = getChatControllerIfExists(jid);
+ if (controller) {
+ unreadCount = controller->getUnreadCount();
+ }
+ return ChatListWindow::Chat(jid, nickResolver_->jidToNick(jid), activity, unreadCount, false);
+}
+
void ChatsManager::handleChatActivity(const JID& jid, const std::string& activity) {
+ ChatListWindow::Chat chat = createChatListChatItem(jid, activity);
/* FIXME: MUC use requires changes here. */
- ChatListWindow::Chat chat(jid, nickResolver_->jidToNick(jid), activity, false);
+
/* FIXME: handle nick changes */
appendRecent(chat);
chatListWindow_->setRecents(recentChats_);
saveRecents();
}
+void ChatsManager::handleUnreadCountChanged(ChatController* controller) {
+ int unreadTotal = 0;
+ foreach (ChatListWindow::Chat chatItem, recentChats_) {
+ if (chatItem.jid == controller->getToJID()) {
+ chatItem.setUnreadCount(controller->getUnreadCount());
+ }
+ unreadTotal += chatItem.unreadCount;
+ }
+ chatListWindow_->setRecents(recentChats_);
+ chatListWindow_->setUnreadCount(unreadTotal);
+}
+
void ChatsManager::appendRecent(const ChatListWindow::Chat& chat) {
recentChats_.erase(std::remove(recentChats_.begin(), recentChats_.end(), chat), recentChats_.end());
recentChats_.push_front(chat);
@@ -314,6 +336,7 @@ ChatController* ChatsManager::createNewChatController(const JID& contact) {
chatControllers_[contact] = controller;
controller->setAvailableServerFeatures(serverDiscoInfo_);
controller->onActivity.connect(boost::bind(&ChatsManager::handleChatActivity, this, contact, _1));
+ controller->onUnreadCountChanged.connect(boost::bind(&ChatsManager::handleUnreadCountChanged, this, controller));
return controller;
}