[vlc-commits] Qt: enable tearOff on Navigation and Bookmarks menus.

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun 22 17:05:43 2011 +0200| [7bfa2a8a0ad0cccc1e012e7e590a9af87dfeff31] | committer: Francois Cartegnie

Qt: enable tearOff on Navigation and Bookmarks menus.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7bfa2a8a0ad0cccc1e012e7e590a9af87dfeff31
---

 modules/gui/qt4/menus.cpp |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index be893ae..221f35e 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -281,11 +281,13 @@ static inline void addAction( QMenu *_menu, QVariant val, QString title ) {
 }
 
 // Add an action with a submenu
-static inline void addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
+static inline QMenu *addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
     QAction *_action = new QAction( title, _menu );
+    QMenu *_submenu = new QMenu( _menu );
     _action->setData( val );
-    _action->setMenu( new QMenu( _menu ) );
+    _action->setMenu( _submenu );
     _menu->addAction( _action );
+    return _submenu;
 }
 
 // Add an action that is a checkbox
@@ -671,14 +673,17 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
 QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
 {
     QAction *action;
+    QMenu *submenu;
 
     addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
     addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
-    addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+    submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+    submenu->setTearOffEnabled( true );
     addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
 
     /* FixMe: sync I_MENU_BOOKMARK string */
-    QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+    submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+    submenu->setTearOffEnabled( true );
     addDPStaticEntry( submenu, qtr( "&Manage" ), "",
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
     submenu->addSeparator();