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

Simplify getting associated apps list in AssociatedApplicationManager

Browse Source 
REVIEW: 125105
This commit is contained in:
Martin Klapetek 2015-09-08 12:30:30 -04:00
parent fd9a936393
commit e07778d97b
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@
#include <qstandardpaths.h> #include <qstandardpaths.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kfileitemactions.h> #include <KMimeTypeTrader>
#if !PLASMA_NO_KIO #if !PLASMA_NO_KIO
#include <krun.h> #include <krun.h>
@ -72,15 +72,8 @@ public:
for (i = urlLists.begin(); i != urlLists.end(); ++i) { for (i = urlLists.begin(); i != urlLists.end(); ++i) {
QAction *a = i.key()->actions()->action("run associated application"); QAction *a = i.key()->actions()->action("run associated application");
if (a) { if (a) {
// This gets the current mimetype _and_ a list of its aliases, because aliases() const QString mimeType = mimeDb.mimeTypeForUrl(i.value().first()).name();
// do not return the current mimetype in it, so it needs to be prepended, const KService::List apps = KMimeTypeTrader::self()->query(mimeType);
// especially for the cases where there are no aliases to be returned,
// this would then just return an empty list, returning the generic action even
// when there is a valid mimetype and an associated app
QStringList mimeTypes{mimeDb.mimeTypeForUrl(i.value().first()).name()};
mimeTypes << mimeDb.mimeTypeForUrl(i.value().first()).aliases();
apps = KFileItemActions::associatedApplications(mimeTypes, QString());
if (!apps.isEmpty()) { if (!apps.isEmpty()) {
a->setIcon(QIcon::fromTheme(apps.first()->icon())); a->setIcon(QIcon::fromTheme(apps.first()->icon()));
a->setText(i18n("Open with %1", apps.first()->genericName().isEmpty() ? apps.first()->genericName() : apps.first()->name())); a->setText(i18n("Open with %1", apps.first()->genericName().isEmpty() ? apps.first()->genericName() : apps.first()->name()));
@ -149,7 +142,8 @@ void AssociatedApplicationManager::setUrls(Plasma::Applet *applet, const QList<Q
QAction *a = applet->actions()->action("run associated application"); QAction *a = applet->actions()->action("run associated application");
if (a) { if (a) {
QMimeDatabase mimeDb; QMimeDatabase mimeDb;
KService::List apps = KFileItemActions::associatedApplications(mimeDb.mimeTypeForUrl(urls.first()).aliases(), QString()); const QString mimeType = mimeDb.mimeTypeForUrl(urls.first()).name();
const KService::List apps = KMimeTypeTrader::self()->query(mimeType);
if (!apps.isEmpty()) { if (!apps.isEmpty()) {
a->setIcon(QIcon::fromTheme(apps.first()->icon())); a->setIcon(QIcon::fromTheme(apps.first()->icon()));
a->setText(i18n("Open with %1", apps.first()->genericName().isEmpty() ? apps.first()->genericName() : apps.first()->name())); a->setText(i18n("Open with %1", apps.first()->genericName().isEmpty() ? apps.first()->genericName() : apps.first()->name()));