forked from qt-creator/qt-creator
Core: show shortcuts in LocatorFiltersFilter
Change-Id: I700128ac2366ff78310dc5be6dbcc8953c2c2a5b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -9,6 +9,8 @@
|
|||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/utilsicons.h>
|
#include <utils/utilsicons.h>
|
||||||
|
|
||||||
|
#include <actionmanager/actionmanager.h>
|
||||||
|
|
||||||
using namespace Core;
|
using namespace Core;
|
||||||
using namespace Core::Internal;
|
using namespace Core::Internal;
|
||||||
|
|
||||||
@@ -45,6 +47,10 @@ void LocatorFiltersFilter::prepareSearch(const QString &entry)
|
|||||||
m_filterShortcutStrings.append(filter->shortcutString());
|
m_filterShortcutStrings.append(filter->shortcutString());
|
||||||
m_filterDisplayNames.append(filter->displayName());
|
m_filterDisplayNames.append(filter->displayName());
|
||||||
m_filterDescriptions.append(filter->description());
|
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);
|
m_icon);
|
||||||
filterEntry.extraInfo = m_filterDisplayNames.at(i);
|
filterEntry.extraInfo = m_filterDisplayNames.at(i);
|
||||||
filterEntry.toolTip = m_filterDescriptions.at(i);
|
filterEntry.toolTip = m_filterDescriptions.at(i);
|
||||||
|
filterEntry.displayExtra = m_filterKeyboardShortcuts.at(i);
|
||||||
entries.append(filterEntry);
|
entries.append(filterEntry);
|
||||||
}
|
}
|
||||||
return entries;
|
return entries;
|
||||||
|
@@ -34,6 +34,7 @@ private:
|
|||||||
QStringList m_filterShortcutStrings;
|
QStringList m_filterShortcutStrings;
|
||||||
QStringList m_filterDisplayNames;
|
QStringList m_filterDisplayNames;
|
||||||
QStringList m_filterDescriptions;
|
QStringList m_filterDescriptions;
|
||||||
|
QStringList m_filterKeyboardShortcuts;
|
||||||
QIcon m_icon;
|
QIcon m_icon;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user