Fix absolute icon paths

wilder-portage-prov
Alexander Lohnau 6 years ago
parent 25de25cb77
commit ba44b69abf
  1. 7
      applets/kicker/plugin/appentry.cpp
  2. 2
      applets/kicker/plugin/recentusagemodel.cpp

@ -28,6 +28,7 @@
#include <QProcess>
#include <QQmlPropertyMap>
#include <QStandardPaths>
#include <QFileInfo>
#if HAVE_X11
#include <QX11Info>
#endif
@ -91,7 +92,11 @@ bool AppEntry::isValid() const
QIcon AppEntry::icon() const
{
if (m_icon.isNull()) {
m_icon = QIcon::fromTheme(m_service->icon(), QIcon::fromTheme(QStringLiteral("unknown")));
if (QFileInfo::exists(m_service->icon())) {
m_icon = QIcon(m_service->icon());
} else {
m_icon = QIcon::fromTheme(m_service->icon(), QIcon::fromTheme(QStringLiteral("unknown")));
}
}
return m_icon;
}

@ -221,7 +221,7 @@ QVariant RecentUsageModel::appData(const QString &resource, int role) const
return AppEntry::nameFromService(service, AppEntry::NameOnly);
}
} else if (role == Qt::DecorationRole) {
return QIcon::fromTheme(service->icon(), QIcon::fromTheme(QStringLiteral("unknown")));
return service->icon();
} else if (role == Kicker::DescriptionRole) {
return service->comment();
} else if (role == Kicker::GroupRole) {

Loading…
Cancel
Save