Skip to content

V
vlc
Commit 197578bb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt menus: SD go in the media menu as on Mac.

parent ba41cc1a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/gui/qt4/menus.cpp
View file @ 197578bb
...@@ -184,8 +184,8 @@ static int InputAutoMenuBuilder( input_thread_t *p_object, ...@@ -184,8 +184,8 @@ static int InputAutoMenuBuilder( input_thread_t *p_object,
PUSH_VAR( "bookmark" ); PUSH_VAR( "bookmark" );
PUSH_VAR( "title" ); PUSH_VAR( "title" );
PUSH_VAR( "chapter" ); PUSH_VAR( "chapter" );
PUSH_VAR( "program" );
PUSH_VAR( "navigation" ); PUSH_VAR( "navigation" );
PUSH_VAR( "program" );
PUSH_VAR( "dvd_menus" ); PUSH_VAR( "dvd_menus" );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -334,6 +334,8 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) ...@@ -334,6 +334,8 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
updateRecents( p_intf ); updateRecents( p_intf );
menu->addMenu( recentsMenu ); menu->addMenu( recentsMenu );
menu->addSeparator(); menu->addSeparator();
menu->addMenu( SDMenu( p_intf, menu ) );
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ), addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
"Ctrl+Y" ); "Ctrl+Y" );
...@@ -411,8 +413,6 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, ...@@ -411,8 +413,6 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
act->setData( true ); act->setData( true );
} }
act = menu->addMenu( SDMenu( p_intf, menu ) );
act->setData( true );
/*menu->addSeparator(); /*menu->addSeparator();
menu->addAction( qtr( "Undock from Interface" ), mi, menu->addAction( qtr( "Undock from Interface" ), mi,
SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/ SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/
...@@ -608,8 +608,8 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) ...@@ -608,8 +608,8 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) ); ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) );
ACT_ADD( menu, "title", qtr( "T&itle" ) ); ACT_ADD( menu, "title", qtr( "T&itle" ) );
ACT_ADD( menu, "chapter", qtr( "&Chapter" ) ); ACT_ADD( menu, "chapter", qtr( "&Chapter" ) );
ACT_ADD( menu, "program", qtr( "&Program" ) );
ACT_ADD( menu, "navigation", qtr( "&Navigation" ) ); ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
ACT_ADD( menu, "program", qtr( "&Program" ) );
} }
input_thread_t *p_object; input_thread_t *p_object;
......
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