[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=50e199a

The following commit has been merged in the master branch:
commit 50e199a315411401b0a9975b326df160a832bfec
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 13 12:32:35 2012 +1100

    The Delegate Channels Patch a.k.a David's massive patch
    
    In the plasmoid:
    Convert plasmoid to a handler from an observer
    Support delegate channels (via a nasty hack currently)
    Add popout button to delegate to main text UI
    Merge the conversationsModel and handler into one class
    Fix exposing a load of items to QML for no reason.
    Some additional tidying. (and some additional messying :-) )
    Clear unread messages on TextChannel::pendingMessagesRemoved()
    
    In the textUI:
    Always raise the window in the main Text UI handleChannel unless
     hint explicitly says otherwise.
    Additionally fixes a bug in which reconnecting an account could
    cause the tabs to 'randomly' switch.
    
    REVIEW: 103908
    CCBUG: 293526
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 07b67ec..783e127 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -8,7 +8,6 @@ Item {
     property Conversation conv
 
     signal closeRequested
-    signal conversationEndRequested
 
     Item {
         id: titleArea
@@ -25,7 +24,7 @@ Item {
             anchors {
                 top: parent.top
                 left: parent.left
-                right: closeButton.left
+                right: popoutButton.left
                 bottom: parent.bottom
             }
 
@@ -34,6 +33,24 @@ Item {
 
             onClicked: closeRequested()
         }
+        
+        PlasmaComponents.ToolButton {
+            id: popoutButton
+
+            anchors {
+                top: parent.top
+                right: closeButton.left
+                bottom: parent.bottom
+            }
+
+            iconSource: "view-conversation-balloon"
+
+            onClicked: {
+                conv.delegateToProperClient();
+                closeRequested();
+            }
+        }
+        
 
         PlasmaComponents.ToolButton {
             id: closeButton
@@ -46,7 +63,7 @@ Item {
 
             iconSource: "dialog-close"
 
-            onClicked: conversationEndRequested()
+            onClicked: conv.requestClose()
         }
     }
 

-- 
ktp-contact-applet packaging