[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=37648e4

The following commit has been merged in the master branch:
commit 37648e40bacb830c6a89fffc257135e894cc012a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Dec 17 15:12:09 2011 +0100

    Support multiple file transfers
    
    FEATURE: 288555
---
 app/chat-window.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index ebec3e7..5d050f5 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -603,30 +603,32 @@ void ChatWindow::startFileTransfer(const Tp::AccountPtr& account, const Tp::Cont
     Q_ASSERT(contact);
 
     // use the keyword "FileTransferLastDirectory" for setting last used dir for file transfer
-    QString fileName = KFileDialog::getOpenFileName(KUrl("kfiledialog:///FileTransferLastDirectory"),
-                                                    QString(),
-                                                    this,
-                                                    i18n("Choose a file"));
+    QStringList fileNames = KFileDialog::getOpenFileNames(KUrl("kfiledialog:///FileTransferLastDirectory"),
+                                                          QString(),
+                                                          this,
+                                                          i18n("Choose files to send to %1").arg(contact->alias()));
 
     // User hit cancel button
-    if (fileName.isEmpty()) {
+    if (fileNames.isEmpty()) {
         return;
     }
 
-    QFileInfo fileinfo(fileName);
+    QDateTime now = QDateTime::currentDateTime();
+    Q_FOREACH(QString fileName, fileNames) {
+        QFileInfo fileinfo(fileName);
 
-    kDebug() << "Filename:" << fileName;
-    kDebug() << "Content type:" << KMimeType::findByFileContent(fileName)->name();
-    // TODO Let the user set a description?
+        kDebug() << "Filename:" << fileName;
+        kDebug() << "Content type:" << KMimeType::findByFileContent(fileName)->name();
 
-    Tp::FileTransferChannelCreationProperties fileTransferProperties(fileName, KMimeType::findByFileContent(fileName)->name());
+        Tp::FileTransferChannelCreationProperties fileTransferProperties(fileName, KMimeType::findByFileContent(fileName)->name());
 
-    Tp::PendingChannelRequest* channelRequest = account->createFileTransfer(contact,
-                                                                            fileTransferProperties,
-                                                                            QDateTime::currentDateTime(),
-                                                                            QLatin1String(PREFERRED_FILETRANSFER_HANDLER));
+        Tp::PendingChannelRequest* channelRequest = account->createFileTransfer(contact,
+                                                                                fileTransferProperties,
+                                                                                QDateTime::currentDateTime(),
+                                                                                QLatin1String(PREFERRED_FILETRANSFER_HANDLER));
 
-    connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+        connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+    }
 }
 
 void ChatWindow::startVideoCall(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)

-- 
ktp-text-ui packaging