Commit 84c9ebfe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remember to check MI when you use it in menus.cpp that can be called by skins.

Close #1846
parent 77e50bbe
...@@ -371,6 +371,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -371,6 +371,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
} }
if( mi ) if( mi )
{ {
msg_Dbg( p_intf, "I am here" );
/* Minimal View */ /* Minimal View */
QAction *action = menu->addAction( qtr( "Mi&nimal View..." ), mi, QAction *action = menu->addAction( qtr( "Mi&nimal View..." ), mi,
SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
...@@ -837,10 +838,15 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) ...@@ -837,10 +838,15 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
if( !b_isFullscreen ) if( !b_isFullscreen )
{ {
submenu = new QMenu( qtr( "Interface" ), menu ); submenu = new QMenu( qtr( "Interface" ), menu );
if( mi )
{
submenu->addAction( QIcon( ":/playlist" ), submenu->addAction( QIcon( ":/playlist" ),
qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
}
addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "", addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
":/settings", SLOT( extendedDialog() ) ); ":/settings", SLOT( extendedDialog() ) );
if( mi )
{
action = submenu->addAction( QIcon( "" ), action = submenu->addAction( QIcon( "" ),
qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) ); qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) );
action->setCheckable( true ); action->setCheckable( true );
...@@ -851,6 +857,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) ...@@ -851,6 +857,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
mi, SLOT( toggleFullScreen() ) ); mi, SLOT( toggleFullScreen() ) );
action->setCheckable( true ); action->setCheckable( true );
action->setChecked( mi->isFullScreen() ); action->setChecked( mi->isFullScreen() );
}
menu->addMenu( submenu ); menu->addMenu( submenu );
} }
......
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