Skip to content

V
vlc-1.1
Commit 6c8ee7e1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Do previous commit in a better way.

parent 03a9b9cb
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
modules/gui/qt4/components/preferences_widgets.cpp
View file @ 6c8ee7e1
...@@ -1205,7 +1205,12 @@ void KeyInputDialog::checkForConflicts( int i_vlckey ) ...@@ -1205,7 +1205,12 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
void KeyInputDialog::keyPressEvent( QKeyEvent *e ) void KeyInputDialog::keyPressEvent( QKeyEvent *e )
{ {
if( e->key() == Qt::Key_Tab || if( e->key() == Qt::Key_Tab ||
( e->modifiers() > 0 && e->modifiers() != Qt::KeypadModifier ) ) return; e->key() == Qt::Key_Shift ||
e->key() == Qt::Key_Control ||
e->key() == Qt::Key_Meta ||
e->key() == Qt::Key_Alt ||
e->key() == Qt::Key_AltGr )
return;
int i_vlck = qtEventToVLCKey( e ); int i_vlck = qtEventToVLCKey( e );
selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) ); selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
checkForConflicts( i_vlck ); checkForConflicts( i_vlck );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment