[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=ccd7644

The following commit has been merged in the master branch:
commit ccd7644cd28d566531c0ec0e72848e7b3d2be3ff
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jan 27 13:30:45 2012 +0100

    Allow to use im-user-* icons instead of user-* and use iconString
---
 KTp/presence.cpp | 34 ++++++++++------------------------
 KTp/presence.h   |  4 ++--
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index 07b96e9..f2663d9 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -36,31 +36,16 @@ Presence::Presence(const Tp::Presence &presence) :
 {
 }
 
-KIcon Presence::icon(QStringList overlays) const
+KIcon Presence::icon(QStringList overlays, bool useImIcons) const
 {
     switch (type()) {
     case Tp::ConnectionPresenceTypeAvailable:
-        return KIcon(QLatin1String("user-online"),
-                     KIconLoader::global(),
-                     overlays);
     case Tp::ConnectionPresenceTypeBusy:
-        return KIcon(QLatin1String("user-busy"),
-                     KIconLoader::global(),
-                     overlays);
     case Tp::ConnectionPresenceTypeAway:
-        return KIcon(QLatin1String("user-away"),
-                     KIconLoader::global(),
-                     overlays);
     case Tp::ConnectionPresenceTypeExtendedAway:
-        return KIcon(QLatin1String("user-away-extended"),
-                     KIconLoader::global(),
-                     overlays);
     case Tp::ConnectionPresenceTypeHidden:
-        return KIcon(QLatin1String("user-invisible"),
-                     KIconLoader::global(),
-                     overlays);
     case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(QLatin1String("user-offline"),
+        return KIcon(iconString(useImIcons),
                      KIconLoader::global(),
                      overlays);
     default:
@@ -68,21 +53,22 @@ KIcon Presence::icon(QStringList overlays) const
     }
 }
 
-QString Presence::iconString() const
+QString Presence::iconString(bool useImIcons) const
 {
     switch (type()) {
     case Tp::ConnectionPresenceTypeAvailable:
-        return QLatin1String("user-online");
+        return useImIcons ? QLatin1String("im-user") : QLatin1String("user-online");
     case Tp::ConnectionPresenceTypeBusy:
-        return QLatin1String("user-busy");
+        return useImIcons ? QLatin1String("im-user-busy") : QLatin1String("user-busy");
     case Tp::ConnectionPresenceTypeAway:
-        return QLatin1String("user-away");
+        return useImIcons ? QLatin1String("im-user-away") : QLatin1String("user-away");
     case Tp::ConnectionPresenceTypeExtendedAway:
-        return QLatin1String("user-away-extended");
+        // FIXME Request an icon "im-user-away-extended"
+        return useImIcons ? QLatin1String("im-user-away") : QLatin1String("user-away-extended");
     case Tp::ConnectionPresenceTypeHidden:
-        return QLatin1String("user-invisible");
+        return useImIcons ? QLatin1String("im-invisible-user") : QLatin1String("user-invisible");
     case Tp::ConnectionPresenceTypeOffline:
-        return QLatin1String("user-offline");
+        return useImIcons ? QLatin1String("im-user-offline") : QLatin1String("user-offline");
     default:
         return QString();
     }
diff --git a/KTp/presence.h b/KTp/presence.h
index 0265071..343a92a 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -35,8 +35,8 @@ class KTP_EXPORT Presence : public Tp::Presence
 public:
     Presence();
     Presence(const Tp::Presence &presence);
-    KIcon icon(QStringList overlays = QStringList()) const;
-    QString iconString() const;
+    KIcon icon(QStringList overlays = QStringList(), bool useImIcons = false) const;
+    QString iconString(bool useImIcons = false) const;
 
     /** Returns which presence is "more available" */
     bool operator <(const Presence &other) const;

-- 
ktp-common-internals packaging