Skip to content

V
vlc-gpu
Commit fd1baec6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: menus, document.

parent 2399e630
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/gui/qt4/menus.cpp
View file @ fd1baec6
...@@ -842,22 +842,26 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) ...@@ -842,22 +842,26 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
menu->addSeparator(); menu->addSeparator();
/* Input menu */
vlc_object_hold( p_input ); vlc_object_hold( p_input );
InputAutoMenuBuilder( p_input, objects, varnames ); InputAutoMenuBuilder( p_input, objects, varnames );
vlc_object_release( p_input ); vlc_object_release( p_input );
/* Audio menu */
submenu = new QMenu( menu ); submenu = new QMenu( menu );
action = menu->addMenu( AudioMenu( p_intf, submenu ) ); action = menu->addMenu( AudioMenu( p_intf, submenu ) );
action->setText( qtr( "&Audio" ) ); action->setText( qtr( "&Audio" ) );
if( action->menu()->isEmpty() ) if( action->menu()->isEmpty() )
action->setEnabled( false ); action->setEnabled( false );
/* Video menu */
submenu = new QMenu( menu ); submenu = new QMenu( menu );
action = menu->addMenu( VideoMenu( p_intf, submenu ) ); action = menu->addMenu( VideoMenu( p_intf, submenu ) );
action->setText( qtr( "&Video" ) ); action->setText( qtr( "&Video" ) );
if( action->menu()->isEmpty() ) if( action->menu()->isEmpty() )
action->setEnabled( false ); action->setEnabled( false );
/* Playback menu for chapters */
submenu = new QMenu( menu ); submenu = new QMenu( menu );
action = menu->addMenu( NavigMenu( p_intf, submenu ) ); action = menu->addMenu( NavigMenu( p_intf, submenu ) );
action->setText( qtr( "&Playback" ) ); action->setText( qtr( "&Playback" ) );
...@@ -904,13 +908,12 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) ...@@ -904,13 +908,12 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
vlc_object_release( p_object ); vlc_object_release( p_object );
} }
else else
{
msg_Dbg( p_intf, "could not find parent interface" ); msg_Dbg( p_intf, "could not find parent interface" );
} }
}
menu->addMenu( submenu ); menu->addMenu( submenu );
} }
/* Static entries for ending, like open */
PopupMenuStaticEntries( menu ); PopupMenuStaticEntries( menu );
p_intf->p_sys->p_popup_menu = menu; p_intf->p_sys->p_popup_menu = menu;
......
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