yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[aurorae] Fix locating of theme configuration file

Browse source
This commit is contained in:
Martin Gräßlin 2013-10-02 09:57:48 +02:00
parent b6990c5fb7
commit 736a0c5611
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/aurorae/src/aurorae.cpp
View file

@ -83,7 +83,8 @@ void AuroraeFactory::initAurorae(KConfig &conf, KConfigGroup &group)
initQML(group); initQML(group);
return; return;
} }
KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"), KConfig::FullConfig, QStandardPaths::DataLocation); KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"),
KConfig::FullConfig, QStandardPaths::GenericDataLocation);
KConfigGroup themeGroup(&conf, themeName); KConfigGroup themeGroup(&conf, themeName);
m_theme->loadTheme(themeName, config); m_theme->loadTheme(themeName, config);
m_theme->setBorderSize((KDecorationDefines::BorderSize)themeGroup.readEntry<int>("BorderSize", KDecorationDefines::BorderNormal)); m_theme->setBorderSize((KDecorationDefines::BorderSize)themeGroup.readEntry<int>("BorderSize", KDecorationDefines::BorderNormal));
@ -160,7 +161,8 @@ void AuroraeFactory::updateConfiguration()
const KConfig conf(QStringLiteral("auroraerc")); const KConfig conf(QStringLiteral("auroraerc"));
const KConfigGroup group(&conf, "Engine"); const KConfigGroup group(&conf, "Engine");
const QString themeName = group.readEntry("ThemeName", "example-deco"); const QString themeName = group.readEntry("ThemeName", "example-deco");
const KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"), KConfig::FullConfig, QStandardPaths::DataLocation); const KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"),
KConfig::FullConfig, QStandardPaths::GenericDataLocation);
const KConfigGroup themeGroup(&conf, themeName); const KConfigGroup themeGroup(&conf, themeName);
if (themeName != m_themeName) { if (themeName != m_themeName) {
m_engine->clearComponentCache(); m_engine->clearComponentCache();