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

* do not reset the config file name when saveApplets is called with a specific file name

Browse Source 
* don't delete applet config groups because nobody actually bothers to implement saveState (*grrrr*) but that's somewhat ok now as we destroy the group on applet destruction. this does mean that dragging applets between containments is probably broken now, but i'll fix that next
* don't recreate the config file on every saveApplets but use the existing shared config ptr whenever possible

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=755635
This commit is contained in:
Aaron J. Seigo 2008-01-01 23:41:59 +00:00
parent 81909190eb
commit e3ff7be17d
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
corona.cpp
View File

@ -74,6 +74,22 @@ public:
QObject::connect(QApplication::desktop(), SIGNAL(resized(int)), q, SLOT(screenResized(int)));
}
void saveApplets(KSharedConfigPtr cg) const
{
KConfigGroup containmentsGroup(cg, "Containments");
foreach (const Containment *containment, containments) {
QString cid = QString::number(containment->id());
KConfigGroup containmentConfig(&containmentsGroup, cid);
containment->saveConstraints(&containmentConfig);
containment->save(&containmentConfig);
KConfigGroup applets(&containmentConfig, "Applets");
foreach (const Applet* applet, containment->applets()) {
KConfigGroup appletConfig(&applets, QString::number(applet->id()));
applet->save(&appletConfig);
}
}
}
bool immutable;
bool kioskImmutable;
QString mimetype;
@ -136,30 +152,17 @@ QString Corona::appletMimeType()
void Corona::saveApplets(const QString &config) const
{
KConfig cg(config);
d->configName = config;
KConfigGroup containments(&cg, "Containments");
foreach (const Containment *containment, d->containments) {
QString cid = QString::number(containment->id());
KConfigGroup containmentConfig(&containments, cid);
containment->saveConstraints(&containmentConfig);
containment->save(&containmentConfig);
KConfigGroup applets(&containmentConfig, "Applets");
applets.deleteGroup();
foreach (const Applet* applet, containment->applets()) {
KConfigGroup appletConfig(&applets, QString::number(applet->id()));
applet->save(&appletConfig);
}
}
KSharedConfigPtr cg = KSharedConfig::openConfig(config);
d->saveApplets(cg);
}
void Corona::saveApplets() const
{
saveApplets(d->configName);
d->saveApplets(config());
scheduleConfigSync();
}
void Corona::scheduleConfigSync()
void Corona::scheduleConfigSync() const
{
//NOTE: this is a pretty simplistic model: we simply save no more than CONFIG_SYNC_TIMEOUT
// after the first time this is called. not much of a heuristic for save points, but
@ -174,7 +177,10 @@ void Corona::scheduleConfigSync()
void Corona::loadApplets(const QString& configName)
{
clearApplets();
d->configName = configName;
if (configName != d->configName) {
d->configName = configName;
d->config = 0;
}
KConfigGroup containments(config(), "Containments");
@ -340,7 +346,7 @@ void Corona::clearApplets()
}
}
KSharedConfigPtr Corona::config()
KSharedConfigPtr Corona::config() const
{
if (!d->config) {
d->config = KSharedConfig::openConfig(d->configName);

4
corona.h
View File

@ -101,7 +101,7 @@ public:
/**
* Returns the the config file used to store the configuration for this Corona
*/
KSharedConfig::Ptr config();
KSharedConfig::Ptr config() const;
public Q_SLOTS:
/**
@ -118,7 +118,7 @@ public Q_SLOTS:
* Called when there have been changes made to configuration that should be saved
* to disk at the next convenient moment
*/
void scheduleConfigSync();
void scheduleConfigSync() const;
/**
* Adds a Containment to the Corona