Bar widgets: modular loading refactoring via BarWidgetRegistry+NWidgetLoader

- Hot reload is working again.
- Should also be more memory efficient on multi monitors.

Modules/Bar/Bar.qml

@@ -48,6 +48,7 @@ Variants {
         layer.enabled: true
       }
 
+      // ------------------------------
       // Left Section - Dynamic Widgets
       Row {
         id: leftSection
@@ -61,30 +62,19 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.left
           delegate: Loader {
-            id: leftWidgetLoader
-            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
-            visible: {
-              if (modelData === "WiFi" && !Settings.data.network.wifiEnabled)
-                return false
-              if (modelData === "Bluetooth" && !Settings.data.network.bluetoothEnabled)
-                return false
-              if (modelData === "Battery" && !shouldShowBattery())
-                return false
-              return true
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            onStatusChanged: {
-              if (status === Loader.Error) {
-                widgetLoader.onWidgetFailed(modelData, "Loader error")
-              } else if (status === Loader.Ready) {
-                widgetLoader.onWidgetLoaded(modelData)
+            sourceComponent: NWidgetLoader {
+              widgetName: modelData
+              widgetProps: {
+                "screen": screen
               }
             }
+            anchors.verticalCenter: parent.verticalCenter
           }
         }
       }
 
+      // ------------------------------
       // Center Section - Dynamic Widgets
       Row {
         id: centerSection
@@ -97,30 +87,19 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.center
           delegate: Loader {
-            id: centerWidgetLoader
-            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
-            visible: {
-              if (modelData === "WiFi" && !Settings.data.network.wifiEnabled)
-                return false
-              if (modelData === "Bluetooth" && !Settings.data.network.bluetoothEnabled)
-                return false
-              if (modelData === "Battery" && !shouldShowBattery())
-                return false
-              return true
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            onStatusChanged: {
-              if (status === Loader.Error) {
-                widgetLoader.onWidgetFailed(modelData, "Loader error")
-              } else if (status === Loader.Ready) {
-                widgetLoader.onWidgetLoaded(modelData)
+            sourceComponent: NWidgetLoader {
+              widgetName: modelData
+              widgetProps: {
+                "screen": screen
               }
             }
+            anchors.verticalCenter: parent.verticalCenter
           }
         }
       }
 
+      // ------------------------------
       // Right Section - Dynamic Widgets
       Row {
         id: rightSection
@@ -134,49 +113,17 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.right
           delegate: Loader {
-            id: rightWidgetLoader
-            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
-            visible: {
-              if (modelData === "WiFi" && !Settings.data.network.wifiEnabled)
-                return false
-              if (modelData === "Bluetooth" && !Settings.data.network.bluetoothEnabled)
-                return false
-              return true
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            onStatusChanged: {
-              if (status === Loader.Error) {
-                widgetLoader.onWidgetFailed(modelData, "Loader error")
-              } else if (status === Loader.Ready) {
-                widgetLoader.onWidgetLoaded(modelData)
+            sourceComponent: NWidgetLoader {
+              widgetName: modelData
+              widgetProps: {
+                "screen": screen
               }
             }
+            anchors.verticalCenter: parent.verticalCenter
           }
         }
       }
     }
-
-    // Helper function to check if battery widget should be visible (same logic as Battery.qml)
-    function shouldShowBattery() {
-      // For now, always show battery widget and let it handle its own visibility
-      // The Battery widget has its own testMode and visibility logic
-      return true
-    }
-
-    // Widget loader instance
-    WidgetLoader {
-      id: widgetLoader
-
-      onWidgetFailed: function (widgetName, error) {
-        Logger.error("Bar", `Widget failed: ${widgetName} - ${error}`)
-      }
-    }
-
-    // Initialize widget loading tracking
-    Component.onCompleted: {
-      const allWidgets = [...Settings.data.bar.widgets.left, ...Settings.data.bar.widgets.center, ...Settings.data.bar.widgets.right]
-      widgetLoader.initializeLoading(allWidgets)
-    }
   }
 }

Modules/Bar/Widgets/ActiveWindow.qml

@@ -9,13 +9,16 @@ import qs.Widgets
 
 Row {
   id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+  property bool showingFullTitle: false
+  property int lastWindowIndex: -1
+
   anchors.verticalCenter: parent.verticalCenter
   spacing: Style.marginS * scaling
   visible: getTitle() !== ""
 
-  property bool showingFullTitle: false
-  property int lastWindowIndex: -1
-
   // Timer to hide full title after window switch
   Timer {
     id: fullTitleTimer

Modules/Bar/Widgets/ArchUpdater.qml

@@ -1,16 +1,18 @@
-import qs.Commons
-import qs.Services
-import qs.Widgets
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Quickshell
+import qs.Commons
+import qs.Services
+import qs.Widgets
 
 NIconButton {
   id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
   sizeMultiplier: 0.8
-
-  readonly property real scaling: ScalingService.scale(screen)
-
   colorBg: Color.mSurfaceVariant
   colorFg: Color.mOnSurface
   colorBorder: Color.transparent
@@ -64,7 +66,7 @@ NIconButton {
 
     if (ArchUpdaterService.updatePackages.length > 0) {
       // Show confirmation dialog for updates
-      PanelService.updatePanel.toggle(screen)
+      PanelService.getPanel("archUpdaterPanel").toggle(screen)
     } else {
       // Just refresh if no updates available
       ArchUpdaterService.doPoll()

Modules/Bar/Widgets/Battery.qml

@@ -6,89 +6,100 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
-NPill {
+Item {
   id: root
 
-  // Test mode
-  property bool testMode: false
-  property int testPercent: 49
-  property bool testCharging: false
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
 
-  property var battery: UPower.displayDevice
-  property bool isReady: testMode ? true : (battery && battery.ready && battery.isLaptopBattery && battery.isPresent)
-  property real percent: testMode ? testPercent : (isReady ? (battery.percentage * 100) : 0)
-  property bool charging: testMode ? testCharging : (isReady ? battery.state === UPowerDeviceState.Charging : false)
-  property bool show: isReady && percent > 0
+  implicitWidth: pill.width
+  implicitHeight: pill.height
 
-  // Choose icon based on charge and charging state
-  function batteryIcon() {
+  NPill {
+    id: pill
 
-    if (charging)
-      return "battery_android_bolt"
+    // Test mode
+    property bool testMode: false
+    property int testPercent: 49
+    property bool testCharging: false
 
-    if (percent >= 95)
-      return "battery_android_full"
+    property var battery: UPower.displayDevice
+    property bool isReady: testMode ? true : (battery && battery.ready && battery.isLaptopBattery && battery.isPresent)
+    property real percent: testMode ? testPercent : (isReady ? (battery.percentage * 100) : 0)
+    property bool charging: testMode ? testCharging : (isReady ? battery.state === UPowerDeviceState.Charging : false)
 
-    // Hardcoded battery symbols
-    if (percent >= 85)
-      return "battery_android_6"
-    if (percent >= 70)
-      return "battery_android_5"
-    if (percent >= 55)
-      return "battery_android_4"
-    if (percent >= 40)
-      return "battery_android_3"
-    if (percent >= 25)
-      return "battery_android_2"
-    if (percent >= 10)
-      return "battery_android_1"
-    if (percent >= 0)
-      return "battery_android_0"
-  }
+    // Choose icon based on charge and charging state
+    function batteryIcon() {
 
-  visible: testMode || (isReady && battery.isLaptopBattery)
+      if (!isReady || !battery.isLaptopBattery)
+        return "battery_android_alert"
 
-  icon: root.batteryIcon()
-  text: Math.round(root.percent) + "%"
-  textColor: charging ? Color.mPrimary : Color.mOnSurface
-  forceShown: Settings.data.bar.alwaysShowBatteryPercentage
-  tooltipText: {
-    let lines = []
+      if (charging)
+        return "battery_android_bolt"
 
-    if (testMode) {
-      lines.push("Time left: " + Time.formatVagueHumanReadableDuration(12345))
+      if (percent >= 95)
+        return "battery_android_full"
+
+      // Hardcoded battery symbols
+      if (percent >= 85)
+        return "battery_android_6"
+      if (percent >= 70)
+        return "battery_android_5"
+      if (percent >= 55)
+        return "battery_android_4"
+      if (percent >= 40)
+        return "battery_android_3"
+      if (percent >= 25)
+        return "battery_android_2"
+      if (percent >= 10)
+        return "battery_android_1"
+      if (percent >= 0)
+        return "battery_android_0"
+    }
+
+    icon: batteryIcon()
+    text: (isReady && battery.isLaptopBattery) ? Math.round(percent) + "%" : "-"
+    textColor: charging ? Color.mPrimary : Color.mOnSurface
+    forceOpen: isReady && battery.isLaptopBattery && Settings.data.bar.alwaysShowBatteryPercentage
+    disableOpen: (!isReady || !battery.isLaptopBattery)
+    tooltipText: {
+      let lines = []
+
+      if (testMode) {
+        lines.push("Time Left: " + Time.formatVagueHumanReadableDuration(12345))
+        return lines.join("\n")
+      }
+
+      if (!isReady || !battery.isLaptopBattery) {
+        return "No Battery Detected"
+      }
+
+      if (battery.timeToEmpty > 0) {
+        lines.push("Time Left: " + Time.formatVagueHumanReadableDuration(battery.timeToEmpty))
+      }
+
+      if (battery.timeToFull > 0) {
+        lines.push("Time Until Full: " + Time.formatVagueHumanReadableDuration(battery.timeToFull))
+      }
+
+      if (battery.changeRate !== undefined) {
+        const rate = battery.changeRate
+        if (rate > 0) {
+          lines.push(charging ? "Charging Rate: " + rate.toFixed(2) + " W" : "Discharging Rate: " + rate.toFixed(
+                                  2) + " W")
+        } else if (rate < 0) {
+          lines.push("Discharging Rate: " + Math.abs(rate).toFixed(2) + " W")
+        } else {
+          lines.push("Estimating...")
+        }
+      } else {
+        lines.push(charging ? "Charging" : "Discharging")
+      }
+
+      if (battery.healthPercentage !== undefined && battery.healthPercentage > 0) {
+        lines.push("Health: " + Math.round(battery.healthPercentage) + "%")
+      }
       return lines.join("\n")
     }
-
-    if (!root.isReady) {
-      return ""
-    }
-
-    if (root.battery.timeToEmpty > 0) {
-      lines.push("Time left: " + Time.formatVagueHumanReadableDuration(root.battery.timeToEmpty))
-    }
-
-    if (root.battery.timeToFull > 0) {
-      lines.push("Time until full: " + Time.formatVagueHumanReadableDuration(root.battery.timeToFull))
-    }
-
-    if (root.battery.changeRate !== undefined) {
-      const rate = root.battery.changeRate
-      if (rate > 0) {
-        lines.push(root.charging ? "Charging rate: " + rate.toFixed(2) + " W" : "Discharging rate: " + rate.toFixed(
-                                     2) + " W")
-      } else if (rate < 0) {
-        lines.push("Discharging rate: " + Math.abs(rate).toFixed(2) + " W")
-      } else {
-        lines.push("Estimating...")
-      }
-    } else {
-      lines.push(root.charging ? "Charging" : "Discharging")
-    }
-
-    if (root.battery.healthPercentage !== undefined && root.battery.healthPercentage > 0) {
-      lines.push("Health: " + Math.round(root.battery.healthPercentage) + "%")
-    }
-    return lines.join("\n")
   }
 }

Modules/Bar/Widgets/Bluetooth.qml

@@ -10,8 +10,11 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  sizeMultiplier: 0.8
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
 
+  visible: Settings.data.network.bluetoothEnabled
+  sizeMultiplier: 0.8
   colorBg: Color.mSurfaceVariant
   colorFg: Color.mOnSurface
   colorBorder: Color.transparent
@@ -28,7 +31,5 @@ NIconButton {
     }
   }
   tooltipText: "Bluetooth Devices"
-  onClicked: {
-    bluetoothPanel.toggle(screen)
-  }
+  onClicked: PanelService.getPanel("bluetoothPanel")?.toggle(screen)
 }

Modules/Bar/Widgets/Brightness.qml

@@ -8,13 +8,16 @@ import qs.Widgets
 Item {
   id: root
 
-  width: pill.width
-  height: pill.height
-  visible: getMonitor() !== null
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
 
   // Used to avoid opening the pill on Quickshell startup
   property bool firstBrightnessReceived: false
 
+  width: pill.width
+  height: pill.height
+  visible: getMonitor() !== null
+
   function getMonitor() {
     return BrightnessService.getMonitorForScreen(screen) || null
   }

Modules/Bar/Widgets/Clock.qml

@@ -1,16 +1,21 @@
 import QtQuick
+import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
 
-// Clock Icon with attached calendar
 Rectangle {
   id: root
-  width: clock.width + Style.marginM * 2 * scaling
-  height: Math.round(Style.capsuleHeight * scaling)
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
+  implicitWidth: clock.width + Style.marginM * 2 * scaling
+  implicitHeight: Math.round(Style.capsuleHeight * scaling)
   radius: Math.round(Style.radiusM * scaling)
   color: Color.mSurfaceVariant
 
+  // Clock Icon with attached calendar
   NClock {
     id: clock
     anchors.verticalCenter: parent.verticalCenter
@@ -24,7 +29,7 @@ Rectangle {
     }
 
     onEntered: {
-      if (!calendarPanel.active) {
+      if (!PanelService.getPanel("calendarPanel")?.active) {
         tooltip.show()
       }
     }
@@ -33,7 +38,7 @@ Rectangle {
     }
     onClicked: {
       tooltip.hide()
-      calendarPanel.toggle(screen)
+      PanelService.getPanel("calendarPanel")?.toggle(screen)
     }
   }
 }

Modules/Bar/Widgets/KeyboardLayout.qml

@@ -6,15 +6,18 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
-Item {
+Row {
   id: root
 
-  width: pill.width
-  height: pill.height
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
 
   // Use the shared service for keyboard layout
   property string currentLayout: KeyboardLayoutService.currentLayout
 
+  width: pill.width
+  height: pill.height
+
   NPill {
     id: pill
     icon: "keyboard_alt"

Modules/Bar/Widgets/MediaMini.qml

@@ -9,6 +9,10 @@ import qs.Widgets
 
 Row {
   id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
   anchors.verticalCenter: parent.verticalCenter
   spacing: Style.marginS * scaling
   visible: MediaService.currentPlayer !== null && MediaService.canPlay

Modules/Bar/Widgets/NotificationHistory.qml

@@ -10,6 +10,9 @@ import qs.Widgets
 NIconButton {
   id: root
 
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
   sizeMultiplier: 0.8
   icon: "notifications"
   tooltipText: "Notification History"
@@ -17,8 +20,5 @@ NIconButton {
   colorFg: Color.mOnSurface
   colorBorder: Color.transparent
   colorBorderHover: Color.transparent
-
-  onClicked: {
-    notificationHistoryPanel.toggle(screen)
-  }
+  onClicked: PanelService.getPanel("notificationHistoryPanel")?.toggle(screen)
 }

Modules/Bar/Widgets/PowerProfile.qml

@@ -1,7 +1,7 @@
 import QtQuick
+import QtQuick.Layouts
 import Quickshell
 import Quickshell.Services.UPower
-import QtQuick.Layouts
 import qs.Commons
 import qs.Services
 import qs.Widgets
@@ -9,6 +9,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
   property var powerProfiles: PowerProfiles
   readonly property bool hasPP: powerProfiles.hasPerformanceProfile
 

Modules/Bar/Widgets/ScreenRecorderIndicator.qml

@@ -1,18 +1,21 @@
+import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
 
 // Screen Recording Indicator
 NIconButton {
-  id: screenRecordingIndicator
+  id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
+  visible: ScreenRecorderService.isRecording
   icon: "videocam"
   tooltipText: "Screen Recording Active\nClick To Stop Recording"
   sizeMultiplier: 0.8
   colorBg: Color.mPrimary
   colorFg: Color.mOnPrimary
-  visible: ScreenRecorderService.isRecording
   anchors.verticalCenter: parent.verticalCenter
-  onClicked: {
-    ScreenRecorderService.toggleRecording()
-  }
+  onClicked: ScreenRecorderService.toggleRecording()
 }

Modules/Bar/Widgets/SidePanelToggle.qml

@@ -1,9 +1,14 @@
 import Quickshell
 import qs.Commons
 import qs.Widgets
+import qs.Services
 
 NIconButton {
-  id: sidePanelToggle
+  id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
   icon: "widgets"
   tooltipText: "Open Side Panel"
   sizeMultiplier: 0.8
@@ -14,5 +19,5 @@ NIconButton {
   colorBorderHover: Color.transparent
 
   anchors.verticalCenter: parent.verticalCenter
-  onClicked: sidePanel.toggle(screen)
+  onClicked: PanelService.getPanel("sidePanel")?.toggle(screen)
 }

Modules/Bar/Widgets/SystemMonitor.qml

@@ -6,6 +6,10 @@ import qs.Widgets
 
 Row {
   id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
   anchors.verticalCenter: parent.verticalCenter
   spacing: Style.marginS * scaling
 

Modules/Bar/Widgets/Tray.qml

@@ -6,15 +6,20 @@ import Quickshell
 import Quickshell.Services.SystemTray
 import Quickshell.Widgets
 import qs.Commons
+import qs.Modules.Bar.Extras
 import qs.Services
 import qs.Widgets
 
 Rectangle {
+  id: root
+
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
   readonly property real itemSize: 24 * scaling
 
   visible: SystemTray.items.values.length > 0
-  width: tray.width + Style.marginM * scaling * 2
-  height: Math.round(Style.capsuleHeight * scaling)
+  implicitWidth: tray.width + Style.marginM * scaling * 2
+  implicitHeight: Math.round(Style.capsuleHeight * scaling)
   radius: Math.round(Style.radiusM * scaling)
   color: Color.mSurfaceVariant
 
@@ -134,9 +139,7 @@ Rectangle {
     function open() {
       visible = true
 
-      // Register into the panel service
-      // so this will autoclose if we open another panel
-      PanelService.registerOpen(trayPanel)
+      PanelService.willOpenPanel(trayPanel)
     }
 
     function close() {
@@ -152,7 +155,7 @@ Rectangle {
 
     Loader {
       id: trayMenu
-      source: "TrayMenu.qml"
+      source: "../Extras/TrayMenu.qml"
     }
   }
 }

Modules/Bar/Widgets/Volume.qml

@@ -9,12 +9,15 @@ import qs.Widgets
 Item {
   id: root
 
-  width: pill.width
-  height: pill.height
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
 
   // Used to avoid opening the pill on Quickshell startup
   property bool firstVolumeReceived: false
 
+  implicitWidth: pill.width
+  implicitHeight: pill.height
+
   function getIcon() {
     if (AudioService.muted) {
       return "volume_off"
@@ -64,6 +67,7 @@ Item {
       }
     }
     onClicked: {
+      var settingsPanel = PanelService.getPanel("settingsPanel")
       settingsPanel.requestedTab = SettingsPanel.Tab.AudioService
       settingsPanel.open(screen)
     }

Modules/Bar/Widgets/WiFi.qml

@@ -10,6 +10,11 @@ import qs.Widgets
 NIconButton {
   id: root
 
+  property ShellScreen screen
+  property real scaling: ScalingService.scale(screen)
+
+  visible: Settings.data.network.wifiEnabled
+
   sizeMultiplier: 0.8
 
   Component.onCompleted: {
@@ -44,11 +49,11 @@ NIconButton {
       return "signal_wifi_bad"
     }
   }
-  tooltipText: "WiFi Networks"
+  tooltipText: "Network / WiFi"
   onClicked: {
     try {
       Logger.log("WiFi", "Button clicked, toggling panel")
-      wifiPanel.toggle(screen)
+      PanelService.getPanel("wifiPanel")?.toggle(screen)
     } catch (error) {
       Logger.error("WiFi", "Error toggling panel:", error)
     }

Modules/Bar/Widgets/Workspace.qml

@@ -10,6 +10,10 @@ import qs.Services
 
 Item {
   id: root
+
+  property ShellScreen screen: null
+  property real scaling: ScalingService.scale(screen)
+
   property bool isDestroying: false
   property bool hovered: false
 
@@ -23,7 +27,8 @@ Item {
 
   signal workspaceChanged(int workspaceId, color accentColor)
 
-  width: {
+  implicitHeight: Math.round(36 * scaling)
+  implicitWidth: {
     let total = 0
     for (var i = 0; i < localWorkspaces.count; i++) {
       const ws = localWorkspaces.get(i)
@@ -39,34 +44,35 @@ Item {
     return total
   }
 
-  height: Math.round(36 * scaling)
-
   Component.onCompleted: {
-    localWorkspaces.clear()
-    for (var i = 0; i < WorkspaceService.workspaces.count; i++) {
-      const ws = WorkspaceService.workspaces.get(i)
-      if (ws.output.toLowerCase() === screen.name.toLowerCase()) {
-        localWorkspaces.append(ws)
-      }
-    }
-    workspaceRepeater.model = localWorkspaces
-    updateWorkspaceFocus()
+    refreshWorkspaces()
   }
 
+  Component.onDestruction: {
+    root.isDestroying = true
+  }
+
+  onScreenChanged: refreshWorkspaces()
+
   Connections {
     target: WorkspaceService
     function onWorkspacesChanged() {
-      localWorkspaces.clear()
+      refreshWorkspaces()
+    }
+  }
+
+  function refreshWorkspaces() {
+    localWorkspaces.clear()
+    if (screen !== null) {
       for (var i = 0; i < WorkspaceService.workspaces.count; i++) {
         const ws = WorkspaceService.workspaces.get(i)
         if (ws.output.toLowerCase() === screen.name.toLowerCase()) {
           localWorkspaces.append(ws)
         }
       }
-
-      workspaceRepeater.model = localWorkspaces
-      updateWorkspaceFocus()
     }
+    workspaceRepeater.model = localWorkspaces
+    updateWorkspaceFocus()
   }
 
   function triggerUnifiedWave() {
@@ -74,6 +80,17 @@ Item {
     masterAnimation.restart()
   }
 
+  function updateWorkspaceFocus() {
+    for (var i = 0; i < localWorkspaces.count; i++) {
+      const ws = localWorkspaces.get(i)
+      if (ws.isFocused === true) {
+        root.triggerUnifiedWave()
+        root.workspaceChanged(ws.id, Color.mPrimary)
+        break
+      }
+    }
+  }
+
   SequentialAnimation {
     id: masterAnimation
     PropertyAction {
@@ -101,17 +118,6 @@ Item {
     }
   }
 
-  function updateWorkspaceFocus() {
-    for (var i = 0; i < localWorkspaces.count; i++) {
-      const ws = localWorkspaces.get(i)
-      if (ws.isFocused === true) {
-        root.triggerUnifiedWave()
-        root.workspaceChanged(ws.id, Color.mPrimary)
-        break
-      }
-    }
-  }
-
   Rectangle {
     id: workspaceBackground
     width: parent.width - Style.marginS * scaling * 2
@@ -254,8 +260,4 @@ Item {
       }
     }
   }
-
-  Component.onDestruction: {
-    root.isDestroying = true
-  }
 }

Modules/Calendar/Calendar.qml

@@ -104,17 +104,6 @@ NPanel {
       year: Time.date.getFullYear()
       locale: Qt.locale() // Use system locale
 
-      // Optionally, update when the panel becomes visible
-      Connections {
-        target: calendarPanel
-        function onVisibleChanged() {
-          if (calendarPanel.visible) {
-            grid.month = Time.date.getMonth()
-            grid.year = Time.date.getFullYear()
-          }
-        }
-      }
-
       delegate: Rectangle {
         width: (Style.baseWidgetSize * scaling)
         height: (Style.baseWidgetSize * scaling)

Modules/SettingsPanel/Tabs/BarTab.qml

@@ -163,7 +163,7 @@ ColumnLayout {
             spacing: Style.marginM * scaling
 
             // Left Section
-            NWidgetCard {
+            NSectionEditor {
               sectionName: "Left"
               widgetModel: Settings.data.bar.widgets.left
               availableWidgets: availableWidgets
@@ -174,7 +174,7 @@ ColumnLayout {
             }
 
             // Center Section
-            NWidgetCard {
+            NSectionEditor {
               sectionName: "Center"
               widgetModel: Settings.data.bar.widgets.center
               availableWidgets: availableWidgets
@@ -185,7 +185,7 @@ ColumnLayout {
             }
 
             // Right Section
-            NWidgetCard {
+            NSectionEditor {
               sectionName: "Right"
               widgetModel: Settings.data.bar.widgets.right
               availableWidgets: availableWidgets
@@ -228,15 +228,6 @@ ColumnLayout {
 
       // Assign the new array
       Settings.data.bar.widgets[section] = newArray
-
-      // Force a settings save
-      //Logger.log("BarTab", "Settings updated, triggering save...")
-
-      // Verify the change was applied
-      Qt.setTimeout(function () {
-        var updatedArray = Settings.data.bar.widgets[section]
-        //Logger.log("BarTab", "Verification - updated section array:", JSON.stringify(updatedArray))
-      }, 100)
     } else {
 
       //Logger.log("BarTab", "Invalid section or index:", section, index, "array length:",
@@ -262,29 +253,19 @@ ColumnLayout {
     }
   }
 
-  // Widget loader for discovering available widgets
-  WidgetLoader {
-    id: widgetLoader
-  }
-
+  // Base list model for all combo boxes
   ListModel {
     id: availableWidgets
   }
 
   Component.onCompleted: {
-    discoverWidgets()
-  }
-
-  // Automatically discover available widgets using WidgetLoader
-  function discoverWidgets() {
+    // Fill out availableWidgets ListModel
     availableWidgets.clear()
-
-    // Use WidgetLoader to discover available widgets
-    const discoveredWidgets = widgetLoader.discoverAvailableWidgets()
-
-    // Add discovered widgets to the ListModel
-    discoveredWidgets.forEach(widget => {
-                                availableWidgets.append(widget)
-                              })
+    BarWidgetRegistry.getAvailableWidgets().forEach(entry => {
+                                                      availableWidgets.append({
+                                                                                "key": entry,
+                                                                                "name": entry
+                                                                              })
+                                                    })
   }
 }

Modules/SidePanel/Cards/UtilitiesCard.qml

@@ -50,6 +50,7 @@ NBox {
       icon: "image"
       tooltipText: "Open Wallpaper Selector"
       onClicked: {
+        var settingsPanel = PanelService.getPanel("settingsPanel")
         settingsPanel.requestedTab = SettingsPanel.Tab.WallpaperSelector
         settingsPanel.open(screen)
       }