launcher: built-in plugins, add settings search plugin with ? default

trigger

quickshell/Services/AppSearchService.qml

@@ -42,64 +42,179 @@ Singleton {
         _cachedCategories = null;
     }
 
-    readonly property var coreApps: [
-        {
-            name: I18n.tr("DMS"),
-            icon: "svg:../assets/danklogo2.svg",
-            comment: I18n.tr("Settings"),
-            action: "ipc:settings",
-            categories: ["Settings", "System"],
-            isCore: true
-        },
-        {
-            name: I18n.tr("DMS"),
-            icon: "material:description",
-            comment: I18n.tr("Notepad"),
-            action: "ipc:notepad",
-            categories: ["Office", "Utility"],
-            isCore: true
-        },
-        {
-            name: I18n.tr("DMS"),
-            icon: "material:monitor_heart",
-            comment: I18n.tr("System Monitor"),
-            action: "ipc:processlist",
-            categories: ["System", "Monitor"],
-            isCore: true
+    readonly property string dmsLogoPath: Qt.resolvedUrl("../assets/danklogo2.svg")
+
+    readonly property var builtInPlugins: ({
+            "dms_settings": {
+                id: "dms_settings",
+                name: I18n.tr("Settings", "settings window title"),
+                icon: "svg+corner:" + dmsLogoPath + "|settings",
+                cornerIcon: "settings",
+                comment: "DMS",
+                action: "ipc:settings",
+                categories: ["Settings", "System"],
+                defaultTrigger: "",
+                isLauncher: false
+            },
+            "dms_notepad": {
+                id: "dms_notepad",
+                name: I18n.tr("Notepad", "Notepad"),
+                icon: "svg+corner:" + dmsLogoPath + "|description",
+                cornerIcon: "description",
+                comment: "DMS",
+                action: "ipc:notepad",
+                categories: ["Office", "Utility"],
+                defaultTrigger: "",
+                isLauncher: false
+            },
+            "dms_sysmon": {
+                id: "dms_sysmon",
+                name: I18n.tr("System Monitor", "sysmon window title"),
+                icon: "svg+corner:" + dmsLogoPath + "|monitor_heart",
+                cornerIcon: "monitor_heart",
+                comment: "DMS",
+                action: "ipc:processlist",
+                categories: ["System", "Monitor"],
+                defaultTrigger: "",
+                isLauncher: false
+            },
+            "dms_settings_search": {
+                id: "dms_settings_search",
+                name: I18n.tr("Settings", "settings window title"),
+                cornerIcon: "search",
+                comment: "DMS",
+                defaultTrigger: "?",
+                isLauncher: true
+            }
+        })
+
+    function getBuiltInPluginTrigger(pluginId) {
+        const plugin = builtInPlugins[pluginId];
+        if (!plugin)
+            return null;
+        return SettingsData.getBuiltInPluginSetting(pluginId, "trigger", plugin.defaultTrigger);
+    }
+
+    readonly property var coreApps: {
+        SettingsData.builtInPluginSettings;
+        const apps = [];
+        for (const pluginId in builtInPlugins) {
+            if (!SettingsData.getBuiltInPluginSetting(pluginId, "enabled", true))
+                continue;
+            const plugin = builtInPlugins[pluginId];
+            if (plugin.isLauncher)
+                continue;
+            apps.push({
+                name: plugin.name,
+                icon: plugin.icon,
+                comment: plugin.comment,
+                action: plugin.action,
+                categories: plugin.categories,
+                isCore: true,
+                builtInPluginId: pluginId
+            });
         }
-    ]
+        return apps;
+    }
+
+    function getBuiltInLauncherPlugins() {
+        const result = {};
+        for (const pluginId in builtInPlugins) {
+            const plugin = builtInPlugins[pluginId];
+            if (!plugin.isLauncher)
+                continue;
+            if (!SettingsData.getBuiltInPluginSetting(pluginId, "enabled", true))
+                continue;
+            result[pluginId] = plugin;
+        }
+        return result;
+    }
+
+    function getBuiltInLauncherTriggers() {
+        const triggers = {};
+        const launchers = getBuiltInLauncherPlugins();
+        for (const pluginId in launchers) {
+            const trigger = getBuiltInPluginTrigger(pluginId);
+            if (trigger && trigger.trim() !== "")
+                triggers[trigger] = pluginId;
+        }
+        return triggers;
+    }
+
+    function getBuiltInLauncherPluginsWithEmptyTrigger() {
+        const result = [];
+        const launchers = getBuiltInLauncherPlugins();
+        for (const pluginId in launchers) {
+            const trigger = getBuiltInPluginTrigger(pluginId);
+            if (!trigger || trigger.trim() === "")
+                result.push(pluginId);
+        }
+        return result;
+    }
+
+    function getBuiltInLauncherItems(pluginId, query) {
+        if (pluginId !== "dms_settings_search")
+            return [];
+
+        SettingsSearchService.search(query);
+        const results = SettingsSearchService.results;
+        const items = [];
+        for (let i = 0; i < results.length; i++) {
+            const r = results[i];
+            items.push({
+                name: r.label,
+                icon: "material:" + r.icon,
+                comment: r.category,
+                action: "settings_nav:" + r.tabIndex + ":" + r.section,
+                categories: ["Settings"],
+                isCore: true,
+                isBuiltInLauncher: true,
+                builtInPluginId: pluginId
+            });
+        }
+        return items;
+    }
+
+    function executeBuiltInLauncherItem(item) {
+        if (!item?.action)
+            return false;
+
+        const parts = item.action.split(":");
+        if (parts[0] !== "settings_nav")
+            return false;
+
+        const tabIndex = parseInt(parts[1]);
+        const section = parts.slice(2).join(":");
+        SettingsSearchService.navigateToSection(section);
+        PopoutService.openSettingsWithTabIndex(tabIndex);
+        return true;
+    }
 
     function getCoreApps(query) {
-        if (!query || query.length === 0) {
+        if (!query || query.length === 0)
             return coreApps;
-        }
-
         const lowerQuery = query.toLowerCase();
-        return coreApps.filter(app => {
-            return app.name.toLowerCase().includes(lowerQuery) || app.comment.toLowerCase().includes(lowerQuery);
-        });
+        return coreApps.filter(app => app.name.toLowerCase().includes(lowerQuery) || app.comment.toLowerCase().includes(lowerQuery));
     }
 
     function executeCoreApp(app) {
-        if (!app || !app.action) {
+        if (!app?.action)
             return false;
-        }
 
-        const actionParts = app.action.split(":");
-        const actionType = actionParts[0];
-        const actionTarget = actionParts[1];
+        const parts = app.action.split(":");
+        if (parts[0] !== "ipc")
+            return false;
 
-        if (actionType === "ipc") {
-            if (actionTarget === "settings") {
-                PopoutService.focusOrToggleSettings();
-                return true;
-            } else if (actionTarget === "notepad") {
-                PopoutService.toggleNotepad();
-                return true;
-            } else if (actionTarget === "processlist") {
-                PopoutService.toggleProcessListModal();
-                return true;
-            }
+        switch (parts[1]) {
+        case "settings":
+            PopoutService.focusOrToggleSettings();
+            return true;
+        case "notepad":
+            PopoutService.openNotepad();
+            return true;
+        case "processlist":
+            PopoutService.showProcessListModal();
+            return true;
         }
         return false;
     }

quickshell/Services/PopoutService.qml

@@ -202,6 +202,7 @@ Singleton {
     property bool _settingsWantsToggle: false
 
     property string _settingsPendingTab: ""
+    property int _settingsPendingTabIndex: -1
 
     function openSettings() {
         if (settingsModal) {
@@ -226,6 +227,19 @@ Singleton {
         }
     }
 
+    function openSettingsWithTabIndex(tabIndex: int) {
+        if (settingsModal) {
+            settingsModal.showWithTab(tabIndex);
+            return;
+        }
+        if (settingsModalLoader) {
+            _settingsPendingTabIndex = tabIndex;
+            _settingsWantsOpen = true;
+            _settingsWantsToggle = false;
+            settingsModalLoader.activeAsync = true;
+        }
+    }
+
     function closeSettings() {
         settingsModal?.close();
     }
@@ -303,7 +317,10 @@ Singleton {
     function _onSettingsModalLoaded() {
         if (_settingsWantsOpen) {
             _settingsWantsOpen = false;
-            if (_settingsPendingTab) {
+            if (_settingsPendingTabIndex >= 0) {
+                settingsModal?.showWithTab(_settingsPendingTabIndex);
+                _settingsPendingTabIndex = -1;
+            } else if (_settingsPendingTab) {
                 settingsModal?.showWithTabName(_settingsPendingTab);
                 _settingsPendingTab = "";
             } else {
@@ -313,7 +330,10 @@ Singleton {
         }
         if (_settingsWantsToggle) {
             _settingsWantsToggle = false;
-            if (_settingsPendingTab) {
+            if (_settingsPendingTabIndex >= 0) {
+                settingsModal.currentTabIndex = _settingsPendingTabIndex;
+                _settingsPendingTabIndex = -1;
+            } else if (_settingsPendingTab) {
                 var idx = settingsModal?.resolveTabIndex(_settingsPendingTab) ?? -1;
                 if (idx >= 0)
                     settingsModal.currentTabIndex = idx;
@@ -358,10 +378,12 @@ Singleton {
     }
 
     function showProcessListModal() {
-        if (processListModalLoader) {
+        if (processListModal) {
+            processListModal.show();
+        } else if (processListModalLoader) {
             processListModalLoader.active = true;
+            Qt.callLater(() => processListModal?.show());
         }
-        processListModal?.show();
     }
 
     function hideProcessListModal() {
@@ -369,10 +391,12 @@ Singleton {
     }
 
     function toggleProcessListModal() {
-        if (processListModalLoader) {
+        if (processListModal) {
+            processListModal.toggle();
+        } else if (processListModalLoader) {
             processListModalLoader.active = true;
+            Qt.callLater(() => processListModal?.show());
         }
-        processListModal?.toggle();
     }
 
     function showColorPicker() {