Qt4 - Unification of Hotkeys for Sprefs et Adv Preferences.

modules/gui/qt4/components/preferences_widgets.cpp

@@ -1016,7 +1016,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
     }
     else
     {
-        l->addWidget( keyContainer, 0, 0, 1, 2 );
+        l->addWidget( keyContainer, line, 0, 1, 2 );
     }
     CONNECT( clearButton, clicked(), shortcutValue, clear() );
     BUTTONACT( setButton, setTheKey() );

modules/gui/qt4/components/preferences_widgets.hpp

@@ -451,7 +451,6 @@ private:
     QTreeWidget *table;
     KeyShortcutEdit *shortcutValue;
     QList<module_config_t *> values;
-    //QWidget *parent;
 private slots:
     void setTheKey();
     void selectKey( QTreeWidgetItem * = NULL );

modules/gui/qt4/components/simple_preferences.cpp

@@ -420,9 +420,22 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
         END_SPREFS_CAT;
 
-        START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
-        //FIMXE
-        END_SPREFS_CAT;
+        case SPrefsHotkeys:
+        {
+            p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-fullscreen" );
+
+            QGridLayout *gLayout = new QGridLayout;
+            panel->setLayout( gLayout );
+            int line = 0;
+
+            KeySelectorControl *ksCtrl =
+                        new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
+                                                this, gLayout, line );
+
+            panel_label->setText( qtr( "Configure Hotkeys" ) );
+
+            break;
+        }
     }
 
     panel_layout->addWidget( panel_label );