X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=197bb88e777ffa0478d8735b97fe042c4d424fed;hb=50a2677b2d7c7f675fbffa6597655c10886ae09c;hp=387f5b8e9d3ea3d07c9a06c94f301c04a105f252;hpb=55c960749e8f91763e720ac610d5dd56f90fcde1;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 387f5b8e9d..197bb88e77 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright © 2006-2009 the VideoLAN team + * Copyright © 2006-2011 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -27,20 +27,28 @@ * - Remove static currentGroup */ +#define __STDC_FORMAT_MACROS 1 +#define __STDC_CONSTANT_MACROS 1 + #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include #include -#include +#include /* vout_thread_t */ +#include /* audio_output_t */ #include "menus.hpp" -#include "main_interface.hpp" /* View modifications */ -#include "dialogs_provider.hpp" /* Dialogs display */ -#include "input_manager.hpp" /* Input Management */ -#include "recents.hpp" /* Recent Items */ -#include "actions_manager.hpp" +#include "main_interface.hpp" /* View modifications */ +#include "dialogs_provider.hpp" /* Dialogs display */ +#include "input_manager.hpp" /* Input Management */ +#include "recents.hpp" /* Recent Items */ +#include "actions_manager.hpp" /* Actions Management: play+volume */ +#include "extensions_manager.hpp" /* Extensions menu */ +#include "util/qmenuview.hpp" /* Simple Playlist menu */ +#include "components/playlist/playlist_model.hpp" /* PLModel getter */ #include #include @@ -48,15 +56,16 @@ #include #include #include -#include +#include +#include /* This file defines the main menus and the pop-up menu (right-click menu) and the systray menu (in that order in the file) - There are 3 menus that have to be rebuilt everytime there are called: - Audio, Video, Navigation - 3 functions are building those menus: AudioMenu, VideoMenu, NavigMenu + There are 4 menus that have to be rebuilt everytime there are called: + Audio, Video, Navigation, view + 4 functions are building those menus: AudioMenu, VideoMenu, NavigMenu, View and 3 functions associated are collecting the objects : InputAutoMenuBuilder, AudioAutoMenuBuilder, VideoAutoMenuBuilder. @@ -69,27 +78,28 @@ enum { - ITEM_NORMAL, - ITEM_CHECK, - ITEM_RADIO + ITEM_NORMAL, /* not a checkbox, nor a radio */ + ITEM_CHECK, /* Checkbox */ + ITEM_RADIO /* Radiobox */ }; static QActionGroup *currentGroup; QMenu *QVLCMenu::recentsMenu = NULL; -/**************************************************************************** - * Menu code helpers: - **************************************************************************** - * Add static entries to DP in menus - ***************************************************************************/ -void addDPStaticEntry( QMenu *menu, - const QString text, +/** + * @brief Add static entries to DP in menus + **/ +QAction *addDPStaticEntry( QMenu *menu, + const QString& text, const char *icon, const char *member, - const char *shortcut = NULL ) + const char *shortcut = NULL, + QAction::MenuRole = QAction::NoRole + ) { QAction *action = NULL; +#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */ if( !EMPTY_STR( icon ) ) { if( !EMPTY_STR( shortcut ) ) @@ -99,6 +109,7 @@ void addDPStaticEntry( QMenu *menu, action = menu->addAction( QIcon( icon ), text, THEDP, member ); } else +#endif { if( !EMPTY_STR( shortcut ) ) action = menu->addAction( text, THEDP, member, qtr( shortcut ) ); @@ -106,25 +117,28 @@ void addDPStaticEntry( QMenu *menu, action = menu->addAction( text, THEDP, member ); } action->setData( STATIC_ENTRY ); + return action; } -/*** - * Same for MIM - ***/ +/** + * @brief Add static entries to MIM in menus + **/ QAction* addMIMStaticEntry( intf_thread_t *p_intf, QMenu *menu, - const QString text, + const QString& text, const char *icon, const char *member, bool bStatic = false ) { QAction *action; - if( strlen( icon ) > 0 ) +#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */ + if( !EMPTY_STR( icon ) ) { action = menu->addAction( text, THEMIM, member ); action->setIcon( QIcon( icon ) ); } else +#endif { action = menu->addAction( text, THEMIM, member ); } @@ -133,15 +147,16 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf, } /** - * @brief Enable all static entries, disable the others + * @brief Enable all static entries of a menu, disable the others + * @param menu the menu in which the entries will be disabled * @param enable if false, disable all entries - */ + **/ void EnableStaticEntries( QMenu *menu, bool enable = true ) { if( !menu ) return; QList< QAction* > actions = menu->actions(); - for( int i = 0; i < actions.size(); ++i ) + for( int i = 0; i < actions.count(); ++i ) { actions[i]->setEnabled( actions[i]->data().toString() == ENTRY_ALWAYS_ENABLED || @@ -152,15 +167,15 @@ void EnableStaticEntries( QMenu *menu, bool enable = true ) /** * \return Number of static entries - */ -int DeleteNonStaticEntries( QMenu *menu ) + **/ +inline int DeleteNonStaticEntries( QMenu *menu ) { if( !menu ) return VLC_EGENERIC; int i_ret = 0; QList< QAction* > actions = menu->actions(); - for( int i = 0; i < actions.size(); ++i ) + for( int i = 0; i < actions.count(); ++i ) { if( actions[i]->data().toString() != STATIC_ENTRY ) delete actions[i]; @@ -176,7 +191,7 @@ int DeleteNonStaticEntries( QMenu *menu ) static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) { QList< QAction* > actions = menu->actions(); - for( int i = 0; i < actions.size(); ++i ) + for( int i = 0; i < actions.count(); ++i ) { if( actions[i]->data().toString() == psz_var ) return actions[i]; @@ -187,19 +202,15 @@ static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) /***************************************************************************** * Definitions of variables for the dynamic menus *****************************************************************************/ -#define PUSH_VAR( var ) varnames.push_back( var ); \ - objects.push_back( VLC_OBJECT(p_object) ) - -#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ - objects.push_back( VLC_OBJECT(p_input) ); +#define PUSH_VAR( var ) varnames.append( var ); \ + objects.append( VLC_OBJECT(p_object) ) -#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \ - objects.push_back( 0 ); varnames.push_back( "" ); \ - i_last_separator = objects.size(); } +#define PUSH_INPUTVAR( var ) varnames.append( var ); \ + objects.append( VLC_OBJECT(p_input) ); static int InputAutoMenuBuilder( input_thread_t *p_object, - vector &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); @@ -211,15 +222,16 @@ static int InputAutoMenuBuilder( input_thread_t *p_object, static int VideoAutoMenuBuilder( vout_thread_t *p_object, input_thread_t *p_input, - vector &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_INPUTVAR( "video-es" ); PUSH_INPUTVAR( "spu-es" ); PUSH_VAR( "fullscreen" ); PUSH_VAR( "video-on-top" ); + PUSH_VAR( "video-wallpaper" ); #ifdef WIN32 - PUSH_VAR( "directx-wallpaper" ); + PUSH_VAR( "direct3d-desktop" ); #endif PUSH_VAR( "video-snapshot" ); PUSH_VAR( "zoom" ); @@ -227,15 +239,16 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, PUSH_VAR( "aspect-ratio" ); PUSH_VAR( "crop" ); PUSH_VAR( "deinterlace" ); + PUSH_VAR( "deinterlace-mode" ); PUSH_VAR( "postprocess" ); return VLC_SUCCESS; } -static int AudioAutoMenuBuilder( aout_instance_t *p_object, +static int AudioAutoMenuBuilder( audio_output_t *p_object, input_thread_t *p_input, - vector &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_INPUTVAR( "audio-es" ); PUSH_VAR( "audio-channels" ); @@ -249,26 +262,43 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, * Simple Code *****************************************************************************/ -#define BAR_ADD( func, title ) { \ - QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); } +// Static menu +static inline void addMenuToMainbar( QMenu *func, QString title, QMenuBar *bar ) { + func->setTitle( title ); + bar->addMenu( func); +} +// Dynamic menu #define BAR_DADD( func, title, id ) { \ QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); \ MenuFunc *f = new MenuFunc( _menu, id ); \ CONNECT( _menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \ THEDP->menusUpdateMapper->setMapping( _menu, f ); } -#define ACT_ADD( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _menu->addAction( _action ); } +// Add a simple action +static inline void addAction( QMenu *_menu, QVariant val, QString title ) { + QAction *_action = new QAction( title, _menu ); + _action->setData( val ); + _menu->addAction( _action ); +} -#define ACT_ADDMENU( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setMenu( new QMenu( _menu ) ); _menu->addAction( _action ); } +// Add an action with a submenu +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( _submenu ); + _menu->addAction( _action ); + return _submenu; +} -#define ACT_ADDCHECK( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setCheckable( true ); _menu->addAction( _action ); } +// Add an action that is a checkbox +static inline void addActionWithCheckbox( QMenu *_menu, QVariant val, QString title ) { + QAction *_action = new QAction( title, _menu ); + _action->setData( val ); + _action->setCheckable( true ); + _menu->addAction( _action ); +} /** * Main Menu Bar Creation @@ -281,53 +311,57 @@ void QVLCMenu::createMenuBar( MainInterface *mi, setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); - BAR_ADD( FileMenu( p_intf, bar ), qtr( "&Media" ) ); + addMenuToMainbar( FileMenu( p_intf, bar, mi ), qtr( "&Media" ), bar ); /* Dynamic menus, rebuilt before being showed */ BAR_DADD( NavigMenu( p_intf, bar ), qtr( "P&layback" ), 3 ); BAR_DADD( AudioMenu( p_intf, bar ), qtr( "&Audio" ), 1 ); BAR_DADD( VideoMenu( p_intf, bar ), qtr( "&Video" ), 2 ); - BAR_ADD( ToolsMenu( bar ), qtr( "&Tools" ) ); - BAR_ADD( ViewMenu( p_intf, mi ), qtr( "V&iew" ) ); - BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) ); + addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar ); + + /* View menu, a bit different */ + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); + + addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar ); + } -#undef BAR_ADD -#undef BAR_DADD /** * Media ( File ) Menu * Opening, streaming and quit **/ -QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) +QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterface *mi ) { QMenu *menu = new QMenu( parent ); + QAction *action; - addDPStaticEntry( menu, qtr( "&Open File..." ), - ":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); - addDPStaticEntry( menu, qtr( "Advanced Open File..." ), - ":/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" ); - addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" ); + addDPStaticEntry( menu, qtr( "Open &File..." ), + ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); + addDPStaticEntry( menu, qtr( I_OP_OPDIR ), + ":/type/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" ); addDPStaticEntry( menu, qtr( "Open &Disc..." ), - ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" ); + ":/type/disc", SLOT( openDiscDialog() ), "Ctrl+D" ); addDPStaticEntry( menu, qtr( "Open &Network Stream..." ), - ":/network", SLOT( openNetDialog() ), "Ctrl+N" ); + ":/type/network", SLOT( openNetDialog() ), "Ctrl+N" ); addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), - ":/capture-card", SLOT( openCaptureDialog() ), - "Ctrl+C" ); + ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" ); + + menu->addSeparator(); + addDPStaticEntry( menu, qtr( "&Open (advanced)..." ), + ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" ); menu->addSeparator(); + addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ), NULL, SLOT( openUrlDialog() ), "Ctrl+V" ); - if( config_GetInt( p_intf, "qt-recentplay" ) ) + if( var_InheritBool( p_intf, "qt-recentplay" ) ) { - recentsMenu = new QMenu( qtr( "&Recent Media" ), menu ); + recentsMenu = new QMenu( qtr( "Open &Recent Media" ), menu ); updateRecents( p_intf ); menu->addMenu( recentsMenu ); } - menu->addMenu( SDMenu( p_intf, menu ) ); menu->addSeparator(); addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ), @@ -337,14 +371,24 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) #ifdef ENABLE_SOUT addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", SLOT( openAndTranscodingDialogs() ), "Ctrl+R" ); - addDPStaticEntry( menu, qtr( "&Streaming..." ), - ":/stream", SLOT( openAndStreamingDialogs() ), - "Ctrl+S" ); + addDPStaticEntry( menu, qtr( "&Stream..." ), + ":/menu/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" ); menu->addSeparator(); #endif + action = addMIMStaticEntry( p_intf, menu, qtr( "Quit at the end of playlist" ), "", + SLOT( activatePlayQuit( bool ) ) ); + action->setCheckable( true ); + action->setChecked( THEMIM->getPlayExitState() ); + + if( mi->getSysTray() ) + { + action = menu->addAction( qtr( "Close to systray"), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + addDPStaticEntry( menu, qtr( "&Quit" ) , - ":/quit", SLOT( quit() ), "Ctrl+Q" ); + ":/menu/quit", SLOT( quit() ), "Ctrl+Q" ); return menu; } @@ -353,119 +397,131 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) **/ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) { - addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/settings", + addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings", SLOT( extendedDialog() ), "Ctrl+E" ); - addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/settings", + addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/settings", SLOT( synchroDialog() ), "" ); - addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/info", + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/info", SLOT( mediaInfoDialog() ), "Ctrl+I" ); addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , - ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" ); + ":/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" ); #endif + addDPStaticEntry( menu, qtr( "Program Guide" ), "", SLOT( epgDialog() ), + "" ); + addDPStaticEntry( menu, qtr( I_MENU_MSG ), - ":/messages", SLOT( messagesDialog() ), - "Ctrl+M" ); + ":/menu/messages", SLOT( messagesDialog() ), "Ctrl+M" ); addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ), "", SLOT( pluginDialog() ) ); menu->addSeparator(); + addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), + ":/menu/preferences", SLOT( toolbarDialog() ) ); + addDPStaticEntry( menu, qtr( "&Preferences" ), - ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole ); return menu; } -QMenu *QVLCMenu::ToolsMenu( QWidget *parent ) -{ - return ToolsMenu( new QMenu( parent ) ); -} - /** * View Menu - * Interface Modification + * Interface modification, load other interfaces, activate Extensions + * \param current, set to NULL for menu creation, else for menu update **/ -QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, - MainInterface *mi, - bool with_intf ) +QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi ) { + QAction *action; + QMenu *menu; + + MainInterface *mi = _mi ? _mi : p_intf->p_sys->p_mi; assert( mi ); - QMenu *menu = new QMenu( qtr( "V&iew" ), mi ); + if( !current ) + { + menu = new QMenu( qtr( "&View" ), mi ); + } + else + { + menu = current; + //menu->clear(); + //HACK menu->clear() does not delete submenus + QList actions = menu->actions(); + foreach( QAction *a, actions ) + { + QMenu *m = a->menu(); + if( a->parent() == menu ) delete a; + else menu->removeAction( a ); + if( m && m->parent() == menu ) delete m; + } + } - QAction *act = menu->addAction( QIcon( ":/playlist_menu" ), + menu->addAction( +#ifndef __APPLE__ + QIcon( ":/menu/playlist_menu" ), +#endif qtr( "Play&list" ), mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); - /*menu->addSeparator(); - menu->addAction( qtr( "Undock from Interface" ), mi, - SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/ - menu->addSeparator(); - if( with_intf ) - { - QMenu *intfmenu = InterfacesMenu( p_intf, menu ); - MenuFunc *f = new MenuFunc( intfmenu, 4 ); - CONNECT( intfmenu, aboutToShow(), THEDP->menusUpdateMapper, map() ); - THEDP->menusUpdateMapper->setMapping( intfmenu, f ); - menu->addSeparator(); - } - /* Minimal View */ - QAction *action = menu->addAction( qtr( "Mi&nimal View" ) ); + action = menu->addAction( qtr( "Mi&nimal Interface" ) ); action->setShortcut( qtr( "Ctrl+H" ) ); action->setCheckable( true ); - action->setChecked( !with_intf && - (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) ); + action->setChecked( (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) ); CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) ); CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) ); /* FullScreen View */ action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, - SLOT( toggleFullScreen() ), QString( "F11" ) ); + SLOT( toggleInterfaceFullScreen() ), QString( "F11" ) ); action->setCheckable( true ); - action->setChecked( mi->isFullScreen() ); + action->setChecked( mi->isInterfaceFullScreen() ); CONNECT( mi, fullscreenInterfaceToggled( bool ), action, setChecked( bool ) ); /* Advanced Controls */ action = menu->addAction( qtr( "&Advanced Controls" ), mi, - SLOT( toggleAdvanced() ) ); + SLOT( toggleAdvancedButtons() ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) action->setChecked( true ); - if( with_intf ) - // I don't want to manage consistency between menus, so no popup-menu - { - action = menu->addAction( qtr( "Quit after Playback" ) ); - action->setCheckable( true ); - CONNECT( action, triggered( bool ), THEMIM, activatePlayQuit( bool ) ); - } + /* Docked Playlist */ + action = menu->addAction( qtr( "Docked Playlist" ) ); + action->setCheckable( true ); + action->setChecked( mi->isPlDocked() ); + CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) ); + action = menu->addAction( qtr( "Status Bar" ) ); + action->setCheckable( true ); + action->setChecked( mi->statusBar()->isVisible() ); + CONNECT( action, triggered( bool ), mi, setStatusBarVisibility( bool) ); #if 0 /* For Visualisations. Not yet working */ - adv = menu->addAction( qtr( "Visualizations selector" ), - mi, SLOT( visual() ) ); + adv = menu->addAction( qtr( "Visualizations selector" ), mi, + SLOT( visual() ) ); adv->setCheckable( true ); if( visual_selector_enabled ) adv->setChecked( true ); #endif menu->addSeparator(); - addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), - ":/preferences", SLOT( toolbarDialog() ) ); + + InterfacesMenu( p_intf, menu ); menu->addSeparator(); + /* Extensions */ + ExtensionsMenu( p_intf, menu ); + return menu; } @@ -474,32 +530,40 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, **/ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) { - vector objects; - vector varnames; - varnames.push_back( "intf-add" ); - objects.push_back( VLC_OBJECT(p_intf) ); + QVector objects; + QVector varnames; + varnames.append( "intf-add" ); + objects.append( VLC_OBJECT(p_intf) ); return Populate( p_intf, current, varnames, objects ); } /** - * Main Audio Menu + * Extensions menu: populate the current menu with extensions **/ -QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) +void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) { - vector objects; - vector varnames; - aout_instance_t *p_aout; - input_thread_t *p_input; + /* Get ExtensionsManager and load extensions if needed */ + ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf ); - if( current->isEmpty() ) + if( !var_InheritBool( p_intf, "qt-autoload-extensions") + && !extMgr->isLoaded() ) { - ACT_ADDMENU( current, "audio-es", qtr( "Audio &Track" ) ); - ACT_ADDMENU( current, "audio-channels", qtr( "Audio &Channels" ) ); - ACT_ADDMENU( current, "audio-device", qtr( "Audio &Device" ) ); - current->addSeparator(); + return; + } + + if( !extMgr->isLoaded() && !extMgr->cannotLoad() ) + { + extMgr->loadExtensions(); + } - ACT_ADDMENU( current, "visual", qtr( "&Visualizations" ) ); + /* Let the ExtensionsManager build itself the menu */ + extMenu->addSeparator(); + extMgr->menu( extMenu ); +} + +static inline void VolumeEntries( intf_thread_t *p_intf, QMenu *current ) +{ current->addSeparator(); QAction *action = current->addAction( qtr( "Increase Volume" ), @@ -511,6 +575,27 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) action = current->addAction( qtr( "Mute" ), ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) ); action->setData( STATIC_ENTRY ); +} + +/** + * Main Audio Menu + **/ +QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) +{ + QVector objects; + QVector varnames; + audio_output_t *p_aout; + input_thread_t *p_input; + + if( current->isEmpty() ) + { + addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) ); + addActionWithSubmenu( current, "audio-channels", qtr( "Audio &Channels" ) ); + addActionWithSubmenu( current, "audio-device", qtr( "Audio &Device" ) ); + current->addSeparator(); + + addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) ); + VolumeEntries( p_intf, current ); } p_input = THEMIM->getInput(); @@ -525,50 +610,63 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) return Populate( p_intf, current, varnames, objects ); } -QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QWidget *parent ) +/* Subtitles */ +QMenu *QVLCMenu::SubtitleMenu( QMenu *current ) { - return AudioMenu( p_intf, new QMenu( parent ) ); + QAction *action; + QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); + action = current->addMenu( submenu ); + action->setData( "spu-es" ); + addDPStaticEntry( submenu, qtr( "Open File..." ), "", + SLOT( loadSubtitlesFile() ) ); + submenu->addSeparator(); + return submenu; } /** * Main Video Menu * Subtitles are part of Video. **/ -QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) +QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle ) { vout_thread_t *p_vout; input_thread_t *p_input; - vector objects; - vector varnames; + QVector objects; + QVector varnames; if( current->isEmpty() ) { - ACT_ADDMENU( current, "video-es", qtr( "Video &Track" ) ); - - QAction *action; - QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); - action = current->addMenu( submenu ); - action->setData( "spu-es" ); - addDPStaticEntry( submenu, qtr( "Open File..." ), "", - SLOT( loadSubtitlesFile() ) ); - submenu->addSeparator(); + addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) ); + if( b_subtitle) + SubtitleMenu( current ); + current->addSeparator(); + /* Surface modifiers */ + addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) ); + addActionWithCheckbox( current, "autoscale", qtr( "Always Fit &Window" ) ); + addActionWithCheckbox( current, "video-on-top", qtr( "Always &on Top" ) ); +#ifdef WIN32 + addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) ); +#endif - ACT_ADDCHECK( current, "fullscreen", qtr( "&Fullscreen" ) ); - ACT_ADDCHECK( current, "video-on-top", qtr( "Always &On Top" ) ); #ifdef WIN32 - ACT_ADDCHECK( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); + addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) ); #endif - ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) ); + current->addSeparator(); + /* Size modifiers */ + addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) ); + addActionWithSubmenu( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); + addActionWithSubmenu( current, "crop", qtr( "&Crop" ) ); current->addSeparator(); + /* Rendering modifiers */ + addActionWithSubmenu( current, "deinterlace", qtr( "&Deinterlace" ) ); + addActionWithSubmenu( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) ); + addActionWithSubmenu( current, "postprocess", qtr( "&Post processing" ) ); - ACT_ADDMENU( current, "zoom", qtr( "&Zoom" ) ); - ACT_ADDCHECK( current, "autoscale", qtr( "Sca&le" ) ); - ACT_ADDMENU( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); - ACT_ADDMENU( current, "crop", qtr( "&Crop" ) ); - ACT_ADDMENU( current, "deinterlace", qtr( "&Deinterlace" ) ); - ACT_ADDMENU( current, "postprocess", qtr( "&Post processing" ) ); + current->addSeparator(); + /* Other actions */ + addAction( current, "video-snapshot", qtr( "Take &Snapshot" ) ); } p_input = THEMIM->getInput(); @@ -582,11 +680,6 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } -QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - return VideoMenu( p_intf, new QMenu( parent ) ); -} - /** * Navigation Menu * For DVD, MP4, MOV and other chapter based format @@ -594,19 +687,23 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent ) 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() ) ); + QMenu *submenu; + + addActionWithSubmenu( menu, "title", qtr( "T&itle" ) ); + addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) ); + submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) ); + submenu->setTearOffEnabled( true ); + addActionWithSubmenu( menu, "program", qtr( "&Program" ) ); + + /* FixMe: sync I_MENU_BOOKMARK string */ + submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu ); + submenu->setTearOffEnabled( true ); + addDPStaticEntry( submenu, qtr( "&Manage" ), "", + SLOT( bookmarksDialog() ), "Ctrl+B" ); 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" ) ); - menu->addSeparator(); PopupMenuPlaylistControlEntries( menu, p_intf ); PopupMenuControlEntries( menu, p_intf ); @@ -619,8 +716,8 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) { /* */ input_thread_t *p_object; - vector objects; - vector varnames; + QVector objects; + QVector varnames; /* Get the input and hold it */ p_object = THEMIM->getInput(); @@ -639,51 +736,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) return Populate( p_intf, menu, varnames, objects ); } -QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - return NavigMenu( p_intf, new QMenu( parent ) ); -} - -/** - * Service Discovery SubMenu - **/ -QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - QMenu *menu = new QMenu( parent ); - menu->setTitle( qtr( I_PL_SD ) ); - - char **ppsz_longnames; - char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames ); - if( !ppsz_names ) - return menu; - - char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames; - for( ; *ppsz_name; ppsz_name++, ppsz_longname++ ) - { - QAction *a = new QAction( qfu( *ppsz_longname ), menu ); - a->setCheckable( true ); - if( playlist_IsServicesDiscoveryLoaded( THEPL, *ppsz_name ) ) - a->setChecked( true ); - CONNECT( a, triggered(), THEDP->SDMapper, map() ); - THEDP->SDMapper->setMapping( a, QString( *ppsz_name ) ); - menu->addAction( a ); - - /* Special case for podcast */ - if( !strcmp( *ppsz_name, "podcast" ) ) - { - QAction *b = new QAction( qtr( "Configure podcasts..." ), menu ); - //b->setEnabled( a->isChecked() ); - menu->addAction( b ); - CONNECT( b, triggered(), THEDP, podcastConfigureDialog() ); - } - free( *ppsz_name ); - free( *ppsz_longname ); - } - free( ppsz_names ); - free( ppsz_longnames ); - return menu; -} - /** * Help/About Menu **/ @@ -691,14 +743,14 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent ) { QMenu *menu = new QMenu( parent ); addDPStaticEntry( menu, qtr( "&Help..." ) , - ":/help", SLOT( helpDialog() ), "F1" ); + ":/menu/help", SLOT( helpDialog() ), "F1" ); #ifdef UPDATE_CHECK addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", SLOT( updateDialog() ) ); #endif menu->addSeparator(); - addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/info", - SLOT( aboutDialog() ), "Shift+F1" ); + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info", + SLOT( aboutDialog() ), "Shift+F1", QAction::AboutRole ); return menu; } @@ -706,17 +758,18 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent ) * Popup menus - Right Click menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ - unsigned int i_last_separator = 0; \ - vector objects; \ - vector varnames; \ + static QMenu* menu = NULL; \ + delete menu; menu = NULL; \ + if( !show ) \ + return; \ + QVector objects; \ + QVector varnames; \ input_thread_t *p_input = THEMIM->getInput(); #define CREATE_POPUP \ + menu = new QMenu(); \ Populate( p_intf, menu, varnames, objects ); \ - p_intf->p_sys->p_popup_menu = menu; \ menu->popup( QCursor::pos() ); \ - p_intf->p_sys->p_popup_menu = NULL; \ - i_last_separator = 0; void QVLCMenu::PopupPlayEntries( QMenu *menu, intf_thread_t *p_intf, @@ -729,24 +782,32 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu, { action = menu->addAction( qtr( "Play" ), ActionsManager::getInstance( p_intf ), SLOT( play() ) ); - action->setIcon( QIcon( ":/play" ) ); +#ifndef __APPLE__ /* No icons in menus in Mac */ + action->setIcon( QIcon( ":/menu/play" ) ); +#endif } else { addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), - ":/pause", SLOT( togglePlayPause() ) ); + ":/menu/pause", SLOT( togglePlayPause() ) ); } } -void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) +void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, + bool b_normal ) { QAction *action; - /* Faster/Slower */ - action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), - SLOT( faster() ) ); - action->setIcon( QIcon( ":/faster") ); - action->setData( STATIC_ENTRY ); + if( b_normal ) + { + /* Faster/Slower */ + action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), + SLOT( faster() ) ); +#ifndef __APPLE__ /* No icons in menus in Mac */ + action->setIcon( QIcon( ":/toolbar/faster2") ); +#endif + action->setData( STATIC_ENTRY ); + } action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(), SLOT( littlefaster() ) ); @@ -760,21 +821,32 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) SLOT( littleslower() ) ); action->setData( STATIC_ENTRY ); - action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), - SLOT( slower() ) ); - action->setIcon( QIcon( ":/slower") ); - action->setData( STATIC_ENTRY ); + if( b_normal ) + { + action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), + SLOT( slower() ) ); +#ifndef __APPLE__ /* No icons in menus in Mac */ + action->setIcon( QIcon( ":/toolbar/slower2") ); +#endif + action->setData( STATIC_ENTRY ); + } menu->addSeparator(); + if( !b_normal ) return; + action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(), SLOT( jumpFwd() ) ); - action->setIcon( QIcon( ":/skip_fw") ); +#ifndef __APPLE__ /* No icons in menus in Mac */ + action->setIcon( QIcon( ":/toolbar/skip_fw") ); +#endif action->setData( STATIC_ENTRY ); action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(), SLOT( jumpBwd() ) ); - action->setIcon( QIcon( ":/skip_back") ); +#ifndef __APPLE__ /* No icons in menus in Mac */ + action->setIcon( QIcon( ":/toolbar/skip_back") ); +#endif action->setData( STATIC_ENTRY ); addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"", SLOT( gotoTimeDialog() ), "Ctrl+T" ); @@ -787,7 +859,7 @@ void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu, { bool bEnable = THEMIM->getInput() != NULL; QAction *action = - addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/stop", + addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/menu/stop", SLOT( stop() ), true ); /* Disable Stop in the right-click popup menu */ if( !bEnable ) @@ -795,25 +867,26 @@ void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu, /* Next / Previous */ addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ), - ":/previous", SLOT( prev() ) ); + ":/menu/previous", SLOT( prev() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), - ":/next", SLOT( next() ) ); + ":/menu/next", SLOT( next() ) ); + menu->addSeparator(); } void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) { - QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); + QMenu *openmenu = new QMenu( qtr( "Open a Media" ), menu ); addDPStaticEntry( openmenu, qtr( "&Open File..." ), - ":/file-asym", SLOT( openFileDialog() ) ); - addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ) ); + ":/type/file-asym", SLOT( openFileDialog() ) ); + addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ), + ":/type/folder-grey", SLOT( PLOpenDir() ) ); addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), - ":/disc", SLOT( openDiscDialog() ) ); + ":/type/disc", SLOT( openDiscDialog() ) ); addDPStaticEntry( openmenu, qtr( "Open &Network..." ), - ":/network", SLOT( openNetDialog() ) ); + ":/type/network", SLOT( openNetDialog() ) ); addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), - ":/capture-card", SLOT( openCaptureDialog() ) ); + ":/type/capture-card", SLOT( openCaptureDialog() ) ); menu->addMenu( openmenu ); menu->addSeparator(); @@ -823,14 +896,14 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) menu->addMenu( helpmenu ); #endif - addDPStaticEntry( menu, qtr( "Quit" ), ":/quit", - SLOT( quit() ), "Ctrl+Q" ); + addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit", + SLOT( quit() ), "Ctrl+Q", QAction::QuitRole ); } /* Video Tracks and Subtitles tracks */ -void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { vout_thread_t *p_vout = THEMIM->getVout(); @@ -840,38 +913,36 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) vlc_object_release( p_vout ); } } - QMenu *menu = new QMenu(); - CREATE_POPUP; + CREATE_POPUP } /* Audio Tracks */ -void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { - aout_instance_t *p_aout = THEMIM->getAout(); + audio_output_t *p_aout = THEMIM->getAout(); AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); if( p_aout ) vlc_object_release( p_aout ); } - QMenu *menu = new QMenu(); - CREATE_POPUP; + CREATE_POPUP } /* Navigation stuff, and general menus ( open ), used only for skins */ -void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { - varnames.push_back( "audio-es" ); + varnames.append( "audio-es" ); InputAutoMenuBuilder( p_input, objects, varnames ); - PUSH_SEPARATOR; + menu->addSeparator(); } - QMenu *menu = new QMenu(); + menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); @@ -884,32 +955,20 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) menu->addSeparator(); PopupMenuStaticEntries( menu ); - p_intf->p_sys->p_popup_menu = menu; menu->popup( QCursor::pos() ); - p_intf->p_sys->p_popup_menu = NULL; } /* Main Menu that sticks everything together */ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { - /* Delete old popup if there is one */ - if( p_intf->p_sys->p_popup_menu ) - delete p_intf->p_sys->p_popup_menu; - - if( !show ) - { - p_intf->p_sys->p_popup_menu = NULL; - return; - } + POPUP_BOILERPLATE /* */ - QMenu *menu = new QMenu(); + menu = new QMenu( ); QAction *action; bool b_isFullscreen = false; MainInterface *mi = p_intf->p_sys->p_mi; - POPUP_BOILERPLATE; - PopupPlayEntries( menu, p_intf, p_input ); PopupMenuPlaylistControlEntries( menu, p_intf ); menu->addSeparator(); @@ -926,9 +985,12 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) b_isFullscreen = !( !val.b_bool ); if( b_isFullscreen ) + { + val.b_bool = false; CreateAndConnect( menu, "fullscreen", qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL, VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, b_isFullscreen ); + } vlc_object_release( p_vout ); menu->addSeparator(); @@ -946,11 +1008,15 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Video menu */ submenu = new QMenu( menu ); - action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action = menu->addMenu( VideoMenu( p_intf, submenu, false ) ); action->setText( qtr( "&Video" ) ); if( action->menu()->isEmpty() ) action->setEnabled( false ); + submenu = SubtitleMenu( menu ); + submenu->setTitle( qtr( "Subti&tle") ); + UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true ); + /* Playback menu for chapters */ submenu = new QMenu( menu ); action = menu->addMenu( NavigMenu( p_intf, submenu ) ); @@ -964,50 +1030,60 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Add some special entries for windowed mode: Interface Menu */ if( !b_isFullscreen ) { - QMenu *submenu = new QMenu( qtr( "Interface" ), menu ); - QMenu *tools = ToolsMenu( submenu ); + QMenu *submenu = new QMenu( qtr( "Tools" ), menu ); + /*QMenu *tools =*/ ToolsMenu( submenu ); submenu->addSeparator(); /* In skins interface, append some items */ if( !mi ) { - - vlc_object_t *p_object = ( vlc_object_t* ) - vlc_object_find_name( p_intf, "skins2", FIND_PARENT ); - if( p_object ) + submenu->setTitle( qtr( "Interface" ) ); + if( p_intf->p_sys->b_isDialogProvider ) { + vlc_object_t* p_object = p_intf->p_parent; + objects.clear(); varnames.clear(); - objects.push_back( p_object ); - varnames.push_back( "intf-skins" ); + objects.append( p_object ); + varnames.append( "intf-skins" ); Populate( p_intf, submenu, varnames, objects ); objects.clear(); varnames.clear(); - objects.push_back( p_object ); - varnames.push_back( "intf-skins-interactive" ); + objects.append( p_object ); + varnames.append( "intf-skins-interactive" ); Populate( p_intf, submenu, varnames, objects ); - - vlc_object_release( p_object ); } else msg_Warn( p_intf, "could not find parent interface" ); } else - menu->addMenu( ViewMenu( p_intf, mi, false )); + { + QMenu *bar = menu; // Needed for next macro + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); + } menu->addMenu( submenu ); } + /* */ + QMenuView *plMenu = new QMenuView( menu ); + plMenu->setTitle( qtr("Playlist") ); + PLModel *model = PLModel::getPLModel( p_intf ); + plMenu->setModel( model ); + CONNECT( plMenu, activated(const QModelIndex&), + model, activateItem(const QModelIndex&)); + menu->addMenu( plMenu ); + /* Static entries for ending, like open */ PopupMenuStaticEntries( menu ); - p_intf->p_sys->p_popup_menu = menu; - p_intf->p_sys->p_popup_menu->popup( QCursor::pos() ); + menu->popup( QCursor::pos() ); } -#undef ACT_ADD -#undef ACT_ADDMENU -#undef ACT_ADDCHECK +#undef CREATE_POPUP +#undef POPUP_BOILERPLATE +#undef BAR_DADD +#ifndef HAVE_MAEMO /************************************************************************ * Systray Menu * ************************************************************************/ @@ -1016,72 +1092,70 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, bool b_force_visible ) { - POPUP_BOILERPLATE; + input_thread_t *p_input = THEMIM->getInput(); /* Get the systray menu and clean it */ QMenu *sysMenu = mi->getSysTrayMenu(); sysMenu->clear(); +#ifndef Q_WS_MAC /* Hide / Show VLC and cone */ if( mi->isVisible() || b_force_visible ) { - sysMenu->addAction( QIcon( ":/vlc16.png" ), + sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), qtr( "Hide VLC media player in taskbar" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + SLOT( hideUpdateSystrayMenu() ) ); } else { - sysMenu->addAction( QIcon( ":/vlc16.png" ), + sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), qtr( "Show VLC media player" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + SLOT( showUpdateSystrayMenu() ) ); } - sysMenu->addSeparator(); +#endif + PopupPlayEntries( sysMenu, p_intf, p_input ); PopupMenuPlaylistControlEntries( sysMenu, p_intf); - PopupMenuControlEntries( sysMenu, p_intf); + PopupMenuControlEntries( sysMenu, p_intf, false ); + VolumeEntries( p_intf, sysMenu ); sysMenu->addSeparator(); - addDPStaticEntry( sysMenu, qtr( "&Open Media" ), - ":/file-wide", SLOT( openFileDialog() ) ); + addDPStaticEntry( sysMenu, qtr( "&Open a Media" ), + ":/type/file-wide", SLOT( openFileDialog() ) ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , - ":/quit", SLOT( quit() ) ); + ":/menu/quit", SLOT( quit() ) ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); } +#endif -#undef CREATE_POPUP -#undef POPUP_BOILERPLATE #undef PUSH_VAR -#undef PUSH_SEPARATOR /************************************************************************* * Builders for automenus *************************************************************************/ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, - vector< const char *> & varnames, - vector & objects ) + QVector< const char *> & varnames, + QVector & objects ) { QMenu *menu = current; assert( menu ); currentGroup = NULL; - vlc_object_t *p_object; - - for( int i = 0; i < ( int )objects.size() ; i++ ) + for( int i = 0; i < (int)objects.count() ; i++ ) { if( !varnames[i] || !*varnames[i] ) { menu->addSeparator(); continue; } - p_object = objects[i]; - UpdateItem( p_intf, menu, varnames[i], p_object, true ); + UpdateItem( p_intf, menu, varnames[i], objects[i], true ); } return menu; } @@ -1240,7 +1314,7 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, switch( i_type & VLC_VAR_TYPE ) { case VLC_VAR_VOID: - var_Get( p_object, psz_var, &val ); + val.i_int = 0; // Prevent the copy of an uninitialized value CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL, p_object, val, i_type ); break; @@ -1257,6 +1331,19 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, #undef TEXT_OR_VAR +/** HACK for the navigation submenu: + * "title %2i" variables take the value 0 if not set + */ +static bool CheckTitle( vlc_object_t *p_object, const char *psz_var ) +{ + int i_title = 0; + if( sscanf( psz_var, "title %2i", &i_title ) <= 0 ) + return true; + + int i_current_title = var_GetInteger( p_object, "title" ); + return ( i_title == i_current_title ); +} + int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, vlc_object_t *p_object, bool b_root ) @@ -1293,6 +1380,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, #define CURVAL val_list.p_list->p_values[i] #define CURTEXT text_list.p_list->p_values[i].psz_string +#define RADIO_OR_COMMAND ( i_type & VLC_VAR_ISCOMMAND ) ? ITEM_NORMAL : ITEM_RADIO for( i = 0; i < val_list.p_list->i_count; i++ ) { @@ -1312,7 +1400,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, var_Get( p_object, psz_var, &val ); another_val.psz_string = strdup( CURVAL.psz_string ); menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string ); - CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, + CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND, p_object, another_val, i_type, val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) ); @@ -1322,17 +1410,18 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, case VLC_VAR_INTEGER: var_Get( p_object, psz_var, &val ); if( CURTEXT ) menutext = qfu( CURTEXT ); - else menutext.sprintf( "%d", CURVAL.i_int ); - CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, + else menutext = QString::number( CURVAL.i_int ); + CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND, p_object, CURVAL, i_type, - CURVAL.i_int == val.i_int ); + ( CURVAL.i_int == val.i_int ) + && CheckTitle( p_object, psz_var ) ); break; case VLC_VAR_FLOAT: var_Get( p_object, psz_var, &val ); if( CURTEXT ) menutext = qfu( CURTEXT ); else menutext.sprintf( "%.2f", CURVAL.f_float ); - CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, + CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND, p_object, CURVAL, i_type, CURVAL.f_float == val.f_float ); break; @@ -1346,13 +1435,14 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, /* clean up everything */ var_FreeList( &val_list, &text_list ); +#undef RADIO_OR_COMMAND #undef CURVAL #undef CURTEXT return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS; } void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, - QString text, QString help, + const QString& text, const QString& help, int i_item_type, vlc_object_t *p_obj, vlc_value_t val, int i_val_type, bool checked ) @@ -1384,8 +1474,13 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, action->setChecked( checked ); - MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type, - val, psz_var ); + MenuItemData *itemData = qFindChild( action, QString() ); + delete itemData; + itemData = new MenuItemData( action, p_obj, i_val_type, val, psz_var ); + + /* remove previous signal-slot connection(s) if any */ + action->disconnect( ); + CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); @@ -1399,33 +1494,43 @@ void QVLCMenu::DoAction( QObject *data ) vlc_object_t *p_object = itemData->p_obj; if( p_object == NULL ) return; + /* Preserve settings across vouts via the playlist object: */ + if( !strcmp( itemData->psz_var, "fullscreen" ) + || !strcmp( itemData->psz_var, "video-on-top" ) ) + var_Set( pl_Get( p_object ), itemData->psz_var, itemData->val ); + var_Set( p_object, itemData->psz_var, itemData->val ); } void QVLCMenu::updateRecents( intf_thread_t *p_intf ) { - if (recentsMenu) + if( recentsMenu ) { QAction* action; RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf ); - QList l = rmrl->recents(); + QStringList l = rmrl->recents(); recentsMenu->clear(); - if( !l.size() ) + if( !l.count() ) { action = recentsMenu->addAction( qtr(" - Empty - ") ); action->setEnabled( false ); } else { - for( int i = 0; i < l.size(); ++i ) + for( int i = 0; i < l.count(); ++i ) { + char *psz_temp = decode_URI_duplicate( qtu( l.at( i ) ) ); + action = recentsMenu->addAction( - QString( "&%1: " ).arg( i + 1 ) + l.at( i ), - rmrl->signalMapper, - SLOT( map() ) ); + QString( "&%1: " ).arg( i + 1 ) + + QApplication::fontMetrics().elidedText( psz_temp, Qt::ElideLeft, 400 ), + rmrl->signalMapper, SLOT( map() ), + i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" ); rmrl->signalMapper->setMapping( action, l.at( i ) ); + + free( psz_temp ); } recentsMenu->addSeparator();