[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=77704d0

The following commit has been merged in the master branch:
commit 77704d02ed38724db3f71e2987a029c77a6358ee
Author: Michael Bohlender <michael.bohlender at mytum.de>
Date:   Tue Jun 26 19:17:58 2012 +0100

    Add tooltip to quick chat plasmoid
    
    Reviewed-by: David Edmundson
    BUG: 296655
---
 plasmoid/declarative-plugin/conversation-target.cpp            | 10 ++++++++++
 plasmoid/declarative-plugin/conversation-target.h              |  3 +++
 .../contents/ui/ConversationDelegate.qml                       |  7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/plasmoid/declarative-plugin/conversation-target.cpp b/plasmoid/declarative-plugin/conversation-target.cpp
index 53280d0..f9c285d 100644
--- a/plasmoid/declarative-plugin/conversation-target.cpp
+++ b/plasmoid/declarative-plugin/conversation-target.cpp
@@ -85,9 +85,19 @@ QIcon ConversationTarget::presenceIcon() const
     }
 }
 
+QString ConversationTarget::presenceIconName() const
+{
+    if (d->contact) {
+       return KTp::Presence(d->contact->presence()).iconName();
+    } else {
+       return QString();                                                                    
+    }                                                                                        
+}
+
 void ConversationTarget::onPresenceChanged(const Tp::Presence&)
 {
     Q_EMIT presenceIconChanged(presenceIcon());
+    Q_EMIT presenceIconNameChanged(presenceIconName());                                      
 }
 
 void ConversationTarget::onAvatarDataChanged(const Tp::AvatarData&)
diff --git a/plasmoid/declarative-plugin/conversation-target.h b/plasmoid/declarative-plugin/conversation-target.h
index ccfd358..cd45f2d 100644
--- a/plasmoid/declarative-plugin/conversation-target.h
+++ b/plasmoid/declarative-plugin/conversation-target.h
@@ -35,6 +35,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationTarget : public QObject
     Q_PROPERTY(QIcon avatar READ avatar NOTIFY avatarChanged);
     Q_PROPERTY(QString nick READ nick NOTIFY nickChanged);
     Q_PROPERTY(QIcon presenceIcon READ presenceIcon NOTIFY presenceIconChanged);
+    Q_PROPERTY(QString presenceIconName READ presenceIconName NOTIFY presenceIconNameChanged)
     Q_PROPERTY(QString id READ id)
 
 public:
@@ -45,6 +46,7 @@ public:
     QString id() const;
     QString nick() const;
     QIcon   presenceIcon() const;
+    QString presenceIconName() const;
 
     Tp::ContactPtr contact() const;
 
@@ -52,6 +54,7 @@ Q_SIGNALS:
     void avatarChanged(QIcon avatar);
     void nickChanged(QString nick);
     void presenceIconChanged(QIcon icon);
+    void presenceIconNameChanged(QString icon);
 
 
 private Q_SLOTS:
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
index cf1277a..f3729a0 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
@@ -21,6 +21,7 @@
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.qtextracomponents 0.1 as ExtraComponents
+import org.kde.plasma.core 0.1 as PlasmaCore
 
 PlasmaComponents.ToolButton {
     id: base
@@ -37,6 +38,12 @@ PlasmaComponents.ToolButton {
             margins: 5
         }
     }
+    
+    PlasmaCore.ToolTip {
+      target: icon
+      mainText: model.conversation.target.nick
+      image: model.conversation.target.presenceIconName
+    }
 
     Rectangle {
         anchors {

-- 
ktp-text-ui packaging