feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mac: Allow searching for e.g. Cmd+E in shortcut settings.

Browse Source 
The tree view shows the fancy special characters for the modifier keys,
so it's not possible to filter for them.

Change-Id: I3f0cab24afe8ccb9a95300e91eb1bc45a0e4313a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Eike Ziller
2012-05-22 15:14:22 +02:00
parent 611ed2f251
commit f6eefeb1d8
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/actionmanager/commandmappings.cpp
View File

@@ -169,8 +169,22 @@ bool CommandMappings::filter(const QString &filterString, QTreeWidgetItem *item)
{ {
bool visible = filterString.isEmpty(); bool visible = filterString.isEmpty();
int columnCount = item->columnCount(); int columnCount = item->columnCount();
for (int i = 0; !visible && i < columnCount; ++i) for (int i = 0; !visible && i < columnCount; ++i) {
visible |= (bool)item->text(i).contains(filterString, Qt::CaseInsensitive); QString text = item->text(i);
#ifdef Q_OS_MAC
// accept e.g. Cmd+E in the filter. the text shows special fancy characters for Cmd
if (i == columnCount - 1) {
QKeySequence key = QKeySequence::fromString(text, QKeySequence::NativeText);
if (!key.isEmpty()) {
text = key.toString(QKeySequence::PortableText);
text.replace(QLatin1String("Ctrl"), QLatin1String("Cmd"));
text.replace(QLatin1String("Meta"), QLatin1String("Ctrl"));
text.replace(QLatin1String("Alt"), QLatin1String("Opt"));
}
}
#endif
visible |= (bool)text.contains(filterString, Qt::CaseInsensitive);
}
int childCount = item->childCount(); int childCount = item->childCount();
if (childCount > 0) { if (childCount > 0) {