Commit 0f0e2e4d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent 7ac20417
...@@ -1164,7 +1164,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, ...@@ -1164,7 +1164,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
gLayout->addWidget( shortcutValue, 3, 1, 1, 2 ); gLayout->addWidget( shortcutValue, 3, 1, 1, 2 );
gLayout->addWidget( setButton, 3, 3, 1, 1 ); 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(), shortcutValue, clear() );
CONNECT( clearButton, clicked(), this, setTheKey() ); CONNECT( clearButton, clicked(), this, setTheKey() );
......
...@@ -552,10 +552,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -552,10 +552,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
panel->setLayout( gLayout ); panel->setLayout( gLayout );
int line = 0; int line = 0;
panel_label->setText( qtr( "Configure Hotkeys" ) );
control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config , control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
this, gLayout, line ); 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 ); controls.append( control );
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment