nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: allow resetting options

Browse source 
Also make options changed programmatically (from QML, etc) mark
themselves as loaded
This commit is contained in:
2 * r + 2 * t 2026-04-12 00:00:56 +10:00
parent 93b5fb5f4f
commit 746d1af826
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugin/src/Caelestia/Config/configobject.cpp
View file

@ -168,6 +168,24 @@ void ConfigObject::syncFromGlobal(ConfigObject* global) {
} }
} }
void ConfigObject::markPropertyLoaded(const QString& name) {
m_loadedKeys.insert(name);
}
void ConfigObject::resetOption(const QString& name) {
m_loadedKeys.remove(name);
// If synced from global, re-copy the global value
if (m_global) {
int idx = metaObject()->indexOfProperty(name.toUtf8().constData());
if (idx >= 0) {
auto prop = metaObject()->property(idx);
if (prop.isWritable())
prop.write(this, prop.read(m_global));
}
}
}
void ConfigObject::resyncFromGlobal() { void ConfigObject::resyncFromGlobal() {
if (!m_global) if (!m_global)
return; return;

4
plugin/src/Caelestia/Config/configobject.hpp
View file

@ -20,6 +20,7 @@ public:
} \ } \
void set_##name(const Type& val) { \ void set_##name(const Type& val) { \
if (caelestia::config::ConfigObject::updateMember(m_##name, val)) { \ if (caelestia::config::ConfigObject::updateMember(m_##name, val)) { \
markPropertyLoaded(QStringLiteral(#name)); \
Q_EMIT name##Changed(); \ Q_EMIT name##Changed(); \
notifyPropertyChanged(QStringLiteral(#name), QVariant::fromValue(m_##name)); \ notifyPropertyChanged(QStringLiteral(#name), QVariant::fromValue(m_##name)); \
} \ } \
@ -68,6 +69,8 @@ public:
[[nodiscard]] bool isPropertyLoaded(const QString& name) const { return m_loadedKeys.contains(name); } [[nodiscard]] bool isPropertyLoaded(const QString& name) const { return m_loadedKeys.contains(name); }
Q_INVOKABLE void resetOption(const QString& name);
[[nodiscard]] bool recentlySaved() const { return m_recentlySaved; } [[nodiscard]] bool recentlySaved() const { return m_recentlySaved; }
template <typename T> static bool updateMember(T& member, const T& value) { template <typename T> static bool updateMember(T& member, const T& value) {
@ -86,6 +89,7 @@ signals:
void propertiesChanged(const QMap<QString, QVariant>& changed); void propertiesChanged(const QMap<QString, QVariant>& changed);
protected: protected:
void markPropertyLoaded(const QString& name);
void notifyPropertyChanged(const QString& name, const QVariant& value); void notifyPropertyChanged(const QString& name, const QVariant& value);
private: private: