added services page + rename barConfig json property to bar, migration helper function

Modules/SettingsNew/Pages/Panels/Bar/BarClock.qml

@@ -0,0 +1,61 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick.Layouts
+import qs.Config
+import qs.Components
+import qs.Modules.SettingsNew.Common
+
+PageBase {
+	id: root
+
+	readonly property list<MenuItem> clockFormats: [
+		MenuItem {
+			text: qsTr("Long format")
+			value: "dddd d MMM - hh:mm"
+		},
+		MenuItem {
+			text: qsTr("Short format")
+			value: "ddd d MMM - hh:mm"
+		},
+		MenuItem {
+			text: qsTr("Time only")
+			value: "hh:mm"
+		},
+		MenuItem {
+			text: qsTr("Long format seconds")
+			value: "dddd d MMM - hh:mm:ss"
+		},
+		MenuItem {
+			text: qsTr("Short format seconds")
+			value: "ddd d MMM - hh:mm:ss"
+		},
+		MenuItem {
+			text: qsTr("Time only seconds")
+			value: "hh:mm:ss"
+		}
+	]
+
+	isSubPage: true
+	title: qsTr("Clock")
+
+	ColumnLayout {
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		spacing: Appearance.spacing.extraSmall / 2
+		width: root.cappedWidth
+
+		SelectRow {
+			Layout.topMargin: Appearance.spacing.extraSmall / 2 - parent.spacing
+			active: root.clockFormats.find(item => item.value === Config.general.dateFormat)
+			first: true
+			last: true
+			menuItems: root.clockFormats
+			subtext: qsTr("Change how time is displayed in the widget")
+			text: qsTr("Time format")
+
+			onSelected: item => {
+				Config.general.dateFormat = item.value;
+			}
+		}
+	}
+}

Modules/SettingsNew/Pages/Panels/Bar/BarStatusIcons.qml

@@ -0,0 +1,93 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick.Layouts
+import qs.Config
+import qs.Modules.SettingsNew.Common
+
+PageBase {
+	id: root
+
+	isSubPage: true
+	title: qsTr("System icons")
+
+	ColumnLayout {
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		spacing: Appearance.spacing.extraSmall / 2
+		width: root.cappedWidth
+
+		// Visible icons
+		SectionHeader {
+			first: true
+			text: qsTr("Visible icons")
+		}
+
+		ToggleRow {
+			checked: Config.bar.tray.showAudio
+			first: true
+			text: qsTr("Speakers")
+
+			onToggled: Config.bar.tray.showAudio = checked
+		}
+
+		ToggleRow {
+			checked: Config.bar.tray.showMicrophone
+			text: qsTr("Microphone")
+
+			onToggled: Config.bar.tray.showMicrophone = checked
+		}
+
+		//////// FOR LATER:
+		// ToggleRow {
+		// 	checked: Config.bar.tray.showNetwork
+		// 	text: qsTr("Network")
+		//
+		// 	onToggled: Config.bar.tray.showNetwork = checked
+		// }
+		//
+		// ToggleRow {
+		// 	checked: Config.bar.tray.showWifi
+		// 	text: qsTr("Wi-Fi")
+		//
+		// 	onToggled: Config.bar.tray.showWifi = checked
+		// }
+		//
+		// ToggleRow {
+		// 	checked: Config.bar.tray.showBluetooth
+		// 	text: qsTr("Bluetooth")
+		//
+		// 	onToggled: Config.bar.tray.showBluetooth = checked
+		// }
+
+		ToggleRow {
+			checked: Config.bar.tray.showPower
+			last: true
+			text: qsTr("Battery")
+
+			onToggled: Config.bar.tray.showPower = checked
+		}
+
+		// Behaviour
+		SectionHeader {
+			text: qsTr("Behavior")
+		}
+
+		ToggleRow {
+			checked: Config.bar.popouts.audio
+			first: true
+			subtext: qsTr("Show a details popout when hovering the audio icons")
+			text: qsTr("Audio popout on hover")
+
+			onToggled: Config.bar.popouts.audio = checked
+		}
+
+		ToggleRow {
+			checked: Config.bar.popouts.upower
+			last: true
+			subtext: qsTr("Show a details popout when hovering the power icon")
+			text: qsTr("Power popout on hover")
+
+			onToggled: Config.bar.popouts.upower = checked
+		}
+	}
+}

Modules/SettingsNew/Pages/Panels/Bar/BarTray.qml

@@ -0,0 +1,31 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick.Layouts
+import qs.Config
+import qs.Modules.SettingsNew.Common
+
+PageBase {
+	id: root
+
+	isSubPage: true
+	title: qsTr("Tray")
+
+	ColumnLayout {
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		spacing: Appearance.spacing.extraSmall / 2
+		width: root.cappedWidth
+
+		SpinRow {
+			first: true
+			from: 12
+			last: true
+			stepSize: 1
+			text: qsTr("Icon size")
+			to: 24
+			value: Config.bar.tray.trayIconSize
+
+			onMoved: value => Config.bar.tray.trayIconSize = value
+		}
+	}
+}

Modules/SettingsNew/Pages/Panels/BarPanel.qml

@@ -23,13 +23,13 @@ PageBase {
 		}
 
 		ToggleRow {
-			checked: Config.barConfig.autoHide
+			checked: Config.bar.autoHide
 			first: true
 			last: true
 			subtext: qsTr("Hide the bar, reveal on hover")
 			text: qsTr("Auto hide")
 
-			onToggled: Config.barConfig.autoHide = checked
+			onToggled: Config.bar.autoHide = checked
 		}
 
 		// Components
@@ -39,44 +39,28 @@ PageBase {
 
 		NavRow {
 			first: true
-			icon: "workspaces"
-			label: qsTr("Workspaces")
-			status: qsTr("Indicators, window icons")
+			icon: "widgets"
+			status: qsTr("System tray icons")
+			text: qsTr("Tray")
 
 			onClicked: root.sState.openSubPage(5)
 		}
 
 		NavRow {
-			icon: "web_asset"
-			label: qsTr("Active window")
-			status: qsTr("Title display, popout")
+			icon: "signal_cellular_alt"
+			status: qsTr("Visible indicators")
+			text: qsTr("Status icons")
 
 			onClicked: root.sState.openSubPage(6)
 		}
 
 		NavRow {
-			icon: "widgets"
-			label: qsTr("Tray")
-			status: qsTr("System tray icons")
+			icon: "schedule"
+			last: true
+			status: qsTr("Date, icon, background")
+			text: qsTr("Clock")
 
 			onClicked: root.sState.openSubPage(7)
 		}
-
-		NavRow {
-			icon: "signal_cellular_alt"
-			label: qsTr("Status icons")
-			status: qsTr("Visible indicators")
-
-			onClicked: root.sState.openSubPage(8)
-		}
-
-		NavRow {
-			icon: "schedule"
-			label: qsTr("Clock")
-			last: true
-			status: qsTr("Date, icon, background")
-
-			onClicked: root.sState.openSubPage(9)
-		}
 	}
 }

Modules/SettingsNew/Pages/Panels/DashboardPanel.qml

@@ -32,54 +32,5 @@ PageBase {
 
 			onToggled: Config.dashboard.enabled = checked
 		}
-
-		// Performance widgets
-		SectionHeader {
-			text: qsTr("Performance widgets")
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showBattery
-			first: true
-			text: qsTr("Battery")
-
-			onToggled: Config.dashboard.performance.showBattery = checked
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showGpu
-			text: qsTr("GPU")
-
-			onToggled: Config.dashboard.performance.showGpu = checked
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showCpu
-			text: qsTr("CPU")
-
-			onToggled: Config.dashboard.performance.showCpu = checked
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showMemory
-			text: qsTr("Memory")
-
-			onToggled: Config.dashboard.performance.showMemory = checked
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showStorage
-			text: qsTr("Storage")
-
-			onToggled: Config.dashboard.performance.showStorage = checked
-		}
-
-		ToggleRow {
-			checked: Config.dashboard.performance.showNetwork
-			last: true
-			text: qsTr("Network")
-
-			onToggled: Config.dashboard.performance.showNetwork = checked
-		}
 	}
 }

Modules/SettingsNew/Pages/Panels/ResourcesPanel.qml

@@ -0,0 +1,85 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+import qs.Components
+import qs.Modules.SettingsNew.Common
+
+PageBase {
+	id: root
+
+	isSubPage: true
+	title: qsTr("Resources")
+
+	ColumnLayout {
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		spacing: Appearance.spacing.extraSmall / 2
+		width: root.cappedWidth
+
+		// General
+		SectionHeader {
+			first: true
+			text: qsTr("General")
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.enabled
+			first: true
+			last: true
+			text: qsTr("Enabled")
+
+			onToggled: Config.dashboard.performance.enabled = checked
+		}
+
+		// Performance widgets
+		SectionHeader {
+			text: qsTr("Performance widgets")
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showBattery
+			first: true
+			text: qsTr("Battery")
+
+			onToggled: Config.dashboard.performance.showBattery = checked
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showGpu
+			text: qsTr("GPU")
+
+			onToggled: Config.dashboard.performance.showGpu = checked
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showCpu
+			text: qsTr("CPU")
+
+			onToggled: Config.dashboard.performance.showCpu = checked
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showMemory
+			text: qsTr("Memory")
+
+			onToggled: Config.dashboard.performance.showMemory = checked
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showStorage
+			text: qsTr("Storage")
+
+			onToggled: Config.dashboard.performance.showStorage = checked
+		}
+
+		ToggleRow {
+			checked: Config.dashboard.performance.showNetwork
+			last: true
+			text: qsTr("Network")
+
+			onToggled: Config.dashboard.performance.showNetwork = checked
+		}
+	}
+}