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

default config was completely unused

Browse Source 
this was probably not helped by lack of documentation, but it is most
likely because we never found a real world use case for it. all use
cases we can currently imagine are able to be handled using other methods
This commit is contained in:
Aaron Seigo 2012-10-05 18:08:33 +02:00
parent 1bb965acbb
commit 9d61df3894
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
private/applet_p.cpp
View File

@ -683,7 +683,6 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
return mainConfig; return mainConfig;
} }
bool newGroup = false;
if (isContainment) { if (isContainment) {
Corona *corona = qobject_cast<Corona*>(q->scene()); Corona *corona = qobject_cast<Corona*>(q->scene());
KConfigGroup containmentConfig; KConfigGroup containmentConfig;
@ -695,10 +694,6 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
containmentConfig = KConfigGroup(KSharedConfig::openConfig(), "Containments"); containmentConfig = KConfigGroup(KSharedConfig::openConfig(), "Containments");
} }
if (package && !containmentConfig.hasGroup(QString::number(appletId))) {
newGroup = true;
}
mainConfig = new KConfigGroup(&containmentConfig, QString::number(appletId)); mainConfig = new KConfigGroup(&containmentConfig, QString::number(appletId));
} else { } else {
KConfigGroup appletConfig; KConfigGroup appletConfig;
@ -719,25 +714,9 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
appletConfig = KConfigGroup(KSharedConfig::openConfig(), "Applets"); appletConfig = KConfigGroup(KSharedConfig::openConfig(), "Applets");
} }
if (package && !appletConfig.hasGroup(QString::number(appletId))) {
newGroup = true;
}
mainConfig = new KConfigGroup(&appletConfig, QString::number(appletId)); mainConfig = new KConfigGroup(&appletConfig, QString::number(appletId));
} }
if (newGroup) {
//see if we have a default configuration in our package
const QString defaultConfigFile = package->filePath("defaultconfig");
if (!defaultConfigFile.isEmpty()) {
#ifndef NDEBUG
kDebug() << "copying default config: " << package->filePath("defaultconfig");
#endif
KConfigGroup defaultConfig(KSharedConfig::openConfig(defaultConfigFile)->group("Configuration"));
defaultConfig.copyTo(mainConfig);
}
}
return mainConfig; return mainConfig;
} }

1
private/packages.cpp
View File

@ -118,7 +118,6 @@ void PlasmoidPackage::initPackage(Package *package)
package->addFileDefinition("mainconfigui", "ui/config.ui", i18n("Main Config UI File")); package->addFileDefinition("mainconfigui", "ui/config.ui", i18n("Main Config UI File"));
package->addFileDefinition("mainconfigxml", "config/main.xml", i18n("Configuration XML file")); package->addFileDefinition("mainconfigxml", "config/main.xml", i18n("Configuration XML file"));
package->addFileDefinition("defaultconfig", "config/default-configrc", i18n("Default configuration"));
package->addDirectoryDefinition("animations", "animations", i18n("Animation scripts")); package->addDirectoryDefinition("animations", "animations", i18n("Animation scripts"));
} }

2
tests/packagestructuretest.cpp
View File

@ -112,7 +112,7 @@ void PackageStructureTest::requiredDirectories()
void PackageStructureTest::files() void PackageStructureTest::files()
{ {
QList<const char*> files; QList<const char*> files;
files << "defaultconfig" << "mainconfigui" << "mainconfigxml" << "mainscript"; files << "mainconfigui" << "mainconfigxml" << "mainscript";
QList<const char*> psFiles = ps.files(); QList<const char*> psFiles = ps.files();