more unfinished changes, process tab for dashboard

Plugins/ZShell/Config/services.hpp

@@ -1,56 +1,42 @@
 #pragma once
-#include "configlist.hpp"
-#include "configobject.hpp"
+#include "common.hpp"
 #include "enums.hpp"
 
 namespace ZShell::config {
 
-class PlayerAliasEntry : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class PlayerAliasEntry : public settings::ObjectNode {
+	CONFIG_NODE(PlayerAliasEntry, settings::ObjectNode)
 
-	CFG_PROPERTY(QString, from)
-	CFG_PROPERTY(QString, to)
-
-	public:
-	explicit PlayerAliasEntry(QObject* parent = nullptr)
-		: ConfigObject(parent) {}
-
-	[[nodiscard]] QStringList identityKeys() const override {
-		return {QStringLiteral("from")};
-	}
+	CONFIG_PROPERTY(QString, from, {})
+	CONFIG_PROPERTY(QString, to, {})
 };
 
 CONFIG_LIST_TYPE(PlayerAliasEntry, PlayerAliasList)
 
-class Services : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class Services : public settings::ObjectNode {
+	CONFIG_NODE(Services, settings::ObjectNode)
 
-	CFG_PROPERTY(qreal, audioIncrement, 0.1)
-	CFG_PROPERTY(qreal, brightnessIncrement, 0.1)
-	CFG_PROPERTY(bool, ddcutilService, true)
-	CFG_PROPERTY(QString, defaultPlayer, QStringLiteral("Spotify"))
-	CFG_PROPERTY(QString, gpuType, QStringLiteral("NVIDIA"))
-	CFG_PROPERTY(LyricsBackend::Enum, lyricsBackend, LyricsBackend::Auto)
-	CFG_PROPERTY(qreal, maxVolume, 1)
-	CFG_PROPERTY(qreal, minBrightness, 0.01)
+	CONFIG_PROPERTY(qreal, audioIncrement, 0.1)
+	CONFIG_PROPERTY(qreal, brightnessIncrement, 0.1)
+	CONFIG_PROPERTY(bool, ddcutilService, true)
+	CONFIG_PROPERTY(QString, defaultPlayer, QStringLiteral("Spotify"))
+	CONFIG_PROPERTY(QString, gpuType, QStringLiteral("NVIDIA"))
+	CONFIG_PROPERTY(LyricsBackend::Enum, lyricsBackend, LyricsBackend::Auto)
+	CONFIG_PROPERTY(qreal, maxVolume, 1)
+	CONFIG_PROPERTY(qreal, minBrightness, 0.01)
 	CONFIG_LIST(
 		PlayerAliasList,
 		playerAliases,
-		{
-			vmap(
+		DEFAULT_ARG({
+			settings::vmap(
 				{{"from", QStringLiteral("com.github.th_ch.youtube_music")},
 				 {"to", QStringLiteral("YT Music")}}),
-		})
-	CFG_PROPERTY(bool, updates, true)
-	CFG_PROPERTY(bool, useFahrenheit, false)
-	CFG_PROPERTY(bool, useTwelveHourClock, false)
-	CFG_PROPERTY(int, visualizerBars, 50)
-	CFG_PROPERTY(QString, weatherLocation, QString())
-
-	public:
-	explicit Services(QObject* parent = nullptr) : ConfigObject(parent) {}
+		}))
+	CONFIG_PROPERTY(bool, updates, true)
+	CONFIG_PROPERTY(bool, useFahrenheit, false)
+	CONFIG_PROPERTY(bool, useTwelveHourClock, false)
+	CONFIG_PROPERTY(int, visualizerBars, 50)
+	CONFIG_PROPERTY(QString, weatherLocation, QString())
 };
 
 } // namespace ZShell::config