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

use the standard KPluginInfo stuff for this

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=858758
This commit is contained in:
Aaron J. Seigo 2008-09-08 16:55:05 +00:00
parent d14e6c63bb
commit 28a014d6fe
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataengine.cpp
View File

@ -428,7 +428,7 @@ DataEnginePrivate::DataEnginePrivate(DataEngine* e, KService::Ptr service)
return; return;
} }
engineName = service->property("X-Plasma-EngineName").toString(); engineName = service->name();
if (engineName.isEmpty()) { if (engineName.isEmpty()) {
engineName = i18n("Unnamed"); engineName = i18n("Unnamed");
} }

7
dataenginemanager.cpp
View File

@ -118,7 +118,7 @@ Plasma::DataEngine* DataEngineManager::loadEngine(const QString& name)
} }
// load the engine, add it to the engines // load the engine, add it to the engines
QString constraint = QString("[X-Plasma-EngineName] == '%1'").arg(name); QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine", KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine",
constraint); constraint);
QString error; QString error;
@ -170,7 +170,10 @@ QStringList DataEngineManager::listAllEngines()
QStringList engines; QStringList engines;
KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine"); KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine");
foreach (const KService::Ptr &service, offers) { foreach (const KService::Ptr &service, offers) {
engines.append(service->property("X-Plasma-EngineName").toString()); QString name = service->property("X-KDE-PluginInfo-Name").toString();
if (!name.isEmpty()) {
engines.append(name);
}
} }
return engines; return engines;

3
servicetypes/plasma-dataengine.desktop
View File

@ -60,6 +60,3 @@ Comment[x-test]=xxPlasma Data Enginexx
Comment[zh_CN]=Plasma 数据引擎 Comment[zh_CN]=Plasma 数据引擎
Comment[zh_TW]=Plasma 資料引擎 Comment[zh_TW]=Plasma 資料引擎
[PropertyDef::X-Plasma-EngineName]
Type=QString