From af2fc8038b31ba678f92d3c531e7a551e27813bd Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 6 Mar 2015 11:21:37 +0100 Subject: [PATCH] show all entries with "Exec" --- qmlcomponents/applicationlistmodel.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/qmlcomponents/applicationlistmodel.cpp b/qmlcomponents/applicationlistmodel.cpp index b6362601..0cde47ef 100644 --- a/qmlcomponents/applicationlistmodel.cpp +++ b/qmlcomponents/applicationlistmodel.cpp @@ -68,26 +68,23 @@ void ApplicationListModel::loadApplications() for(KServiceGroup::List::ConstIterator it = subGroupList.begin();it != subGroupList.end(); it++) { KSycocaEntry::Ptr groupEntry = (*it); - if (groupEntry->isType(KST_KServiceGroup) && groupEntry->name() != "System") { + if (groupEntry->isType(KST_KServiceGroup) && groupEntry->name() != "System/" && groupEntry->name() != "Settingsmenu/") { KServiceGroup::Ptr serviceGroup(static_cast(groupEntry.data())); if (!serviceGroup->noDisplay()) { KServiceGroup::List entryGroupList = serviceGroup->entries(true); - for(KServiceGroup::List::ConstIterator it = entryGroupList.begin(); it != entryGroupList.end(); it++) { + for(KServiceGroup::List::ConstIterator it = entryGroupList.begin(); it != entryGroupList.end(); it++) {qWarning()<<"BBBBB"<<(*it)->name(); KSycocaEntry::Ptr entry = (*it); ApplicationData data; - if (entry->isType(KST_KService)) { + + if (entry->property("Exec").isValid()) { KService::Ptr service(static_cast(entry.data())); if (service->isApplication()) { - KPluginInfo plugin(service); - if (!plugin.isValid()) { - continue; - } - data.name = plugin.name(); - data.icon = plugin.icon(); + data.name = service->name(); + data.icon = service->icon(); data.storageId = service->storageId(); - data.entryPath = plugin.entryPath(); + data.entryPath = service->exec(); m_applicationList << data; } }