Commit 4067e7cc authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

Qt: Menus: make speed menu tearable.

Tuning playback speed is usually done through multiple actions (because
values are relative/increments). It is better to create a tear-off menu
from it. Especially true since status bar isn't enabled by default.
(cherry picked from commit 88515f20)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent f1513e90
...@@ -797,11 +797,13 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, ...@@ -797,11 +797,13 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
bool b_normal ) bool b_normal )
{ {
QAction *action; QAction *action;
QMenu *rateMenu = new QMenu( "Sp&eed" );
rateMenu->setTearOffEnabled( true );
if( b_normal ) if( b_normal )
{ {
/* Faster/Slower */ /* Faster/Slower */
action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), action = rateMenu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
SLOT( faster() ) ); SLOT( faster() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */ #ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/faster2") ); action->setIcon( QIcon( ":/toolbar/faster2") );
...@@ -809,21 +811,21 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, ...@@ -809,21 +811,21 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
action->setData( STATIC_ENTRY ); action->setData( STATIC_ENTRY );
} }
action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(), action = rateMenu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
SLOT( littlefaster() ) ); SLOT( littlefaster() ) );
action->setData( STATIC_ENTRY ); action->setData( STATIC_ENTRY );
action = menu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(), action = rateMenu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(),
SLOT( normalRate() ) ); SLOT( normalRate() ) );
action->setData( STATIC_ENTRY ); action->setData( STATIC_ENTRY );
action = menu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(), action = rateMenu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
SLOT( littleslower() ) ); SLOT( littleslower() ) );
action->setData( STATIC_ENTRY ); action->setData( STATIC_ENTRY );
if( b_normal ) if( b_normal )
{ {
action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
SLOT( slower() ) ); SLOT( slower() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */ #ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/slower2") ); action->setIcon( QIcon( ":/toolbar/slower2") );
...@@ -831,6 +833,9 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, ...@@ -831,6 +833,9 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
action->setData( STATIC_ENTRY ); action->setData( STATIC_ENTRY );
} }
action = menu->addMenu( rateMenu );
action->setData( STATIC_ENTRY );
menu->addSeparator(); menu->addSeparator();
if( !b_normal ) return; if( !b_normal ) return;
......
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