[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=962bb16

The following commit has been merged in the master branch:
commit 962bb16c4ce3f37eb4c2541164ddfa74184688dc
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Feb 25 17:33:08 2013 +0100

    Adopt the FilteredPinnedContactsProxyModel
    
    Maintains behavior when there's active conversations that are pinned, for
    the preferred and minumum sizes, as we don't hide the contacts using
    the delegate's visible property
    
    Reviewed by David Edmundson, on the mailing list
---
 chat/org.kde.ktp-chat/contents/ui/main.qml | 34 ++++++++++++++++--------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 2072a7e..1932a48 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -33,7 +33,7 @@ Grid {
     property real minimumHeight: flow===Flow.TopToBottom ? itemsCount*minimumItemSize : minimumItemSize
     property real minimumWidth: flow===Flow.LeftToRight ? itemsCount*minimumItemSize : minimumItemSize
     property int currentIndex: -1
-    property int itemsCount: pinnedModel.count + conversationsView.count
+    property int itemsCount: pinnedView.count + conversationsView.count
     property real itemWidth: Math.max(0, flow===Flow.LeftToRight ? Math.min(height, width/itemsCount) : width)
     property real itemHeight:Math.max(0, flow===Flow.TopToBottom ? Math.min(width, height/itemsCount) : height)
 
@@ -70,10 +70,10 @@ Grid {
     onItemsCountChanged: reconsiderStatus()
 
     Repeater {
+        id: pinnedView
         delegate: ConversationDelegateButton {
             width: base.itemWidth
             height: base.itemHeight
-            visible: available && !alreadyChatting
             onClicked: handler.conversations.startChat(account, contact)
             avatar: decoration
             overlay: ExtraComponents.QIconItem {
@@ -82,21 +82,23 @@ Grid {
                     icon: presenceIcon
                 }
         }
-        model: PinnedContactsModel {
-            id: pinnedModel
-            conversations: handler.conversations
-            accountManager: handler.accountManager
+        model: FilteredPinnedContactsProxyModel {
+            sourceModel: PinnedContactsModel {
+                id: pinnedModel
+                conversations: handler.conversations
+                accountManager: handler.accountManager
 
-            Component.onCompleted: plasmoid.addEventListener('ConfigChanged', 
-                                    function() {
-                                        var v = plasmoid.readConfig("pinnedContacts");
-                                        console.log("loading state", v)
-                                        if(v!="")
-                                            pinnedModel.state = v
-                                    });
-            onCountChanged: {
-                plasmoid.writeConfig("pinnedContacts", pinnedModel.state)
-                console.log("saving state", pinnedModel.state)
+                Component.onCompleted: plasmoid.addEventListener('ConfigChanged', 
+                                        function() {
+                                            var v = plasmoid.readConfig("pinnedContacts");
+                                            console.log("loading state", v)
+                                            if(v!="")
+                                                pinnedModel.state = v
+                                        });
+                onCountChanged: {
+                    plasmoid.writeConfig("pinnedContacts", pinnedModel.state)
+                    console.log("saving state", pinnedModel.state)
+                }
             }
         }
     }

-- 
ktp-contact-applet packaging