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

KRUSH:

Browse Source 
* endsWith, since it must end with; prevent possible clash with an applet with the name containment ;)
* don't add containments multiple times to the scene; no harm, but it spits out warnings to the konsole

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=735125
This commit is contained in:
Aaron J. Seigo 2007-11-10 23:20:48 +00:00
parent a0592bf1f4
commit 131fb643b6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
corona.cpp
View File

@ -150,7 +150,7 @@ void Corona::loadApplets(const QString& configname)
QHash<int, Containment*> containments; QHash<int, Containment*> containments;
foreach (const QString& group, config.groupList()) { foreach (const QString& group, config.groupList()) {
KConfigGroup appletConfig(&config, group); KConfigGroup appletConfig(&config, group);
if (group.contains("containment")) { if (group.endsWith("containment")) {
int cid = group.left(group.indexOf('-')).toUInt(); int cid = group.left(group.indexOf('-')).toUInt();
Containment *c = addContainment(appletConfig.readEntry("plugin", QString()), QVariantList(), Containment *c = addContainment(appletConfig.readEntry("plugin", QString()), QVariantList(),
cid, true); cid, true);
@ -158,7 +158,7 @@ void Corona::loadApplets(const QString& configname)
addItem(c); addItem(c);
containments.insert(c->id(), c); containments.insert(c->id(), c);
c->initConstraints(&appletConfig); c->initConstraints(&appletConfig);
//kDebug() << "Containment" << c->id() << "geometry is" << c->geometry(); //kDebug() << "Containment" << c->id() << "geometry is" << c->geometry().toRect() << "config'd with" << appletConfig.name();
} }
} else { } else {
// it's an applet, let's grab the containment association // it's an applet, let's grab the containment association
@ -197,7 +197,6 @@ void Corona::loadApplets(const QString& configname)
} else { } else {
foreach (Containment* containment, d->containments) { foreach (Containment* containment, d->containments) {
containment->init(); containment->init();
addItem(containment);
foreach(Applet* applet, containment->applets()) { foreach(Applet* applet, containment->applets()) {
applet->init(); applet->init();