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

feat: print full option path in warning

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-12 23:04:57 +10:00
parent 666d451f4b
commit 03c1e5060a
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,8 +30,8 @@ void ConfigObject::loadFromJson(const QJsonObject& obj) {
continue; continue;
if (isGlobalOnly(key)) if (isGlobalOnly(key))
qCWarning( qCWarning(lcConfig, "Option '%s' is global-only and will be ignored in per-monitor config",
lcConfig, "Option '%s' is global-only and will be ignored in per-monitor config", qUtf8Printable(key)); qUtf8Printable(propertyPath(key)));
const auto jsonVal = obj.value(key); const auto jsonVal = obj.value(key);
@ -210,6 +210,38 @@ void ConfigObject::resyncFromGlobal() {
} }
} }
QString ConfigObject::propertyPath(const QString& name) const {
QStringList parts;
parts.append(name);
const QObject* obj = this;
while (auto* parentObj = obj->parent()) {
auto* parentConfig = qobject_cast<const ConfigObject*>(parentObj);
if (!parentConfig)
break;
// Find which property name this child is on the parent
const auto* meta = parentConfig->metaObject();
bool found = false;
for (int i = meta->propertyOffset(); i < meta->propertyCount(); ++i) {
auto prop = meta->property(i);
auto val = prop.read(parentObj);
if (val.value<QObject*>() == obj) {
parts.prepend(QString::fromUtf8(prop.name()));
found = true;
break;
}
}
if (!found)
break;
obj = parentObj;
}
return parts.join(QLatin1Char('.'));
}
bool ConfigObject::isPropertyLoaded(const QString& name) const { bool ConfigObject::isPropertyLoaded(const QString& name) const {
return m_loadedKeys.contains(name); return m_loadedKeys.contains(name);
} }

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

@ -48,12 +48,14 @@ private:
public: \ public: \
[[nodiscard]] Type name() const { \ [[nodiscard]] Type name() const { \
if (isOverlay()) \ if (isOverlay()) \
qCWarning(caelestia::config::lcConfig, "Reading global-only option '%s' on per-monitor overlay", #name); \ qCWarning(caelestia::config::lcConfig, "Reading global-only option '%s' on per-monitor overlay", \
qUtf8Printable(propertyPath(QStringLiteral(#name)))); \
return m_##name; \ return m_##name; \
} \ } \
void set_##name(const Type& val) { \ void set_##name(const Type& val) { \
if (isOverlay()) \ if (isOverlay()) \
qCWarning(caelestia::config::lcConfig, "Writing global-only option '%s' on per-monitor overlay", #name); \ qCWarning(caelestia::config::lcConfig, "Writing global-only option '%s' on per-monitor overlay", \
qUtf8Printable(propertyPath(QStringLiteral(#name)))); \
if (caelestia::config::ConfigObject::updateMember(m_##name, val)) { \ if (caelestia::config::ConfigObject::updateMember(m_##name, val)) { \
markPropertyLoaded(QStringLiteral(#name)); \ markPropertyLoaded(QStringLiteral(#name)); \
Q_EMIT name##Changed(); \ Q_EMIT name##Changed(); \
@ -88,6 +90,7 @@ public:
void clearLoadedKeys(); void clearLoadedKeys();
[[nodiscard]] bool isPropertyLoaded(const QString& name) const; [[nodiscard]] bool isPropertyLoaded(const QString& name) const;
[[nodiscard]] QString propertyPath(const QString& name) const;
[[nodiscard]] bool isOverlay() const; [[nodiscard]] bool isOverlay() const;
// Returns true only on overlays — global singleton always returns false. // Returns true only on overlays — global singleton always returns false.
[[nodiscard]] bool isGlobalOnly(const QString& name) const; [[nodiscard]] bool isGlobalOnly(const QString& name) const;