Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
Dolphin
Commits
40cc5f66
Commit
40cc5f66
authored
Oct 11, 2022
by
Laurent Montel
Browse files
port to KIO::createDefaultJobUiDelegate
parent
d3617c06
Pipeline
#245935
canceled with stage
in 3 minutes and 54 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/dolphinmainwindow.cpp
View file @
40cc5f66
...
...
@@ -42,7 +42,12 @@
#include
<KDualAction>
#include
<KFileItemListProperties>
#include
<KIO/CommandLauncherJob>
#include
<kio_version.h>
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
#include
<KIO/JobUiDelegateFactory>
#else
#include
<KIO/JobUiDelegate>
#endif
#include
<KIO/OpenFileManagerWindowJob>
#include
<KIO/OpenUrlJob>
#include
<KJobWidgets>
...
...
@@ -1241,7 +1246,11 @@ void DolphinMainWindow::handleUrl(const QUrl& url)
activeViewContainer
()
->
setUrl
(
url
);
}
else
{
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
));
#endif
m_lastHandleUrlOpenJob
->
setShowOpenOrExecuteDialog
(
true
);
connect
(
m_lastHandleUrlOpenJob
,
&
KIO
::
OpenUrlJob
::
mimeTypeFound
,
this
,
...
...
src/dolphinviewcontainer.cpp
View file @
40cc5f66
...
...
@@ -24,7 +24,12 @@
#endif
#include
<KFileItemActions>
#include
<KFilePlacesModel>
#include
<kio_version.h>
#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
#include
<KIO/JobUiDelegateFactory>
#else
#include
<KIO/JobUiDelegate>
#endif
#include
<KIO/OpenUrlJob>
#include
<KLocalizedString>
#include
<KMessageWidget>
...
...
@@ -758,7 +763,11 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item)
}
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
);
connect
(
job
,
&
KIO
::
OpenUrlJob
::
finished
,
this
,
&
DolphinViewContainer
::
slotOpenUrlFinished
);
job
->
start
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment