initial commit, primitive loading of QML code outside of shell directory

.gitignore

@@ -13,5 +13,3 @@ uv.lock
 .qtcreator/
 dist/
 **/target/
-**/test-plugins/
-**/Charts/

Config/BarConfig.qml

@@ -59,8 +59,6 @@ JsonObject {
 	}
 	property int rounding: 8
 	property int smoothing: 32
-	property Tray tray: Tray {
-	}
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true
@@ -71,7 +69,4 @@ JsonObject {
 		property bool tray: true
 		property bool upower: true
 	}
-	component Tray: JsonObject {
-		property int trayIconSize: 24
-	}
 }

Config/Config.qml

@@ -22,6 +22,7 @@ Singleton {
 	property alias notifs: adapter.notifs
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
+	property alias plugins: adapter.plugins
 	property bool recentlySaved: false
 	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
@@ -100,9 +101,6 @@ Singleton {
 			border: barConfig.border,
 			smoothing: barConfig.smoothing,
 			height: barConfig.height,
-			tray: {
-				trayIconSize: barConfig.tray.trayIconSize
-			},
 			popouts: {
 				tray: barConfig.popouts.tray,
 				audio: barConfig.popouts.audio,
@@ -143,7 +141,8 @@ Singleton {
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
 			dock: serializeDock(),
-			screenshot: serializeScreenshot()
+			screenshot: serializeScreenshot(),
+			plugins: serializePlugins()
 		};
 	}
 
@@ -217,10 +216,6 @@ Singleton {
 			},
 			idle: {
 				timeouts: general.idle.timeouts
-			},
-			battery: {
-				popupThresholds: general.battery.popupThresholds,
-				critPerc: general.battery.critPerc
 			}
 		};
 	}
@@ -296,6 +291,13 @@ Singleton {
 		};
 	}
 
+	function serializePlugins(): var {
+		return {
+			enabled: plugins.enabled,
+			entries: plugins.entries
+		};
+	}
+
 	function serializeScreenshot(): var {
 		return {
 			enable_pp: screenshot.enable_pp,
@@ -465,6 +467,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property PluginConfig plugins: PluginConfig {
+			}
 			property Screenshot screenshot: Screenshot {
 			}
 			property Services services: Services {

Config/General.qml

@@ -4,8 +4,6 @@ import Quickshell
 JsonObject {
 	property Apps apps: Apps {
 	}
-	property Battery battery: Battery {
-	}
 	property Color color: Color {
 	}
 	property string dateFormat: "ddd d MMM - hh:mm:ss"
@@ -21,17 +19,6 @@ JsonObject {
 		property list<string> playback: ["mpv"]
 		property list<string> terminal: ["kitty"]
 	}
-	component Battery: JsonObject {
-		property int critPerc: 5
-		property list<var> popupThresholds: [
-			{
-				perc: 20,
-				name: qsTr("Low battery"),
-				message: qsTr("Battery is low"),
-				icon: "battery_android_frame_2"
-			},
-		]
-	}
 	component Color: JsonObject {
 		property int hyprsunsetTemp: 5000
 		property string mode: "dark"

Config/PluginConfig.qml

@@ -0,0 +1,11 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: false
+	property list<var> entries: [
+		{
+			id: "Plugin",
+			enabled: false
+		},
+	]
+}

Daemons/Battery.qml

@@ -1,47 +0,0 @@
-import Quickshell
-import Quickshell.Services.UPower
-import QtQuick
-import ZShell
-import qs.Config
-import qs.Components.Toast
-
-Scope {
-	id: root
-
-	readonly property real currentPerc: UPower.displayDevice.percentage
-	readonly property list<var> popupThresholds: [...Config.general.battery.popupThresholds].sort((a, b) => b.perc - a.perc)
-
-	Connections {
-		function onOnBatteryChanged(): void {
-			if (UPower.onBattery) {
-				if (Config.utilities.toasts.chargingChanged)
-					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
-			} else {
-				if (Config.utilities.toasts.chargingChanged)
-					Toaster.toast(qsTr("Charger plugged in"), qsTr("Battery is charging"), "power");
-				for (const level of root.popupThresholds)
-					level.warned = false;
-			}
-		}
-
-		target: UPower
-	}
-
-	Connections {
-		function onPercentageChanged(): void {
-			if (!UPower.onBattery)
-				return;
-
-			const p = UPower.displayDevice.percentage * 100;
-			for (const perc of root.popupThresholds) {
-				if (p <= perc.perc && !perc.warned) {
-					perc.warned = true;
-					console.log(perc.warned + "\n" + [...Config.general.battery.popupThresholds][0].warned);
-					Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery perc is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
-				}
-			}
-		}
-
-		target: UPower.displayDevice
-	}
-}

Daemons/NotifServer.qml

@@ -179,8 +179,6 @@ Singleton {
 		property string appIcon
 		property string appName
 		property string body
-		property string cachedImageSource: ""
-		property bool cachingImage: false
 		property bool closed
 		readonly property Connections conn: Connections {
 			function onActionsChanged(): void {
@@ -216,9 +214,9 @@ Singleton {
 			}
 
 			function onImageChanged(): void {
-				notif.imageSource = notif.notification.image || "";
-				notif.image = notif.imageSource;
-				notif.cacheImageIfNeeded();
+				notif.image = notif.notification.image;
+				if (notif.notification?.image)
+					notif.dummyImageLoader.active = true;
 			}
 
 			function onResidentChanged(): void {
@@ -235,12 +233,60 @@ Singleton {
 
 			target: notif.notification
 		}
+		readonly property LazyLoader dummyImageLoader: LazyLoader {
+			active: false
+
+			PanelWindow {
+				color: "transparent"
+				implicitHeight: Config.notifs.sizes.image
+				implicitWidth: Config.notifs.sizes.image
+
+				mask: Region {
+				}
+
+				Image {
+					function tryCache(): void {
+						if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
+							return;
+
+						const cacheKey = notif.appName + notif.summary + notif.id;
+						let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
+						for (let i = 0; i < cacheKey.length; i++) {
+							ch = cacheKey.charCodeAt(i);
+							h1 = Math.imul(h1 ^ ch, 2654435761);
+							h2 = Math.imul(h2 ^ ch, 1597334677);
+						}
+						h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
+						h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+						h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
+						h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+						const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);
+
+						const cache = `${Paths.notifimagecache}/${hash}.png`;
+						ZShellIo.saveItem(this, Qt.resolvedUrl(cache), () => {
+							notif.image = cache;
+							notif.dummyImageLoader.active = false;
+						});
+					}
+
+					anchors.fill: parent
+					asynchronous: true
+					cache: false
+					fillMode: Image.PreserveAspectCrop
+					opacity: 0
+					source: Qt.resolvedUrl(notif.image)
+
+					onHeightChanged: tryCache()
+					onStatusChanged: tryCache()
+					onWidthChanged: tryCache()
+				}
+			}
+		}
 		property real expireTimeout: 5
 		property bool hasActionIcons
+		property string id
 		property string image
-		property string imageSource
 		property var locks: new Set()
-		property string notifId
 		property Notification notification
 		property bool popup
 		property bool resident
@@ -283,26 +329,6 @@ Singleton {
 		}
 		property int urgency: NotificationUrgency.Normal
 
-		function cacheImageIfNeeded(): void {
-			const source = imageSource;
-
-			if (!source || cachingImage)
-				return;
-
-			if (cachedImageSource === source)
-				return;
-
-			cachingImage = true;
-
-			ZShellIo.cacheImage(Qt.resolvedUrl(source), Paths.notifimagecache, (path, url) => {
-				cachedImageSource = source;
-				image = path;
-				cachingImage = false;
-			}, () => {
-				cachingImage = false;
-			});
-		}
-
 		function close(): void {
 			closed = true;
 			if (locks.size === 0 && root.list.includes(this)) {
@@ -326,13 +352,14 @@ Singleton {
 			if (!notification)
 				return;
 
-			notifId = notification.id;
+			id = notification.id;
 			summary = notification.summary;
 			body = notification.body;
 			appIcon = notification.appIcon;
 			appName = notification.appName;
-			imageSource = notification.image || "";
-			image = imageSource;
+			image = notification.image;
+			if (notification?.image)
+				dummyImageLoader.active = true;
 			expireTimeout = notification.expireTimeout;
 			urgency = notification.urgency;
 			resident = notification.resident;
@@ -342,8 +369,6 @@ Singleton {
 						text: a.text,
 						invoke: () => a.invoke()
 					}));
-
-			cacheImageIfNeeded();
 		}
 	}
 }

Drawers/Drawing.qml

@@ -23,7 +23,6 @@ Canvas {
 		ctx.save();
 		ctx.lineWidth = root.penWidth;
 		ctx.strokeStyle = root.penColor;
-		ctx.lineJoin = "round";
 		ctx.lineCap = "round";
 		ctx.beginPath();
 		ctx.moveTo(points[0].x, points[0].y);

Drawers/DrawingInput.qml

@@ -22,20 +22,20 @@ CustomMouseArea {
 	}
 
 	acceptedButtons: Qt.LeftButton | Qt.RightButton
-	enabled: z > 0
+	anchors.fill: root.visibilities.isDrawing ? parent : undefined
 	hoverEnabled: true
 	visible: root.visibilities.isDrawing
 
 	onPositionChanged: event => {
 		const x = event.x;
 		const y = event.y;
+
 		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
 			root.drawing.points.push(Qt.point(x, y));
 			root.drawing.requestPaint();
-			return;
 		}
 
-		if (!(event.buttons & Qt.LeftButton) && root.inLeftPanel(root.popout, x, y)) {
+		if (root.inLeftPanel(root.popout, x, y)) {
 			root.z = -2;
 			root.panels.drawing.expanded = true;
 		}

Drawers/Interactions.qml

@@ -78,7 +78,7 @@ CustomMouseArea {
 		const dragY = y - dragStart.y;
 
 		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			root.input.z = 2;
+			// root.input.z = 2;
 			root.panels.drawing.expanded = false;
 		}
 

Drawers/Windows.qml

@@ -35,7 +35,7 @@ Variants {
 			property var root: Quickshell.shellDir
 
 			WlrLayershell.exclusionMode: ExclusionMode.Ignore
-			// WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+			WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 			color: "transparent"
 			contentItem.focus: true
 			mask: visibilities.isDrawing ? null : region
@@ -229,7 +229,6 @@ Variants {
 					id: notifsBg
 
 					panel: panels.notifications
-					radius: Appearance.rounding.normal
 				}
 
 				PanelBg {
@@ -305,34 +304,22 @@ Variants {
 				}
 			}
 
-			Loader {
-				id: drawingLoader
+			Drawing {
+				id: drawing
 
-				active: visibilities.isDrawing
 				anchors.fill: parent
 				z: 2
-
-				sourceComponent: Drawing {
-					id: drawing
-				}
 			}
 
-			Loader {
-				id: inputLoader
+			DrawingInput {
+				id: input
 
-				active: visibilities.isDrawing
-				anchors.fill: parent
+				bar: bar
+				drawing: drawing
+				panels: panels
+				popout: panels.drawing
+				visibilities: visibilities
 				z: 2
-
-				sourceComponent: DrawingInput {
-					id: input
-
-					bar: bar
-					drawing: drawingLoader.item
-					panels: panels
-					popout: panels.drawing
-					visibilities: visibilities
-				}
 			}
 
 			Interactions {
@@ -340,8 +327,8 @@ Variants {
 
 				anchors.fill: parent
 				bar: bar
-				drawing: drawingLoader.item
-				input: inputLoader.item
+				drawing: drawing
+				input: input
 				panels: panels
 				popouts: panels.popouts
 				screen: scope.modelData
@@ -352,7 +339,7 @@ Variants {
 					id: panels
 
 					bar: bar
-					drawingItem: drawingLoader.item
+					drawingItem: drawing
 					screen: scope.modelData
 					visibilities: visibilities
 

Extensions/FetchPlugins.qml

@@ -0,0 +1,18 @@
+pragma Singleton
+
+import Quickshell
+import ZShell.Models
+
+Singleton {
+	id: root
+
+	property alias plugins: plugins.entries
+
+	FileSystemModel {
+		id: plugins
+
+		nameFilters: ["*.qml"]
+		path: Quickshell.env("HOME") + "/.config/zshell"
+		recursive: false
+	}
+}

Extensions/LoadExtensions.qml

@@ -0,0 +1,17 @@
+import Quickshell
+import QtQuick
+import ZShell.Models
+import qs.Config
+
+Repeater {
+	model: FetchPlugins.plugins
+
+	LazyLoader {
+		required property FileSystemEntry modelData
+
+		activeAsync: Config.plugins.entries.some(p => {
+			return p.id === modelData.baseName && p.enabled;
+		})
+		source: modelData.path
+	}
+}

Helpers/SystemUsage.qml

@@ -17,7 +17,6 @@ Singleton {
 	property var disks: []
 	property real gpuMemTotal: 0
 	property real gpuMemUsed
-	property string gpuName
 	property real gpuPerc
 	property real gpuTemp
 	readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType

Modules/Dashboard/Wrapper.qml

@@ -20,7 +20,7 @@ Item {
 	required property PersistentProperties visibilities
 
 	implicitHeight: content.implicitHeight
-	implicitWidth: content.implicitWidth || 854
+	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
 	opacity: 1 - offsetScale
 	visible: offsetScale < 1
 

Modules/Dock/Wrapper.qml

@@ -9,17 +9,18 @@ Item {
 	id: root
 
 	property int contentHeight
-	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.dock && Config.dock.enable
 	required property PersistentProperties visibilities
 
+	readonly property bool shouldBeActive: visibilities.dock
+	property real offsetScale: shouldBeActive ? 0 : 1
+
+	visible: offsetScale < 1
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth || 400
 	opacity: 1 - offsetScale
-	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
@@ -31,10 +32,10 @@ Item {
 	Loader {
 		id: content
 
-		active: root.shouldBeActive || root.visible
 		anchors.left: parent.left
 		anchors.top: parent.top
-		asynchronous: true
+
+		active: root.shouldBeActive || root.visible
 
 		sourceComponent: Content {
 			panels: root.panels

Modules/Drawing/Wrapper.qml

@@ -44,10 +44,10 @@ Item {
 	Loader {
 		id: icon
 
-		active: root.shouldBeActive || root.visible
+		active: Qt.binding(() => root.shouldBeActive || root.visible)
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		asynchronous: true
+		height: content.contentItem.height
 		opacity: root.expanded ? 0 : 1
 
 		Behavior on opacity {
@@ -63,10 +63,8 @@ Item {
 	Loader {
 		id: content
 
-		active: root.shouldBeActive || root.visible
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		asynchronous: true
 		opacity: root.expanded ? 1 : 0
 
 		Behavior on opacity {
@@ -77,5 +75,7 @@ Item {
 			drawing: root.drawing
 			visibilities: root.visibilities
 		}
+
+		Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible)
 	}
 }

Modules/Launcher/Wrapper.qml

@@ -4,7 +4,6 @@ import Quickshell
 import QtQuick
 import qs.Components
 import qs.Config
-import qs.Modules.Launcher.Services
 
 Item {
 	id: root
@@ -20,17 +19,26 @@ Item {
 			max -= panels.popouts.nonAnimHeight;
 		return max;
 	}
-	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.launcher
 	required property PersistentProperties visibilities
+	readonly property bool shouldBeActive: visibilities.launcher
+	property real offsetScale: shouldBeActive ? 0 : 1
 
+	onShouldBeActiveChanged: {
+		if (shouldBeActive) {
+			implicitHeight = Qt.binding(() => content.implicitHeight);
+			timer.stop();
+		} else {
+			implicitHeight = implicitHeight;
+		}
+	}
+
+	visible: offsetScale < 1
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth || 400
 	opacity: 1 - offsetScale
-	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
@@ -39,26 +47,61 @@ Item {
 		}
 	}
 
-	Component.onCompleted: Qt.callLater(() => Apps)
-	onShouldBeActiveChanged: {
-		if (shouldBeActive)
-			implicitHeight = Qt.binding(() => content.implicitHeight);
-		else
-			implicitHeight = implicitHeight;
+	onMaxHeightChanged: timer.start()
+
+	Connections {
+		function onEnabledChanged(): void {
+			timer.start();
+		}
+
+		function onMaxShownChanged(): void {
+			timer.start();
+		}
+
+		target: Config.launcher
+	}
+
+	Connections {
+		function onValuesChanged(): void {
+			if (DesktopEntries.applications.values.length < Config.launcher.maxAppsShown)
+				timer.start();
+		}
+
+		target: DesktopEntries.applications
+	}
+
+	Timer {
+		id: timer
+
+		interval: Appearance.anim.durations.small
+
+		onRunningChanged: {
+			if (running && !root.shouldBeActive) {
+				content.visible = false;
+				content.active = true;
+			} else {
+				root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
+				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
+				content.visible = true;
+			}
+		}
 	}
 
 	Loader {
 		id: content
 
-		active: root.shouldBeActive || root.visible
+		active: false
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		asynchronous: true
 
 		sourceComponent: Content {
 			maxHeight: root.maxHeight
 			panels: root.panels
 			visibilities: root.visibilities
+
+			Component.onCompleted: root.contentHeight = implicitHeight
 		}
+
+		Component.onCompleted: timer.start()
 	}
 }

Modules/Notifications/Content.qml

@@ -8,7 +8,7 @@ import QtQuick
 Item {
 	id: root
 
-	readonly property int padding: Appearance.padding.smaller
+	readonly property int padding: 6
 	required property Item panels
 	required property PersistentProperties visibilities
 
@@ -54,7 +54,7 @@ Item {
 		anchors.fill: parent
 		anchors.margins: root.padding
 		color: "transparent"
-		radius: Appearance.rounding.normal - root.padding
+		radius: Appearance.rounding.smallest / 2
 
 		CustomListView {
 			id: list
@@ -72,7 +72,7 @@ Item {
 				required property NotifServer.Notif modelData
 				readonly property alias nonAnimHeight: notif.nonAnimHeight
 
-				implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Appearance.spacing.small)
+				implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : 8)
 				implicitWidth: notif.implicitWidth
 
 				ListView.onRemove: removeAnim.start()
@@ -151,6 +151,48 @@ Item {
 					property: "y"
 				}
 			}
+
+			ExtraIndicator {
+				anchors.top: parent.top
+				extra: {
+					const count = list.count;
+					if (count === 0)
+						return 0;
+
+					const scrollY = list.contentY;
+
+					let height = 0;
+					for (let i = 0; i < count; i++) {
+						height += (list.itemAtIndex(i)?.nonAnimHeight ?? 0) + 8;
+
+						if (height - 8 >= scrollY)
+							return i;
+					}
+
+					return count;
+				}
+			}
+
+			ExtraIndicator {
+				anchors.bottom: parent.bottom
+				extra: {
+					const count = list.count;
+					if (count === 0)
+						return 0;
+
+					const scrollY = list.contentHeight - (list.contentY + list.height);
+
+					let height = 0;
+					for (let i = count - 1; i >= 0; i--) {
+						height += (list.itemAtIndex(i)?.nonAnimHeight ?? 0) + 8;
+
+						if (height - 8 >= scrollY)
+							return count - i - 1;
+					}
+
+					return 0;
+				}
+			}
 		}
 	}
 

Modules/Settings/Categories.qml

@@ -116,6 +116,12 @@ Item {
 			key: "updates"
 			name: "Updates"
 		}
+
+		ListElement {
+			icon: "extension"
+			key: "plugins"
+			name: "Extensions"
+		}
 	}
 
 	CustomClippingRect {

Modules/Settings/Categories/Bar.qml

@@ -56,21 +56,6 @@ SettingsPage {
 		}
 	}
 
-	SettingsSection {
-		sectionId: "Tray"
-
-		SettingsHeader {
-			name: "System tray"
-		}
-
-		SettingSpinBox {
-			min: 16
-			name: "Tray icon size"
-			object: Config.barConfig.tray
-			setting: "trayIconSize"
-		}
-	}
-
 	SettingsSection {
 		sectionId: "Popouts"
 

Modules/Settings/Categories/Plugins.qml

@@ -0,0 +1,18 @@
+import qs.Modules.Settings.Controls
+import qs.Config
+
+SettingsPage {
+	SettingsSection {
+		sectionId: "Plugins"
+
+		SettingsHeader {
+			name: "Plugins"
+		}
+
+		SettingBarEntryList {
+			name: "Enable or disable plugins"
+			object: Config.plugins
+			setting: "entries"
+		}
+	}
+}

Modules/Settings/Content.qml

@@ -79,6 +79,8 @@ Item {
 				stack.push(screenshot);
 			else if (currentCategory === "updates")
 				stack.push(updates);
+			else if (currentCategory === "plugins")
+				stack.push(plugins);
 		}
 
 		target: root
@@ -134,7 +136,7 @@ Item {
 			anchors.right: parent.right
 			anchors.top: searchBar.bottom
 			anchors.topMargin: Appearance.spacing.smaller
-			color: DynamicColors.tPalette.m3surfaceContainer
+			color: DynamicColors.tPalette.m3surfaceContainerLowest
 			radius: Appearance.rounding.normal
 
 			StackView {
@@ -245,4 +247,11 @@ Item {
 		Cat.SystemUpdates {
 		}
 	}
+
+	Component {
+		id: plugins
+
+		Cat.Plugins {
+		}
+	}
 }

Modules/Settings/Wrapper.qml

@@ -32,9 +32,10 @@ Item {
 		Loader {
 			id: content
 
-			active: root.shouldBeActive || root.visible
+			active: true
 			anchors.bottom: parent.bottom
 			anchors.horizontalCenter: parent.horizontalCenter
+			visible: true
 
 			sourceComponent: Content {
 				screen: root.screen

Modules/SysTray/TrayItem.qml

@@ -3,7 +3,6 @@ import QtQuick
 import QtQuick.VectorImage
 import Quickshell
 import Quickshell.Services.SystemTray
-import qs.Helpers
 import qs.Modules
 import qs.Components
 import qs.Config
@@ -12,36 +11,12 @@ Item {
 	id: root
 
 	property bool current: popouts.currentName.startsWith(`traymenu${ind}`) && popouts.hasCurrent
-	readonly property real dpr: Hypr.monitorFor(loader.screen).scale
+	property bool hasLoaded: false
 	required property int ind
 	required property SystemTrayItem item
 	required property RowLayout loader
 	required property Wrapper popouts
 
-	function resolveIcon(app: string, icon: string): string {
-		if (app === "chrome_status_icon_1") {
-			return Quickshell.iconPath("discord-tray");
-		} else if (app === "AyuGramDesktop") {
-			if (icon === Quickshell.iconPath("com.ayugram.desktop-attention-symbolic"))
-				return Quickshell.iconPath("telegram-attention-panel");
-			else if (icon === Quickshell.iconPath("com.ayugram.desktop-mute-symbolic"))
-				return Quickshell.iconPath("telegram-mute-panel");
-			else if (icon === Quickshell.iconPath("com.ayugram.desktop-symbolic"))
-				return Quickshell.iconPath("telegram-panel");
-		} else if (app === "TelegramDesktop") {
-			if (icon === Quickshell.iconPath("org.telegram.desktop-symbolic"))
-				return Quickshell.iconPath("telegram-panel");
-			else if (icon === Quickshell.iconPath("org.telegram.desktop-attention-symbolic"))
-				return Quickshell.iconPath("telegram-attention-panel");
-			else if (icon === Quickshell.iconPath("org.telegram.desktop-mute-symbolic"))
-				return Quickshell.iconPath("telegram-mute-panel");
-		} else if (app === "steam") {
-			return Quickshell.iconPath("steam_tray_mono");
-		}
-
-		return root.item.icon;
-	}
-
 	CustomRect {
 		anchors.fill: parent
 		anchors.margins: 3
@@ -55,8 +30,7 @@ Item {
 			onClicked: {
 				if (mouse.button === Qt.LeftButton) {
 					root.item.activate();
-					console.log(icon.source + "\n" + root.item.id);
-				} else if (mouse.button === Qt.RightButton && Config.barConfig.popouts.tray) {
+				} else if (mouse.button === Qt.RightButton) {
 					root.popouts.currentName = `traymenu${root.ind}`;
 					root.popouts.currentCenter = Qt.binding(() => root.mapToItem(root.loader, root.implicitWidth / 2, 0).x);
 					root.popouts.hasCurrent = true;
@@ -74,11 +48,9 @@ Item {
 		id: icon
 
 		anchors.centerIn: parent
-		antialiasing: true
 		color: root.current ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
-		implicitSize: Config.barConfig.tray.trayIconSize * root.dpr
+		implicitSize: 22
 		layer.enabled: Config.general.color.smart || Config.general.color.scheduleDark
-		scale: 1 / root.dpr
-		source: root.resolveIcon(root.item.id, root.item.icon)
+		source: root.item.icon
 	}
 }

Modules/SysTray/TrayWidget.qml

@@ -23,12 +23,12 @@ RowLayout {
 			let modRowPos = sysTrayMod.mapToItem(sysModRow, modPos.x, modPos.y);
 			let child = sysModRow.childAt(modRowPos.x, modRowPos.y);
 			if (child) {
-				if (child.objectName === "audioWidget" && Config.barConfig.popouts.audio)
+				if (child.objectName === "audioWidget")
 					return {
 						id: "audio",
 						item: child
 					};
-				if (child.objectName === "upowerWidget" && Config.barConfig.popouts.upower)
+				if (child.objectName === "upowerWidget")
 					return {
 						id: "upower",
 						item: child

Modules/Updates/UpdatesPopout.qml

@@ -11,161 +11,150 @@ import qs.Helpers
 CustomClippingRect {
 	id: root
 
-	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
 	readonly property int itemHeight: 50 + Appearance.padding.smaller * 2
 	required property var wrapper
 
 	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitHeight: hasUpdates ? updatesListLoader.item?.implicitHeight + Appearance.padding.small * 2 : noUpdatesLoader.item.height
-	implicitWidth: hasUpdates ? updatesListLoader.item?.contentWidth + Appearance.padding.small * 2 : noUpdatesLoader.item.width
+	implicitHeight: updatesList.visible ? updatesList.implicitHeight + Appearance.padding.small * 2 : noUpdates.height
+	implicitWidth: updatesList.visible ? updatesList.contentWidth + Appearance.padding.small * 2 : noUpdates.width
 	radius: Appearance.rounding.small
 
-	Loader {
-		id: noUpdatesLoader
+	Item {
+		id: noUpdates
 
-		active: !root.hasUpdates
 		anchors.centerIn: parent
+		height: 200
+		visible: script.values.length === 0
+		width: 600
 
-		sourceComponent: Item {
-			id: noUpdates
+		MaterialIcon {
+			id: noUpdatesIcon
 
-			height: 200
-			width: 300
+			anchors.horizontalCenter: parent.horizontalCenter
+			anchors.top: parent.top
+			color: DynamicColors.tPalette.m3onSurfaceVariant
+			font.pointSize: Appearance.font.size.extraLarge * 3
+			horizontalAlignment: Text.AlignHCenter
+			text: "check"
+		}
 
-			MaterialIcon {
-				id: noUpdatesIcon
-
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: parent.top
-				color: DynamicColors.tPalette.m3onSurfaceVariant
-				font.pointSize: Appearance.font.size.extraLarge * 3
-				horizontalAlignment: Text.AlignHCenter
-				text: "check"
-			}
-
-			CustomText {
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: noUpdatesIcon.bottom
-				color: DynamicColors.tPalette.m3onSurfaceVariant
-				horizontalAlignment: Text.AlignHCenter
-				text: qsTr("No updates available")
-				verticalAlignment: Text.AlignVCenter
-			}
+		CustomText {
+			anchors.horizontalCenter: parent.horizontalCenter
+			anchors.top: noUpdatesIcon.bottom
+			color: DynamicColors.tPalette.m3onSurfaceVariant
+			horizontalAlignment: Text.AlignHCenter
+			text: qsTr("No updates available")
+			verticalAlignment: Text.AlignVCenter
 		}
 	}
 
-	Loader {
-		id: updatesListLoader
+	CustomListView {
+		id: updatesList
 
-		active: root.hasUpdates
 		anchors.centerIn: parent
+		contentHeight: childrenRect.height
+		contentWidth: 600
+		displayMarginBeginning: root.itemHeight
+		displayMarginEnd: root.itemHeight
+		implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
+		implicitWidth: contentWidth
+		spacing: Appearance.spacing.normal
+		visible: script.values.length > 0
 
-		sourceComponent: CustomListView {
-			id: updatesList
+		delegate: CustomRect {
+			id: update
 
-			contentHeight: childrenRect.height
-			contentWidth: 600
-			displayMarginBeginning: root.itemHeight
-			displayMarginEnd: root.itemHeight
-			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
-			implicitWidth: contentWidth
-			spacing: Appearance.spacing.normal
+			required property var modelData
+			readonly property list<string> sections: modelData.update.split(" ")
 
-			delegate: CustomRect {
-				id: update
+			// anchors.left: parent.left
+			// anchors.right: parent.right
+			color: DynamicColors.tPalette.m3surfaceContainer
+			implicitHeight: root.itemHeight
+			implicitWidth: 600
+			radius: Appearance.rounding.small - Appearance.padding.small
 
-				required property var modelData
-				readonly property list<string> sections: modelData.update.split(" ")
+			RowLayout {
+				anchors.fill: parent
+				anchors.leftMargin: Appearance.padding.smaller
+				anchors.rightMargin: Appearance.padding.smaller
 
-				// anchors.left: parent.left
-				// anchors.right: parent.right
-				color: DynamicColors.tPalette.m3surfaceContainer
-				implicitHeight: root.itemHeight
-				implicitWidth: 600
-				radius: Appearance.rounding.small - Appearance.padding.small
+				MaterialIcon {
+					font.pointSize: Appearance.font.size.large * 2
+					text: "package_2"
+				}
+
+				ColumnLayout {
+					Layout.fillWidth: true
+
+					CustomText {
+						Layout.fillWidth: true
+						Layout.preferredHeight: 25
+						elide: Text.ElideRight
+						font.pointSize: Appearance.font.size.large
+						text: update.sections[0]
+					}
+
+					CustomText {
+						Layout.fillWidth: true
+						color: DynamicColors.palette.m3onSurfaceVariant
+						text: Updates.formatUpdateTime(update.modelData.timestamp)
+					}
+				}
 
 				RowLayout {
-					anchors.fill: parent
-					anchors.leftMargin: Appearance.padding.smaller
-					anchors.rightMargin: Appearance.padding.smaller
+					Layout.fillHeight: true
+					Layout.preferredWidth: 300
+
+					MarqueeText {
+						id: versionFrom
+
+						Layout.fillHeight: true
+						Layout.preferredWidth: 125
+						animate: true
+						color: DynamicColors.palette.m3tertiary
+						font.pointSize: Appearance.font.size.large
+						horizontalAlignment: Text.AlignHCenter
+						marqueeEnabled: true
+						pauseMs: 4000
+						text: update.sections[1]
+						width: 125
+					}
 
 					MaterialIcon {
-						font.pointSize: Appearance.font.size.large * 2
-						text: "package_2"
-					}
-
-					ColumnLayout {
-						Layout.fillWidth: true
-
-						CustomText {
-							Layout.fillWidth: true
-							Layout.preferredHeight: 25
-							elide: Text.ElideRight
-							font.pointSize: Appearance.font.size.large
-							text: update.sections[0]
-						}
-
-						CustomText {
-							Layout.fillWidth: true
-							color: DynamicColors.palette.m3onSurfaceVariant
-							text: Updates.formatUpdateTime(update.modelData.timestamp)
-						}
-					}
-
-					RowLayout {
 						Layout.fillHeight: true
-						Layout.preferredWidth: 300
+						color: DynamicColors.palette.m3secondary
+						font.pointSize: Appearance.font.size.extraLarge
+						horizontalAlignment: Text.AlignHCenter
+						text: "arrow_right_alt"
+						verticalAlignment: Text.AlignVCenter
+					}
 
-						MarqueeText {
-							id: versionFrom
+					MarqueeText {
+						id: versionTo
 
-							Layout.fillHeight: true
-							Layout.preferredWidth: 125
-							animate: true
-							color: DynamicColors.palette.m3tertiary
-							font.pointSize: Appearance.font.size.large
-							horizontalAlignment: Text.AlignHCenter
-							marqueeEnabled: true
-							pauseMs: 4000
-							text: update.sections[1]
-							width: 125
-						}
-
-						MaterialIcon {
-							Layout.fillHeight: true
-							color: DynamicColors.palette.m3secondary
-							font.pointSize: Appearance.font.size.extraLarge
-							horizontalAlignment: Text.AlignHCenter
-							text: "arrow_right_alt"
-							verticalAlignment: Text.AlignVCenter
-						}
-
-						MarqueeText {
-							id: versionTo
-
-							Layout.fillHeight: true
-							Layout.preferredWidth: 120
-							animate: true
-							color: DynamicColors.palette.m3primary
-							font.pointSize: Appearance.font.size.large
-							horizontalAlignment: Text.AlignHCenter
-							marqueeEnabled: true
-							pauseMs: 4000
-							text: update.sections[3]
-							width: 125
-						}
+						Layout.fillHeight: true
+						Layout.preferredWidth: 120
+						animate: true
+						color: DynamicColors.palette.m3primary
+						font.pointSize: Appearance.font.size.large
+						horizontalAlignment: Text.AlignHCenter
+						marqueeEnabled: true
+						pauseMs: 4000
+						text: update.sections[3]
+						width: 125
 					}
 				}
 			}
-			model: ScriptModel {
-				id: script
+		}
+		model: ScriptModel {
+			id: script
 
-				objectProp: "update"
-				values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
-							update,
-							timestamp
-						}))
-			}
+			objectProp: "update"
+			values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
+						update,
+						timestamp
+					}))
 		}
 	}
 }

Modules/Wallpaper/Wallpaper.qml

@@ -6,7 +6,7 @@ import qs.Modules.DesktopIcons
 
 Loader {
 	active: Config.background.enabled
-	asynchronous: false
+	asynchronous: true
 
 	sourceComponent: Variants {
 		model: Quickshell.screens

Modules/Wrapper.qml

@@ -15,8 +15,9 @@ Item {
 	property real currentCenter
 	property alias currentName: popoutState.currentName
 	property string detachedMode
+	readonly property bool isDetached: detachedMode.length > 0
 	property alias hasCurrent: popoutState.hasCurrent
-	readonly property real nonAnimHeight: content.implicitHeight || 150
+	readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
 	readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
 	required property real offsetScale
 	property string queuedMode
@@ -27,13 +28,29 @@ Item {
 		detachedMode = "";
 	}
 
+	function detach(mode: string): void {
+		setAnims(true);
+		if (mode === "winfo") {
+			detachedMode = mode;
+		} else {
+			queuedMode = mode;
+			detachedMode = "any";
+		}
+		setAnims(false);
+		focus = true;
+	}
+
+	function setAnims(detach: bool): void {
+		const type = `expressive${detach ? "Slow" : "Default"}Spatial`;
+		animLength = Appearance.anim.durations[type];
+		animCurve = Appearance.anim.curves[type];
+	}
+
 	focus: hasCurrent
 	implicitHeight: nonAnimHeight
 	implicitWidth: nonAnimWidth
 
 	Behavior on implicitHeight {
-		enabled: root.offsetScale < 1
-
 		Anim {
 			duration: root.animLength
 			easing.bezierCurve: root.animCurve
@@ -55,14 +72,42 @@ Item {
 	Comp {
 		id: content
 
+		// anchors.horizontalCenter: parent.horizontalCenter
+		// anchors.top: parent.top
 		anchors.centerIn: parent
-		shouldBeActive: root.hasCurrent
+		shouldBeActive: root.hasCurrent && !root.detachedMode
 
 		sourceComponent: Content {
 			popouts: popoutState
 		}
 	}
 
+	// Comp {
+	// 	id: winfo
+	//
+	// 	anchors.centerIn: parent
+	// 	shouldBeActive: root.detachedMode === "winfo"
+	//
+	// 	sourceComponent: WindowInfo {
+	// 		client: Hypr.activeToplevel
+	// 		screen: root.screen
+	// 	}
+	// }
+	//
+	// Comp {
+	// 	id: controlCenter
+	//
+	// 	anchors.centerIn: parent
+	// 	shouldBeActive: root.detachedMode === "any"
+	//
+	// 	sourceComponent: ControlCenter {
+	// 		active: root.queuedMode
+	// 		screen: root.screen
+	//
+	// 		onClose: root.close()
+	// 	}
+	// }
+
 	component Comp: Loader {
 		id: comp
 

Plugins/ZShell/Models/filesystemmodel.cpp

@@ -7,473 +7,464 @@
 namespace ZShell::models {
 
 FileSystemEntry::FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent)
-    : QObject(parent)
-    , m_fileInfo(path)
-    , m_path(path)
-    , m_relativePath(relativePath)
-    , m_isImageInitialised(false)
-    , m_mimeTypeInitialised(false) {}
+	: QObject(parent)
+	, m_fileInfo(path)
+	, m_path(path)
+	, m_relativePath(relativePath)
+	, m_isImageInitialised(false)
+	, m_mimeTypeInitialised(false) {
+}
 
 QString FileSystemEntry::path() const {
-    return m_path;
+	return m_path;
 };
 
 QString FileSystemEntry::relativePath() const {
-    return m_relativePath;
+	return m_relativePath;
 };
 
 QString FileSystemEntry::name() const {
-    return m_fileInfo.fileName();
+	return m_fileInfo.fileName();
 };
 
 QString FileSystemEntry::baseName() const {
-    return m_fileInfo.baseName();
+	return m_fileInfo.baseName();
 };
 
 QString FileSystemEntry::parentDir() const {
-    return m_fileInfo.absolutePath();
+	return m_fileInfo.absolutePath();
 };
 
 QString FileSystemEntry::suffix() const {
-    return m_fileInfo.completeSuffix();
+	return m_fileInfo.completeSuffix();
 };
 
 qint64 FileSystemEntry::size() const {
-    return m_fileInfo.size();
+	return m_fileInfo.size();
 };
 
 bool FileSystemEntry::isDir() const {
-    return m_fileInfo.isDir();
+	return m_fileInfo.isDir();
 };
 
 bool FileSystemEntry::isImage() const {
-    if (!m_isImageInitialised) {
-        QImageReader reader(m_path);
-        m_isImage = reader.canRead();
-        m_isImageInitialised = true;
-    }
-    return m_isImage;
+	if (!m_isImageInitialised) {
+		QImageReader reader(m_path);
+		m_isImage = reader.canRead();
+		m_isImageInitialised = true;
+	}
+	return m_isImage;
 }
 
 QString FileSystemEntry::mimeType() const {
-    if (!m_mimeTypeInitialised) {
-        const QMimeDatabase db;
-        m_mimeType = db.mimeTypeForFile(m_path).name();
-        m_mimeTypeInitialised = true;
-    }
-    return m_mimeType;
+	if (!m_mimeTypeInitialised) {
+		static const QMimeDatabase s_db;
+		m_mimeType = s_db.mimeTypeForFile(m_path).name();
+		m_mimeTypeInitialised = true;
+	}
+	return m_mimeType;
 }
 
 void FileSystemEntry::updateRelativePath(const QDir& dir) {
-    const auto relPath = dir.relativeFilePath(m_path);
-    if (m_relativePath != relPath) {
-        m_relativePath = relPath;
-        emit relativePathChanged();
-    }
+	const auto relPath = dir.relativeFilePath(m_path);
+	if (m_relativePath != relPath) {
+		m_relativePath = relPath;
+		emit relativePathChanged();
+	}
 }
 
 FileSystemModel::FileSystemModel(QObject* parent)
-    : QAbstractListModel(parent)
-    , m_recursive(false)
-    , m_watchChanges(true)
-    , m_showHidden(false)
-    , m_filter(NoFilter) {
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive);
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir);
+	: QAbstractListModel(parent)
+	, m_recursive(false)
+	, m_watchChanges(true)
+	, m_showHidden(false)
+	, m_filter(NoFilter) {
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive);
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir);
 }
 
 int FileSystemModel::rowCount(const QModelIndex& parent) const {
-    if (parent != QModelIndex()) {
-        return 0;
-    }
-    return static_cast<int>(m_entries.size());
+	if (parent != QModelIndex()) {
+		return 0;
+	}
+	return static_cast<int>(m_entries.size());
 }
 
 QVariant FileSystemModel::data(const QModelIndex& index, int role) const {
-    if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) {
-        return QVariant();
-    }
-    return QVariant::fromValue(m_entries.at(index.row()));
+	if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) {
+		return QVariant();
+	}
+	return QVariant::fromValue(m_entries.at(index.row()));
 }
 
 QHash<int, QByteArray> FileSystemModel::roleNames() const {
-    return { { Qt::UserRole, "modelData" } };
+	return { { Qt::UserRole, "modelData" } };
 }
 
 QString FileSystemModel::path() const {
-    return m_path;
+	return m_path;
 }
 
 void FileSystemModel::setPath(const QString& path) {
-    if (m_path == path) {
-        return;
-    }
+	if (m_path == path) {
+		return;
+	}
 
-    m_path = path;
-    emit pathChanged();
+	m_path = path;
+	emit pathChanged();
 
-    m_dir.setPath(m_path);
+	m_dir.setPath(m_path);
 
-    for (const auto& entry : std::as_const(m_entries)) {
-        entry->updateRelativePath(m_dir);
-    }
+	for (const auto& entry : std::as_const(m_entries)) {
+		entry->updateRelativePath(m_dir);
+	}
 
-    update();
+	update();
 }
 
 bool FileSystemModel::recursive() const {
-    return m_recursive;
+	return m_recursive;
 }
 
 void FileSystemModel::setRecursive(bool recursive) {
-    if (m_recursive == recursive) {
-        return;
-    }
+	if (m_recursive == recursive) {
+		return;
+	}
 
-    m_recursive = recursive;
-    emit recursiveChanged();
+	m_recursive = recursive;
+	emit recursiveChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::watchChanges() const {
-    return m_watchChanges;
+	return m_watchChanges;
 }
 
 void FileSystemModel::setWatchChanges(bool watchChanges) {
-    if (m_watchChanges == watchChanges) {
-        return;
-    }
+	if (m_watchChanges == watchChanges) {
+		return;
+	}
 
-    m_watchChanges = watchChanges;
-    emit watchChangesChanged();
+	m_watchChanges = watchChanges;
+	emit watchChangesChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::showHidden() const {
-    return m_showHidden;
+	return m_showHidden;
 }
 
 void FileSystemModel::setShowHidden(bool showHidden) {
-    if (m_showHidden == showHidden) {
-        return;
-    }
+	if (m_showHidden == showHidden) {
+		return;
+	}
 
-    m_showHidden = showHidden;
-    emit showHiddenChanged();
+	m_showHidden = showHidden;
+	emit showHiddenChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::sortReverse() const {
-    return m_sortReverse;
+	return m_sortReverse;
 }
 
 void FileSystemModel::setSortReverse(bool sortReverse) {
-    if (m_sortReverse == sortReverse) {
-        return;
-    }
+	if (m_sortReverse == sortReverse) {
+		return;
+	}
 
-    m_sortReverse = sortReverse;
-    emit sortReverseChanged();
+	m_sortReverse = sortReverse;
+	emit sortReverseChanged();
 
-    update();
+	update();
 }
 
 FileSystemModel::Filter FileSystemModel::filter() const {
-    return m_filter;
+	return m_filter;
 }
 
 void FileSystemModel::setFilter(Filter filter) {
-    if (m_filter == filter) {
-        return;
-    }
+	if (m_filter == filter) {
+		return;
+	}
 
-    m_filter = filter;
-    emit filterChanged();
+	m_filter = filter;
+	emit filterChanged();
 
-    update();
+	update();
 }
 
 QStringList FileSystemModel::nameFilters() const {
-    return m_nameFilters;
+	return m_nameFilters;
 }
 
 void FileSystemModel::setNameFilters(const QStringList& nameFilters) {
-    if (m_nameFilters == nameFilters) {
-        return;
-    }
+	if (m_nameFilters == nameFilters) {
+		return;
+	}
 
-    m_nameFilters = nameFilters;
-    emit nameFiltersChanged();
+	m_nameFilters = nameFilters;
+	emit nameFiltersChanged();
 
-    update();
+	update();
 }
 
 QQmlListProperty<FileSystemEntry> FileSystemModel::entries() {
-    return QQmlListProperty<FileSystemEntry>(this, &m_entries);
+	return QQmlListProperty<FileSystemEntry>(this, &m_entries);
 }
 
 void FileSystemModel::watchDirIfRecursive(const QString& path) {
-    if (m_recursive && m_watchChanges) {
-        const auto currentDir = m_dir;
-        const bool showHidden = m_showHidden;
-        const auto future = QtConcurrent::run([showHidden, path]() {
-            QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+	if (m_recursive && m_watchChanges) {
+		const auto currentDir = m_dir;
+		const bool showHidden = m_showHidden;
+		auto future = QtConcurrent::run([showHidden, path]() {
+				QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            QDirIterator iter(path, filters, QDirIterator::Subdirectories);
-            QStringList dirs;
-            while (iter.hasNext()) {
-                dirs << iter.next();
-            }
-            return dirs;
-        });
-        const auto watcher = new QFutureWatcher<QStringList>(this);
-        connect(watcher, &QFutureWatcher<QStringList>::finished, this, [currentDir, showHidden, watcher, this]() {
-            const auto paths = watcher->result();
-            if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
-                // Ignore if dir or showHidden has changed
-                m_watcher.addPaths(paths);
-            }
-            watcher->deleteLater();
-        });
-        watcher->setFuture(future);
-    }
+				QDirIterator iter(path, filters, QDirIterator::Subdirectories);
+				QStringList dirs;
+				while (iter.hasNext()) {
+					dirs << iter.next();
+				}
+				return dirs;
+			});
+		future.then(this, [currentDir, showHidden, this](const QStringList& paths) {
+				if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
+					// Ignore if dir or showHidden has changed
+					m_watcher.addPaths(paths);
+				}
+			});
+	}
 }
 
 void FileSystemModel::update() {
-    updateWatcher();
-    updateEntries();
+	updateWatcher();
+	updateEntries();
 }
 
 void FileSystemModel::updateWatcher() {
-    if (!m_watcher.directories().isEmpty()) {
-        m_watcher.removePaths(m_watcher.directories());
-    }
+	if (!m_watcher.directories().isEmpty()) {
+		m_watcher.removePaths(m_watcher.directories());
+	}
 
-    if (!m_watchChanges || m_path.isEmpty()) {
-        return;
-    }
+	if (!m_watchChanges || m_path.isEmpty()) {
+		return;
+	}
 
-    m_watcher.addPath(m_path);
-    watchDirIfRecursive(m_path);
+	m_watcher.addPath(m_path);
+	watchDirIfRecursive(m_path);
 }
 
 void FileSystemModel::updateEntries() {
-    if (m_path.isEmpty()) {
-        if (!m_entries.isEmpty()) {
-            beginResetModel();
-            qDeleteAll(m_entries);
-            m_entries.clear();
-            endResetModel();
-            emit entriesChanged();
-        }
+	if (m_path.isEmpty()) {
+		if (!m_entries.isEmpty()) {
+			beginResetModel();
+			qDeleteAll(m_entries);
+			m_entries.clear();
+			endResetModel();
+			emit entriesChanged();
+		}
 
-        return;
-    }
+		return;
+	}
 
-    for (auto& future : m_futures) {
-        future.cancel();
-    }
-    m_futures.clear();
+	for (auto& future : m_futures) {
+		future.cancel();
+	}
+	m_futures.clear();
 
-    updateEntriesForDir(m_path);
+	updateEntriesForDir(m_path);
 }
 
 void FileSystemModel::updateEntriesForDir(const QString& dir) {
-    const auto recursive = m_recursive;
-    const auto showHidden = m_showHidden;
-    const auto filter = m_filter;
-    const auto nameFilters = m_nameFilters;
+	const auto recursive = m_recursive;
+	const auto showHidden = m_showHidden;
+	const auto filter = m_filter;
+	const auto nameFilters = m_nameFilters;
 
-    QSet<QString> oldPaths;
-    for (const auto& entry : std::as_const(m_entries)) {
-        oldPaths << entry->path();
-    }
+	QSet<QString> oldPaths;
+	for (const auto& entry : std::as_const(m_entries)) {
+		oldPaths << entry->path();
+	}
 
-    const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
-        const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
+	auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString> > >& promise) {
+			const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
 
-        std::optional<QDirIterator> iter;
+			std::optional<QDirIterator> iter;
 
-        if (filter == Images) {
-            QStringList extraNameFilters = nameFilters;
-            const auto formats = QImageReader::supportedImageFormats();
-            for (const auto& format : formats) {
-                extraNameFilters << "*." + format;
-            }
+			if (filter == Images) {
+				QStringList extraNameFilters = nameFilters;
+				const auto formats = QImageReader::supportedImageFormats();
+				for (const auto& format : formats) {
+					extraNameFilters << "*." + format;
+				}
 
-            QDir::Filters filters = QDir::Files;
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+				QDir::Filters filters = QDir::Files;
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            iter.emplace(dir, extraNameFilters, filters, flags);
-        } else {
-            QDir::Filters filters;
+				iter.emplace(dir, extraNameFilters, filters, flags);
+			} else {
+				QDir::Filters filters;
 
-            if (filter == Files) {
-                filters = QDir::Files;
-            } else if (filter == Dirs) {
-                filters = QDir::Dirs | QDir::NoDotAndDotDot;
-            } else {
-                filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot;
-            }
+				if (filter == Files) {
+					filters = QDir::Files;
+				} else if (filter == Dirs) {
+					filters = QDir::Dirs | QDir::NoDotAndDotDot;
+				} else {
+					filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot;
+				}
 
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            if (nameFilters.isEmpty()) {
-                iter.emplace(dir, filters, flags);
-            } else {
-                iter.emplace(dir, nameFilters, filters, flags);
-            }
-        }
+				if (nameFilters.isEmpty()) {
+					iter.emplace(dir, filters, flags);
+				} else {
+					iter.emplace(dir, nameFilters, filters, flags);
+				}
+			}
 
-        QSet<QString> newPaths;
-        while (iter->hasNext()) {
-            if (promise.isCanceled()) {
-                return;
-            }
+			QSet<QString> newPaths;
+			while (iter->hasNext()) {
+				if (promise.isCanceled()) {
+					return;
+				}
 
-            QString path = iter->next();
+				QString path = iter->next();
 
-            if (filter == Images) {
-                QImageReader reader(path);
-                if (!reader.canRead()) {
-                    continue;
-                }
-            }
+				if (filter == Images) {
+					QImageReader reader(path);
+					if (!reader.canRead()) {
+						continue;
+					}
+				}
 
-            newPaths.insert(path);
-        }
+				newPaths.insert(path);
+			}
 
-        if (promise.isCanceled() || newPaths == oldPaths) {
-            return;
-        }
+			if (promise.isCanceled()) {
+				return;
+			}
 
-        promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths));
-    });
+			promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths));
+		});
 
-    if (m_futures.contains(dir)) {
-        m_futures[dir].cancel();
-    }
-    m_futures.insert(dir, future);
+	if (m_futures.contains(dir)) {
+		m_futures[dir].cancel();
+	}
+	m_futures.insert(dir, future);
 
-    const auto watcher = new QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>(this);
-
-    connect(watcher, &QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>::finished, this, [dir, watcher, this]() {
-        m_futures.remove(dir);
-
-        if (!watcher->future().isResultReadyAt(0)) {
-            watcher->deleteLater();
-            return;
-        }
-
-        const auto result = watcher->result();
-        applyChanges(result.first, result.second);
-
-        watcher->deleteLater();
-    });
-
-    watcher->setFuture(future);
+	future
+	.then(this,
+	      [dir, this](QPair<QSet<QString>, QSet<QString> > result) {
+			m_futures.remove(dir);
+			if (!result.first.isEmpty() || !result.second.isEmpty()) {
+				applyChanges(result.first, result.second);
+			}
+		})
+	.onCanceled(this, [dir, this]() {
+			m_futures.remove(dir);
+		});
 }
 
 void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) {
-    QList<int> removedIndices;
-    for (int i = 0; i < m_entries.size(); ++i) {
-        if (removedPaths.contains(m_entries[i]->path())) {
-            removedIndices << i;
-        }
-    }
-    std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>());
+	QList<int> removedIndices;
+	for (int i = 0; i < m_entries.size(); ++i) {
+		if (removedPaths.contains(m_entries[i]->path())) {
+			removedIndices << i;
+		}
+	}
+	std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>());
 
-    // Batch remove old entries
-    int start = -1;
-    int end = -1;
-    for (int idx : std::as_const(removedIndices)) {
-        if (start == -1) {
-            start = idx;
-            end = idx;
-        } else if (idx == end - 1) {
-            end = idx;
-        } else {
-            beginRemoveRows(QModelIndex(), end, start);
-            for (int i = start; i >= end; --i) {
-                m_entries.takeAt(i)->deleteLater();
-            }
-            endRemoveRows();
+	// Batch remove old entries
+	int start = -1;
+	int end = -1;
+	for (int idx : std::as_const(removedIndices)) {
+		if (start == -1) {
+			start = idx;
+			end = idx;
+		} else if (idx == end - 1) {
+			end = idx;
+		} else {
+			beginRemoveRows(QModelIndex(), end, start);
+			for (int i = start; i >= end; --i) {
+				m_entries.takeAt(i)->deleteLater();
+			}
+			endRemoveRows();
 
-            start = idx;
-            end = idx;
-        }
-    }
-    if (start != -1) {
-        beginRemoveRows(QModelIndex(), end, start);
-        for (int i = start; i >= end; --i) {
-            m_entries.takeAt(i)->deleteLater();
-        }
-        endRemoveRows();
-    }
+			start = idx;
+			end = idx;
+		}
+	}
+	if (start != -1) {
+		beginRemoveRows(QModelIndex(), end, start);
+		for (int i = start; i >= end; --i) {
+			m_entries.takeAt(i)->deleteLater();
+		}
+		endRemoveRows();
+	}
 
-    // Create new entries
-    QList<FileSystemEntry*> newEntries;
-    for (const auto& path : addedPaths) {
-        newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this);
-    }
-    std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) {
-        return compareEntries(a, b);
-    });
+	// Create new entries
+	QList<FileSystemEntry*> newEntries;
+	for (const auto& path : addedPaths) {
+		newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this);
+	}
+	std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) {
+			return compareEntries(a, b);
+		});
 
-    // Batch insert new entries
-    int insertStart = -1;
-    QList<FileSystemEntry*> batchItems;
-    for (const auto& entry : std::as_const(newEntries)) {
-        const auto it = std::lower_bound(
-            m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) {
-                return compareEntries(a, b);
-            });
-        const auto row = static_cast<int>(it - m_entries.begin());
+	// Batch insert new entries
+	int insertStart = -1;
+	QList<FileSystemEntry*> batchItems;
+	for (const auto& entry : std::as_const(newEntries)) {
+		const auto it = std::lower_bound(
+			m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) {
+				return compareEntries(a, b);
+			});
+		const auto row = static_cast<int>(it - m_entries.begin());
 
-        if (insertStart == -1) {
-            insertStart = row;
-            batchItems << entry;
-        } else if (row == insertStart + batchItems.size()) {
-            batchItems << entry;
-        } else {
-            beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
-            for (int i = 0; i < batchItems.size(); ++i) {
-                m_entries.insert(insertStart + i, batchItems[i]);
-            }
-            endInsertRows();
+		if (insertStart == -1) {
+			insertStart = row;
+			batchItems << entry;
+		} else if (row == insertStart + batchItems.size()) {
+			batchItems << entry;
+		} else {
+			beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
+			for (int i = 0; i < batchItems.size(); ++i) {
+				m_entries.insert(insertStart + i, batchItems[i]);
+			}
+			endInsertRows();
 
-            insertStart = row;
-            batchItems.clear();
-            batchItems << entry;
-        }
-    }
-    if (!batchItems.isEmpty()) {
-        beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
-        for (int i = 0; i < batchItems.size(); ++i) {
-            m_entries.insert(insertStart + i, batchItems[i]);
-        }
-        endInsertRows();
-    }
+			insertStart = row;
+			batchItems.clear();
+			batchItems << entry;
+		}
+	}
+	if (!batchItems.isEmpty()) {
+		beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
+		for (int i = 0; i < batchItems.size(); ++i) {
+			m_entries.insert(insertStart + i, batchItems[i]);
+		}
+		endInsertRows();
+	}
 
-    emit entriesChanged();
+	emit entriesChanged();
 }
 
 bool FileSystemModel::compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const {
-    if (a->isDir() != b->isDir()) {
-        return m_sortReverse ^ a->isDir();
-    }
-    const auto cmp = a->relativePath().localeAwareCompare(b->relativePath());
-    return m_sortReverse ? cmp > 0 : cmp < 0;
+	if (a->isDir() != b->isDir()) {
+		return m_sortReverse ^ a->isDir();
+	}
+	const auto cmp = a->relativePath().localeAwareCompare(b->relativePath());
+	return m_sortReverse ? cmp > 0 : cmp < 0;
 }
 
 } // namespace ZShell::models

Plugins/ZShell/Models/filesystemmodel.hpp

@@ -13,136 +13,136 @@
 namespace ZShell::models {
 
 class FileSystemEntry : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel")
+Q_OBJECT
+QML_ELEMENT
+        QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel")
 
-    Q_PROPERTY(QString path READ path CONSTANT)
-    Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QString baseName READ baseName CONSTANT)
-    Q_PROPERTY(QString parentDir READ parentDir CONSTANT)
-    Q_PROPERTY(QString suffix READ suffix CONSTANT)
-    Q_PROPERTY(qint64 size READ size CONSTANT)
-    Q_PROPERTY(bool isDir READ isDir CONSTANT)
-    Q_PROPERTY(bool isImage READ isImage CONSTANT)
-    Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
+Q_PROPERTY(QString path READ path CONSTANT)
+Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
+Q_PROPERTY(QString name READ name CONSTANT)
+Q_PROPERTY(QString baseName READ baseName CONSTANT)
+Q_PROPERTY(QString parentDir READ parentDir CONSTANT)
+Q_PROPERTY(QString suffix READ suffix CONSTANT)
+Q_PROPERTY(qint64 size READ size CONSTANT)
+Q_PROPERTY(bool isDir READ isDir CONSTANT)
+Q_PROPERTY(bool isImage READ isImage CONSTANT)
+Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
 
 public:
-    explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr);
+explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr);
 
-    [[nodiscard]] QString path() const;
-    [[nodiscard]] QString relativePath() const;
-    [[nodiscard]] QString name() const;
-    [[nodiscard]] QString baseName() const;
-    [[nodiscard]] QString parentDir() const;
-    [[nodiscard]] QString suffix() const;
-    [[nodiscard]] qint64 size() const;
-    [[nodiscard]] bool isDir() const;
-    [[nodiscard]] bool isImage() const;
-    [[nodiscard]] QString mimeType() const;
+[[nodiscard]] QString path() const;
+[[nodiscard]] QString relativePath() const;
+[[nodiscard]] QString name() const;
+[[nodiscard]] QString baseName() const;
+[[nodiscard]] QString parentDir() const;
+[[nodiscard]] QString suffix() const;
+[[nodiscard]] qint64 size() const;
+[[nodiscard]] bool isDir() const;
+[[nodiscard]] bool isImage() const;
+[[nodiscard]] QString mimeType() const;
 
-    void updateRelativePath(const QDir& dir);
+void updateRelativePath(const QDir& dir);
 
 signals:
-    void relativePathChanged();
+void relativePathChanged();
 
 private:
-    const QFileInfo m_fileInfo;
+const QFileInfo m_fileInfo;
 
-    const QString m_path;
-    QString m_relativePath;
+const QString m_path;
+QString m_relativePath;
 
-    mutable bool m_isImage;
-    mutable bool m_isImageInitialised;
+mutable bool m_isImage;
+mutable bool m_isImageInitialised;
 
-    mutable QString m_mimeType;
-    mutable bool m_mimeTypeInitialised;
+mutable QString m_mimeType;
+mutable bool m_mimeTypeInitialised;
 };
 
 class FileSystemModel : public QAbstractListModel {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
-    Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged)
-    Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
-    Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged)
-    Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged)
-    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
+Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged)
+Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
+Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged)
+Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged)
+Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged)
 
-    Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged)
+Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged)
 
 public:
-    enum Filter {
-        NoFilter,
-        Images,
-        Files,
-        Dirs
-    };
-    Q_ENUM(Filter)
+enum Filter {
+	NoFilter,
+	Images,
+	Files,
+	Dirs
+};
+Q_ENUM(Filter)
 
-    explicit FileSystemModel(QObject* parent = nullptr);
+explicit FileSystemModel(QObject* parent = nullptr);
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
+int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+QHash<int, QByteArray> roleNames() const override;
 
-    [[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+[[nodiscard]] QString path() const;
+void setPath(const QString& path);
 
-    [[nodiscard]] bool recursive() const;
-    void setRecursive(bool recursive);
+[[nodiscard]] bool recursive() const;
+void setRecursive(bool recursive);
 
-    [[nodiscard]] bool watchChanges() const;
-    void setWatchChanges(bool watchChanges);
+[[nodiscard]] bool watchChanges() const;
+void setWatchChanges(bool watchChanges);
 
-    [[nodiscard]] bool showHidden() const;
-    void setShowHidden(bool showHidden);
+[[nodiscard]] bool showHidden() const;
+void setShowHidden(bool showHidden);
 
-    [[nodiscard]] bool sortReverse() const;
-    void setSortReverse(bool sortReverse);
+[[nodiscard]] bool sortReverse() const;
+void setSortReverse(bool sortReverse);
 
-    [[nodiscard]] Filter filter() const;
-    void setFilter(Filter filter);
+[[nodiscard]] Filter filter() const;
+void setFilter(Filter filter);
 
-    [[nodiscard]] QStringList nameFilters() const;
-    void setNameFilters(const QStringList& nameFilters);
+[[nodiscard]] QStringList nameFilters() const;
+void setNameFilters(const QStringList& nameFilters);
 
-    [[nodiscard]] QQmlListProperty<FileSystemEntry> entries();
+[[nodiscard]] QQmlListProperty<FileSystemEntry> entries();
 
 signals:
-    void pathChanged();
-    void recursiveChanged();
-    void watchChangesChanged();
-    void showHiddenChanged();
-    void sortReverseChanged();
-    void filterChanged();
-    void nameFiltersChanged();
-    void entriesChanged();
+void pathChanged();
+void recursiveChanged();
+void watchChangesChanged();
+void showHiddenChanged();
+void sortReverseChanged();
+void filterChanged();
+void nameFiltersChanged();
+void entriesChanged();
 
 private:
-    QDir m_dir;
-    QFileSystemWatcher m_watcher;
-    QList<FileSystemEntry*> m_entries;
-    QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString>>>> m_futures;
+QDir m_dir;
+QFileSystemWatcher m_watcher;
+QList<FileSystemEntry*> m_entries;
+QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString> > > > m_futures;
 
-    QString m_path;
-    bool m_recursive;
-    bool m_watchChanges;
-    bool m_showHidden;
-    bool m_sortReverse;
-    Filter m_filter;
-    QStringList m_nameFilters;
+QString m_path;
+bool m_recursive;
+bool m_watchChanges;
+bool m_showHidden;
+bool m_sortReverse = false;
+Filter m_filter;
+QStringList m_nameFilters;
 
-    void watchDirIfRecursive(const QString& path);
-    void update();
-    void updateWatcher();
-    void updateEntries();
-    void updateEntriesForDir(const QString& dir);
-    void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths);
-    [[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const;
+void watchDirIfRecursive(const QString& path);
+void update();
+void updateWatcher();
+void updateEntries();
+void updateEntriesForDir(const QString& dir);
+void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths);
+[[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const;
 };
 
 } // namespace ZShell::models

Plugins/ZShell/writefile.cpp

@@ -1,355 +1,131 @@
 #include "writefile.hpp"
 
 #include <QtConcurrent/qtconcurrentrun.h>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QSaveFile>
-#include <QtGui/QImageReader>
-#include <QtQuick/qquickimageprovider.h>
 #include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/qquickwindow.h>
-
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QImage>
-#include <QJSValue>
-#include <QQmlEngine>
-#include <QSize>
-#include <QVariant>
+#include <qdir.h>
+#include <qfileinfo.h>
+#include <qfuturewatcher.h>
+#include <qqmlengine.h>
 
 namespace ZShell {
 
-// ============================================================
-// saveItem
-// ============================================================
-
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path) {
-	this->saveItem(target, path, QRect(), QJSValue(), QJSValue());
+    this->saveItem(target, path, QRect(), QJSValue(), QJSValue());
 }
 
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect) {
-	this->saveItem(target, path, rect, QJSValue(), QJSValue());
+    this->saveItem(target, path, rect, QJSValue(), QJSValue());
 }
 
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved) {
-	this->saveItem(target, path, QRect(), onSaved, QJSValue());
+    this->saveItem(target, path, QRect(), onSaved, QJSValue());
 }
 
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed) {
-	this->saveItem(target, path, QRect(), onSaved, onFailed);
+    this->saveItem(target, path, QRect(), onSaved, onFailed);
 }
 
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved) {
-	this->saveItem(target, path, rect, onSaved, QJSValue());
+    this->saveItem(target, path, rect, onSaved, QJSValue());
 }
 
-void ZShellIo::saveItem(
-	QQuickItem* target,
-	const QUrl& path,
-	const QRect& rect,
-	QJSValue onSaved,
-	QJSValue onFailed
-	) {
-	if (!target) {
-		qWarning() << "ZShellIo::saveItem: a target is required";
-		return;
-	}
+void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed) {
+    if (!target) {
+        qWarning() << "ZShellIo::saveItem: a target is required";
+        return;
+    }
 
-	if (!path.isLocalFile()) {
-		qWarning() << "ZShellIo::saveItem:" << path << "is not a local file";
-		return;
-	}
+    if (!path.isLocalFile()) {
+        qWarning() << "ZShellIo::saveItem:" << path << "is not a local file";
+        return;
+    }
 
-	if (!target->window()) {
-		qWarning() << "ZShellIo::saveItem: unable to save target"
-		           << target
-		           << "without a window";
-		return;
-	}
+    if (!target->window()) {
+        qWarning() << "ZShellIo::saveItem: unable to save target" << target << "without a window";
+        return;
+    }
 
-	auto scaledRect = rect;
+    auto scaledRect = rect;
+    const qreal scale = target->window()->devicePixelRatio();
+    if (rect.isValid() && !qFuzzyCompare(scale + 1.0, 2.0)) {
+        scaledRect =
+            QRectF(rect.left() * scale, rect.top() * scale, rect.width() * scale, rect.height() * scale).toRect();
+    }
 
-	const qreal scale = target->window()->devicePixelRatio();
+    const QSharedPointer<const QQuickItemGrabResult> grabResult = target->grabToImage();
 
-	if (rect.isValid() && !qFuzzyCompare(scale + 1.0, 2.0)) {
-		scaledRect = QRectF(
-			rect.left() * scale,
-			rect.top() * scale,
-			rect.width() * scale,
-			rect.height() * scale
-			).toRect();
-	}
+    QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this,
+        [grabResult, scaledRect, path, onSaved, onFailed, this]() {
+            const auto future = QtConcurrent::run([=]() {
+                QImage image = grabResult->image();
 
-	const QSharedPointer<const QQuickItemGrabResult> grabResult =
-		target->grabToImage();
+                if (scaledRect.isValid()) {
+                    image = image.copy(scaledRect);
+                }
 
-	QObject::connect(
-		grabResult.data(),
-		&QQuickItemGrabResult::ready,
-		this,
-		[grabResult, scaledRect, path, onSaved, onFailed, this]() {
-			const auto future = QtConcurrent::run([grabResult, scaledRect, path]() {
-				QImage image = grabResult->image();
+                const QString file = path.toLocalFile();
+                const QString parent = QFileInfo(file).absolutePath();
+                return QDir().mkpath(parent) && image.save(file);
+            });
 
-				if (scaledRect.isValid()) {
-					image = image.copy(scaledRect);
-				}
+            auto* watcher = new QFutureWatcher<bool>(this);
+            auto* engine = qmlEngine(this);
 
-				const QString file = path.toLocalFile();
-				const QString parent = QFileInfo(file).absolutePath();
-
-				QDir().mkpath(parent);
-
-				QSaveFile out(file);
-				if (!out.open(QIODevice::WriteOnly)) {
-					return false;
-				}
-
-				if (!image.save(&out, "PNG")) {
-					return false;
-				}
-
-				return out.commit();
-			});
-
-			auto* watcher = new QFutureWatcher<bool>(this);
-			auto* engine = qmlEngine(this);
-
-			QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() {
-				if (watcher->result()) {
-					if (onSaved.isCallable() && engine) {
-						onSaved.call({
-							engine->toScriptValue(path.toLocalFile()),
-							engine->toScriptValue(path)
-						});
-					}
-				} else {
-					qWarning() << "ZShellIo::saveItem: failed to save" << path;
-					if (onFailed.isCallable() && engine) {
-						onFailed.call({
-							engine->toScriptValue(path)
-						});
-					}
-				}
-				watcher->deleteLater();
-			});
-
-			watcher->setFuture(future);
-		}
-		);
+            QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() {
+                if (watcher->result()) {
+                    if (onSaved.isCallable()) {
+                        onSaved.call(
+                            { QJSValue(path.toLocalFile()), engine->toScriptValue(QVariant::fromValue(path)) });
+                    }
+                } else {
+                    qWarning() << "ZShellIo::saveItem: failed to save" << path;
+                    if (onFailed.isCallable()) {
+                        onFailed.call({ engine->toScriptValue(QVariant::fromValue(path)) });
+                    }
+                }
+                watcher->deleteLater();
+            });
+            watcher->setFuture(future);
+        });
 }
 
-// ============================================================
-// cacheImage
-// ============================================================
-
-void ZShellIo::cacheImage(const QUrl& source, const QString& cacheDir) {
-	this->cacheImage(source, cacheDir, QJSValue(), QJSValue());
-}
-
-void ZShellIo::cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved) {
-	this->cacheImage(source, cacheDir, onSaved, QJSValue());
-}
-
-void ZShellIo::cacheImage(
-	const QUrl& source,
-	const QString& cacheDir,
-	QJSValue onSaved,
-	QJSValue onFailed
-	) {
-	if (cacheDir.isEmpty()) {
-		qWarning() << "ZShellIo::cacheImage: cacheDir is empty";
-		return;
-	}
-
-	QImage image;
-	if (!loadSourceImage(source, image)) {
-		qWarning() << "ZShellIo::cacheImage: failed to load source image" << source;
-		auto* engine = qmlEngine(this);
-		if (onFailed.isCallable() && engine) {
-			onFailed.call({
-					engine->toScriptValue(source),
-					engine->toScriptValue(cacheDir)
-				});
-		}
-		return;
-	}
-
-	const auto future = QtConcurrent::run([image, cacheDir]() -> QString {
-			if (image.isNull()) {
-				return QString();
-			}
-
-			const QImage normalized = image.convertToFormat(QImage::Format_RGBA8888);
-
-			const QByteArray bytes(
-				reinterpret_cast<const char*>(normalized.constBits()),
-				qsizetype(normalized.sizeInBytes())
-				);
-
-			const QByteArray digest =
-				QCryptographicHash::hash(bytes, QCryptographicHash::Sha256).toHex();
-
-			QDir dir(cacheDir);
-			if (!dir.exists() && !QDir().mkpath(cacheDir)) {
-				return QString();
-			}
-
-			const QString finalPath = dir.filePath(QString::fromLatin1(digest) + ".png");
-
-			if (QFile::exists(finalPath)) {
-				return finalPath;
-			}
-
-			QSaveFile out(finalPath);
-			if (!out.open(QIODevice::WriteOnly)) {
-				return QString();
-			}
-
-			if (!normalized.save(&out, "PNG")) {
-				return QString();
-			}
-
-			if (!out.commit()) {
-				return QString();
-			}
-
-			return finalPath;
-		});
-
-	auto* watcher = new QFutureWatcher<QString>(this);
-	auto* engine = qmlEngine(this);
-
-	QObject::connect(watcher, &QFutureWatcher<QString>::finished, this, [=]() {
-			const QString finalPath = watcher->result();
-
-			if (!finalPath.isEmpty()) {
-				if (onSaved.isCallable() && engine) {
-					onSaved.call({
-						engine->toScriptValue(finalPath),
-						engine->toScriptValue(QUrl::fromLocalFile(finalPath))
-					});
-				}
-			} else {
-				qWarning() << "ZShellIo::cacheImage: failed to cache" << source;
-				if (onFailed.isCallable() && engine) {
-					onFailed.call({
-						engine->toScriptValue(source),
-						engine->toScriptValue(cacheDir)
-					});
-				}
-			}
-
-			watcher->deleteLater();
-		});
-
-	watcher->setFuture(future);
-}
-
-// ============================================================
-// loadSourceImage
-// ============================================================
-
-bool ZShellIo::loadSourceImage(const QUrl& source, QImage& image) const {
-	image = QImage();
-
-	if (source.isLocalFile()) {
-		QImageReader reader(source.toLocalFile());
-		reader.setAutoTransform(true);
-		image = reader.read();
-		return !image.isNull();
-	}
-
-	if (source.scheme() == "image") {
-		auto* engine = qmlEngine(const_cast<ZShellIo*>(this));
-		if (!engine) {
-			qWarning() << "ZShellIo::loadSourceImage: no QQmlEngine";
-			return false;
-		}
-
-		const QString providerId = source.host();
-
-		const QString imageId =
-			source.path().startsWith('/')
-		? source.path().mid(1)
-		: source.path();
-
-		auto* providerBase = engine->imageProvider(providerId);
-		if (!providerBase) {
-			qWarning() << "ZShellIo::loadSourceImage: provider not found"
-			           << providerId;
-			return false;
-		}
-
-		auto* provider = dynamic_cast<QQuickImageProvider*>(providerBase);
-		if (!provider) {
-			qWarning() << "ZShellIo::loadSourceImage: provider is not a QQuickImageProvider"
-			           << providerId;
-			return false;
-		}
-
-		QSize size;
-
-		switch (provider->imageType()) {
-		case QQuickImageProvider::Image:
-			image = provider->requestImage(imageId, &size, QSize());
-			break;
-
-		case QQuickImageProvider::Pixmap:
-			image = provider->requestPixmap(imageId, &size, QSize()).toImage();
-			break;
-
-		default:
-			qWarning() << "ZShellIo::loadSourceImage: unsupported provider type"
-			           << providerId;
-			return false;
-		}
-
-		return !image.isNull();
-	}
-
-	qWarning() << "ZShellIo::loadSourceImage: unsupported source" << source;
-	return false;
-}
-
-// ============================================================
-// File ops
-// ============================================================
-
 bool ZShellIo::copyFile(const QUrl& source, const QUrl& target, bool overwrite) const {
-	if (!source.isLocalFile()) {
-		qWarning() << "ZShellIo::copyFile: source" << source << "is not a local file";
-		return false;
-	}
-	if (!target.isLocalFile()) {
-		qWarning() << "ZShellIo::copyFile: target" << target << "is not a local file";
-		return false;
-	}
+    if (!source.isLocalFile()) {
+        qWarning() << "ZShellIo::copyFile: source" << source << "is not a local file";
+        return false;
+    }
+    if (!target.isLocalFile()) {
+        qWarning() << "ZShellIo::copyFile: target" << target << "is not a local file";
+        return false;
+    }
 
-	if (overwrite) {
-		QFile::remove(target.toLocalFile());
-	}
+    if (overwrite) {
+        if (!QFile::remove(target.toLocalFile())) {
+            qWarning() << "ZShellIo::copyFile: overwrite was specified but failed to remove" << target.toLocalFile();
+            return false;
+        }
+    }
 
-	return QFile::copy(source.toLocalFile(), target.toLocalFile());
+    return QFile::copy(source.toLocalFile(), target.toLocalFile());
 }
 
 bool ZShellIo::deleteFile(const QUrl& path) const {
-	if (!path.isLocalFile()) {
-		qWarning() << "ZShellIo::deleteFile: path" << path << "is not a local file";
-		return false;
-	}
+    if (!path.isLocalFile()) {
+        qWarning() << "ZShellIo::deleteFile: path" << path << "is not a local file";
+        return false;
+    }
 
-	return QFile::remove(path.toLocalFile());
+    return QFile::remove(path.toLocalFile());
 }
 
 QString ZShellIo::toLocalFile(const QUrl& url) const {
-	if (!url.isLocalFile()) {
-		qWarning() << "ZShellIo::toLocalFile: given url is not a local file" << url;
-		return QString();
-	}
+    if (!url.isLocalFile()) {
+        qWarning() << "ZShellIo::toLocalFile: given url is not a local file" << url;
+        return QString();
+    }
 
-	return url.toLocalFile();
+    return url.toLocalFile();
 }
 
 } // namespace ZShell

Plugins/ZShell/writefile.hpp

@@ -1,40 +1,31 @@
 #pragma once
 
 #include <QtQuick/qquickitem.h>
-#include <QImage>
-#include <QJSValue>
-#include <QObject>
+#include <qobject.h>
 #include <qqmlintegration.h>
-#include <QUrl>
 
 namespace ZShell {
 
 class ZShellIo : public QObject {
 
-Q_OBJECT
-QML_ELEMENT
-QML_SINGLETON
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
 public:
-// clang-format off
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
-Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
+    // clang-format off
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
+    // clang-format on
 
-Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir);
-Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved);
-Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved, QJSValue onFailed);
-// clang-format on
-
-Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
-Q_INVOKABLE bool deleteFile(const QUrl& path) const;
-Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
-
-private:
-bool loadSourceImage(const QUrl& source, QImage& image) const;
+    Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
+    Q_INVOKABLE bool deleteFile(const QUrl& path) const;
+    Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
 };
 
+
 } // namespace ZShell

cli/src/zshell/__init__.py

@@ -1,57 +1,16 @@
 from __future__ import annotations
-import os
-import sys
-from pathlib import Path
-
 import typer
-from typer._completion_shared import install, _get_shell_name
-from typer._completion_classes import completion_init
 from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
 
-app = typer.Typer(name="zshell-cli", add_completion=False)
+app = typer.Typer()
 
 app.add_typer(shell.app, name="shell")
 app.add_typer(scheme.app, name="scheme")
 app.add_typer(screenshot.app, name="screenshot")
 app.add_typer(wallpaper.app, name="wallpaper")
 app.add_typer(record.app, name="record")
-
-
-def _completion_installed() -> bool:
-    shell = _get_shell_name()
-    match shell:
-        case "zsh":
-            return (Path.home() / ".zfunc" / "_zshell-cli").exists()
-        case "bash":
-            return (Path.home() / ".bash_completions" / "zshell-cli.sh").exists()
-        case "fish":
-            return (Path.home() / ".config" / "fish" / "completions" / "zshell-cli.fish").exists()
-    return False
-
-
-def _install_completion() -> None:
-    if _completion_installed():
-        print("zshell-cli: Shell completion already installed.")
-        raise typer.Exit()
-    shell = _get_shell_name()
-    if shell is None:
-        print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
-        raise typer.Exit(code=1)
-    try:
-        _, path = install(prog_name="zshell-cli")
-        print(f"zshell-cli: Shell completion installed ({shell}: {path})")
-        print("zshell-cli: Restart your shell or source the file to enable tab-completion.")
-    except Exception as e:
-        print(f"zshell-cli: Failed to install shell completion: {e}", file=sys.stderr)
-        raise typer.Exit(code=1)
+# app.add_typer(preset.app, name="preset")
 
 
 def main() -> None:
-    if "--install-autocomplete" in sys.argv:
-        _install_completion()
-        return
-    if "_ZSHELL_CLI_COMPLETE" in os.environ:
-        completion_init()
-    if sys.stdout.isatty() and not _completion_installed():
-        print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
     app()

cli/src/zshell/subcommands/record.py

@@ -18,7 +18,8 @@ TEMP_RECORDING = STATE_DIR / "recording.mp4"
 REPLAY_RECORDING = STATE_DIR / "replay.mp4"
 NOTIF_ID_FILE = STATE_DIR / "notifid.txt"
 
-RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR", str(Path(HOME) / "Videos/Recordings"))
+RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR",
+                           str(Path(HOME) / "Videos/Recordings"))
 
 
 def _read_extra_args() -> list[str]:
@@ -35,7 +36,7 @@ def _is_recording() -> bool:
     return subprocess.run(["pidof", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
 
 
-def _notify(summary: str, body: str = "", actions: list | None = None, timeout: int = 5000) -> Optional[int]:
+def _notify(summary: str, body: str = "", actions: list = None, timeout: int = 5000) -> Optional[int]:
     args = ["notify-send", summary, body, "-t", str(timeout), "-p"]
     if actions:
         for action in actions:
@@ -48,12 +49,14 @@ def _notify(summary: str, body: str = "", actions: list | None = None, timeout:
 
 
 def _close_notification(notif_id: int):
-    subprocess.run(["notify-send", "--close", str(notif_id)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["notify-send", "--close", str(notif_id)],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
 
 def _get_monitors() -> list[dict]:
     try:
-        res = subprocess.run(["hyprctl", "monitors", "-j"], capture_output=True, text=True)
+        res = subprocess.run(["hyprctl", "monitors", "-j"],
+                             capture_output=True, text=True)
         return json.loads(res.stdout)
     except Exception:
         return []
@@ -89,7 +92,6 @@ def _slurp_region() -> Optional[str]:
 
 def _parse_geometry(geometry: str) -> Optional[tuple[int, int, int, int]]:
     import re
-
     match = re.match(r"(\d+)x(\d+)\+(\d+)\+(\d+)", geometry)
     if match:
         return int(match.group(3)), int(match.group(4)), int(match.group(1)), int(match.group(2))
@@ -137,7 +139,8 @@ def start_recording(region: Optional[str], sound: bool):
     cmd.extend(extra_args)
     cmd.extend(["-o", str(TEMP_RECORDING)])
 
-    subprocess.Popen(cmd, start_new_session=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.Popen(cmd, start_new_session=True,
+                     stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     notif_id = _notify("Recording started", f"Saving to {TEMP_RECORDING}")
     if notif_id is not None:
@@ -145,12 +148,14 @@ def start_recording(region: Optional[str], sound: bool):
 
     time.sleep(1)
     if not _is_recording():
-        _notify("Recording failed", "Check gpu-screen-recorder output.", timeout=5000)
+        _notify("Recording failed",
+                "Check gpu-screen-recorder output.", timeout=5000)
         raise typer.Exit(code=1)
 
 
 def stop_recording(clipboard: bool):
-    subprocess.run(["pkill", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-f", RECORDER],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     for _ in range(50):
         if not _is_recording():
@@ -173,31 +178,30 @@ def stop_recording(clipboard: bool):
         NOTIF_ID_FILE.unlink()
 
     if clipboard:
-        subprocess.run(
-            ["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
+        subprocess.run(["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
+                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     _notify("Recording stopped", f"Saved to {final_path}", timeout=5000)
 
 
 def toggle_pause():
-    subprocess.run(["pkill", "-USR2", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-USR2", "-f", RECORDER],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     typer.echo("Toggled pause.")
 
 
 @app.command()
 def record(
     region: Optional[str] = typer.Option(
-        None,
-        "--region",
-        "-r",
+        None, "--region", "-r",
         help="Record a region. Use 'slurp' (or omit value) to select interactively, or give 'WxH+X+Y'.",
     ),
-    sound: bool = typer.Option(False, "--sound", "-s", help="Record audio from default output."),
-    pause: bool = typer.Option(False, "--pause", "-p", help="Toggle pause/resume."),
-    clipboard: bool = typer.Option(False, "--clipboard", "-c", help="Copy the final recording path to clipboard."),
+    sound: bool = typer.Option(
+        False, "--sound", "-s", help="Record audio from default output."),
+    pause: bool = typer.Option(
+        False, "--pause", "-p", help="Toggle pause/resume."),
+    clipboard: bool = typer.Option(
+        False, "--clipboard", "-c", help="Copy the final recording path to clipboard."),
 ):
     """Start or stop a screen recording with gpu-screen-recorder."""
     if pause:

cli/src/zshell/subcommands/scheme.py

@@ -2,7 +2,6 @@ import typer
 import json
 import shutil
 import os
-import sys
 import re
 import subprocess
 
@@ -16,61 +15,11 @@ from materialyoucolor.score.score import Score
 from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
 from materialyoucolor.hct.hct import Hct
 from materialyoucolor.utils.color_utils import argb_from_rgb
-from materialyoucolor.utils.math_utils import (
-    difference_degrees,
-    rotation_direction,
-    sanitize_degrees_double,
-)
+from materialyoucolor.utils.math_utils import difference_degrees, rotation_direction, sanitize_degrees_double
 
 app = typer.Typer()
 
 
-def _complete_scheme_name(incomplete):
-    schemes = [
-        "fruit-salad",
-        "expressive",
-        "monochrome",
-        "rainbow",
-        "tonal-spot",
-        "neutral",
-        "fidelity",
-        "content",
-        "vibrant",
-    ]
-    return [s for s in schemes if incomplete in s]
-
-
-def _complete_preset(incomplete):
-    results = []
-    for sid, meta in list_schemes().items():
-        for v in meta.variants:
-            preset = f"{sid}:{v.id}"
-            if incomplete in preset:
-                results.append((preset, f"{meta.name} - {v.name}"))
-    return results
-
-
-def _complete_mode(incomplete):
-    return [m for m in ("dark", "light") if incomplete in m]
-
-
-def _complete_accent(ctx, incomplete):
-    preset_val = ctx.params.get("preset")
-    if preset_val:
-        try:
-            p_scheme, p_variant = resolve_preset(preset_val)
-            for v in list_schemes()[p_scheme].variants:
-                if v.id == p_variant:
-                    return [a for a in v.accents if incomplete in a]
-        except (ValueError, KeyError):
-            pass
-    all_accents = set()
-    for meta in list_schemes().values():
-        for v in meta.variants:
-            all_accents.update(v.accents)
-    return [a for a in sorted(all_accents) if incomplete in a]
-
-
 @app.command()
 def list_presets(
     json_format: bool = typer.Option(False, "--json", help="Output in JSON format"),
@@ -81,7 +30,7 @@ def list_presets(
         for sid, meta in sorted(schemes.items()):
             variants = {}
             for v in meta.variants:
-                entry: dict[str, Any] = {"modes": sorted(v.modes)}
+                entry = {"modes": sorted(v.modes)}
                 if v.accents:
                     entry["accents"] = sorted(v.accents)
                     entry["default_accent"] = sorted(v.accents)[0]
@@ -106,35 +55,14 @@ def list_presets(
 
 @app.command()
 def generate(
-    image_path: Optional[Path] = typer.Option(
-        None, help="Path to source image. Required for image mode."
-    ),
+    image_path: Optional[Path] = typer.Option(None, help="Path to source image. Required for image mode."),
     scheme: Optional[str] = typer.Option(
-        None,
-        help="Color scheme algorithm to use for image mode. Ignored in preset mode.",
-        autocompletion=_complete_scheme_name,
-    ),
-    preset: Optional[str] = typer.Option(
-        None,
-        help="Name of a premade scheme in this format: <scheme>:<variant>",
-        autocompletion=_complete_preset,
-    ),
-    mode: Optional[str] = typer.Option(
-        None,
-        help="Mode of the preset scheme (dark or light).",
-        autocompletion=_complete_mode,
-    ),
-    accent: Optional[str] = typer.Option(
-        None,
-        help="Accent for schemes that support it (e.g. mauve).",
-        autocompletion=_complete_accent,
+        None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."
     ),
+    preset: Optional[str] = typer.Option(None, help="Name of a premade scheme in this format: <scheme>:<variant>"),
+    mode: Optional[str] = typer.Option(None, help="Mode of the preset scheme (dark or light)."),
+    accent: Optional[str] = typer.Option(None, help="Accent for schemes that support it (e.g. mauve)."),
 ):
-    if not any([image_path, scheme, preset, mode, accent]):
-        print(
-            "Hint: use --preset <scheme>:<variant> or --image-path <path>",
-            file=sys.stderr,
-        )
 
     HOME = str(os.getenv("HOME"))
     OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
@@ -272,15 +200,11 @@ def generate(
     def harmonize(from_hct: Hct, to_hct: Hct, tone_boost: float) -> Hct:
         diff = difference_degrees(from_hct.hue, to_hct.hue)
         rotation = min(diff * 0.8, 100)
-        output_hue = sanitize_degrees_double(
-            from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue)
-        )
+        output_hue = sanitize_degrees_double(from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue))
         tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
         return Hct.from_hct(output_hue, from_hct.chroma, tone)
 
-    def terminal_palette(
-        colors: dict[str, str], mode: str, variant: str
-    ) -> dict[str, str]:
+    def terminal_palette(colors: dict[str, str], mode: str, variant: str) -> dict[str, str]:
         light = mode.lower() == "light"
 
         key_hex = (
@@ -312,7 +236,7 @@ def generate(
 
         image = Image.open(image_path)
         image = image.convert("RGB")
-        image.thumbnail(size, Image.Resampling.NEAREST)
+        image.thumbnail(size, Image.NEAREST)
 
         thumbnail_file.parent.mkdir(parents=True, exist_ok=True)
         image.save(thumbnail_path, "JPEG")
@@ -344,15 +268,8 @@ def generate(
         is_dark = ""
 
         with Image.open(image_path) as img:
-            img.thumbnail((1, 1), Image.Resampling.LANCZOS)
-            px = img.getpixel((0, 0))
-            if isinstance(px, (int, float)):
-                r = g = b = int(px)
-            elif px is not None:
-                r, g, b = int(px[0]), int(px[1]), int(px[2])
-            else:
-                r = g = b = 0
-            hct = Hct.from_int(argb_from_rgb(r, g, b))
+            img.thumbnail((1, 1), Image.LANCZOS)
+            hct = Hct.from_int(argb_from_rgb(*img.getpixel((0, 0))))
             is_dark = "light" if hct.tone > 50 else "dark"
 
         return is_dark
@@ -514,8 +431,6 @@ def generate(
 
             raw = tpl_path.read_text(encoding="utf-8")
             out_path, body = split_directive_and_body(raw)
-            if out_path is None:
-                continue
 
             out_path.parent.mkdir(parents=True, exist_ok=True)
 
@@ -569,30 +484,23 @@ def generate(
         with CONFIG.open() as f:
             config = json.load(f)
 
-        scheme_type = config["colors"].get("schemeType", "fruit-salad")
-        scheme = scheme or scheme_type
-        assert isinstance(scheme, str)
+        scheme = scheme or config["colors"]["schemeType"]
         config_mode = config["general"]["color"]["mode"]
         smart = bool(config["general"]["color"].get("smart", False))
         scheme_class = get_scheme_class(scheme)
 
-        p_variant = "default"
         if preset:
             p_scheme, p_variant = resolve_preset(preset)
             schemes = list_schemes()
             if accent and p_scheme in schemes:
                 meta = schemes[p_scheme]
-                var_accents = next(
-                    (v.accents for v in meta.variants if v.id == p_variant), ()
-                )
+                var_accents = next((v.accents for v in meta.variants if v.id == p_variant), ())
                 if accent not in var_accents:
                     available = ", ".join(var_accents) if var_accents else "none"
                     raise typer.BadParameter(
                         f"Accent '{accent}' not available for '{p_scheme}:{p_variant}'. Available accents: {available}"
                     )
-            palette_obj = get_palette(
-                p_scheme, p_variant, mode or config_mode, accent=accent
-            )
+            palette_obj = get_palette(p_scheme, p_variant, mode or config_mode, accent=accent)
             colors = palette_obj.colors
             effective_mode = palette_obj.mode
             name = palette_obj.scheme

cli/src/zshell/subcommands/shell.py

@@ -2,6 +2,7 @@ import subprocess
 import sys
 import time
 
+import click
 import typer
 
 args = ["qs", "-c", "zshell"]
@@ -13,8 +14,7 @@ app = typer.Typer()
 def kill():
     result = subprocess.run(args + ["kill"], capture_output=True)
     if result.returncode != 0:
-        sys.stderr.write("No running instance to kill.\n")
-        sys.exit(1)
+        raise click.ClickException("No running instance to kill.")
     sys.stderr.write(result.stderr.decode())
 
 
@@ -23,12 +23,10 @@ def start_instance(no_daemon: bool = False) -> None:
     stdout = result.stdout.decode().strip()
     if stdout:
         if "already running" in stdout.lower():
-            sys.stderr.write(stdout + "\n")
-            sys.exit(1)
+            raise click.ClickException(stdout)
     if result.returncode != 0:
         stderr = result.stderr.decode().strip()
-        sys.stderr.write(stderr + "\n")
-        sys.exit(1)
+        raise click.ClickException(stderr)
 
 
 @app.command()
@@ -52,9 +50,7 @@ def restart(no_daemon: bool = False):
 def show():
     result = subprocess.run(args + ["ipc"] + ["show"], capture_output=True)
     if result.returncode != 0:
-        sys.stderr.write(result.stderr.decode())
-        sys.exit(1)
-    sys.stdout.write(result.stdout.decode())
+        raise click.ClickException(result.stderr.decode().strip())
     sys.stderr.write(result.stderr.decode())
 
 
@@ -62,8 +58,7 @@ def show():
 def log():
     result = subprocess.run(args + ["log"], capture_output=True)
     if result.returncode != 0:
-        sys.stderr.write(result.stderr.decode())
-        sys.exit(1)
+        raise click.ClickException(result.stderr.decode().strip())
     sys.stdout.write(result.stdout.decode())
     sys.stderr.write(result.stderr.decode())
 
@@ -72,8 +67,7 @@ def log():
 def lock():
     result = subprocess.run(args + ["ipc"] + ["call"] + ["lock"] + ["lock"], capture_output=True)
     if result.returncode != 0:
-        sys.stderr.write(result.stderr.decode())
-        sys.exit(1)
+        raise click.ClickException(result.stderr.decode().strip())
     sys.stderr.write(result.stderr.decode())
 
 
@@ -81,6 +75,5 @@ def lock():
 def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
     result = subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + (method_args or []), capture_output=True)
     if result.returncode != 0:
-        sys.stderr.write(result.stderr.decode())
-        sys.exit(1)
+        raise click.ClickException(result.stderr.decode().strip())
     sys.stderr.write(result.stderr.decode())

cli/src/zshell/subcommands/wallpaper.py

@@ -34,9 +34,9 @@ def lockscreen(
         return
 
     if size[0] < 3840 or size[1] < 2160:
-        img = img.resize((size[0] // 2, size[1] // 2), Image.Resampling.NEAREST)
+        img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST)
     else:
-        img = img.resize((size[0] // 4, size[1] // 4), Image.Resampling.NEAREST)
+        img = img.resize((size[0] // 4, size[1] // 4), Image.NEAREST)
 
     img = img.filter(ImageFilter.GaussianBlur(blur_amount))
 

cli/tests/test_shell.py

@@ -62,9 +62,8 @@ class TestStart:
 class TestShow:
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_show_runs_ipc_show(self, mock_run):
-        mock_run.return_value = CompletedProcess([], 0, b"target visibilities\n", b"")
-        result = invoke("show")
-        assert "target visibilities" in result.output
+        mock_run.return_value = CompletedProcess([], 0, b"", b"target visibilities\n")
+        invoke("show")
         mock_run.assert_called_once_with(["qs", "-c", "zshell", "ipc", "show"], capture_output=True)
 
 

scripts/SettingsIndex.mjs

@@ -180,14 +180,6 @@ export const settingsIndex = [
         section: "Bar",
         keywords: ["smoothing", "rounding"],
     },
-    // System tray section
-    {
-        name: "Tray icon size",
-        category: "bar",
-        categoryName: "Bar",
-        section: "Tray",
-        keywords: ["tray", "icon", "size"],
-    },
     // Popouts section
     {
         name: "Tray",

shell.qml

@@ -1,25 +1,20 @@
 //@ pragma UseQApplication
 //@ pragma Env QSG_RENDER_LOOP=threaded
-// @ pragma Env QSG_RHI_BACKEND=vulkan
+//@ pragma Env QSG_RHI_BACKEND=vulkan
 //@ pragma Env QSG_NO_VSYNC=1
 //@ pragma Env QS_NO_RELOAD_POPUP=1
 //@ pragma Env QT_SCALE_FACTOR_ROUNDING_POLICY=Round
 //@ pragma DropExpensiveFonts
 import Quickshell
-import Quickshell.Services.UPower
+import qs.Extensions
 import qs.Modules
 import qs.Modules.Wallpaper
 import qs.Modules.Lock
 import qs.Drawers
 import qs.Helpers
 import qs.Modules.Polkit
-import qs.Daemons
 
 ShellRoot {
-	id: root
-
-	readonly property bool laptop: UPower.displayDevice.isLaptopBattery
-
 	settings.watchFiles: true
 
 	Windows {
@@ -45,10 +40,6 @@ ShellRoot {
 	Polkit {
 	}
 
-	LazyLoader {
-		activeAsync: root.laptop
-
-		component: Battery {
-		}
+	LoadExtensions {
 	}
 }