[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=7ce0a20

The following commit has been merged in the master branch:
commit 7ce0a202cc7298ed1e6e063eec439c570b9add4e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Feb 11 17:04:57 2013 +0000

    Show new messages in delegate
    
    REVIEW:108978
---
 contact-delegate-compact.cpp | 4 ++++
 contact-delegate.cpp         | 4 ++++
 contact-list-widget.cpp      | 1 +
 main-widget.cpp              | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 3b3753b..ee2e668 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -73,6 +73,10 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
         avatar = SmallIcon("im-user", KIconLoader::SizeMedium);
     }
 
+    if (index.data(KTp::ContactUnreadMessageCountRole).toInt() > 0) {
+        avatar = SmallIcon("mail-unread-new", KIconLoader::SizeMedium);
+    }
+
     style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
 
     // This value is used to set the correct width for the username and the presence message.
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 923be5e..810594a 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -77,6 +77,10 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
         avatar = SmallIcon("im-user", KIconLoader::SizeMedium);
     }
 
+    if (index.data(KTp::ContactUnreadMessageCountRole).toInt() > 0) {
+        avatar = SmallIcon("mail-unread-new", KIconLoader::SizeMedium);
+    }
+
     QPainterPath roundedPath;
     roundedPath.addRoundedRect(iconRect, 20, 20, Qt::RelativeSize);
 
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 352e41b..2e8dcb8 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -71,6 +71,7 @@ ContactListWidget::ContactListWidget(QWidget *parent)
     d->compactDelegate = new ContactDelegateCompact(ContactDelegateCompact::Normal, this);
 
     d->model = new KTp::ContactsModel(this);
+    d->model->setTrackUnreadMessages(true);
     d->model->setDynamicSortFilter(true);
     d->model->setSortRole(Qt::DisplayRole);
 
diff --git a/main-widget.cpp b/main-widget.cpp
index c7eb052..a3ea666 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -36,6 +36,7 @@
 #include <TelepathyQt/PendingContacts>
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingReady>
+#include <TelepathyQt/TextChannel>
 
 #include <KTp/contact-factory.h>
 #include <KTp/types.h>
@@ -101,6 +102,7 @@ MainWidget::MainWidget(QWidget *parent)
                                                                       << Tp::Contact::FeatureClientTypes);
 
     Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
+    channelFactory->addFeaturesForTextChats(Tp::Features() << Tp::Channel::FeatureCore << Tp::TextChannel::FeatureMessageQueue);
 
     m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
                                                   accountFactory,

-- 
ktp-contact-list packaging