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

Shortcut dialogs: Make it possible to use Accel Keyboard Shortcuts

Browse Source 
Fixes: QTCREATORBUG-810

Reviewed-By: con
This commit is contained in:
Daniel Molkentin
2010-03-17 15:46:24 +01:00
parent f2ce73bfe3
commit 51568b5974
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -116,8 +116,6 @@ void ShortcutSettings::finish()
bool ShortcutSettings::eventFilter(QObject *o, QEvent *e) bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
{ {
Q_UNUSED(o)
if ( e->type() == QEvent::KeyPress ) { if ( e->type() == QEvent::KeyPress ) {
QKeyEvent *k = static_cast<QKeyEvent*>(e); QKeyEvent *k = static_cast<QKeyEvent*>(e);
handleKeyEvent(k); handleKeyEvent(k);
@@ -125,9 +123,15 @@ bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
} }
if ( e->type() == QEvent::Shortcut || if ( e->type() == QEvent::Shortcut ||
e->type() == QEvent::ShortcutOverride || e->type() == QEvent::KeyRelease ) {
e->type() == QEvent::KeyRelease )
return true; return true;
}
if (e->type() == QEvent::ShortcutOverride) {
// for shortcut overrides, we need to accept as well
e->accept();
return true;
}
return false; return false;
} }