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

Fix DecorationPalette loading when kdeglobals doesn't exist

Browse source 
When kdeglobals doesn't exist, QStandardPaths::locate() for it returns
an empty string, so the check in previous fix doesn't work in this case.

This change sets m_colorScheme properly in this case and also creates an
empty kdeglobals(needed because QFileSystemWatcher can't monitor
non-existing files) so kdeglobals can be reloaded if it is later
populated.

REVIEW: 123399
This commit is contained in:
Mika Allan Rauhala 2015-04-22 12:31:05 +02:00 committed by Martin Gräßlin
parent 740be3e8d3
commit 9636922827
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
decorations/decorationpalette.cpp
View file

@ -41,6 +41,15 @@ DecorationPalette::DecorationPalette(const QString &colorScheme)
? colorScheme ? colorScheme
: QStandardPaths::locate(QStandardPaths::GenericConfigLocation, colorScheme)) : QStandardPaths::locate(QStandardPaths::GenericConfigLocation, colorScheme))
{ {
if (m_colorScheme.isEmpty() && colorScheme == QStringLiteral("kdeglobals")) {
// kdeglobals doesn't exist so create it. This is needed to monitor it using QFileSystemWatcher.
auto config = KSharedConfig::openConfig(colorScheme, KConfig::SimpleConfig);
KConfigGroup wmConfig(config, QStringLiteral("WM"));
wmConfig.writeEntry("FakeEntryToKeepThisGroup", true);
config->sync();
m_colorScheme = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, colorScheme);
}
m_watcher.addPath(m_colorScheme); m_watcher.addPath(m_colorScheme);
connect(&m_watcher, &QFileSystemWatcher::fileChanged, [this]() { connect(&m_watcher, &QFileSystemWatcher::fileChanged, [this]() {
m_watcher.addPath(m_colorScheme); m_watcher.addPath(m_colorScheme);