[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:13:03 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=876a8e3

The following commit has been merged in the master branch:
commit 876a8e3d4a2fac46bb83c757ad359bd4b6779bc3
Author: Luca Beltrame <lbeltrame at kde.org>
Date:   Tue Dec 15 08:10:42 2015 +0100

    Support "last visited directory" in ktp-filetransfer-handler
    
    Shamelessly copied from ktorrent code, and already tested in other
    applications.
    
    REVIEW: 126359
---
 src/CMakeLists.txt                                |  1 +
 src/handle-incoming-file-transfer-channel-job.cpp | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80d1758..296c276 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ target_link_libraries(ktp-filetransfer-handler
             KF5::CoreAddons
             KF5::I18n
             KF5::KIOWidgets
+            KF5::KIOFileWidgets
             KF5::ConfigCore
             Qt5::Core
             Qt5::DBus
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 1e97d0d..5d87510 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -30,6 +30,8 @@
 #include <KLocalizedString>
 #include <kio/renamedialog.h>
 #include <kio/global.h>
+#include <KIOFileWidgets/KFileWidget>
+#include <KIOFileWidgets/KRecentDirs>
 #include <kjobtrackerinterface.h>
 
 #include <TelepathyQt/IncomingFileTransferChannel>
@@ -176,7 +178,15 @@ void HandleIncomingFileTransferChannelJobPrivate::start()
     }
 
     if (askForDownloadDirectory) {
-        url = QFileDialog::getSaveFileUrl(0, QString(), QUrl(QLatin1String("kfiledialog:///FileTransferLastDirectory/") + channel->fileName()));
+
+        QString recentDirClass;
+
+        url = QFileDialog::getSaveFileUrl(0, QString(),
+                                          KFileWidget::getStartUrl(QUrl(QLatin1String("kfiledialog:///FileTransferLastDirectory/") + channel->fileName()), recentDirClass));
+
+        if (!recentDirClass.isEmpty()) {
+            KRecentDirs::add(recentDirClass, url.toLocalFile());
+        }
 
         partUrl.setPath(url.path() + QLatin1String(".part"));
         partUrl.setScheme(QLatin1String("file"));

-- 
ktp-filetransfer-handler packaging



More information about the pkg-kde-commits mailing list