lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2095 from spiros132/main

Browse Source 
feat(desktop-widgets): Better desktopWidgetSettings for plugins, and fixed a bug related to the desktopWidgetSettings
This commit is contained in:
Lemmy
2026-03-07 13:15:43 -05:00
committed by GitHub
parent 5f2020151c 46b149cb94
commit 88f95c82e3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/DesktopWidgets/DraggableDesktopWidget.qml
+1 -1
View File
@@ -302,7 +302,7 @@ Item {
if (DesktopWidgetRegistry.isPluginWidget(widgetId)) {
var pluginId = widgetId.replace("plugin:", "");
var manifest = PluginRegistry.getPluginManifest(pluginId);
hasSettings = manifest && manifest.entryPoints && manifest.entryPoints.settings;
hasSettings = manifest && manifest.entryPoints && (manifest.entryPoints.settings || manifest.entryPoints.desktopWidgetSettings);
} else {
hasSettings = DesktopWidgetRegistry.widgetSettingsMap[widgetId] !== undefined;
}
Modules/Panels/Settings/DesktopWidgets/DesktopWidgetSettingsDialog.qml
+10 -2
View File
@@ -186,10 +186,18 @@ Popup {
if (manifest && manifest.entryPoints && manifest.entryPoints.desktopWidgetSettings) {
settingsPath = "file://" + pluginDir + "/" + manifest.entryPoints.desktopWidgetSettings;
var widgetSettings = {};
widgetSettings.data = widgetData || {};
widgetSettings.metadata = DesktopWidgetRegistry.widgetMetadata[widgetId] || {};
widgetSettings.save = function () {
var newSettings = Object.assign({}, widgetSettings.data);
root.settingsCache = newSettings;
saveTimer.start();
};
settingsLoader.setSource(settingsPath + "?v=" + loadVersion, {
"pluginApi": api,
"widgetData": widgetData || {},
"widgetMetadata": DesktopWidgetRegistry.widgetMetadata[widgetId]
"widgetSettings": widgetSettings
});
} else {
Logger.w("DesktopWidgetSettingsDialog", "Plugin does not have desktop widget settings:", pluginId);