[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=417c8e5

The following commit has been merged in the master branch:
commit 417c8e5fc6e152b0913c420fd8660e51fa8a9f1b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Oct 24 14:32:24 2011 +0200

    Improved global presence tooltip layout
    
    Reviewed-by: David Edmundson
    REVIEW: 102957
    BUG: 283807
---
 global-presence-chooser.cpp |  5 ++++-
 kpresence.cpp               | 20 ++++++++++++++++++++
 kpresence.h                 |  2 ++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index c0f1ef8..867f2e6 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -144,6 +144,7 @@ bool GlobalPresenceChooser::event(QEvent *e)
         QHelpEvent *helpEvent = static_cast<QHelpEvent *>(e);
 
         QString toolTipText;
+        toolTipText.append("<table>");
 
         Q_FOREACH(const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
             if (account->isEnabled()) {
@@ -152,10 +153,12 @@ bool GlobalPresenceChooser::event(QEvent *e)
                 QString presenceIconString = QString::fromLatin1("<img src=\"%1\">").arg(presenceIconPath);
                 QString accountIconPath = KIconLoader::global()->iconPath(account->iconName(), 1);
                 QString accountIconString = QString::fromLatin1("<img src=\"%1\">").arg(accountIconPath);
-                toolTipText.append(QString::fromLatin1("<p>%1 %2 %3</p>").arg(presenceIconString, account->displayName(), accountIconString));
+                QString presenceString = accountPresence.displayString();
+                toolTipText.append(QString::fromLatin1("<tr><td>%1 %2</td></tr><tr><td style=\"padding-left: 24px\">%3 %4</td></tr>").arg(accountIconString, account->displayName(), presenceIconString, presenceString));
             }
         }
 
+        toolTipText.append("</table>");
         QToolTip::showText(helpEvent->globalPos(), toolTipText, this);
         return true;
     }
diff --git a/kpresence.cpp b/kpresence.cpp
index 446f4ea..3ec484e 100644
--- a/kpresence.cpp
+++ b/kpresence.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "kpresence.h"
+#include <KLocalizedString>
 
 KPresence::KPresence() :
     Tp::Presence()
@@ -76,3 +77,22 @@ bool KPresence::operator <(const KPresence &other) const
     }
 }
 
+QString KPresence::displayString() const
+{
+    switch (type()) {
+        case Tp::ConnectionPresenceTypeAvailable:
+            return i18n("Available");
+        case Tp::ConnectionPresenceTypeBusy:
+            return i18n("Busy");
+        case Tp::ConnectionPresenceTypeAway:
+            return i18n("Away");
+        case Tp::ConnectionPresenceTypeExtendedAway:
+            return i18n("Not available");
+        case Tp::ConnectionPresenceTypeHidden:
+            return i18n("Invisible");
+        case Tp::ConnectionPresenceTypeOffline:
+            return i18n("Offline");
+        default:
+            return QString();
+    }
+}
diff --git a/kpresence.h b/kpresence.h
index 91ed5c7..2321816 100644
--- a/kpresence.h
+++ b/kpresence.h
@@ -34,6 +34,8 @@ public:
 
     /** Returns which presence is "more available" */
     bool operator <(const KPresence &other) const;
+
+    QString displayString() const;
 };
 
 #endif // KPRESENCE_H

-- 
ktp-contact-list packaging