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

differentiate loadLayout from importLayout by making loadLayout set what the configuration file to use is while import simply brings the data from the config file in without changing the target config file to save to for the corona. open vs import, iow.

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1136734
This commit is contained in:
Aaron J. Seigo 2010-06-10 15:59:53 +00:00
parent 81ac415af6
commit f7c28b7ebb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
corona.cpp
View File

@ -438,14 +438,13 @@ void Corona::layoutContainments()
void Corona::loadLayout(const QString &configName)
{
KSharedConfigPtr conf;
if (configName.isEmpty() || configName == d->configName) {
conf = config();
} else {
conf = KSharedConfig::openConfig(configName);
if (!configName.isEmpty() && configName != d->configName) {
// if we have a new config name passed in, then use that as the config file for this Corona
d->config = 0;
d->configName = configName;
}
KSharedConfigPtr conf = config();
d->importLayout(*conf, conf != config());
}