vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 7 18:08:45 2011 +0100| [fda57ab50f7207863b92f5f9dc0472306bdbefc8] | committer: Francois Cartegnie
Qt: Bookmarks are custom and playback only related
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fda57ab50f7207863b92f5f9dc0472306bdbefc8
---
modules/gui/qt4/menus.cpp | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 8528a31..209ad74 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -381,8 +381,6 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
":/menu/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
- addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ),"",
- SLOT( bookmarksDialog() ), "Ctrl+B" );
#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ),
"Ctrl+W" );
@@ -670,18 +668,19 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
QAction *action;
- QMenu *submenu = new QMenu( qtr( "&Bookmarks" ), menu );
- addDPStaticEntry( submenu, qtr( "Manage &bookmarks" ), "",
- SLOT( bookmarksDialog() ) );
- submenu->addSeparator();
- action = menu->addMenu( submenu );
- action->setData( "bookmark" );
-
ACT_ADDMENU( menu, "title", qtr( "T&itle" ) );
ACT_ADDMENU( menu, "chapter", qtr( "&Chapter" ) );
ACT_ADDMENU( menu, "navigation", qtr( "&Navigation" ) );
ACT_ADDMENU( menu, "program", qtr( "&Program" ) );
+ /* FixMe: sync I_MENU_BOOKMARK string */
+ QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ addDPStaticEntry( submenu, qtr( "&Manage" ), "",
+ SLOT( bookmarksDialog() ), "Ctrl+B" );
+ submenu->addSeparator();
+ action = menu->addMenu( submenu );
+ action->setData( "bookmark" );
+
menu->addSeparator();
PopupMenuPlaylistControlEntries( menu, p_intf );
PopupMenuControlEntries( menu, p_intf );