]> git.sesse.net Git - vlc/commitdiff
Do previous commit in a better way.
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 17 Jan 2008 09:00:34 +0000 (09:00 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 17 Jan 2008 09:00:34 +0000 (09:00 +0000)
modules/gui/qt4/components/preferences_widgets.cpp

index 3a3675062eb04abfb1e35d0b484b7b31232bd959..d957344a91399566ab12d4f9cdead333e6aef47a 100644 (file)
@@ -1205,7 +1205,12 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
 void KeyInputDialog::keyPressEvent( QKeyEvent *e )
 {
     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 );
     selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
     checkForConflicts( i_vlck );