Merge branch 'main' into module/wifi

Modules/Settings/PageCompRegistry.qml

@@ -2,8 +2,8 @@ pragma Singleton
 
 import QtQuick
 import QtQuick.Layouts
-import qs.Components
 import ZShell.Config
+import qs.Components
 import qs.Modules.Settings.Common
 import qs.Modules.Settings.Pages
 import qs.Modules.Settings.Pages.Wallpaper
@@ -45,7 +45,11 @@ QtObject {
 
 		// Connectivity
 		Component {
-			PlaceholderComp {
+			StackPage {
+				Component {
+					NetworkPage {
+					}
+				}
 			}
 		},
 		Component {

Modules/Settings/Pages/NetworkPage.qml

@@ -3,11 +3,12 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
+import ZShell.Config
 import qs.Modules.Settings.Common
-import qs.Modules.SysTray.Popouts.Network
+import qs.Modules.Bar.Popouts.Network
 import qs.Components
-import qs.Config
 import qs.Helpers
+import qs.Services
 
 PageBase {
 	id: root
@@ -19,7 +20,7 @@ PageBase {
 
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		spacing: Appearance.spacing.extraSmall / 2
+		spacing: Tokens.spacing.extraSmall / 2
 		width: root.cappedWidth
 
 		Toggle {
@@ -56,7 +57,7 @@ PageBase {
 		id: networkItem
 
 		readonly property bool connecting: Network.connectingNetwork === modelData
-		property int horizontalPadding: Appearance.padding.largeIncreased
+		property int horizontalPadding: Tokens.padding.largeIncreased
 		required property int index
 		readonly property bool isSecure: Network.isSecure(modelData.security)
 		required property bool known
@@ -64,10 +65,10 @@ PageBase {
 		required property Repeater repeater
 
 		Layout.fillWidth: true
-		Layout.preferredHeight: visible ? rowLayout.implicitHeight + Appearance.padding.smaller * 2 : 0
+		Layout.preferredHeight: visible ? rowLayout.implicitHeight + Tokens.padding.smaller * 2 : 0
 		first: index === 0
 		last: index === (repeater.count - 1)
-		radius: Appearance.rounding.small
+		radius: Tokens.rounding.small
 
 		RowLayout {
 			id: rowLayout
@@ -83,9 +84,9 @@ PageBase {
 
 				CustomText {
 					Layout.fillWidth: true
-					Layout.leftMargin: Appearance.spacing.extraSmall
-					Layout.rightMargin: Appearance.spacing.extraSmall
-					color: networkItem.modelData.active ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
+					Layout.leftMargin: Tokens.spacing.extraSmall
+					Layout.rightMargin: Tokens.spacing.extraSmall
+					color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurface
 					elide: Text.ElideRight
 					text: networkItem.modelData.name
 				}
@@ -95,9 +96,9 @@ PageBase {
 
 					anchors.left: parent.left
 					anchors.right: parent.right
-					color: DynamicColors.palette.m3outline
+					color: Colors.palette.m3outline
 					elide: Text.ElideRight
-					font.pointSize: Appearance.font.size.small
+					font.pointSize: Tokens.font.size.small
 					text: qsTr("%1 strength").arg(Math.round(networkItem.modelData.signalStrength * 100) + "%")
 				}
 			}
@@ -110,8 +111,8 @@ PageBase {
 				MaterialIcon {
 					id: icon
 
-					color: networkItem.modelData.active ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurfaceVariant
-					font.pointSize: Appearance.font.size.large
+					color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+					font.pointSize: Tokens.font.size.large
 					opacity: networkItem.connecting ? 0 : 1
 					text: Icons.getNetworkIcon(networkItem.modelData.signalStrength * 100, networkItem.isSecure)
 
@@ -139,7 +140,7 @@ PageBase {
 		}
 
 		StateLayer {
-			color: networkItem.modelData.active ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+			color: networkItem.modelData.active ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 
 			onClicked: {
 				if (networkItem.isSecure && !networkItem.known) {
@@ -157,7 +158,7 @@ PageBase {
 
 		required property Repeater repeater
 
-		Layout.preferredHeight: repeater.count > 0 ? Appearance.spacing.extraSmall : 0
+		Layout.preferredHeight: repeater.count > 0 ? Tokens.spacing.extraSmall : 0
 	}
 	component Toggle: CustomSwitch {
 		id: toggleItem
@@ -169,13 +170,13 @@ PageBase {
 
 		Layout.fillWidth: true
 		cLayer: 2
-		horizontalPadding: Appearance.padding.largeIncreased
+		horizontalPadding: Tokens.padding.largeIncreased
 		implicitHeight: Math.max(implicitContentHeight, implicitIndicatorHeight) + verticalPadding * 2
 		implicitWidth: implicitContentWidth + implicitIndicatorWidth + horizontalPadding * 2
 		indicator.anchors.right: right
 		indicator.anchors.rightMargin: toggleItem.horizontalPadding
 		indicator.anchors.verticalCenter: verticalCenter
-		verticalPadding: Appearance.padding.normal
+		verticalPadding: Tokens.padding.normal
 
 		background: ConnectedRect {
 			id: bg
@@ -190,7 +191,7 @@ PageBase {
 			anchors.left: parent.left
 			anchors.leftMargin: toggleItem.horizontalPadding
 			anchors.right: toggleItem.indicator.left
-			anchors.rightMargin: Appearance.spacing.normal
+			anchors.rightMargin: Tokens.spacing.normal
 			implicitHeight: column.implicitHeight
 			implicitWidth: column.implicitWidth
 
@@ -210,7 +211,7 @@ PageBase {
 					elide: Text.ElideRight
 					font: {
 						const f = Qt.font(label.font);
-						f.pointSize = Appearance.font.size.smaller;
+						f.pointSize = Tokens.font.size.smaller;
 						return f;
 					}
 					text: toggleItem.text
@@ -221,11 +222,11 @@ PageBase {
 
 					anchors.left: parent.left
 					anchors.right: parent.right
-					color: DynamicColors.palette.m3outline
+					color: Colors.palette.m3outline
 					elide: Text.ElideRight
 					font: {
 						const f = Qt.font(subtext.font);
-						f.pointSize = Appearance.font.size.small;
+						f.pointSize = Tokens.font.size.small;
 						return f;
 					}
 					text: toggleItem.subtext

Modules/Settings/Pages/Panels/BarPanel.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick.Layouts
 import ZShell.Config
+import qs.Components
 import qs.Modules.Settings.Common
 
 PageBase {
@@ -25,7 +26,6 @@ PageBase {
 		ToggleRow {
 			checked: Config.bar.autoHide
 			first: true
-			last: true
 			settingAnchor: "bar-autohide"
 			subtext: qsTr("Hide the bar, reveal on hover")
 			text: qsTr("Auto hide")
@@ -33,6 +33,34 @@ PageBase {
 			onToggled: Config.bar.autoHide = checked
 		}
 
+		SelectRow {
+			active: Config.bar.position === "top" ? menuItems[0] : Config.bar.position === "left" ? menuItems[1] : menuItems[2]
+			last: true
+			settingAnchor: "bar-position"
+			subtext: qsTr("Change which edge the bar appears on")
+			text: qsTr("Position")
+
+			menuItems: [
+				MenuItem {
+					icon: "build"
+					text: qsTr("Top")
+					value: "top"
+				},
+				MenuItem {
+					icon: "rotate_auto"
+					text: qsTr("Left")
+					value: "left"
+				},
+				MenuItem {
+					icon: "rotate_auto"
+					text: qsTr("Bottom")
+					value: "bottom"
+				}
+			]
+
+			onSelected: item => Config.bar.position = item.value
+		}
+
 		// Components
 		SectionHeader {
 			text: qsTr("Components")

Modules/Settings/Pages/ScreenshotPage.qml

@@ -70,10 +70,7 @@ PageBase {
 				}
 			]
 
-			onSelected: item => {
-				Config.screenshot.mode = item.value;
-				Config.save();
-			}
+			onSelected: item => Config.screenshot.mode = item.value
 		}
 
 		SectionHeader {

Modules/Settings/Pages/WallpaperPage.qml

@@ -104,7 +104,6 @@ PageBase {
 					onApplySettings: (start, end) => {
 						Config.general.color.scheduleDarkStart = start;
 						Config.general.color.scheduleDarkEnd = end;
-						Config.save();
 						ModeScheduler.checkStartup();
 						PopupManager.requestClose();
 					}
@@ -146,7 +145,6 @@ PageBase {
 					onApplySettings: (start, end) => {
 						Config.general.color.scheduleHyprsunsetStart = start;
 						Config.general.color.scheduleHyprsunsetEnd = end;
-						Config.save();
 						Hyprsunset.checkStartup();
 						PopupManager.requestClose();
 					}