[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=a9f0fc0

The following commit has been merged in the master branch:
commit a9f0fc0936f712e3dc25fccbc2e8f5567a330502
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Mar 5 02:02:40 2013 +0100

    Make it possible to send files
    
    Support sending files by dropping it on the person button on the plasmoid
    (not the dialog).If you drop a file on a contact, the file will be sent to
    the contact.
    
    REVIEW: 109179
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml   |  2 ++
 .../contents/ui/ConversationDelegateButton.qml               | 12 ++++++++++++
 chat/org.kde.ktp-chat/contents/ui/main.qml                   |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index b82f34e..de44494 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -30,6 +30,8 @@ ConversationDelegateButton {
     avatar: model.conversation.target.avatar
     nick: model.conversation.target.nick
     presenceIconName: model.conversation.target.presenceIconName
+    account: model.conversation.target.account
+    contact: model.conversation.target.contact
     onClicked: toggleVisibility()
     
     function toggleVisibility() { setVisible(!isCurrentConversation) }
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index f251ac5..68017c2 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -22,9 +22,13 @@ import QtQuick 1.1
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.qtextracomponents 0.1 as ExtraComponents
 import org.kde.plasma.core 0.1 as PlasmaCore
+import org.kde.draganddrop 1.0 as DnD
+import org.kde.telepathy 0.1
 
 PlasmaComponents.ToolButton
 {
+    property variant account
+    property variant contact
     property alias avatar: icon.icon
     property alias nick: tooltip.mainText
     property alias presenceIconName: tooltip.image
@@ -44,6 +48,14 @@ PlasmaComponents.ToolButton
       target: parent
     }
     
+    DnD.DropArea {
+        anchors.fill: parent
+        DeclarativeKTpActions { id: actions }
+        onDrop: if (event.mimeData.url!="") {
+            actions.startFileTransfer(parent.account, parent.contact, event.mimeData.url)
+        }
+    }
+    
     Loader {
         id: overlayLoader
         anchors {
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 1932a48..9cd0ed5 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -81,6 +81,8 @@ Grid {
                     anchors.margins: parent.width/3
                     icon: presenceIcon
                 }
+            account: model.account
+            contact: model.contact
         }
         model: FilteredPinnedContactsProxyModel {
             sourceModel: PinnedContactsModel {

-- 
ktp-contact-applet packaging