Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Jan Paul Batrina
Ark
Commits
56c1b43b
Commit
56c1b43b
authored
May 12, 2020
by
David Faure
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port to KIO::ApplicationLauncherJob
parent
2811c052
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
11 deletions
+27
-11
CMakeLists.txt
CMakeLists.txt
+1
-1
app/compressfileitemaction.cpp
app/compressfileitemaction.cpp
+9
-3
app/extractfileitemaction.cpp
app/extractfileitemaction.cpp
+9
-3
part/arkviewer.cpp
part/arkviewer.cpp
+8
-4
No files found.
CMakeLists.txt
View file @
56c1b43b
...
...
@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project
(
ark VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION 5.10.0
)
set
(
KF5_MIN_VERSION 5.
61
.0
)
set
(
KF5_MIN_VERSION 5.
70
.0
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/modules
)
...
...
app/compressfileitemaction.cpp
View file @
56c1b43b
...
...
@@ -24,9 +24,11 @@
#include <QMenu>
#include <QMimeDatabase>
#include <KPluginFactory>
#include <KDialogJobUiDelegate>
#include <KIO/ApplicationLauncherJob>
#include <KLocalizedString>
#include <KRun>
#include <KPluginFactory>
#include <KService>
#include <algorithm>
...
...
@@ -99,7 +101,11 @@ QAction *CompressFileItemAction::createAction(const QIcon& icon, const QString&
QAction
*
action
=
new
QAction
(
icon
,
name
,
parent
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
[
exec
,
urls
,
parent
]()
{
KRun
::
run
(
exec
,
urls
,
parent
);
KService
::
Ptr
service
(
new
KService
(
QStringLiteral
(
"ark"
),
exec
,
QString
()));
KIO
::
ApplicationLauncherJob
*
job
=
new
KIO
::
ApplicationLauncherJob
(
service
);
job
->
setUrls
(
urls
);
job
->
setUiDelegate
(
new
KDialogJobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
parent
));
job
->
start
();
});
return
action
;
...
...
app/extractfileitemaction.cpp
View file @
56c1b43b
...
...
@@ -24,9 +24,11 @@
#include <QFileInfo>
#include <QMenu>
#include <KPluginFactory>
#include <KDialogJobUiDelegate>
#include <KIO/ApplicationLauncherJob>
#include <KLocalizedString>
#include <KRun>
#include <KPluginFactory>
#include <KService>
#include "mimetypes.h"
#include "pluginmanager.h"
...
...
@@ -104,7 +106,11 @@ QAction *ExtractFileItemAction::createAction(const QIcon& icon, const QString& n
QAction
*
action
=
new
QAction
(
icon
,
name
,
parent
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
[
exec
,
urls
,
parent
]()
{
KRun
::
run
(
exec
,
urls
,
parent
);
KService
::
Ptr
service
(
new
KService
(
QStringLiteral
(
"ark"
),
exec
,
QString
()));
KIO
::
ApplicationLauncherJob
*
job
=
new
KIO
::
ApplicationLauncherJob
(
service
);
job
->
setUrls
(
urls
);
job
->
setUiDelegate
(
new
KDialogJobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
parent
));
job
->
start
();
});
return
action
;
...
...
part/arkviewer.cpp
View file @
56c1b43b
...
...
@@ -22,12 +22,13 @@
#include "arkviewer.h"
#include "ark_debug.h"
#include <KIO/JobUiDelegate>
#include <KIO/ApplicationLauncherJob>
#include <KLocalizedString>
#include <KMimeTypeTrader>
#include <KMessageBox>
#include <KParts/ReadOnlyPart>
#include <KParts/OpenUrlArguments>
#include <KRun>
#include <KXMLGUIFactory>
#include <QFile>
...
...
@@ -96,9 +97,12 @@ void ArkViewer::view(const QString& fileName)
qCDebug
(
ARK
)
<<
"Using external viewer"
;
const
QList
<
QUrl
>
fileUrlList
=
{
QUrl
::
fromLocalFile
(
fileName
)};
// The last argument (tempFiles) set to true means that the temporary
// file will be removed when the viewer application exits.
KRun
::
runService
(
*
viewer
,
fileUrlList
,
nullptr
,
true
);
KIO
::
ApplicationLauncherJob
*
job
=
new
KIO
::
ApplicationLauncherJob
(
viewer
);
job
->
setUrls
(
fileUrlList
);
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
nullptr
));
// The temporary file will be removed when the viewer application exits.
job
->
setRunFlags
(
KIO
::
ApplicationLauncherJob
::
DeleteTemporaryFiles
);
job
->
start
();
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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