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

we need to init() the constraint earlier now that the ContainmentType isn't set until init()

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=742848
This commit is contained in:
Aaron J. Seigo 2007-11-29 01:02:33 +00:00
parent eb62d53f8f
commit 4c582073df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
corona.cpp
View File

@ -159,7 +159,7 @@ void Corona::loadApplets(const QString& configName)
} }
int cid = group.toUInt(); int cid = group.toUInt();
kDebug() << "got a containment in the config, trying to make a" << containmentConfig.readEntry("plugin", QString()) << "from" << group; //kDebug() << "got a containment in the config, trying to make a" << containmentConfig.readEntry("plugin", QString()) << "from" << group;
Containment *c = addContainment(containmentConfig.readEntry("plugin", QString()), QVariantList(), Containment *c = addContainment(containmentConfig.readEntry("plugin", QString()), QVariantList(),
cid, true); cid, true);
if (!c) { if (!c) {
@ -167,15 +167,16 @@ void Corona::loadApplets(const QString& configName)
} }
addItem(c); addItem(c);
c->init();
c->loadConstraints(&containmentConfig); c->loadConstraints(&containmentConfig);
//kDebug() << "Containment" << c->id() << "geometry is" << c->geometry().toRect() << "config'd with" << appletConfig.name(); //kDebug() << "Containment" << c->id() << "geometry is" << c->geometry().toRect() << "config'd with" << appletConfig.name();
KConfigGroup applets(&containmentConfig, "Applets"); KConfigGroup applets(&containmentConfig, "Applets");
foreach (const QString &appletGroup, applets.groupList()) { foreach (const QString &appletGroup, applets.groupList()) {
kDebug() << "reading from applet group" << appletGroup; //kDebug() << "reading from applet group" << appletGroup;
int appId = appletGroup.toUInt(); int appId = appletGroup.toUInt();
KConfigGroup appletConfig(&applets, appletGroup); KConfigGroup appletConfig(&applets, appletGroup);
kDebug() << "the name is" << appletConfig.name(); //kDebug() << "the name is" << appletConfig.name();
QString plugin = appletConfig.readEntry("plugin", QString()); QString plugin = appletConfig.readEntry("plugin", QString());
if (plugin.isEmpty()) { if (plugin.isEmpty()) {
@ -201,7 +202,6 @@ void Corona::loadApplets(const QString& configName)
} else { } else {
foreach (Containment* containment, d->containments) { foreach (Containment* containment, d->containments) {
QString cid = QString::number(containment->id()); QString cid = QString::number(containment->id());
containment->init();
KConfigGroup containmentConfig(&containments, cid); KConfigGroup containmentConfig(&containments, cid);
containment->setImmutable(containmentConfig.isImmutable()); containment->setImmutable(containmentConfig.isImmutable());