[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=5c8227e

The following commit has been merged in the master branch:
commit 5c8227efe96b3f9714a9592b4fbb8db490ba89b3
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jan 14 23:53:59 2012 +1100

    Rename Conversation::model to Conversation::messages
    
    And remove useless commented out code.
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml           |  3 ++-
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 12 +-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 042edcc..d592c22 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -74,6 +74,7 @@ Item {
             rightMargin: chatArea.anchors.leftMargin
         }
 
+//         contemplating if this makes it look better or worse
 //         PlasmaComponents.Highlight { anchors.fill: chatArea }
 
         ListView {
@@ -88,7 +89,7 @@ Item {
             clip: true
 
             delegate: TextDelegate {}
-            model: conv.model
+            model: conv.messages
         }
 
         PlasmaComponents.ScrollBar {
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 3606b3c..75390c2 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -15,11 +15,6 @@ Item {
 
     signal toggled
 
-//     Rectangle {
-//         anchors.fill: parent
-//         color: "blue"
-//     }
-
     PlasmaCore.FrameSvgItem {
         id: canvas
 
@@ -29,11 +24,8 @@ Item {
         anchors.fill: parent
     }
 
-    //ise listitem?
     PlasmaWidgets.IconWidget {
         id: icon
-//         text: model.conversation.target.nick
-//         icon: model.conversation.target.presenceIcon
 
         anchors.fill: parent
         anchors.margins: 5
@@ -78,11 +70,9 @@ Item {
         anchors.fill: parent
 
         hoverEnabled: true
+        preventStealing: true
 
-        //move le onClicked into main
         onClicked: toggle();
-
-        preventStealing: true
     }
 
     function toggle() {

-- 
ktp-contact-applet packaging