[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=55f11bb

The following commit has been merged in the master branch:
commit 55f11bb9e739d232a2950fd03adcfefda2495c46
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Dec 1 15:24:26 2011 +0100

    Use AccountsModel::PresenceRole for presences instead of switch-case
    
    Reviewed-by: David Edmundson
---
 contact-delegate-compact.cpp | 31 +++++--------------------------
 contact-delegate.cpp         | 32 +++++---------------------------
 2 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 265a295..a3a43c1 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -38,6 +38,7 @@
 #include <KTelepathy/Models/proxy-tree-node.h>
 #include <KTelepathy/Models/groups-model-item.h>
 #include <KTelepathy/Models/groups-model.h>
+#include <KTelepathy/presence.h>
 
 const int SPACING = 4;
 const int AVATAR_SIZE = 22;
@@ -82,31 +83,9 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
 
     painter->drawPixmap(iconRect, avatar);
 
-    QPixmap icon;
-
-    switch (index.data(AccountsModel::PresenceTypeRole).toInt()) {
-    case Tp::ConnectionPresenceTypeAvailable:
-        icon = SmallIcon("user-online", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeAway:
-        icon = SmallIcon("user-away", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeExtendedAway:
-        icon = SmallIcon("user-away-extended", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeBusy:
-        icon = SmallIcon("user-busy", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeHidden:
-        icon = SmallIcon("user-invisible", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeOffline:
-        icon = SmallIcon("user-offline", KIconLoader::SizeSmallMedium);
-        break;
-    default:
-        icon = SmallIcon("task-attention", KIconLoader::SizeSmallMedium);
-        break;
-    }
+    KTp::Presence presence = index.data(AccountsModel::PresenceRole).value<KTp::Presence>();
+
+    QPixmap icon = presence.icon().pixmap(KIconLoader::SizeSmallMedium);
 
     QRect statusIconRect = optV4.rect;
     statusIconRect.setSize(QSize(PRESENCE_ICON_SIZE, PRESENCE_ICON_SIZE));
@@ -141,7 +120,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     painter->setPen(presenceMessagePen);
 
     painter->drawText(presenceMessageRect,
-                      nameFontMetrics.elidedText(index.data(AccountsModel::PresenceMessageRole).toString(),
+                      nameFontMetrics.elidedText(presence.statusMessage(),
                                                  Qt::ElideRight, presenceMessageRect.width()));
 
     painter->restore();
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index c3badef..10ef1df 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -38,6 +38,7 @@
 #include <KTelepathy/Models/proxy-tree-node.h>
 #include <KTelepathy/Models/groups-model-item.h>
 #include <KTelepathy/Models/groups-model.h>
+#include <KTelepathy/presence.h>
 
 const int SPACING = 4;
 const int AVATAR_SIZE = 32;
@@ -96,31 +97,9 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
         painter->drawPath(roundedPath);
     }
 
-    QPixmap icon;
-
-    switch (index.data(AccountsModel::PresenceTypeRole).toInt()) {
-    case Tp::ConnectionPresenceTypeAvailable:
-        icon = SmallIcon("user-online", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeAway:
-        icon = SmallIcon("user-away", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeExtendedAway:
-        icon = SmallIcon("user-away-extended", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeBusy:
-        icon = SmallIcon("user-busy", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeHidden:
-        icon = SmallIcon("user-invisible", KIconLoader::SizeSmallMedium);
-        break;
-    case Tp::ConnectionPresenceTypeOffline:
-        icon = SmallIcon("user-offline", KIconLoader::SizeSmallMedium);
-        break;
-    default:
-        icon = SmallIcon("task-attention", KIconLoader::SizeSmallMedium);
-        break;
-    }
+    KTp::Presence presence = index.data(AccountsModel::PresenceRole).value<KTp::Presence>();
+
+    QPixmap icon = presence.icon().pixmap(KIconLoader::SizeSmallMedium);
 
     QRect statusIconRect = optV4.rect;
     statusIconRect.setSize(QSize(PRESENCE_ICON_SIZE, PRESENCE_ICON_SIZE));
@@ -162,10 +141,9 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
 
     painter->setFont(statusFont);
     painter->drawText(statusMsgRect,
-                      statusFontMetrics.elidedText(index.data(AccountsModel::PresenceMessageRole).toString(),
+                      statusFontMetrics.elidedText(presence.statusMessage(),
                                                    Qt::ElideRight, statusMsgRect.width()));
 
-
     painter->restore();
 }
 

-- 
ktp-contact-list packaging