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

The following commit has been merged in the master branch:
commit 5fc36e7cc105d52c724906cce0dc05df6e63d1f2
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 13 13:01:45 2012 +1100

    Re-create binding to acknowledge messages when popup opens
---
 .../org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml     |  3 +--
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml      | 13 ++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
index 783e127..e3052b8 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
@@ -33,7 +33,7 @@ Item {
 
             onClicked: closeRequested()
         }
-        
+
         PlasmaComponents.ToolButton {
             id: popoutButton
 
@@ -50,7 +50,6 @@ Item {
                 closeRequested();
             }
         }
-        
 
         PlasmaComponents.ToolButton {
             id: closeButton
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
index 0ca90cd..4d580aa 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
@@ -6,12 +6,11 @@ import org.kde.plasma.components 0.1 as PlasmaComponents
 
 
 Item {
-    
+
     TelepathyTextObserver {
         id: main
     }
 
-    
     id: top
     ListView {
         id: base
@@ -31,7 +30,7 @@ Item {
             //FIXME: put in a loader to not slow down the model
             PlasmaCore.Dialog {
                 id: dialog
-                windowFlags: Qt.Dialog
+                windowFlags: Qt.Popup
                 visible: conv.pressed
 
                 mainItem: ChatWidget {
@@ -52,6 +51,14 @@ Item {
                 }
             }
 
+            // needed to let MessageModel know when messages are visible
+            // so that it can acknowledge them properly
+            Binding {
+                target: model.conversation.messages
+                property: "visibleToUser"
+                value: conv.pressed
+            }
+
             onToggled: {
                 if(pressed) {
                     var point = dialog.popupPosition(conv, Qt.AlignBottom);

-- 
ktp-text-ui packaging