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

The following commit has been merged in the master branch:
commit b5ef5e55f45459716f864697957d58234179d8c4
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Sat Aug 20 13:00:31 2011 +0200

    ADD video and file transfer buttons + FIX send mail bug
---
 src/contactWrapper.cpp                       | 13 ++++++++++++-
 src/contactWrapper.h                         |  2 ++
 src/declarative/contents/ui/DropDownMenu.qml | 24 +++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/contactWrapper.cpp b/src/contactWrapper.cpp
index 39c8dcf..9f3d70b 100644
--- a/src/contactWrapper.cpp
+++ b/src/contactWrapper.cpp
@@ -20,6 +20,7 @@
 #include "contactWrapper.h"
 
 #include <KToolInvocation>
+#include <KUrl>
 
 #include <TelepathyQt4/AvatarData>
 #include <TelepathyQt4/PendingChannelRequest>
@@ -103,7 +104,7 @@ void ContactWrapper::sendMail()
         return;
     }
 
-    KToolInvocation::invokeMailer(m_contact->id());
+    KToolInvocation::invokeMailer(KUrl(m_contact->id()));
 }
 
 void ContactWrapper::startAudioCall()
@@ -111,6 +112,11 @@ void ContactWrapper::startAudioCall()
     qDebug("ContactWrapper::startAudioCall");
 }
 
+void ContactWrapper::startFileTransfer()
+{
+    qDebug("ContactWrapper::startFileTransfer");
+}
+
 void ContactWrapper::startTextChat()
 {
     if (!m_account || !m_contact) {
@@ -123,6 +129,11 @@ void ContactWrapper::startTextChat()
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(genericOperationFinished(Tp::PendingOperation*)));
 }
 
+void ContactWrapper::startVideoCall()
+{
+    qDebug("ContactWrapper::startVideoCall");
+}
+
 void ContactWrapper::setContact(const Tp::ContactPtr& newContact, const Tp::AccountPtr &relatedAccount)
 {
     qDebug() << "setting new contact to: " << newContact->id();
diff --git a/src/contactWrapper.h b/src/contactWrapper.h
index 6964809..0d6b712 100644
--- a/src/contactWrapper.h
+++ b/src/contactWrapper.h
@@ -57,7 +57,9 @@ public:
 public slots:
     void sendMail();
     void startAudioCall();
+    void startFileTransfer();
     void startTextChat();
+    void startVideoCall();
 
 signals:
     void avatarChanged();
diff --git a/src/declarative/contents/ui/DropDownMenu.qml b/src/declarative/contents/ui/DropDownMenu.qml
index ca22aaf..04af5c5 100644
--- a/src/declarative/contents/ui/DropDownMenu.qml
+++ b/src/declarative/contents/ui/DropDownMenu.qml
@@ -25,7 +25,7 @@ Item {
     state: "hidden";
 
     Row {
-        spacing: 4;
+        spacing: 2;
         anchors.centerIn: parent;
 
         PlasmaWidgets.IconWidget {
@@ -60,6 +60,28 @@ Item {
                 TelepathyContact.startTextChat();
             }
         }
+
+        PlasmaWidgets.IconWidget {
+            id: videoButton;
+            icon: QIcon("camera-web");
+            width: 22;
+            height: 22;
+
+            onClicked: {
+                TelepathyContact.startVideoCall();
+            }
+        }
+
+        PlasmaWidgets.IconWidget {
+            id: fileTransferButton;
+            icon: QIcon("mail-attachment");
+            width: 22;
+            height: 22;
+
+            onClicked: {
+                TelepathyContact.startFileTransfer();
+            }
+        }
     }
 
     states: [

-- 
ktp-contact-applet packaging