more unfinished changes, process tab for dashboard

Plugins/ZShell/Config/colors.hpp

@@ -1,38 +1,29 @@
 #pragma once
-#include "configobject.hpp"
+#include "common.hpp"
 #include <qqmlintegration.h>
 
 namespace ZShell::config {
 
-class Presets : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class Presets : public settings::ObjectNode {
+	CONFIG_NODE(Presets, settings::ObjectNode)
 
-	CFG_PROPERTY(QString, accent, QString())
-	CFG_PROPERTY(QString, name, QStringLiteral("Catppuccin"))
-	CFG_PROPERTY(QString, variant, QStringLiteral("latte"))
-
-	public:
-	explicit Presets(QObject* parent = nullptr) : ConfigObject(parent) {}
+	CONFIG_PROPERTY(QString, accent, QString())
+	CONFIG_PROPERTY(QString, name, QStringLiteral("Catppuccin"))
+	CONFIG_PROPERTY(QString, variant, QStringLiteral("latte"))
 };
 
-class Colors : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class Colors : public settings::ObjectNode {
+	CONFIG_NODE(Colors, settings::ObjectNode)
 
 	CONFIG_SUBOBJECT(Presets, presets)
-	CFG_PROPERTY(QString, schemeType, QStringLiteral("fidelity"))
-	CFG_PROPERTY(bool, scheduleDark, false)
-	CFG_PROPERTY(int, scheduleDarkEnd, 600)
-	CFG_PROPERTY(int, scheduleDarkStart, 1140)
-	CFG_PROPERTY(bool, schemeGen, true)
-	CFG_PROPERTY(bool, neovimColors, false)
-	CFG_PROPERTY(QString, mode, QStringLiteral("dark"))
-	CFG_PROPERTY(bool, smart, false)
-
-	public:
-	explicit Colors(QObject* parent = nullptr)
-		: ConfigObject(parent), m_presets(new Presets(this)) {}
+	CONFIG_PROPERTY(QString, schemeType, QStringLiteral("fidelity"))
+	CONFIG_PROPERTY(bool, scheduleDark, false)
+	CONFIG_PROPERTY(int, scheduleDarkEnd, 600)
+	CONFIG_PROPERTY(int, scheduleDarkStart, 1140)
+	CONFIG_PROPERTY(bool, schemeGen, true)
+	CONFIG_PROPERTY(bool, neovimColors, false)
+	CONFIG_PROPERTY(QString, mode, QStringLiteral("dark"))
+	CONFIG_PROPERTY(bool, smart, false)
 };
 
 } // namespace ZShell::config