mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
port to KIO::createDefaultJobUiDelegate
This commit is contained in:
parent
d3617c06d4
commit
40cc5f665d
|
@ -42,7 +42,12 @@
|
||||||
#include <KDualAction>
|
#include <KDualAction>
|
||||||
#include <KFileItemListProperties>
|
#include <KFileItemListProperties>
|
||||||
#include <KIO/CommandLauncherJob>
|
#include <KIO/CommandLauncherJob>
|
||||||
|
#include <kio_version.h>
|
||||||
|
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
|
||||||
|
#include <KIO/JobUiDelegateFactory>
|
||||||
|
#else
|
||||||
#include <KIO/JobUiDelegate>
|
#include <KIO/JobUiDelegate>
|
||||||
|
#endif
|
||||||
#include <KIO/OpenFileManagerWindowJob>
|
#include <KIO/OpenFileManagerWindowJob>
|
||||||
#include <KIO/OpenUrlJob>
|
#include <KIO/OpenUrlJob>
|
||||||
#include <KJobWidgets>
|
#include <KJobWidgets>
|
||||||
|
@ -1241,7 +1246,11 @@ void DolphinMainWindow::handleUrl(const QUrl& url)
|
||||||
activeViewContainer()->setUrl(url);
|
activeViewContainer()->setUrl(url);
|
||||||
} else {
|
} else {
|
||||||
m_lastHandleUrlOpenJob = new KIO::OpenUrlJob(url);
|
m_lastHandleUrlOpenJob = new KIO::OpenUrlJob(url);
|
||||||
|
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
|
||||||
|
m_lastHandleUrlOpenJob->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
|
#else
|
||||||
m_lastHandleUrlOpenJob->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
m_lastHandleUrlOpenJob->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
|
#endif
|
||||||
m_lastHandleUrlOpenJob->setShowOpenOrExecuteDialog(true);
|
m_lastHandleUrlOpenJob->setShowOpenOrExecuteDialog(true);
|
||||||
|
|
||||||
connect(m_lastHandleUrlOpenJob, &KIO::OpenUrlJob::mimeTypeFound, this,
|
connect(m_lastHandleUrlOpenJob, &KIO::OpenUrlJob::mimeTypeFound, this,
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
#endif
|
#endif
|
||||||
#include <KFileItemActions>
|
#include <KFileItemActions>
|
||||||
#include <KFilePlacesModel>
|
#include <KFilePlacesModel>
|
||||||
|
#include <kio_version.h>
|
||||||
|
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
|
||||||
|
#include <KIO/JobUiDelegateFactory>
|
||||||
|
#else
|
||||||
#include <KIO/JobUiDelegate>
|
#include <KIO/JobUiDelegate>
|
||||||
|
#endif
|
||||||
#include <KIO/OpenUrlJob>
|
#include <KIO/OpenUrlJob>
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
#include <KMessageWidget>
|
#include <KMessageWidget>
|
||||||
|
@ -758,7 +763,11 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item)
|
||||||
}
|
}
|
||||||
|
|
||||||
KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype());
|
KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype());
|
||||||
job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoWarningHandlingEnabled, this));
|
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
|
||||||
|
job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
|
#else
|
||||||
|
job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
|
#endif
|
||||||
job->setShowOpenOrExecuteDialog(true);
|
job->setShowOpenOrExecuteDialog(true);
|
||||||
connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
|
connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
|
||||||
job->start();
|
job->start();
|
||||||
|
|
Loading…
Reference in a new issue