From 0acca7d2d3ae89ef4823a3710e1f170283e5cce8 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 30 Jan 2026 11:10:12 -0500 Subject: [PATCH] settings: clean the deprecated "allowUserSettings" + fix gear icon showing when plugin has no settings --- Commons/Settings.qml | 4 ++-- Modules/DesktopWidgets/DesktopWidgets.qml | 4 +--- Modules/Panels/Settings/Bar/MonitorWidgetsConfig.qml | 4 +--- Modules/Panels/Settings/Tabs/Bar/BarTab.qml | 4 +--- .../Settings/Tabs/ControlCenter/ControlCenterTab.qml | 4 +--- Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml | 4 +--- Services/UI/BarWidgetRegistry.qml | 7 +------ Widgets/NSectionEditor.qml | 2 +- 8 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 413385361..616a24d1a 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -1111,7 +1111,7 @@ Singleton { // Delete deprecated user settings from the wiget for (const k of Object.keys(widget)) { - if (k === "id" || k === "allowUserSettings") { + if (k === "id") { continue; } if (!keys.includes(k)) { @@ -1122,7 +1122,7 @@ Singleton { // Inject missing default setting (metaData) from BarWidgetRegistry for (var i = 0; i < keys.length; i++) { const k = keys[i]; - if (k === "id" || k === "allowUserSettings") { + if (k === "id") { continue; } diff --git a/Modules/DesktopWidgets/DesktopWidgets.qml b/Modules/DesktopWidgets/DesktopWidgets.qml index a4de4ecb3..40756ea2b 100644 --- a/Modules/DesktopWidgets/DesktopWidgets.qml +++ b/Modules/DesktopWidgets/DesktopWidgets.qml @@ -83,9 +83,7 @@ Variants { var metadata = DesktopWidgetRegistry.widgetMetadata[widgetId]; if (metadata) { Object.keys(metadata).forEach(function (key) { - if (key !== "allowUserSettings") { - newWidget[key] = metadata[key]; - } + newWidget[key] = metadata[key]; }); } diff --git a/Modules/Panels/Settings/Bar/MonitorWidgetsConfig.qml b/Modules/Panels/Settings/Bar/MonitorWidgetsConfig.qml index 6d3af1fbd..76b3307a6 100644 --- a/Modules/Panels/Settings/Bar/MonitorWidgetsConfig.qml +++ b/Modules/Panels/Settings/Bar/MonitorWidgetsConfig.qml @@ -44,9 +44,7 @@ NBox { var metadata = BarWidgetRegistry.widgetMetadata[widgetId]; if (metadata) { Object.keys(metadata).forEach(function (key) { - if (key !== "allowUserSettings") { - newWidget[key] = metadata[key]; - } + newWidget[key] = metadata[key]; }); } } diff --git a/Modules/Panels/Settings/Tabs/Bar/BarTab.qml b/Modules/Panels/Settings/Tabs/Bar/BarTab.qml index e5e6e6990..178920546 100644 --- a/Modules/Panels/Settings/Tabs/Bar/BarTab.qml +++ b/Modules/Panels/Settings/Tabs/Bar/BarTab.qml @@ -33,9 +33,7 @@ ColumnLayout { var metadata = BarWidgetRegistry.widgetMetadata[widgetId]; if (metadata) { Object.keys(metadata).forEach(function (key) { - if (key !== "allowUserSettings") { - newWidget[key] = metadata[key]; - } + newWidget[key] = metadata[key]; }); } } diff --git a/Modules/Panels/Settings/Tabs/ControlCenter/ControlCenterTab.qml b/Modules/Panels/Settings/Tabs/ControlCenter/ControlCenterTab.qml index 5dc561d50..9f5502ca3 100644 --- a/Modules/Panels/Settings/Tabs/ControlCenter/ControlCenterTab.qml +++ b/Modules/Panels/Settings/Tabs/ControlCenter/ControlCenterTab.qml @@ -184,9 +184,7 @@ ColumnLayout { var metadata = ControlCenterWidgetRegistry.widgetMetadata[widgetId]; if (metadata) { Object.keys(metadata).forEach(function (key) { - if (key !== "allowUserSettings") { - newWidget[key] = metadata[key]; - } + newWidget[key] = metadata[key]; }); } } diff --git a/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml b/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml index 023f01133..97de881b7 100644 --- a/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml +++ b/Modules/Panels/Settings/Tabs/DesktopWidgetsTab.qml @@ -234,9 +234,7 @@ ColumnLayout { var metadata = DesktopWidgetRegistry.widgetMetadata[widgetId]; if (metadata) { Object.keys(metadata).forEach(function (key) { - if (key !== "allowUserSettings") { - newWidget[key] = metadata[key]; - } + newWidget[key] = metadata[key]; }); } } diff --git a/Services/UI/BarWidgetRegistry.qml b/Services/UI/BarWidgetRegistry.qml index 59ffe9905..d3dc7c3c9 100644 --- a/Services/UI/BarWidgetRegistry.qml +++ b/Services/UI/BarWidgetRegistry.qml @@ -372,12 +372,7 @@ Singleton { // Helper function to check if widget has user settings function widgetHasUserSettings(id) { var meta = widgetMetadata[id]; - if (meta === undefined) - return false; - // allowUserSettings=false lets a widget opt out of the settings dialog - if (meta.allowUserSettings === false) - return false; - return true; + return (meta !== undefined); } // ------------------------------ diff --git a/Widgets/NSectionEditor.qml b/Widgets/NSectionEditor.qml index de8b15ed2..9a56b3429 100644 --- a/Widgets/NSectionEditor.qml +++ b/Widgets/NSectionEditor.qml @@ -111,7 +111,7 @@ NBox { return [Color.mPrimary, Color.mOnPrimary]; } - // Check if widget has settings (either core widget with allowUserSettings or plugin with settings entry point) + // Check if widget has settings (either core widget with metadata or plugin with settings entry point) function widgetHasSettings(widgetId) { // Check if it's a core widget with user settings if (root.widgetRegistry && root.widgetRegistry.widgetHasUserSettings(widgetId)) {