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

improve loading of system kcms

Browse Source 
* don't use libkutils on reduced footprint profile builds
* load the kcms even if there isn't a configLoader for the package
This commit is contained in:
Aaron Seigo 2011-11-02 17:24:25 +01:00
parent ebbf1bbc32
commit 9a4825380f
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
applet.cpp
View File

@ -53,8 +53,6 @@
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kauthorized.h> #include <kauthorized.h>
#include <kcolorscheme.h> #include <kcolorscheme.h>
#include <kcmoduleinfo.h>
#include <kcmoduleproxy.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kicon.h> #include <kicon.h>
@ -68,6 +66,11 @@
#include <kwindowsystem.h> #include <kwindowsystem.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#ifndef PLASMA_NO_KUTILS
#include <kcmoduleinfo.h>
#include <kcmoduleproxy.h>
#endif
#ifndef PLASMA_NO_SOLID #ifndef PLASMA_NO_SOLID
#include <solid/powermanagement.h> #include <solid/powermanagement.h>
#endif #endif
@ -1885,14 +1888,16 @@ void Applet::showConfigurationInterface()
} }
d->publishUI.publishCheckbox = 0; d->publishUI.publishCheckbox = 0;
if (d->package && d->configLoader) { if (d->package) {
KConfigDialog *dialog = 0; KConfigDialog *dialog = 0;
const QString uiFile = d->package->filePath("mainconfigui"); const QString uiFile = d->package->filePath("mainconfigui");
KDesktopFile df(d->package->path() + "/metadata.desktop"); KDesktopFile df(d->package->path() + "/metadata.desktop");
const QStringList kcmPlugins = df.desktopGroup().readEntry("X-Plasma-ConfigPlugins", QStringList()); const QStringList kcmPlugins = df.desktopGroup().readEntry("X-Plasma-ConfigPlugins", QStringList());
if (!uiFile.isEmpty() || !kcmPlugins.isEmpty()) { if (!uiFile.isEmpty() || !kcmPlugins.isEmpty()) {
dialog = new AppletConfigDialog(0, d->configDialogId(), d->configLoader); KConfigSkeleton *configLoader = d->configLoader ? d->configLoader : new KConfigSkeleton(0);
dialog = new AppletConfigDialog(0, d->configDialogId(), configLoader);
dialog->setWindowTitle(d->configWindowTitle()); dialog->setWindowTitle(d->configWindowTitle());
dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setAttribute(Qt::WA_DeleteOnClose, true);
bool hasPages = false; bool hasPages = false;
@ -1906,6 +1911,7 @@ void Applet::showConfigurationInterface()
} }
foreach (const QString &kcm, kcmPlugins) { foreach (const QString &kcm, kcmPlugins) {
#ifndef PLASMA_NO_KUTILS
KCModuleProxy *module = new KCModuleProxy(kcm); KCModuleProxy *module = new KCModuleProxy(kcm);
if (module->realModule()) { if (module->realModule()) {
dialog->addPage(module, module->moduleInfo().moduleName(), module->moduleInfo().icon()); dialog->addPage(module, module->moduleInfo().moduleName(), module->moduleInfo().icon());
@ -1913,6 +1919,22 @@ void Applet::showConfigurationInterface()
} else { } else {
delete module; delete module;
} }
#else
KService::Ptr service = KService::serviceByStorageId(kcm);
if (service) {
QString error;
KCModule *module = service->createInstance<KCModule>(dialog, QVariantList(), &error);
if (module) {
connect(module, SIGNAL(changed(bool)), dialog, SLOT(settingsModified(bool)));
dialog->addPage(module, service->name(), service->icon());
hasPages = true;
} else {
#ifndef NDEBUG
kDebug() << "failed to load kcm" << kcm << "for" << name();
#endif
}
}
#endif
} }
if (hasPages) { if (hasPages) {