From 7a65416170baa8fd836f58b10f838c53df64cd0b Mon Sep 17 00:00:00 2001 From: Lemmy Date: Wed, 18 Mar 2026 19:16:12 -0400 Subject: [PATCH] fix(about): show noctalia-qs new version string --- Assets/settings-search-index.json | 9 +++++++++ Modules/Panels/Settings/Tabs/About/VersionSubTab.qml | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Assets/settings-search-index.json b/Assets/settings-search-index.json index 01df0cdd5..704173c5f 100644 --- a/Assets/settings-search-index.json +++ b/Assets/settings-search-index.json @@ -1899,6 +1899,15 @@ "subTab": 2, "subTabLabel": "common.history" }, + { + "labelKey": "panels.notifications.rules-label", + "descriptionKey": "panels.notifications.rules-description", + "widget": "NLabel", + "tab": 9, + "tabLabel": "common.notifications", + "subTab": 5, + "subTabLabel": "panels.notifications.rules-tab" + }, { "labelKey": "panels.notifications.sounds-unavailable-label", "descriptionKey": "panels.notifications.sounds-unavailable-description", diff --git a/Modules/Panels/Settings/Tabs/About/VersionSubTab.qml b/Modules/Panels/Settings/Tabs/About/VersionSubTab.qml index e497e02d8..7e5e82bbc 100644 --- a/Modules/Panels/Settings/Tabs/About/VersionSubTab.qml +++ b/Modules/Panels/Settings/Tabs/About/VersionSubTab.qml @@ -258,12 +258,13 @@ ColumnLayout { onExited: function (exitCode) { if (exitCode === 0) { var output = stdout.text.trim(); - // Format: "noctalia-qs 0.3.0, revision abc12345, distributed by: ..." + // Format (old): "noctalia-qs 0.3.0, revision abc12345, distributed by: ..." + // Format (new): "noctalia-qs 0.0.9 (revision b602b69c81d96a1d7c645328feb7b1e1d4b7b7a4, distributed by Unset)" // Only set if this is actually noctalia-qs; leave empty for upstream quickshell - var match = output.match(/noctalia-qs\s+(\S+),\s+revision\s*([0-9a-f]*)/i); + var match = output.match(/noctalia-qs\s+(\S+?)[\s,(]+revision\s*([0-9a-f]*)/i); if (match) { root.qsVersion = match[1]; - root.qsRevision = match[2]; + root.qsRevision = match[2] ? match[2].substring(0, 9) : ""; } } }