refactor: use entries directly in bar object instead of nested components + various fixes and additions to settings

Config/Appearance.qml

@@ -1,13 +1,119 @@
 pragma Singleton
 
 import Quickshell
+import QtQuick
 
 Singleton {
-	readonly property AppearanceConf.Anim anim: Config.appearance.anim
-	readonly property AppearanceConf.Deform deform: Config.appearance.deform
-	readonly property AppearanceConf.FontStuff font: Config.appearance.font
-	readonly property AppearanceConf.Padding padding: Config.appearance.padding
-	readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
-	readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
-	readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency
+	property Anim anim: Anim {
+	}
+	property Deform deform: Deform {
+	}
+	property FontStuff font: FontStuff {
+	}
+	property Padding padding: Padding {
+	}
+	property Rounding rounding: Rounding {
+	}
+	property Spacing spacing: Spacing {
+	}
+	property Transparency transparency: Transparency {
+	}
+
+	component Anim: QtObject {
+		property AnimCurves curves: AnimCurves {
+		}
+		property AnimDurations durations: AnimDurations {
+		}
+		property real mediaGifSpeedAdjustment: Config.appearance.anim.mediaGifSpeedAdjustment
+		property real sessionGifSpeed: Config.appearance.anim.sessionGifSpeed
+	}
+	component AnimCurves: QtObject {
+		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
+		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
+		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
+		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
+		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
+		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
+		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
+		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
+		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+	}
+	component AnimDurations: QtObject {
+		property int expressiveDefaultSpatial: 500 * scale
+		property int expressiveEffects: 200 * scale
+		property int expressiveFastEffects: 150 * scale
+		property int expressiveFastSpatial: 350 * scale
+		property int expressiveSlowEffects: 300 * scale
+		property int extraLarge: 1000 * scale
+		property int large: 600 * scale
+		property int normal: 400 * scale
+		property real scale: 1
+		property int small: 200 * scale
+	}
+	component Deform: QtObject {
+		property real scale: Config.appearance.deform.scale
+	}
+	component FontFamily: QtObject {
+		property string clock: Config.appearance.font.family.clock
+		property string material: Config.appearance.font.family.material
+		property string mono: Config.appearance.font.family.mono
+		property string sans: Config.appearance.font.family.sans
+	}
+	component FontSize: QtObject {
+		property int extraLarge: 28 * scale
+		property int large: 18 * scale
+		property int larger: 16 * scale
+		property int medium: 14 * scale
+		property int normal: 13 * scale
+		property real scale: 1
+		property int small: 11 * scale
+		property int smaller: 12 * scale
+	}
+	component FontStuff: QtObject {
+		property FontFamily family: FontFamily {
+		}
+		property FontSize size: FontSize {
+		}
+	}
+	component Padding: QtObject {
+		property int extraLarge: 28 * scale
+		property int extraLargeIncreased: 32 * scale
+		property int extraSmall: 4 * scale
+		property int large: 16 * scale
+		property int largeIncreased: 20 * scale
+		property int larger: 12 * scale
+		property int normal: 8 * scale
+		property real scale: 1
+		property int small: 5 * scale
+		property int smaller: 7 * scale
+		property int smallest: 2 * scale
+	}
+	component Rounding: QtObject {
+		property int extraSmall: 4 * scale
+		property int full: 1000 * scale
+		property int large: 24 * scale
+		property int medium: 16 * scale
+		property int normal: 18 * scale
+		property real scale: 1
+		property int small: 12 * scale
+		property int smallest: 8 * scale
+	}
+	component Spacing: QtObject {
+		property int extraSmall: 4 * scale
+		property int large: 20 * scale
+		property int larger: 16 * scale
+		property int normal: 12 * scale
+		property real scale: 1
+		property int small: 8 * scale
+		property int smaller: 10 * scale
+	}
+	component Transparency: QtObject {
+		property real base: Config.appearance.transparency.base
+		property bool enabled: Config.appearance.transparency.enabled
+		property real layers: Config.appearance.transparency.layers
+	}
 }

Config/AppearanceConf.qml

@@ -7,50 +7,13 @@ JsonObject {
 	}
 	property FontStuff font: FontStuff {
 	}
-	property Padding padding: Padding {
-	}
-	property Rounding rounding: Rounding {
-	}
-	property Spacing spacing: Spacing {
-	}
 	property Transparency transparency: Transparency {
 	}
 
 	component Anim: JsonObject {
-		property AnimCurves curves: AnimCurves {
-		}
-		property AnimDurations durations: AnimDurations {
-		}
 		property real mediaGifSpeedAdjustment: 300
 		property real sessionGifSpeed: 0.7
 	}
-	component AnimCurves: JsonObject {
-		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
-		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
-		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
-		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
-		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
-		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
-		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
-		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
-		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
-		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
-		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
-		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
-		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
-	}
-	component AnimDurations: JsonObject {
-		property int expressiveDefaultSpatial: 500 * scale
-		property int expressiveEffects: 200 * scale
-		property int expressiveFastEffects: 150 * scale
-		property int expressiveFastSpatial: 350 * scale
-		property int expressiveSlowEffects: 300 * scale
-		property int extraLarge: 1000 * scale
-		property int large: 600 * scale
-		property int normal: 400 * scale
-		property real scale: 1
-		property int small: 200 * scale
-	}
 	component Deform: JsonObject {
 		property real scale: 1
 	}
@@ -60,53 +23,9 @@ JsonObject {
 		property string mono: "CaskaydiaCove NF"
 		property string sans: "Segoe UI Variable Text"
 	}
-	component FontSize: JsonObject {
-		property int extraLarge: 28 * scale
-		property int large: 18 * scale
-		property int larger: 16 * scale
-		property int medium: 14 * scale
-		property int normal: 13 * scale
-		property real scale: 1
-		property int small: 11 * scale
-		property int smaller: 12 * scale
-	}
 	component FontStuff: JsonObject {
 		property FontFamily family: FontFamily {
 		}
-		property FontSize size: FontSize {
-		}
-	}
-	component Padding: JsonObject {
-		property int extraLarge: 28 * scale
-		property int extraLargeIncreased: 32 * scale
-		property int extraSmall: 4 * scale
-		property int large: 16 * scale
-		property int largeIncreased: 20 * scale
-		property int larger: 12 * scale
-		property int normal: 8 * scale
-		property real scale: 1
-		property int small: 5 * scale
-		property int smaller: 7 * scale
-		property int smallest: 2 * scale
-	}
-	component Rounding: JsonObject {
-		property int extraSmall: 4 * scale
-		property int full: 1000 * scale
-		property int large: 24 * scale
-		property int medium: 16 * scale
-		property int normal: 18 * scale
-		property real scale: 1
-		property int small: 12 * scale
-		property int smallest: 8 * scale
-	}
-	component Spacing: JsonObject {
-		property int extraSmall: 4 * scale
-		property int large: 20 * scale
-		property int larger: 16 * scale
-		property int normal: 12 * scale
-		property real scale: 1
-		property int small: 8 * scale
-		property int smaller: 10 * scale
 	}
 	component Transparency: JsonObject {
 		property real base: 0.85

Config/BackgroundConfig.qml

@@ -4,11 +4,4 @@ import qs.Config
 JsonObject {
 	property bool enabled: true
 	property int wallFadeDuration: MaterialEasing.standardTime
-	property real alignX: 0.5
-	property real alignY: 0.5
-	property real zoom: 1.0
-	property real sourceClipX: 0
-	property real sourceClipY: 0
-	property real sourceClipW: 0
-	property real sourceClipH: 0
 }

Config/BarConfig.qml

@@ -40,6 +40,10 @@ JsonObject {
 			id: "tray",
 			enabled: true
 		},
+		{
+			id: "statusIcons",
+			enabled: true
+		},
 		{
 			id: "network",
 			enabled: false
@@ -63,23 +67,38 @@ JsonObject {
 	}
 
 	component Popouts: JsonObject {
-		property bool activeWindow: true
-		property bool audio: true
-		property bool clock: true
-		property bool network: true
-		property bool resources: true
+		property bool statusIcons: true
 		property bool tray: true
-		property bool upower: true
 	}
 	component Tray: JsonObject {
 		property bool recolorIcons: false
-		property bool showAudio: true
-		property bool showBluetooth: false
-		property bool showMicrophone: true
-		property bool showNetwork: false
 		property bool showOnHover: false
-		property bool showPower: true
-		property bool showWifi: false
+		property list<var> statusIcons: [
+			{
+				id: "audio",
+				enabled: true
+			},
+			{
+				id: "microphone",
+				enabled: true
+			},
+			{
+				id: "bluetooth",
+				enabled: true
+			},
+			{
+				id: "network",
+				enabled: false
+			},
+			{
+				id: "wifi",
+				enabled: false
+			},
+			{
+				id: "power",
+				enabled: true
+			},
+		]
 		property int trayIconSize: 24
 	}
 }