Codebase list ktp-filetransfer-handler / fe0a4d4
Merge tag 'refs/tags/upstream/16.04.0' Upstream version 16.04.0 Automatic packaging 8 years ago
3 changed file(s) with 15 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
+3
-3
CMakeLists.txt less more
22 cmake_minimum_required(VERSION 2.8.12)
33
44 # KDE Application Version, managed by release script
5 set(KDE_APPLICATIONS_VERSION_MAJOR "15")
6 set(KDE_APPLICATIONS_VERSION_MINOR "12")
7 set(KDE_APPLICATIONS_VERSION_MICRO "3")
5 set(KDE_APPLICATIONS_VERSION_MAJOR "16")
6 set(KDE_APPLICATIONS_VERSION_MINOR "04")
7 set(KDE_APPLICATIONS_VERSION_MICRO "0")
88 set(KTP_FILETRANSFER_HANDLER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
99
1010 find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+1
-0
src/CMakeLists.txt less more
1717 KF5::CoreAddons
1818 KF5::I18n
1919 KF5::KIOWidgets
20 KF5::KIOFileWidgets
2021 KF5::ConfigCore
2122 Qt5::Core
2223 Qt5::DBus
+11
-1
src/handle-incoming-file-transfer-channel-job.cpp less more
2929 #include <KLocalizedString>
3030 #include <kio/renamedialog.h>
3131 #include <kio/global.h>
32 #include <KIOFileWidgets/KFileWidget>
33 #include <KIOFileWidgets/KRecentDirs>
3234 #include <kjobtrackerinterface.h>
3335
3436 #include <TelepathyQt/IncomingFileTransferChannel>
175177 }
176178
177179 if (askForDownloadDirectory) {
178 url = QFileDialog::getSaveFileUrl(0, QString(), QUrl(QLatin1String("kfiledialog:///FileTransferLastDirectory/") + channel->fileName()));
180
181 QString recentDirClass;
182
183 url = QFileDialog::getSaveFileUrl(0, QString(),
184 KFileWidget::getStartUrl(QUrl(QLatin1String("kfiledialog:///FileTransferLastDirectory/") + channel->fileName()), recentDirClass));
185
186 if (!recentDirClass.isEmpty()) {
187 KRecentDirs::add(recentDirClass, url.toLocalFile());
188 }
179189
180190 partUrl.setPath(url.path() + QLatin1String(".part"));
181191 partUrl.setScheme(QLatin1String("file"));