[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=22d4203

The following commit has been merged in the master branch:
commit 22d4203a1386cd1c844ccc6300d4eacd301398e8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Aug 11 16:16:01 2012 +0100

    Use attached properties to get model data
    
    REVIEW: 106001
---
 .../contents/ui/ConversationDelegate.qml                         | 9 +++------
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml           | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
index 6767580..c73d2d4 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
@@ -26,12 +26,9 @@ import org.kde.plasma.core 0.1 as PlasmaCore
 PlasmaComponents.ToolButton {
     id: base
     width: height
-
-    property alias image: icon.icon
-    property alias overlayText: text.text
-
     ExtraComponents.QIconItem {
         id: icon
+        icon: model.conversation.target.avatar
         anchors {
             fill: parent
             margins: 5
@@ -60,13 +57,13 @@ PlasmaComponents.ToolButton {
             anchors.fill: parent
 
             font.pixelSize: parent.height
-            text: "0"
+            text: model.conversation.messages.unreadCount
             color: "white"
 
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
 
-        visible: base.overlayText != "0"
+        visible: model.conversation.messages.unreadCount !== 0
     }
 }
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
index 8650342..1241894 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
@@ -48,9 +48,6 @@ ListView {
     delegate : ConversationDelegate {
         id: convButton
         height: Math.min(base.width, base.height)
-
-        image: model.conversation.target.avatar
-        overlayText: model.conversation.messages.unreadCount
         onClicked: {
             if(base.currentIndex == index)
                 base.currentIndex = -1

-- 
ktp-text-ui packaging