Qt4 - Hotkeys, correct some unicode problem and change the default behaviour.

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 466597d87bed08a7a7bf46e563a976f7e45cf918..be376ee19ec9d83e25610f0cecb3ec00c1f74c76 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1130,13 +1130,14 @@ KeyInputDialog::KeyInputDialog( QList<module_config_t*>& _values,
     l->addWidget( selected , Qt::AlignCenter );
     l->addWidget( warning, Qt::AlignCenter );
 
-    QDialogButtonBox *buttonBox = new QDialogButtonBox;
+    buttonBox = new QDialogButtonBox;
     QPushButton *ok = new QPushButton( qtr("OK") );
     QPushButton *cancel = new QPushButton( qtr("Cancel") );
     buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
     buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );
 
     l->addWidget( buttonBox );
+    buttonBox->hide();
 
     CONNECT( buttonBox, accepted(), this, accept() );
     CONNECT( buttonBox, rejected(), this, reject() );
@@ -1146,6 +1147,7 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
 {
     conflicts = false;
     module_config_t *p_current = NULL;
+    /* Search for conflicts */
     foreach( p_current, values )
     {
         if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
@@ -1155,13 +1157,15 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
             break;
         }
     }
+
     if( conflicts )
     {
         warning->setText(
           qtr("Warning: the  key is already assigned to \"") +
-          QString( p_current->psz_text ) + "\"" );
+          qfu( p_current->psz_text ) + "\"" );
+        buttonBox->hide();
     }
-    else warning->setText( "" );
+    else accept();
 }
 
 void KeyInputDialog::keyPressEvent( QKeyEvent *e )