[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=46a5eba

The following commit has been merged in the master branch:
commit 46a5eba4e1bd705fc39f58af5262a029e3cbe431
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 14 23:42:30 2012 +0000

    Do delegates properly
---
 .../contents/ui/ContactList.qml                    | 10 +-----
 .../contents/ui/ListContactDelegate.qml            | 36 +++++-----------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/org.kde.ktp.contactlist/contents/ui/ContactList.qml b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
index 5228e88..951c2d7 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactList.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
@@ -81,15 +81,7 @@ Item {
         model: contactList.model;
         boundsBehavior: Flickable.StopAtBounds
 
-        delegate:
-            ListContactDelegate {
-                delegateDisplayName: aliasName;
-                delegateAvatar: avatar;
-//                delegatePresenceIcon: presenceIcon;
-                delegatePresenceMessage: presenceMessage;
-                delegatePresenceName: presenceName;
-//                delegatePresenceType: presenceType;
-            }
+        delegate: ListContactDelegate {}
     }
 
     // GRIDVIEW
diff --git a/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml b/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
index 7e93424..9cbb7e1 100644
--- a/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
@@ -27,16 +27,6 @@ Item {
     height: 30;
     width: parent.width;
 
-    property string delegateDisplayName;
-    property string delegateAvatar;
-//    property string delegatePresenceIcon;
-    property string delegatePresenceMessage;
-//    property string delegatePresenceType;
-    property string delegatePresenceName;
-
-    // get color from current plasma theme
-    property QtObject theme: PlasmaCore.Theme {}
-
     PlasmaWidgets.IconWidget {
         id: avatar;
         width: 22;
@@ -48,13 +38,6 @@ Item {
             leftMargin: 2;
             verticalCenter: parent.verticalCenter;
         }
-
-        Component.onCompleted: {
-            console.log("LOADED: " + delegate.delegateAvatar);
-//            console.log("NEW URI IS: " + TelepathyContactList.extractAvatarPathFromNepomuk(delegate.delegateAvatar));
-//            console.log("PRESENCE ICON: " + delegatePresenceIcon);
-            console.log("PRESENCE MESSAGE: "+ delegatePresenceMessage);
-        }
     }
 
     BorderImage {
@@ -76,9 +59,9 @@ Item {
     }
 
     Text {
-        id: nick;
-        text: delegateDisplayName;
-        color: theme.textColor;
+        id: nickLabel;
+        text: aliasName;
+        color: PlasmaCore.Theme.textColor;
         font.bold: true;
 
         anchors {
@@ -89,14 +72,14 @@ Item {
     }
 
     Text {
-        id: presenceMessage;
-        text: delegatePresenceMessage;
-        color: theme.textColor;
+        id: presenceMessageLabel;
+        text: presenceMessage;
+        color: PlasmaCore.Theme.textColor;
         elide: Text.ElideRight;
         font.italic: true;
 
         anchors {
-            left: nick.right;
+            left: nickLabel.right;
             leftMargin: 4;
             right: parent.right;
             verticalCenter: parent.verticalCenter;
@@ -109,11 +92,6 @@ Item {
 //         anchors.fill: parent;
 //     }
 
-    onDelegatePresenceNameChanged: {
-        console.log("PRESENCE NAME: "+ delegatePresenceName);
-        setAvatarPresenceStatus(delegatePresenceName);
-    }
-
     function setAvatarPresenceStatus(presenceStatus)
     {
         switch (presenceStatus) {

-- 
ktp-contact-applet packaging