From a28bdff5986161bc5e762c6d29540e6d384a825f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 17 Jun 2008 01:25:29 +0200 Subject: [PATCH] Qt menus: use addDPStaticEntry and add a static Subtitles Loader in popup Signed-off-by: Jean-Baptiste Kempf --- modules/gui/qt4/menus.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 0a5dbd0593..6e14039800 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -479,9 +479,8 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); action = current->addMenu( submenu ); action->setData( "spu-es" ); - action = submenu->addAction( qfu( "Load File..." ), THEDP, - SLOT( loadSubtitlesFile() ) ); - action->setData( "_static_" ); + addDPStaticEntry( submenu, qtr( "Load File..." ), "", "", + SLOT( loadSubtitlesFile() ) ); ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) ); ACT_ADD( current, "zoom", qtr( "&Zoom" ) ); @@ -608,8 +607,6 @@ QMenu *QVLCMenu::HelpMenu( QMenu *current ) return menu; } -#undef ACT_ADD - /***************************************************************************** * Popup menus - Right Click menus * *****************************************************************************/ @@ -805,10 +802,18 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) action->setEnabled( false ); /* Video menu */ + submenu = new QMenu(); + ACT_ADD( submenu, "video-es", qtr( "Video Track" ) ); + QMenu *subsubmenu = new QMenu( qtr( "&Subtitles Track" ), submenu ); + addDPStaticEntry( subsubmenu, qtr( "Load File..." ), "", "", + SLOT( loadSubtitlesFile() ) ); + action = submenu->addMenu( subsubmenu ); + action->setData( "spu-es" ); + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); if( p_vout ) vlc_object_release( p_vout ); - submenu = Populate( p_intf, NULL, varnames, objects ); + Populate( p_intf, submenu, varnames, objects ); varnames.clear(); objects.clear(); action = menu->addMenu( submenu ); action->setText( qtr( "Video" ) ); @@ -854,6 +859,8 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } } +#undef ACT_ADD + /************************************************************************ * Systray Menu * ************************************************************************/ -- 2.39.2