Move widget logic into it's own file (Commons/WidgetLoader.qml)

Commons/WidgetLoader.qml

@@ -0,0 +1,70 @@
+import QtQuick
+import qs.Commons
+
+QtObject {
+  id: root
+
+  // Signal emitted when widget loading status changes
+  signal widgetLoaded(string widgetName)
+  signal widgetFailed(string widgetName, string error)
+  signal loadingComplete(int total, int loaded, int failed)
+
+  // Properties to track loading status
+  property int totalWidgets: 0
+  property int loadedWidgets: 0
+  property int failedWidgets: 0
+
+  // Auto-discover widget components
+  function getWidgetComponent(widgetName) {
+    if (!widgetName || widgetName.trim() === "") {
+      return null
+    }
+    
+    const widgetPath = `../Modules/Bar/Widgets/${widgetName}.qml`
+    Logger.log("WidgetLoader", `Attempting to load widget from: ${widgetPath}`)
+    
+    // Try to load the widget directly from file
+    const component = Qt.createComponent(widgetPath)
+    if (component.status === Component.Ready) {
+      Logger.log("WidgetLoader", `Successfully created component for: ${widgetName}.qml`)
+      return component
+    }
+    
+    const errorMsg = `Failed to load ${widgetName}.qml widget, status: ${component.status}, error: ${component.errorString()}`
+    Logger.error("WidgetLoader", errorMsg)
+    return null
+  }
+
+  // Initialize loading tracking
+  function initializeLoading(widgetList) {
+    totalWidgets = widgetList.length
+    loadedWidgets = 0
+    failedWidgets = 0
+    
+    if (totalWidgets > 0) {
+      Logger.log("WidgetLoader", `Attempting to load ${totalWidgets} widgets`)
+    }
+  }
+
+  // Track widget loading success
+  function onWidgetLoaded(widgetName) {
+    loadedWidgets++
+    widgetLoaded(widgetName)
+    
+    if (loadedWidgets + failedWidgets === totalWidgets) {
+      Logger.log("WidgetLoader", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
+      loadingComplete(totalWidgets, loadedWidgets, failedWidgets)
+    }
+  }
+
+  // Track widget loading failure
+  function onWidgetFailed(widgetName, error) {
+    failedWidgets++
+    widgetFailed(widgetName, error)
+    
+    if (loadedWidgets + failedWidgets === totalWidgets) {
+      Logger.log("WidgetLoader", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
+      loadingComplete(totalWidgets, loadedWidgets, failedWidgets)
+    }
+  }
+}

Modules/Bar/Bar.qml

@@ -23,9 +23,7 @@ Variants {
     implicitHeight: Style.barHeight * scaling
     color: Color.transparent
 
-    Component.onCompleted: {
+
-      logWidgetLoadingSummary()
-    }
 
     // If no bar activated in settings, then show them all
     visible: modelData ? (Settings.data.bar.monitors.includes(modelData.name)
@@ -64,16 +62,15 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.left
           delegate: Loader {
-            id: widgetLoader
+            id: leftWidgetLoader
-            sourceComponent: getWidgetComponent(modelData)
+            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
             anchors.verticalCenter: parent.verticalCenter
             onStatusChanged: {
               if (status === Loader.Error) {
-                Logger.error("Bar", `Failed to load ${modelData} widget`)
+                widgetLoader.onWidgetFailed(modelData, "Loader error")
-                onWidgetFailed()
               } else if (status === Loader.Ready) {
-                onWidgetLoaded()
+                widgetLoader.onWidgetLoaded(modelData)
               }
             }
           }
@@ -92,16 +89,15 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.center
           delegate: Loader {
-            id: widgetLoader
+            id: centerWidgetLoader
-            sourceComponent: getWidgetComponent(modelData)
+            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
             anchors.verticalCenter: parent.verticalCenter
             onStatusChanged: {
               if (status === Loader.Error) {
-                Logger.error("Bar", `Failed to load ${modelData} widget`)
+                widgetLoader.onWidgetFailed(modelData, "Loader error")
-                onWidgetFailed()
               } else if (status === Loader.Ready) {
-                onWidgetLoaded()
+                widgetLoader.onWidgetLoaded(modelData)
               }
             }
           }
@@ -121,16 +117,15 @@ Variants {
         Repeater {
           model: Settings.data.bar.widgets.right
           delegate: Loader {
-            id: widgetLoader
+            id: rightWidgetLoader
-            sourceComponent: getWidgetComponent(modelData)
+            sourceComponent: widgetLoader.getWidgetComponent(modelData)
             active: true
             anchors.verticalCenter: parent.verticalCenter
             onStatusChanged: {
               if (status === Loader.Error) {
-                Logger.error("Bar", `Failed to load ${modelData} widget`)
+                widgetLoader.onWidgetFailed(modelData, "Loader error")
-                onWidgetFailed()
               } else if (status === Loader.Ready) {
-                onWidgetLoaded()
+                widgetLoader.onWidgetLoaded(modelData)
               }
             }
           }
@@ -138,60 +133,31 @@ Variants {
       }
     }
 
-    // Auto-discover widget components
+    // Widget loader instance
-    function getWidgetComponent(widgetName) {
+    WidgetLoader {
-      if (!widgetName || widgetName.trim() === "") {
+      id: widgetLoader
-        return null
+      
+      onWidgetLoaded: function(widgetName) {
+        Logger.log("Bar", `Widget loaded: ${widgetName}`)
       }
       
-      const widgetPath = `../Bar/Widgets/${widgetName}.qml`
+      onWidgetFailed: function(widgetName, error) {
-      Logger.log("Bar", `Attempting to load widget from: ${widgetPath}`)
+        Logger.error("Bar", `Widget failed: ${widgetName} - ${error}`)
-      
-      // Try to load the widget directly from file
-      const component = Qt.createComponent(widgetPath)
-      if (component.status === Component.Ready) {
-        Logger.log("Bar", `Successfully created component for: ${widgetName}.qml`)
-        return component
       }
       
-      Logger.error("Bar", `Failed to load ${widgetName}.qml widget, status: ${component.status}, error: ${component.errorString()}`)
+      onLoadingComplete: function(total, loaded, failed) {
-      return null
+        Logger.log("Bar", `Widget loading complete: ${loaded}/${total} loaded, ${failed} failed`)
+      }
     }
 
-    // Track widget loading status
+    // Initialize widget loading tracking
-    property int totalWidgets: 0
+    Component.onCompleted: {
-    property int loadedWidgets: 0
-    property int failedWidgets: 0
-
-    // Log widget loading summary
-    function logWidgetLoadingSummary() {
       const allWidgets = [
         ...Settings.data.bar.widgets.left,
         ...Settings.data.bar.widgets.center,
         ...Settings.data.bar.widgets.right
       ]
-      
+      widgetLoader.initializeLoading(allWidgets)
-      totalWidgets = allWidgets.length
-      loadedWidgets = 0
-      failedWidgets = 0
-      
-      if (totalWidgets > 0) {
-        Logger.log("Bar", `Attempting to load ${totalWidgets} widgets`)
-      }
-    }
-
-    function onWidgetLoaded() {
-      loadedWidgets++
-      if (loadedWidgets + failedWidgets === totalWidgets) {
-        Logger.log("Bar", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
-      }
-    }
-
-    function onWidgetFailed() {
-      failedWidgets++
-      if (loadedWidgets + failedWidgets === totalWidgets) {
-        Logger.log("Bar", `Loaded ${loadedWidgets}/${totalWidgets} widgets`)
-      }
     }