Skip to content

V
vlc-2-2
Commit 492b2bc1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: fix subtitle menu

parent e472a4a9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/gui/qt4/menus.cpp
View file @ 492b2bc1
......@@ -597,7 +597,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
}
/* Subtitles */
QMenu *QVLCMenu::SubMenu( intf_thread_t *p_intf, QMenu *current )
QMenu *QVLCMenu::SubtitleMenu( intf_thread_t *p_intf, QMenu *current )
{
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
......@@ -624,7 +624,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
{
addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
if( b_subtitle)
SubMenu( p_intf, current );
SubtitleMenu( p_intf, current );
current->addSeparator();
......@@ -982,7 +982,9 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
if( action->menu()->isEmpty() )
action->setEnabled( false );
SubMenu( p_intf, menu )->setTitle( qtr( "Subti&tle") );
submenu = SubtitleMenu( p_intf, menu );
submenu->setTitle( qtr( "Subti&tle") );
UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
/* Playback menu for chapters */
submenu = new QMenu( menu );
......
modules/gui/qt4/menus.hpp
View file @ 492b2bc1
......@@ -113,7 +113,7 @@ private:
static QMenu *VideoMenu( intf_thread_t *p_intf, QWidget *parent ) {
return VideoMenu( p_intf, new QMenu( parent ) );
}
static QMenu *SubMenu(intf_thread_t *p_intf, QMenu *current);
static QMenu *SubtitleMenu(intf_thread_t *p_intf, QMenu *current);
static QMenu *AudioMenu( intf_thread_t *, QMenu * );
static QMenu *AudioMenu( intf_thread_t *p_intf, QWidget *parent ) {
......
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