vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Sep 28 22:43:25 2013 +0200| [d56da1224dd818b76aacaa08c7a35977cb4c9106] | committer: Jean-Baptiste Kempf
Qt: fix subtitle popup menu > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d56da1224dd818b76aacaa08c7a35977cb4c9106 --- modules/gui/qt4/menus.cpp | 12 +++++++----- modules/gui/qt4/menus.hpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 6e10bcb..59804ea 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -626,13 +626,13 @@ QMenu *VLCMenuBar::AudioMenu( intf_thread_t *p_intf, QMenu * current ) } /* Subtitles */ -QMenu *VLCMenuBar::SubtitleMenu( intf_thread_t *p_intf, QMenu *current ) +QMenu *VLCMenuBar::SubtitleMenu( intf_thread_t *p_intf, QMenu *current, bool b_popup ) { input_thread_t *p_input; QVector<vlc_object_t *> objects; QVector<const char *> varnames; - if( current->isEmpty() ) + if( current->isEmpty() || b_popup ) { addDPStaticEntry( current, qtr( "Add &Subtitle File..." ), "", SLOT( loadSubtitlesFile() ) ); @@ -1046,9 +1046,11 @@ void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show ) if( action->menu()->isEmpty() ) action->setEnabled( false ); - submenu = SubtitleMenu( p_intf, menu ); - submenu->setTitle( qtr( "Subti&tle") ); - UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true ); + /* Subtitles menu */ + submenu = new QMenu( menu ); + action = menu->addMenu( SubtitleMenu( p_intf, submenu, true ) ); + action->setText( qtr( "Subti&tle") ); + UpdateItem( p_intf, submenu, "spu-es", VLC_OBJECT(p_input), true ); /* Playback menu for chapters */ submenu = new QMenu( menu ); diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp index 6d5e006..3b39c7b 100644 --- a/modules/gui/qt4/menus.hpp +++ b/modules/gui/qt4/menus.hpp @@ -122,7 +122,7 @@ private: static QMenu *VideoMenu( intf_thread_t *p_intf, QWidget *parent ) { return VideoMenu( p_intf, new QMenu( parent ) ); } - static QMenu *SubtitleMenu( intf_thread_t *, QMenu *current); + static QMenu *SubtitleMenu( intf_thread_t *, QMenu *current, bool b_popup = false ); static QMenu *SubtitleMenu( intf_thread_t *p_intf, QWidget *parent) { return SubtitleMenu( p_intf, new QMenu( parent ) ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
