quickshell: drop support for 0.2, require 0.3+

- Remove all compat code
- Rewire LegacyNetworkService to use Quickshell.Networking
- Add parentWindow to settings child windows

quickshell/Modules/Lock/FadeToLockWindow.qml

@@ -4,11 +4,13 @@ import QtQuick
 import Quickshell
 import Quickshell.Wayland
 import qs.Common
+import qs.Services
 
 PanelWindow {
     id: root
 
     property bool active: false
+    property bool _completed: false
 
     signal fadeCompleted
     signal fadeCancelled
@@ -35,7 +37,8 @@ PanelWindow {
         opacity: 0
 
         onOpacityChanged: {
-            if (opacity >= 0.99 && root.active) {
+            if (opacity >= 0.99 && root.active && !root._completed) {
+                root._completed = true;
                 root.fadeCompleted();
             }
         }
@@ -58,6 +61,7 @@ PanelWindow {
     function startFade() {
         if (!SettingsData.fadeToLockEnabled)
             return;
+        _completed = false;
         active = true;
         fadeOverlay.opacity = 0.0;
         fadeSeq.stop();
@@ -65,12 +69,29 @@ PanelWindow {
     }
 
     function cancelFade() {
+        if (_completed)
+            return;
         fadeSeq.stop();
         fadeOverlay.opacity = 0.0;
         active = false;
         fadeCancelled();
     }
 
+    function dismiss() {
+        fadeSeq.stop();
+        fadeOverlay.opacity = 0.0;
+        active = false;
+        _completed = false;
+    }
+
+    Connections {
+        target: IdleService
+        function onIsShellLockedChanged() {
+            if (!IdleService.isShellLocked && root._completed)
+                root.dismiss();
+        }
+    }
+
     MouseArea {
         anchors.fill: parent
         enabled: root.active

quickshell/Modules/Lock/VideoScreensaver.qml

@@ -15,7 +15,7 @@ Item {
     property bool inputEnabled: false
     property point lastMousePos: Qt.point(-1, -1)
     property bool mouseInitialized: false
-    property var videoPlayer: null
+    readonly property var videoPlayer: playerLoader.item
 
     signal dismissed
 
@@ -27,6 +27,24 @@ Item {
         anchors.fill: parent
         color: "black"
         visible: root.active
+
+        Loader {
+            id: playerLoader
+            anchors.fill: parent
+            active: false
+            source: "VideoScreensaverPlayer.qml"
+            onLoaded: {
+                item.errorOccurred.connect((error, errorString) => {
+                    log.warn("playback error:", errorString);
+                    ToastService.showError(I18n.tr("Video Screensaver"), I18n.tr("Playback error: ") + errorString);
+                    root.dismiss();
+                });
+                if (root.videoSource) {
+                    item.source = root.videoSource;
+                    item.play();
+                }
+            }
+        }
     }
 
     Timer {
@@ -82,43 +100,6 @@ Item {
         }
     }
 
-    function createVideoPlayer() {
-        if (videoPlayer)
-            return true;
-
-        try {
-            videoPlayer = Qt.createQmlObject(`
-                import QtQuick
-                import QtMultimedia
-                Video {
-                    anchors.fill: parent
-                    fillMode: VideoOutput.PreserveAspectCrop
-                    loops: MediaPlayer.Infinite
-                    volume: 0
-                }
-            `, background, "VideoScreensaver.VideoPlayer");
-
-            videoPlayer.errorOccurred.connect((error, errorString) => {
-                log.warn("playback error:", errorString);
-                ToastService.showError(I18n.tr("Video Screensaver"), I18n.tr("Playback error: ") + errorString);
-                root.dismiss();
-            });
-
-            return true;
-        } catch (e) {
-            log.warn("Failed to create video player:", e);
-            return false;
-        }
-    }
-
-    function destroyVideoPlayer() {
-        if (videoPlayer) {
-            videoPlayer.stop();
-            videoPlayer.destroy();
-            videoPlayer = null;
-        }
-    }
-
     function start() {
         if (!SettingsData.lockScreenVideoEnabled || !SettingsData.lockScreenVideoPath)
             return;
@@ -128,8 +109,12 @@ Item {
             return;
         }
 
-        if (!createVideoPlayer())
+        playerLoader.active = true;
+        if (playerLoader.status === Loader.Error) {
+            log.warn("Failed to load video player");
+            playerLoader.active = false;
             return;
+        }
 
         videoPicker.result = "";
         videoPicker.folder = "";
@@ -144,7 +129,9 @@ Item {
     function dismiss() {
         if (!active)
             return;
-        destroyVideoPlayer();
+        if (videoPlayer)
+            videoPlayer.stop();
+        playerLoader.active = false;
         inputEnabled = false;
         active = false;
         videoSource = "";

quickshell/Modules/Lock/VideoScreensaverPlayer.qml

@@ -0,0 +1,8 @@
+import QtQuick
+import QtMultimedia
+
+Video {
+    fillMode: VideoOutput.PreserveAspectCrop
+    loops: MediaPlayer.Infinite
+    volume: 0
+}