test script

Modules/Settings/Categories/General.qml

@@ -161,7 +161,7 @@ SettingsPage {
 		SettingSpinner {
 			name: "Schedule dark mode"
 			object: Config.general.color
-			settings: ["scheduleDarkStart", "scheduleDarkEnd"]
+			settings: ["scheduleDarkStart", "scheduleDarkEnd", "scheduleDark"]
 		}
 	}
 

Modules/Settings/Controls/SettingSpinner.qml

@@ -62,25 +62,84 @@ Item {
 			}
 		}
 
-		SpinnerButton {
-			Layout.preferredHeight: Appearance.font.size.large + Appearance.padding.smaller * 2
-			Layout.preferredWidth: height * 2
-			currentIndex: root.object[root.settings[0]]
-			text: root.formattedValue(root.settings[0])
+		ColumnLayout {
+			id: optionLayout
 
-			menu.onItemSelected: item => {
-				root.commitChoice(item, root.settings[0]);
+			Layout.fillHeight: true
+			Layout.preferredWidth: 100
+
+			RowLayout {
+				Layout.preferredWidth: optionLayout.width
+
+				CustomText {
+					Layout.alignment: Qt.AlignLeft | Qt.AlignHCenter
+					Layout.fillWidth: true
+					text: qsTr("Enabled: ")
+				}
+
+				CustomSwitch {
+					id: enabledSwitch
+
+					Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
+					checked: root.object[root.settings[2]]
+
+					onToggled: {
+						root.object[root.settings[2]] = checked;
+						Config.save();
+					}
+				}
 			}
-		}
 
-		SpinnerButton {
-			Layout.preferredHeight: Appearance.font.size.large + Appearance.padding.smaller * 2
-			Layout.preferredWidth: height * 2
-			currentIndex: root.object[root.settings[1]]
-			text: root.formattedValue(root.settings[1])
+			RowLayout {
+				Layout.preferredWidth: optionLayout.width
+				z: setting2.expanded ? -1 : 1
 
-			menu.onItemSelected: item => {
-				root.commitChoice(item, root.settings[1]);
+				CustomText {
+					Layout.alignment: Qt.AlignLeft | Qt.AlignHCenter
+					Layout.fillWidth: true
+					text: qsTr("Start: ")
+				}
+
+				SpinnerButton {
+					id: setting1
+
+					Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
+					Layout.preferredHeight: Appearance.font.size.large + Appearance.padding.smaller * 2
+					Layout.preferredWidth: height * 2
+					currentIndex: root.object[root.settings[0]]
+					enabled: enabledSwitch.checked
+					text: root.formattedValue(root.settings[0])
+
+					menu.onItemSelected: item => {
+						root.commitChoice(item, root.settings[0]);
+					}
+				}
+			}
+
+			RowLayout {
+				Layout.preferredWidth: optionLayout.width
+				z: setting1.expanded ? -1 : 1
+
+				CustomText {
+					Layout.alignment: Qt.AlignLeft | Qt.AlignHCenter
+					Layout.fillWidth: true
+					text: qsTr("End: ")
+				}
+
+				SpinnerButton {
+					id: setting2
+
+					Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
+					Layout.preferredHeight: Appearance.font.size.large + Appearance.padding.smaller * 2
+					Layout.preferredWidth: height * 2
+					currentIndex: root.object[root.settings[1]]
+					enabled: enabledSwitch.checked
+					text: root.formattedValue(root.settings[1])
+
+					menu.onItemSelected: item => {
+						root.commitChoice(item, root.settings[1]);
+					}
+				}
 			}
 		}
 	}

Modules/Settings/Controls/SpinnerButton.qml

@@ -8,19 +8,21 @@ CustomRect {
 	id: root
 
 	property alias currentIndex: menu.currentIndex
+	property bool enabled
 	property alias expanded: menu.expanded
 	property alias label: label
 	property alias menu: menu
 	property alias text: label.text
 
-	color: DynamicColors.palette.m3primary
+	color: enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
 	radius: Appearance.rounding.full
+	z: expanded ? 100 : 0
 
 	CustomText {
 		id: label
 
 		anchors.centerIn: parent
-		color: DynamicColors.palette.m3onPrimary
+		color: root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3onSurface, 2)
 		font.pointSize: Appearance.font.size.large
 	}
 
@@ -28,6 +30,8 @@ CustomRect {
 		function onClicked(): void {
 			SettingsDropdowns.toggle(menu, root);
 		}
+
+		visible: root.enabled
 	}
 
 	PathViewMenu {

Modules/TrayItem.qml

@@ -43,7 +43,7 @@ Item {
 		anchors.centerIn: parent
 		color: DynamicColors.palette.m3onSurface
 		implicitSize: 22
-		layer.enabled: DynamicColors.light
+		layer.enabled: Config.general.color.smart || Config.general.color.scheduleDark
 		source: root.item.icon
 	}
 }