alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port plasma-framework away from KRun

Browse Source
This commit is contained in:
David Faure 2020-05-22 22:36:25 +02:00
parent c46a0dbf00
commit 50530a7739
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/CMakeLists.txt
View File

@ -125,7 +125,7 @@ PRIVATE
KF5::GuiAddons #kimagecache KF5::GuiAddons #kimagecache
KF5::I18n KF5::I18n
KF5::KIOCore #ServiceJob KF5::KIOCore #ServiceJob
KF5::KIOWidgets #KRun KF5::KIOWidgets #KIO::JobUiDelegate
KF5::WindowSystem #compositingActive KF5::WindowSystem #compositingActive
KF5::Declarative #runtimePlatform KF5::Declarative #runtimePlatform
KF5::XmlGui #KActionCollection KF5::XmlGui #KActionCollection

27
src/plasma/private/associatedapplicationmanager.cpp
View File

@ -33,8 +33,10 @@
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <KMimeTypeTrader> #include <KMimeTypeTrader>
#include <KIO/ApplicationLauncherJob>
#include <KRun> #include <KIO/OpenUrlJob>
#include <KIO/JobUiDelegate>
#include <KNotificationJobUiDelegate>
#include "plasma/applet.h" #include "plasma/applet.h"
@ -192,13 +194,22 @@ QList<QUrl> AssociatedApplicationManager::urls(const Plasma::Applet *applet) con
void AssociatedApplicationManager::run(Plasma::Applet *applet) void AssociatedApplicationManager::run(Plasma::Applet *applet)
{ {
if (d->applicationNames.contains(applet)) { if (d->applicationNames.contains(applet)) {
bool success = KRun::run(d->applicationNames.value(applet), d->urlLists.value(applet), nullptr); const QString exec = d->applicationNames.value(applet);
if (!success) { KService::Ptr service(new KService(exec, exec, QString() /*icon*/));
qCWarning(LOG_PLASMA) << "couldn't run" << d->applicationNames.value(applet) << d->urlLists.value(applet); KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service);
} job->setUrls(d->urlLists.value(applet));
job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled));
connect(job, &KJob::result, this, [this, applet](KJob *job) {
if (job->error()) {
qCWarning(LOG_PLASMA) << "couldn't run" << d->applicationNames.value(applet) << d->urlLists.value(applet) << job->errorString();
}
});
job->start();
} else if (d->urlLists.contains(applet)) { } else if (d->urlLists.contains(applet)) {
KRun *krun = new KRun(d->urlLists.value(applet).first(), nullptr); KIO::OpenUrlJob *job = new KIO::OpenUrlJob(d->urlLists.value(applet).first());
krun->setAutoDelete(true); // TODO use a KNotifications-based ui delegate that supports the Open With dialog
job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, nullptr));
job->start();
} }
} }