From cddaacc6c6fb2abf7fdfc77a2f01243c4bafd50f Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 6 Oct 2022 12:04:39 +0200
Subject: [PATCH] Core: show shortcuts in LocatorFiltersFilter

Change-Id: I700128ac2366ff78310dc5be6dbcc8953c2c2a5b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/locator/locatorfiltersfilter.cpp | 7 +++++++
 src/plugins/coreplugin/locator/locatorfiltersfilter.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index 665290687e2..26e71064514 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -9,6 +9,8 @@
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 
+#include <actionmanager/actionmanager.h>
+
 using namespace Core;
 using namespace Core::Internal;
 
@@ -45,6 +47,10 @@ void LocatorFiltersFilter::prepareSearch(const QString &entry)
             m_filterShortcutStrings.append(filter->shortcutString());
             m_filterDisplayNames.append(filter->displayName());
             m_filterDescriptions.append(filter->description());
+            QString keyboardShortcut;
+            if (auto command = ActionManager::command(filter->actionId()))
+                keyboardShortcut = command->keySequence().toString(QKeySequence::NativeText);
+            m_filterKeyboardShortcuts.append(keyboardShortcut);
         }
     }
 }
@@ -62,6 +68,7 @@ QList<LocatorFilterEntry> LocatorFiltersFilter::matchesFor(QFutureInterface<Loca
                                 m_icon);
         filterEntry.extraInfo = m_filterDisplayNames.at(i);
         filterEntry.toolTip = m_filterDescriptions.at(i);
+        filterEntry.displayExtra = m_filterKeyboardShortcuts.at(i);
         entries.append(filterEntry);
     }
     return entries;
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
index a58463b0fe5..54687ff3ec7 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
@@ -34,6 +34,7 @@ private:
     QStringList m_filterShortcutStrings;
     QStringList m_filterDisplayNames;
     QStringList m_filterDescriptions;
+    QStringList m_filterKeyboardShortcuts;
     QIcon m_icon;
 };