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

Merge "Do not keep reparsing plasmarc configuration"

Browse Source
This commit is contained in:
David Edmundson 2014-12-11 12:40:37 +01:00 committed by Gerrit Code Review
commit e9d760d93b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/declarativeimports/core/units.cpp
View File

@ -1,6 +1,7 @@
/*************************************************************************** /***************************************************************************
* Copyright 2013 Marco Martin <mart@kde.org> * * Copyright 2013 Marco Martin <mart@kde.org> *
* Copyright 2014 Sebastian Kügler <sebas@kde.org> * * Copyright 2014 Sebastian Kügler <sebas@kde.org> *
* Copyright 2014 David Edmundson <davidedmunsdon@kde.org> *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
@ -59,8 +60,8 @@ Units::Units(QObject *parent)
connect(KDirWatch::self(), &KDirWatch::dirty, this, &Units::settingsFileChanged); connect(KDirWatch::self(), &KDirWatch::dirty, this, &Units::settingsFileChanged);
// ... but also remove/recreate cycles, like KConfig does it // ... but also remove/recreate cycles, like KConfig does it
connect(KDirWatch::self(), &KDirWatch::created, this, &Units::settingsFileChanged); connect(KDirWatch::self(), &KDirWatch::created, this, &Units::settingsFileChanged);
// Trigger configuration read // read configuration
settingsFileChanged(plasmarc); updatePlasmaRCSettings();
} }
Units::~Units() Units::~Units()
@ -70,18 +71,24 @@ Units::~Units()
void Units::settingsFileChanged(const QString &file) void Units::settingsFileChanged(const QString &file)
{ {
if (file.endsWith(plasmarc)) { if (file.endsWith(plasmarc)) {
KSharedConfigPtr cfg = KSharedConfig::openConfig(plasmarc);
KConfigGroup cfg = KConfigGroup(KSharedConfig::openConfig(plasmarc), groupName); cfg->reparseConfiguration();
cfg.config()->reparseConfiguration(); updatePlasmaRCSettings();
const int longDuration = cfg.readEntry("longDuration", defaultLongDuration);
if (longDuration != m_longDuration) {
m_longDuration = longDuration;
emit durationChanged();
}
} }
} }
void Units::updatePlasmaRCSettings()
{
KConfigGroup cfg = KConfigGroup(KSharedConfig::openConfig(plasmarc), groupName);
const int longDuration = cfg.readEntry("longDuration", defaultLongDuration);
if (longDuration != m_longDuration) {
m_longDuration = longDuration;
emit durationChanged();
}
}
void Units::iconLoaderSettingsChanged() void Units::iconLoaderSettingsChanged()
{ {
// These are not scaled, we respect the user's setting over dpi scaling // These are not scaled, we respect the user's setting over dpi scaling

3
src/declarativeimports/core/units.h
View File

@ -164,11 +164,12 @@ Q_SIGNALS:
private Q_SLOTS: private Q_SLOTS:
void iconLoaderSettingsChanged(); void iconLoaderSettingsChanged();
void settingsFileChanged(const QString &settings); void settingsFileChanged(const QString &file);
private: private:
void updateDevicePixelRatio(); void updateDevicePixelRatio();
void updateSpacing(); void updateSpacing();
void updatePlasmaRCSettings();
/** /**
* @return The dpi-adjusted size for a given icon size * @return The dpi-adjusted size for a given icon size
*/ */