[vlc-devel] commit: Qt: Add the hotkeys-mousewheel configuration to simple preferences. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 23 21:39:47 2009 +0100| [0f0e2e4db97b945967b204018c88a55bc0665a32] | committer: Jean-Baptiste Kempf 

Qt: Add the hotkeys-mousewheel configuration to simple preferences.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0f0e2e4db97b945967b204018c88a55bc0665a32
---

 modules/gui/qt4/components/preferences_widgets.cpp |    2 +-
 modules/gui/qt4/components/simple_preferences.cpp  |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 1adcb1c..036ecc9 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1164,7 +1164,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
     gLayout->addWidget( shortcutValue, 3, 1, 1, 2 );
     gLayout->addWidget( setButton, 3, 3, 1, 1 );
 
-    l->addWidget( keyContainer, line, 0, 1, 2 );
+    l->addWidget( keyContainer, line, 0, 1, -1 );
 
     CONNECT( clearButton, clicked(), shortcutValue, clear() );
     CONNECT( clearButton, clicked(), this, setTheKey() );
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index f8e4a17..9281a64 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -552,10 +552,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             panel->setLayout( gLayout );
             int line = 0;
 
+            panel_label->setText( qtr( "Configure Hotkeys" ) );
             control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
                                                 this, gLayout, line );
+            controls.append( control );
 
-            panel_label->setText( qtr( "Configure Hotkeys" ) );
+            line++;
+            p_config = config_FindConfig( VLC_OBJECT(p_intf), "hotkeys-mousewheel-mode" );
+            control = new IntegerListConfigControl( VLC_OBJECT(p_intf),
+                    p_config, false, this, gLayout, line );
             controls.append( control );
 
             break;