[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=9c8ddc9

The following commit has been merged in the master branch:
commit 9c8ddc9019fd89aead0da6dc25e3ff0afd8244cd
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Jan 29 19:33:33 2015 +0100

    [contactlist] Put back the presence name into the tooltip
    
    Just like old times.
    
    Reviewed-by: David Edmundson
---
 .../org.kde.ktp-contactlist/contents/ui/main.qml   | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index fa60d0e..d218224 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -34,6 +34,8 @@ Item
         source: ktpPresence.currentPresenceIconName
     }
 
+    Plasmoid.busy: ktpPresence.isChangingPresence
+
     KTp.PresenceModel {
         id: presenceModel
     }
@@ -41,10 +43,36 @@ Item
     KTp.GlobalPresence {
         id: ktpPresence
         accountManager: telepathyManager.accountManager
+
+        onRequestedPresenceChanged: {
+            updateTooltip();
+        }
+
+        onCurrentPresenceChanged: {
+            updateTooltip();
+        }
+
+        onIsChangingPresenceChanged: {
+            updateTooltip();
+        }
     }
 
     function setPresence(row) {
         ktpPresence.requestedPresence = presenceModel.get(row, "presence");
+
+    }
+
+    function updateTooltip() {
+        if (ktpPresence.isChangingPresence) {
+            if (ktpPresence.presenceType == KTp.GlobalPresence.Offline) {
+                Plasmoid.toolTipSubText = i18nc("Means 'Connecting your IM accounts', it's in the applet tooltip", "Connecting...");
+            } else {
+                Plasmoid.toolTipSubText = i18nc("The arg is the presence name (as is in ktp-common-internals.po, eg. Changing Presence to Away..., it's in the applet tooltip",
+                                                "Changing Presence to %1...", ktpPresence.requestedPresenceName);
+            }
+        } else {
+            Plasmoid.toolTipSubText = ktpPresence.currentPresenceName;
+        }
     }
 
     Component.onCompleted: {

-- 
ktp-contact-applet packaging