X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=f409ee25771a42add426f96e2f1ed180a0a7a718;hb=cacd39b8661a299781bbeb4c888a36d4a47215ca;hp=5b40b3142d0d4f605b91ac8f6e81a2ec0f8bcf88;hpb=3ede77e483e385fadd70b36906f6cb58199a7cd6;p=vlc

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 5b40b3142d..f409ee2577 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -27,31 +27,23 @@
  * Todo:
  *  - Finish implementation (see WX)
  *  - Improvements over WX
- *      - Password field implementation (through "pwd" bool param
  *      - Validator for modulelist
- *  - Implement update stuff using a general Updated signal
  */
 
 #include "components/preferences_widgets.hpp"
 #include "util/customwidgets.hpp"
-#include "qt4.hpp"
 
-#include <QLineEdit>
+#include <vlc_keys.h>
+
 #include <QString>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
 #include <QVariant>
-#include <QComboBox>
 #include <QGridLayout>
-#include <QPushButton>
 #include <QSlider>
 #include <QFileDialog>
 #include <QFontDialog>
 #include <QGroupBox>
-
-#include <vlc_keys.h>
-
-
+#include <QTreeWidgetItem>
+#include <QSignalMapper>
 QString formatTooltip(const QString & tooltip)
 {
     QString formatted =
@@ -79,7 +71,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
                                              QGridLayout *l, int &line )
 {
     ConfigControl *p_control = NULL;
-    if( p_item->psz_current ) return NULL;
+    if( p_item->psz_current || p_item->b_unsaveable ) return NULL;
 
     switch( p_item->i_type )
     {
@@ -107,6 +99,14 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
             p_control = new StringListConfigControl( p_this, p_item,
                                             parent, false, l, line );
         break;
+    case CONFIG_ITEM_PASSWORD:
+        if( !p_item->i_list )
+            p_control = new StringConfigControl( p_this, p_item, parent,
+                                                 l, line, true );
+        else
+            p_control = new StringListConfigControl( p_this, p_item,
+                                            parent, true, l, line );
+        break;
     case CONFIG_ITEM_INTEGER:
         if( p_item->i_list )
             p_control = new IntegerListConfigControl( p_this, p_item,
@@ -197,8 +197,9 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
                                           int &line, bool pwd ) :
                            VStringConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     text = new QLineEdit( qfu(p_item->value.psz) );
+    if( pwd ) text->setEchoMode( QLineEdit::Password );
     finish();
 
     if( !l )
@@ -226,9 +227,9 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
 void StringConfigControl::finish()
 {
     text->setText( qfu(p_item->value.psz) );
-    text->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 /*********** File **************/
@@ -238,7 +239,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
                                           int &line, bool pwd ) :
                            VStringConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     text = new QLineEdit( qfu(p_item->value.psz) );
     browse = new QPushButton( qtr( "Browse..." ) );
     QHBoxLayout *textAndButton = new QHBoxLayout();
@@ -291,9 +292,9 @@ void FileConfigControl::updateField()
 void FileConfigControl::finish()
 {
     text->setText( qfu(p_item->value.psz) );
-    text->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 /********* String / Directory **********/
@@ -348,7 +349,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
                QGridLayout *l, int &line) :
                VStringConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     combo = new QComboBox();
     finish( bycat );
     if( !l )
@@ -362,6 +363,42 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
         l->addWidget( label, line, 0 );
         l->addWidget( combo, line, 1, Qt::AlignRight );
     }
+
+    if( p_item->i_action )
+    {
+        QSignalMapper *signalMapper = new QSignalMapper(this);
+
+        /* Some stringLists like Capture listings have action associated */
+        for( int i = 0; i < p_item->i_action; i++ )
+        {
+            QPushButton *button =
+                new QPushButton( qfu( p_item->ppsz_action_text[i] ));
+            CONNECT( button, clicked(), signalMapper, map() );
+            signalMapper->setMapping( button, i );
+            l->addWidget( button, line, 2 + i, Qt::AlignRight );
+        }
+        CONNECT( signalMapper, mapped( int ),
+                this, actionRequested( int ) );
+    }
+}
+
+void StringListConfigControl::actionRequested( int i_action )
+{
+    /* Supplementary check for boundaries */
+    if( i_action < 0 || i_action >= p_item->i_action ) return;
+
+    vlc_value_t val;
+    val.psz_string = qtu( (combo->itemData( combo->currentIndex() ).toString() ) );
+
+    p_item->ppf_action[i_action]( p_this, getName(), val, val, 0 );
+
+    if( p_item->b_dirty )
+    {
+        combo->clear();
+        finish( true );
+        p_item->b_dirty = VLC_FALSE;
+
+    }
 }
 StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
                 module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
@@ -386,9 +423,9 @@ void StringListConfigControl::finish( bool bycat )
                                           p_item->ppsz_list[i_index] ) )
             combo->setCurrentIndex( combo->count() - 1 );
     }
-    combo->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 QString StringListConfigControl::getValue()
@@ -396,13 +433,33 @@ QString StringListConfigControl::getValue()
     return combo->itemData( combo->currentIndex() ).toString();
 }
 
+void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
+                        QComboBox *combo, QWidget *parent )
+{
+    module_config_t *p_config =
+                      config_FindConfig( VLC_OBJECT(p_intf), configname );
+    if( p_config )
+    {
+        for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
+        {
+            combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
+                    QVariant( p_config->pi_list[i_index] ) );
+            if( p_config->value.i == p_config->pi_list[i_index] )
+            {
+                combo->setCurrentIndex( i_index );
+            }
+        }
+        combo->setToolTip( qfu( p_config->psz_longtext ) );
+    }
+}
+
 /********* Module **********/
 ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
                module_config_t *_p_item, QWidget *_parent, bool bycat,
                QGridLayout *l, int &line) :
                VStringConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     combo = new QComboBox();
     finish( bycat );
     if( !l )
@@ -417,6 +474,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
         l->addWidget( combo, line, 1, Qt::AlignRight );
     }
 }
+
 ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
                 module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
                 bool bycat ) : VStringConfigControl( _p_this, _p_item )
@@ -442,7 +500,7 @@ void ModuleConfigControl::finish( bool bycat )
 
         if( bycat )
         {
-            if( !strcmp( p_parser->psz_object_name, "main" ) ) continue;
+            if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
 
             for (size_t i = 0; i < p_parser->confsize; i++)
             {
@@ -450,26 +508,26 @@ void ModuleConfigControl::finish( bool bycat )
                 /* Hack: required subcategory is stored in i_min */
                 if( p_config->i_type == CONFIG_SUBCATEGORY &&
                     p_config->value.i == p_item->min.i )
-                    combo->addItem( qfu(p_parser->psz_longname),
-                                    QVariant( p_parser->psz_object_name ) );
+                    combo->addItem( qtr( module_GetLongName( p_parser )),
+                                    QVariant( module_GetObjName( p_parser ) ) );
                 if( p_item->value.psz && !strcmp( p_item->value.psz,
-                                                  p_parser->psz_object_name) )
+                                                  module_GetObjName( p_parser ) ) )
                     combo->setCurrentIndex( combo->count() - 1 );
             }
         }
-        else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
+        else if( module_IsCapable( p_parser, p_item->psz_type ) )
         {
-            combo->addItem( qfu(p_parser->psz_longname),
-                            QVariant( p_parser->psz_object_name ) );
+            combo->addItem( qtr(module_GetLongName( p_parser ) ),
+                            QVariant( module_GetObjName( p_parser ) ) );
             if( p_item->value.psz && !strcmp( p_item->value.psz,
-                                              p_parser->psz_object_name) )
+                                              module_GetObjName( p_parser ) ) )
                 combo->setCurrentIndex( combo->count() - 1 );
         }
     }
     vlc_list_release( p_list );
-    combo->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 QString ModuleConfigControl::getValue()
@@ -479,21 +537,21 @@ QString ModuleConfigControl::getValue()
 
 /********* Module list **********/
 ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
-               module_config_t *_p_item, QWidget *_parent, bool bycat,
-               QGridLayout *l, int &line) :
-               VStringConfigControl( _p_this, _p_item, _parent )
+        module_config_t *_p_item, QWidget *_parent, bool bycat,
+        QGridLayout *l, int &line) :
+    VStringConfigControl( _p_this, _p_item, _parent )
 {
-    groupBox = new QGroupBox ( qfu(p_item->psz_text) );
+    groupBox = new QGroupBox ( qtr(p_item->psz_text) );
     text = new QLineEdit();
     QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
 
     finish( bycat );
 
     int boxline = 0;
-    for( QVector<QCheckBox*>::iterator it = modules.begin();
-         it != modules.end(); it++ )
+    for( QVector<checkBoxListItem*>::iterator it = modules.begin();
+            it != modules.end(); it++ )
     {
-        layoutGroupBox->addWidget( *it, boxline++, 0 );
+        layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 );
     }
     layoutGroupBox->addWidget( text, boxline, 0 );
 
@@ -507,22 +565,14 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
     {
         l->addWidget( groupBox, line, 0, 1, -1 );
     }
+
+    text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) );
 }
-#if 0
-ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
-                module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
-                bool bycat ) : VStringConfigControl( _p_this, _p_item )
-{
-    combo = _combo;
-    label = _label;
-    finish( bycat );
-}
-#endif
 
 ModuleListConfigControl::~ModuleListConfigControl()
 {
-    for( QVector<QCheckBox*>::iterator it = modules.begin();
-         it != modules.end(); it++ )
+    for( QVector<checkBoxListItem*>::iterator it = modules.begin();
+            it != modules.end(); it++ )
     {
         delete *it;
     }
@@ -530,6 +580,25 @@ ModuleListConfigControl::~ModuleListConfigControl()
     delete text;
 }
 
+#define CHECKBOX_LISTS \
+{ \
+       QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\
+       checkBoxListItem *cbl = new checkBoxListItem; \
+\
+       CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\
+       cb->setToolTip( formatTooltip( qtr( module_GetLongName( p_parser ))));\
+       cbl->checkBox = cb; \
+\
+       int i = -1; \
+       while( p_parser->pp_shortcuts[++i] != NULL); \
+       i--; \
+\
+       cbl->psz_module = strdup( i>=0?p_parser->pp_shortcuts[i] \
+                                 : module_GetObjName( p_parser ) ); \
+       modules.push_back( cbl ); \
+}
+
+
 void ModuleListConfigControl::finish( bool bycat )
 {
     vlc_list_t *p_list;
@@ -543,38 +612,30 @@ void ModuleListConfigControl::finish( bool bycat )
 
         if( bycat )
         {
-            if( !strcmp( p_parser->psz_object_name, "main" ) ) continue;
+            if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
 
             for (size_t i = 0; i < p_parser->confsize; i++)
             {
                 module_config_t *p_config = p_parser->p_config + i;
                 /* Hack: required subcategory is stored in i_min */
                 if( p_config->i_type == CONFIG_SUBCATEGORY &&
-                    p_config->value.i == p_item->min.i )
+                        p_config->value.i == p_item->min.i )
                 {
-                    QCheckBox *cb =
-                        new QCheckBox( qfu( p_parser->psz_object_name ) );
-                    CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );
-                    cb->setToolTip(
-                            formatTooltip( qfu(p_parser->psz_longname)) );
-                    modules.push_back( cb );
+                    CHECKBOX_LISTS;
                 }
             }
         }
-        else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
+        else if( module_IsCapable( p_parser, p_item->psz_type ) )
         {
-            QCheckBox *cb =
-                new QCheckBox( qfu( p_parser->psz_object_name ) );
-                    CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );
-            cb->setToolTip( formatTooltip(qfu(p_parser->psz_longname)) );
-            modules.push_back( cb );
+            CHECKBOX_LISTS;
         }
     }
     vlc_list_release( p_list );
-    text->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( groupBox )
-        groupBox->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
+#undef CHECKBOX_LISTS
 
 QString ModuleListConfigControl::getValue()
 {
@@ -583,20 +644,20 @@ QString ModuleListConfigControl::getValue()
 
 void ModuleListConfigControl::hide()
 {
-    for( QVector<QCheckBox*>::iterator it = modules.begin();
+    for( QVector<checkBoxListItem*>::iterator it = modules.begin();
          it != modules.end(); it++ )
     {
-        (*it)->hide();
+        (*it)->checkBox->hide();
     }
     groupBox->hide();
 }
 
 void ModuleListConfigControl::show()
 {
-    for( QVector<QCheckBox*>::iterator it = modules.begin();
+    for( QVector<checkBoxListItem*>::iterator it = modules.begin();
          it != modules.end(); it++ )
     {
-        (*it)->show();
+        (*it)->checkBox->show();
     }
     groupBox->show();
 }
@@ -607,19 +668,19 @@ void ModuleListConfigControl::onUpdate( int value )
     text->clear();
     bool first = true;
 
-    for( QVector<QCheckBox*>::iterator it = modules.begin();
+    for( QVector<checkBoxListItem*>::iterator it = modules.begin();
          it != modules.end(); it++ )
     {
-        if( (*it)->isChecked() )
+        if( (*it)->checkBox->isChecked() )
         {
             if( first )
             {
-                text->setText( text->text() + (*it)->text() );
+                text->setText( text->text() + (*it)->psz_module );
                 first = false;
             }
             else
             {
-                text->setText( text->text() + ":" + (*it)->text() );
+                text->setText( text->text() + ":" + (*it)->psz_module );
             }
         }
     }
@@ -636,7 +697,7 @@ IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this,
                                             int &line ) :
                            VIntConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     spin = new QSpinBox; spin->setMinimumWidth( 80 );
     spin->setAlignment( Qt::AlignRight );
     spin->setMaximumWidth( 90 );
@@ -669,9 +730,9 @@ void IntegerConfigControl::finish()
     spin->setMaximum( 2000000000 );
     spin->setMinimum( -2000000000 );
     spin->setValue( p_item->value.i );
-    spin->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 int IntegerConfigControl::getValue()
@@ -714,9 +775,9 @@ IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl(
     slider->setMaximum( p_item->max.i );
     slider->setMinimum( p_item->min.i );
     slider->setValue( p_item->value.i );
-    slider->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    slider->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 int IntegerRangeSliderConfigControl::getValue()
@@ -731,7 +792,7 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
                QGridLayout *l, int &line) :
                VIntConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     combo = new QComboBox();
     finish( bycat );
     if( !l )
@@ -761,14 +822,14 @@ void IntegerListConfigControl::finish( bool bycat )
 
     for( int i_index = 0; i_index < p_item->i_list; i_index++ )
     {
-        combo->addItem( qfu(p_item->ppsz_list_text[i_index] ),
+        combo->addItem( qtr(p_item->ppsz_list_text[i_index] ),
                         QVariant( p_item->pi_list[i_index] ) );
         if( p_item->value.i == p_item->pi_list[i_index] )
             combo->setCurrentIndex( combo->count() - 1 );
     }
-    combo->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 int IntegerListConfigControl::getValue()
@@ -783,7 +844,7 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
                                       int &line ) :
                     VIntConfigControl( _p_this, _p_item, _parent )
 {
-    checkbox = new QCheckBox( qfu(p_item->psz_text) );
+    checkbox = new QCheckBox( qtr(p_item->psz_text) );
     finish();
 
     if( !l )
@@ -812,7 +873,7 @@ void BoolConfigControl::finish()
 {
     checkbox->setCheckState( p_item->value.i == VLC_TRUE ? Qt::Checked
                                                         : Qt::Unchecked );
-    checkbox->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 int BoolConfigControl::getValue()
@@ -831,7 +892,7 @@ FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
                                         int &line ) :
                     VFloatConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
+    label = new QLabel( qtr(p_item->psz_text) );
     spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 );
     spin->setMaximumWidth( 90 );
     spin->setAlignment( Qt::AlignRight );
@@ -867,9 +928,9 @@ void FloatConfigControl::finish()
     spin->setMinimum( -2000000000. );
     spin->setSingleStep( 0.1 );
     spin->setValue( (double)p_item->value.f );
-    spin->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+    spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 float FloatConfigControl::getValue()
@@ -933,7 +994,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
 void KeySelectorControl::finish()
 {
     if( label )
-        label->setToolTip( formatTooltip(qfu(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 
     /* Fill the table */
     table->setColumnCount( 2 );
@@ -950,7 +1011,7 @@ void KeySelectorControl::finish()
             strstr( p_item->psz_name , "key-" ) )
         {
             QTreeWidgetItem *treeItem = new QTreeWidgetItem();
-            treeItem->setText( 0, qfu( p_item->psz_text ) );
+            treeItem->setText( 0, qtr( p_item->psz_text ) );
             treeItem->setText( 1, VLCKeyToString( p_item->value.i ) );
             treeItem->setData( 0, Qt::UserRole,
                                   QVariant::fromValue( (void*)p_item ) );
@@ -981,6 +1042,8 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
                 QTreeWidgetItem *it = table->topLevelItem(i);
                 module_config_t *p_item = static_cast<module_config_t*>
                               (it->data( 0, Qt::UserRole ).value<void*>());
+                if( p_keyItem != p_item && p_item->value.i == d->keyValue )
+                    p_item->value.i = 0;
                 it->setText( 1, VLCKeyToString( p_item->value.i ) );
             }
         }
@@ -1035,7 +1098,6 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
         if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
                                                     keyToChange ) )
         {
-            p_current->value.i = 0;
             conflicts = true;
             break;
         }