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

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index aa37f123a5d42ea1aa155c329b441dbedecad121..388053ff8af76b8292bcd01f8148808cc8c82eaa 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -423,7 +423,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
     BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
 
     controlLayout->setColumnStretch( 7 , 2 );
-    
+
     /*
      * Other first Line buttons
      * Might need to be inside a frame to avoid a few resizing pb
@@ -449,7 +449,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
     controlLayout->addWidget( extSettingsButton, 3, 12 );
 
     controlLayout->setColumnStretch( 14, 5 );
-    
+
     /* Volume */
     VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
 

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 )

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 45315bc572d681324b8f1e02a681c1fb65409245..1b9ff8173e7ed8e97f677c275598cc63b3c28c50 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -50,6 +50,7 @@ class QTreeWidget;
 class QTreeWidgetItem;
 class QGroupBox;
 class QGridLayout;
+class QDialogButtonBox;
 
 class ConfigControl : public QObject
 {
@@ -423,6 +424,7 @@ private:
     QLabel *warning;
     const char * keyToChange;
     QList<module_config_t*> values;
+    QDialogButtonBox *buttonBox;
 };
 
 class KeyShortcutEdit: public QLineEdit