last 7 months of qs changes

modules/user/modules/quickshell/shell/shell.qml

@@ -1,3 +1,4 @@
+//@ pragma ShellId shell
 import Quickshell
 import Quickshell.Io
 import Quickshell.Wayland
@@ -6,8 +7,15 @@ import QtQuick.Layouts
 import ".."
 import "screenshot" as Screenshot
 import "bar" as Bar
+import "lock" as Lock
+import "notifications" as Notifs
+import "launcher" as Launcher
 
 ShellRoot {
+	Component.onCompleted: [Lock.Controller, Launcher.Controller.init()]
+
+	ReloadPopup {}
+
 	Process {
 		command: ["mkdir", "-p", ShellGlobals.rtpath]
 		running: true
@@ -29,15 +37,16 @@ ShellRoot {
 		}
 	}
 
+	Notifs.NotificationOverlay {
+		screen: Quickshell.screens.find(s => s.name == "DP-1")
+	}
+
 	Variants {
 		model: Quickshell.screens
 
 		Scope {
 			property var modelData
 
-			/*Bar {
-				screen: modelData
-			}*/
 			Bar.Bar {
 				screen: modelData
 			}
@@ -46,6 +55,8 @@ ShellRoot {
 				id: window
 
 				screen: modelData
+
+				exclusionMode: ExclusionMode.Ignore
 				WlrLayershell.layer: WlrLayer.Background
 				WlrLayershell.namespace: "shell:background"
 
@@ -60,101 +71,6 @@ ShellRoot {
 					anchors.fill: parent
 					screen: window.screen
 				}
-
-				SelectionLayer {
-					id: selectionLayer
-
-					onSelectionComplete: (x, y, width, height) => {
-						console.log(`selection complete: ${x} ${y} ${width} ${height}`)
-						termSpawner.x = x
-						termSpawner.y = y
-						termSpawner.width = width
-						termSpawner.height = height
-						termSpawner.running = true
-					}
-
-					Process {
-						id: termSpawner
-						property real x;
-						property real y;
-						property real width;
-						property real height;
-
-						command: [
-							"hyprctl",
-							"dispatch",
-							"exec",
-							`[float;; noanim; move ${x} ${y}; size ${width} ${height}] alacritty --class AlacrittyTermselect`
-						]
-					}
-
-					Connections {
-						target: ShellIpc
-
-						function onTermSelectChanged() {
-							if (ShellIpc.termSelect) {
-								selectionLayer.selectionArea.startSelection(true);
-							} else {
-								selectionLayer.selectionArea.endSelection();
-							}
-						}
-					}
-
-					Connections {
-						target: HyprlandIpc
-
-						function onWindowOpened(_, _, klass, _) {
-							if (klass == "AlacrittyTermselect") {
-								selectionLayer.selectionArea.selecting = false
-							}
-						}
-					}
-				}
-
-				SelectionArea {
-					anchors.fill: parent
-					screen: window.screen
-					selectionArea: selectionLayer.selectionArea
-
-				}
-			}
-
-			PanelWindow {
-				visible: false
-				screen: modelData
-				WlrLayershell.layer: WlrLayer.Overlay
-
-				anchors {
-					right: true
-					bottom: true
-				}
-
-				margins {
-					right: 50
-					bottom: 50
-				}
-
-				width: content.width
-				height: content.height
-
-				color: "transparent"
-				mask: Region {}
-
-				ColumnLayout {
-					id: content
-
-					Text {
-						text: "Activate Linux"
-						color: "#50ffffff"
-						font.pointSize: 22
-					}
-
-					Text {
-						text: "Go to Settings to activate Linux"
-						color: "#50ffffff"
-						font.pointSize: 14
-					}
-				}
 			}
 		}
 	}