X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=0f08e26d3ce38826b853f477091f9c3eee5ac743;hb=5b41c88864e2e6cb57cc9d37ca8ba35263827063;hp=2174813c486d6f4df2851ec171e5b10af4138172;hpb=92a4720a62666e8bfdcc565e802c6fdaf0e70980;p=vlc

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 2174813c48..0f08e26d3c 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -25,32 +25,27 @@
 
 /**
  * Todo:
- *  - Finish implementation (see WX)
+ *  - Finish implementation (see WX, there might be missing a
+ *    i_action handler for IntegerLists, but I don't see any module using it...
  *  - 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>
+#include <QDialogButtonBox>
 
 QString formatTooltip(const QString & tooltip)
 {
@@ -79,7 +74,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 +102,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 +200,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 +230,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 +242,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 +295,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,8 +352,9 @@ 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();
+    combo->setMinimumWidth( 80 );
     finish( bycat );
     if( !l )
     {
@@ -362,6 +367,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 +427,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,14 +437,35 @@ 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();
+    combo->setMinimumWidth( 80 );
     finish( bycat );
     if( !l )
     {
@@ -417,6 +479,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 +505,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 +513,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()
@@ -483,7 +546,7 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
         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 );
 
@@ -508,18 +571,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
         l->addWidget( groupBox, line, 0, 1, -1 );
     }
 
-    text->setToolTip( formatTooltip( qfu( p_item->psz_longtext) ) );
+    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()
 {
@@ -534,11 +587,11 @@ ModuleListConfigControl::~ModuleListConfigControl()
 
 #define CHECKBOX_LISTS \
 { \
-       QCheckBox *cb = new QCheckBox( qfu( p_parser->psz_longname ) );\
+       QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\
        checkBoxListItem *cbl = new checkBoxListItem; \
 \
        CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\
-       cb->setToolTip( formatTooltip( qfu(p_parser->psz_longname)) );\
+       cb->setToolTip( formatTooltip( qtr( module_GetLongName( p_parser ))));\
        cbl->checkBox = cb; \
 \
        int i = -1; \
@@ -546,7 +599,7 @@ ModuleListConfigControl::~ModuleListConfigControl()
        i--; \
 \
        cbl->psz_module = strdup( i>=0?p_parser->pp_shortcuts[i] \
-                                 : p_parser->psz_object_name ); \
+                                 : module_GetObjName( p_parser ) ); \
        modules.push_back( cbl ); \
 }
 
@@ -564,7 +617,7 @@ 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++)
             {
@@ -577,15 +630,15 @@ void ModuleListConfigControl::finish( bool bycat )
                 }
             }
         }
-        else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
+        else if( module_IsCapable( p_parser, p_item->psz_type ) )
         {
             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
 
@@ -649,7 +702,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 );
@@ -682,9 +735,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()
@@ -727,9 +780,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()
@@ -744,8 +797,9 @@ 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();
+    combo->setMinimumWidth( 80 );
     finish( bycat );
     if( !l )
     {
@@ -774,14 +828,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()
@@ -796,7 +850,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 )
@@ -825,7 +879,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()
@@ -844,8 +898,9 @@ FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
                                         int &line ) :
                     VFloatConfigControl( _p_this, _p_item, _parent )
 {
-    label = new QLabel( qfu(p_item->psz_text) );
-    spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 );
+    label = new QLabel( qtr(p_item->psz_text) );
+    spin = new QDoubleSpinBox; 
+    spin->setMinimumWidth( 80 );
     spin->setMaximumWidth( 90 );
     spin->setAlignment( Qt::AlignRight );
     finish();
@@ -880,9 +935,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()
@@ -926,27 +981,47 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
                                 ConfigControl( _p_this, _p_item, _parent )
 
 {
-    label = new QLabel( qtr("Select an action to change the associated hotkey") );
-    table = new QTreeWidget( 0 );
+    QWidget *keyContainer = new QWidget;
+    QGridLayout *gLayout = new QGridLayout( keyContainer );
+
+    label = new QLabel(
+            qtr( "Select an action to change the associated hotkey") );
+
+    /* Deactivated for now
+    QLabel *searchLabel = new QLabel( qtr( "Search" ) );
+    QLineEdit *actionSearch = new QLineEdit;*/
+
+    table = new QTreeWidget;
+    table->setColumnCount(2);
+    table->headerItem()->setText( 0, qtr( "Action" ) );
+    table->headerItem()->setText( 1, qtr( "Shortcut" ) );
+
+    shortcutValue = new KeyShortcutEdit;
+    shortcutValue->setReadOnly(true);
+
+    QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
+    QPushButton *setButton = new QPushButton( qtr( "Set" ) );
     finish();
 
-    if( !l )
-    {
-        QVBoxLayout *layout = new QVBoxLayout();
-        layout->addWidget( label, 0 ); layout->addWidget( table, 1 );
-        widget->setLayout( layout );
-    }
-    else
-    {
-        l->addWidget( label, line, 0, 1, 2 );
-        l->addWidget( table, line+1, 0, 1,2 );
-    }
+    gLayout->addWidget( label, 0, 0, 1, 4 );
+  /* deactivated for now
+    gLayout->addWidget( searchLabel, 1, 0, 1, 2 );
+    gLayout->addWidget( actionSearch, 1, 2, 1, 2 ); */
+    gLayout->addWidget( table, 2, 0, 1, 4 );
+    gLayout->addWidget( clearButton, 3, 0, 1, 1 );
+    gLayout->addWidget( shortcutValue, 3, 1, 1, 2 );
+    gLayout->addWidget( setButton, 3, 3, 1, 1 );
+
+    l->addWidget( keyContainer, line, 0, 1, 2 );
+
+    CONNECT( clearButton, clicked(), shortcutValue, clear() );
+    BUTTONACT( setButton, setTheKey() );
 }
 
 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 );
@@ -960,10 +1035,10 @@ void KeySelectorControl::finish()
         module_config_t *p_item = p_main->p_config + i;
 
         if( p_item->i_type & CONFIG_ITEM && p_item->psz_name &&
-            strstr( p_item->psz_name , "key-" ) )
+            strstr( p_item->psz_name , "key-" ) && !EMPTY_STR( p_item->psz_text ) )
         {
             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 ) );
@@ -973,16 +1048,31 @@ void KeySelectorControl::finish()
     }
     table->resizeColumnToContents( 0 );
 
+    CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
+             this, select1Key( QTreeWidgetItem * ) );
     CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
              this, selectKey( QTreeWidgetItem * ) );
+    CONNECT( shortcutValue, pressed(), this, selectKey() );
+}
+
+void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem )
+{
+    shortcutValue->setText( keyItem->text( 1 ) );
 }
 
 void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
 {
-   module_config_t *p_keyItem = static_cast<module_config_t*>
+    /* This happens when triggered by ClickEater */
+    if( keyItem == NULL ) keyItem = table->currentItem();
+
+    /* This can happen when nothing is selected on the treeView
+       and the shortcutValue is clicked */
+    if( !keyItem ) return;
+
+    module_config_t *p_keyItem = static_cast<module_config_t*>
                           (keyItem->data( 0, Qt::UserRole ).value<void*>());
 
-    KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text );
+    KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text, widget );
     d->exec();
     if( d->result() == QDialog::Accepted )
     {
@@ -994,15 +1084,22 @@ 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*>());
-                it->setText( 1, VLCKeyToString( p_item->value.i ) );
+                if( p_keyItem != p_item && p_item->value.i == d->keyValue )
+                    p_item->value.i = 0;
+                shortcutValue->setText( VLCKeyToString( p_item->value.i ) );
             }
         }
         else
-            keyItem->setText( 1, VLCKeyToString( p_keyItem->value.i ) );
+            shortcutValue->setText( VLCKeyToString( p_keyItem->value.i ) );
     }
     delete d;
 }
 
+void KeySelectorControl::setTheKey()
+{
+    table->currentItem()->setText( 1, shortcutValue->text() );
+}
+
 void KeySelectorControl::doApply()
 {
     foreach( module_config_t *p_current, values )
@@ -1012,54 +1109,59 @@ void KeySelectorControl::doApply()
 }
 
 KeyInputDialog::KeyInputDialog( QList<module_config_t*>& _values,
-                                const char * _keyToChange ) :
-                                                QDialog(0), keyValue(0)
+                                const char * _keyToChange,
+                                QWidget *_parent ) :
+                                QDialog( _parent ), keyValue(0)
 {
     setModal( true );
     values = _values;
     conflicts = false;
     keyToChange = _keyToChange;
+
     setWindowTitle( qtr( "Hotkey for " ) + qfu( keyToChange)  );
 
-    QVBoxLayout *l = new QVBoxLayout( this );
-    selected = new QLabel( qtr("Press the new keys for ")  + qfu(keyToChange) );
-    warning = new QLabel();
-    l->addWidget( selected , Qt::AlignCenter );
-    l->addWidget( warning, Qt::AlignCenter );
+    vLayout = new QVBoxLayout( this );
+    selected = new QLabel( qtr("Press the new keys for ") + qfu( keyToChange ) );
+    vLayout->addWidget( selected , Qt::AlignCenter );
 
-    QHBoxLayout *l2 = new QHBoxLayout();
+    buttonBox = new QDialogButtonBox;
     QPushButton *ok = new QPushButton( qtr("OK") );
-    l2->addWidget( ok );
     QPushButton *cancel = new QPushButton( qtr("Cancel") );
-    l2->addWidget( cancel );
+    buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
+    buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );
 
-    BUTTONACT( ok, accept() );
-    BUTTONACT( cancel, reject() );
+    vLayout->addWidget( buttonBox );
+    buttonBox->hide();
 
-    l->addLayout( l2 );
+    CONNECT( buttonBox, accepted(), this, accept() );
+    CONNECT( buttonBox, rejected(), this, reject() );
 }
 
 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,
                                                     keyToChange ) )
         {
-            p_current->value.i = 0;
             conflicts = true;
             break;
         }
     }
+
     if( conflicts )
     {
-        warning->setText(
+        QLabel *warning = new QLabel(
           qtr("Warning: the  key is already assigned to \"") +
-          QString( p_current->psz_text ) + "\"" );
+          qfu( p_current->psz_text ) + "\"" );
+        warning->setWordWrap( true );
+        vLayout->insertWidget( 1, warning );
+        buttonBox->show();
     }
-    else warning->setText( "" );
+    else accept();
 }
 
 void KeyInputDialog::keyPressEvent( QKeyEvent *e )
@@ -1078,3 +1180,8 @@ void KeyInputDialog::wheelEvent( QWheelEvent *e )
     checkForConflicts( i_vlck );
     keyValue = i_vlck;
 }
+
+void KeyShortcutEdit::mousePressEvent( QMouseEvent *)
+{
+    emit pressed();
+}