From dfc3bd9535cf6d55824baa1db5bf9ed952267339 Mon Sep 17 00:00:00 2001
From: Lemmy <studio@quadbyte.net>
Date: Sun, 29 Mar 2026 19:39:56 -0400
Subject: [PATCH] fix(plugins): fixed desktopWidget settings vs plugin settings

---
 .../Settings/Tabs/DesktopWidgetsTab.qml       |  3 +-
 Widgets/NPluginSettingsPopup.qml              |  5 ++-
 Widgets/NSectionEditor.qml                    | 40 ++++++++++++++-----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml b/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml
index ae1fa10e7..97075242b 100644
--- a/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml
+++ b/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml
@@ -109,7 +109,8 @@ ColumnLayout {
         onRemoveWidget: (section, index) => _removeWidgetFromMonitor(modelData.name, index)
         onMoveWidget: (fromSection, index, toSection) => _moveWidgetToMonitor(fromSection, index, toSection)
         onUpdateWidgetSettings: (section, index, settings) => _updateWidgetSettingsForMonitor(modelData.name, index, settings)
-        onOpenPluginSettingsRequested: manifest => pluginSettingsDialog.openPluginSettings(manifest)
+        pluginSettingsEntryPoints: ["desktopWidgetSettings", "settings"]
+        onOpenPluginSettingsRequested: (manifest, entryPoint) => pluginSettingsDialog.openPluginSettings(manifest, entryPoint)
       }
     }
   }
diff --git a/Widgets/NPluginSettingsPopup.qml b/Widgets/NPluginSettingsPopup.qml
index e39463d70..50886816d 100644
--- a/Widgets/NPluginSettingsPopup.qml
+++ b/Widgets/NPluginSettingsPopup.qml
@@ -121,7 +121,7 @@ Popup {
     currentPluginApi = null;
   }
 
-  function openPluginSettings(pluginManifest) {
+  function openPluginSettings(pluginManifest, settingsEntryPoint) {
     currentPlugin = pluginManifest;
 
     // Use composite key if available (for custom plugins), otherwise use manifest ID (for official plugins)
@@ -138,7 +138,8 @@ Popup {
 
     // Get plugin directory
     var pluginDir = PluginRegistry.getPluginDir(pluginId);
-    var settingsPath = pluginDir + "/" + pluginManifest.entryPoints.settings;
+    var settingsEntry = settingsEntryPoint ? pluginManifest.entryPoints[settingsEntryPoint] : pluginManifest.entryPoints.settings;
+    var settingsPath = pluginDir + "/" + settingsEntry;
 
     settingsLoader.setSource("file://" + settingsPath, {
                                "pluginApi": currentPluginApi
diff --git a/Widgets/NSectionEditor.qml b/Widgets/NSectionEditor.qml
index 944719988..f2045460d 100644
--- a/Widgets/NSectionEditor.qml
+++ b/Widgets/NSectionEditor.qml
@@ -39,6 +39,7 @@ NBox {
     return "arrow-right"; // Default fallback icon
   }
 
+  property var pluginSettingsEntryPoints: ["settings"]
   property var widgetRegistry: null
   property string settingsDialogComponent: "invalid-settings-dialog"
   property var screen: null // Screen reference for per-screen widget settings
@@ -117,7 +118,7 @@ NBox {
   signal moveWidget(string fromSection, int index, string toSection)
   signal dragPotentialStarted
   signal dragPotentialEnded
-  signal openPluginSettingsRequested(var pluginManifest)
+  signal openPluginSettingsRequested(var pluginManifest, string settingsEntryPoint)
 
   color: Color.mSurface
   Layout.fillWidth: true
@@ -199,7 +200,13 @@ NBox {
     if (root.widgetRegistry && root.widgetRegistry.isPluginWidget(widgetId)) {
       var pluginId = widgetId.replace("plugin:", "");
       var manifest = PluginRegistry.getPluginManifest(pluginId);
-      return manifest?.entryPoints?.settings !== undefined;
+      if (!manifest?.entryPoints)
+        return false;
+      for (var i = 0; i < root.pluginSettingsEntryPoints.length; i++) {
+        if (manifest.entryPoints[root.pluginSettingsEntryPoints[i]] !== undefined)
+          return true;
+      }
+      return false;
     }
 
     // Check if it's a core widget with user settings
@@ -212,23 +219,38 @@ NBox {
 
   // Open settings for a widget
   function openWidgetSettings(index, widgetData) {
-    // Check if this is a plugin widget
+    // Check if this is a plugin widget with a generic "settings" entry point
     var isPlugin = root.widgetRegistry && root.widgetRegistry.isPluginWidget(widgetData.id);
 
     if (isPlugin) {
-      // Handle plugin settings - emit signal for parent to handle
       var pluginId = widgetData.id.replace("plugin:", "");
       var manifest = PluginRegistry.getPluginManifest(pluginId);
 
-      if (!manifest || !manifest.entryPoints?.settings) {
+      var settingsKey = null;
+      if (manifest?.entryPoints) {
+        for (var i = 0; i < root.pluginSettingsEntryPoints.length; i++) {
+          if (manifest.entryPoints[root.pluginSettingsEntryPoints[i]] !== undefined) {
+            settingsKey = root.pluginSettingsEntryPoints[i];
+            break;
+          }
+        }
+      }
+      if (!manifest || !settingsKey) {
         Logger.e("NSectionEditor", "Plugin settings not found for:", pluginId);
         return;
       }
 
-      // Emit signal to request opening plugin settings
-      root.openPluginSettingsRequested(manifest);
-    } else {
-      // Handle core widget settings
+      // "desktopWidgetSettings" is handled by the settingsDialogComponent
+      // (DesktopWidgetSettingsDialog) which passes widgetSettings/save properly.
+      // Only generic "settings" goes through the plugin settings popup.
+      if (settingsKey !== "desktopWidgetSettings") {
+        root.openPluginSettingsRequested(manifest, settingsKey);
+        return;
+      }
+    }
+
+    // Handle core widgets and plugin desktop widget settings
+    {
       var component = Qt.createComponent(Qt.resolvedUrl(root.settingsDialogComponent));
 
       function instantiateAndOpen() {