X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=5962c192d2c540098a64a7b7da9dcb7b78501a8d;hb=223419069363b3eab712cff2d0ac671a94d8fc65;hp=967b992c5cfb93a1b75bd4fe3ac300bd46040e83;hpb=3ab81753822bd0a37786e6fd026a349e7a0e0830;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 967b992c5c..5962c192d2 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,11 +1,12 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright ( C ) 2006-2007 the VideoLAN team + * Copyright © 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac * Jean-Baptiste Kempf + * Jean-Philippe André * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,11 +23,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/** \todo + * - Remove static currentGroup + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include #include @@ -42,6 +47,22 @@ #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 + and 3 functions associated are collecting the objects : + InputAutoMenuBuilder, AudioAutoMenuBuilder, VideoAutoMenuBuilder. + + A QSignalMapper decides when to rebuild those menus cf MenuFunc in the .hpp + Just before one of those menus are aboutToShow(), they are rebuild. + + + */ + enum { ITEM_NORMAL, @@ -57,22 +78,25 @@ void addDPStaticEntry( QMenu *menu, const char *help, const char *icon, const char *member, - const char *shortcut ) + const char *shortcut = NULL ) { + QAction *action = NULL; if( !EMPTY_STR( icon ) > 0 ) { if( !EMPTY_STR( shortcut ) > 0 ) - menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) ); + action = menu->addAction( QIcon( icon ), text, THEDP, + member, qtr( shortcut ) ); else - menu->addAction( QIcon( icon ), text, THEDP, member ); + action = menu->addAction( QIcon( icon ), text, THEDP, member ); } else { if( !EMPTY_STR( shortcut ) > 0 ) - menu->addAction( text, THEDP, member, qtr( shortcut ) ); + action = menu->addAction( text, THEDP, member, qtr( shortcut ) ); else - menu->addAction( text, THEDP, member ); + action = menu->addAction( text, THEDP, member ); } + action->setData( "_static_" ); } void addMIMStaticEntry( intf_thread_t *p_intf, @@ -93,11 +117,45 @@ void addMIMStaticEntry( intf_thread_t *p_intf, } } +void EnableDPStaticEntries( QMenu *menu, bool enable = true ) +{ + if( !menu ) + return; + + QAction *action; + foreach( action, menu->actions() ) + { + if( action->data().toString() == "_static_" ) + action->setEnabled( enable ); + } +} + +/** + * \return Number of static entries + */ +int DeleteNonStaticEntries( QMenu *menu ) +{ + int i_ret = 0; + QAction *action; + if( !menu ) + return VLC_EGENERIC; + foreach( action, menu->actions() ) + { + if( action->data().toString() != "_static_" ) + delete action; + else + i_ret++; + } +} + /***************************************************************************** * Definitions of variables for the dynamic menus *****************************************************************************/ #define PUSH_VAR( var ) varnames.push_back( var ); \ - objects.push_back( p_object->i_object_id ) + objects.push_back( p_object ? p_object->i_object_id : 0 ) + +#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ + objects.push_back( p_input ? p_input->i_object_id : 0 ); #define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \ objects.push_back( 0 ); varnames.push_back( "" ); \ @@ -117,9 +175,12 @@ static int InputAutoMenuBuilder( vlc_object_t *p_object, } static int VideoAutoMenuBuilder( vlc_object_t *p_object, + input_thread_t *p_input, vector &objects, vector &varnames ) { + PUSH_INPUTVAR( "video-es" ); + PUSH_INPUTVAR( "spu-es" ); PUSH_VAR( "fullscreen" ); PUSH_VAR( "zoom" ); PUSH_VAR( "deinterlace" ); @@ -129,42 +190,73 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, PUSH_VAR( "directx-wallpaper" ); PUSH_VAR( "video-snapshot" ); - vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object, - VLC_OBJECT_DECODER, - FIND_PARENT ); - if( p_dec_obj != NULL ) + if( p_object ) { - vlc_object_t *p_object = p_dec_obj; - PUSH_VAR( "ffmpeg-pp-q" ); - vlc_object_release( p_dec_obj ); + vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object, + VLC_OBJECT_DECODER, + FIND_PARENT ); + if( p_dec_obj ) + { + vlc_object_t *p_object = p_dec_obj; + PUSH_VAR( "ffmpeg-pp-q" ); + vlc_object_release( p_dec_obj ); + } } return VLC_SUCCESS; } static int AudioAutoMenuBuilder( vlc_object_t *p_object, + input_thread_t *p_input, vector &objects, vector &varnames ) { + PUSH_INPUTVAR( "audio-es" ); PUSH_VAR( "audio-device" ); PUSH_VAR( "audio-channels" ); - PUSH_VAR( "visual" ); PUSH_VAR( "equalizer" ); + PUSH_VAR( "visual" ); return VLC_SUCCESS; } +static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) +{ + QAction *action; + foreach( action, menu->actions() ) + { + if( action->data().toString() == psz_var ) + return action; + } + return NULL; +} + +static QAction * FindActionWithText( QMenu *menu, QString &text ) +{ + QAction *action; + foreach( action, menu->actions() ) + { + if( action->text() == text ) + return action; + } + return NULL; +} + /***************************************************************************** * All normal menus * Simple Code *****************************************************************************/ #define BAR_ADD( func, title ) { \ - QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); } + QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _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 ); } + 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 ); } /** * Main Menu Bar Creation @@ -173,16 +265,18 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, bool visual_selector_enabled ) { + /* QMainWindows->menuBar() + gives the QProcess::destroyed timeout issue on Cleanlooks style with + setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); BAR_ADD( FileMenu(), qtr( "&Media" ) ); BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) ); - BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), + BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ), qtr( "&Tools" ) ); - BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 ); + BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 1 ); + BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 ); BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 ); - - BAR_ADD( HelpMenu(), qtr( "&Help" ) ); + BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) ); } #undef BAR_ADD #undef BAR_DADD @@ -234,7 +328,7 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ), "Ctrl+Y" ); menu->addSeparator(); - menu->addAction( qtr( "Undock from interface" ), mi, + menu->addAction( qtr( "Undock from Interface" ), mi, SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) ); return menu; } @@ -246,11 +340,12 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) * This menu can be an interface menu but also a right click menu. **/ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, + QMenu *current, MainInterface *mi, bool visual_selector_enabled, bool with_intf ) { - QMenu *menu = new QMenu; + QMenu *menu = new QMenu( current ); if( mi ) { menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), @@ -265,27 +360,30 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, if( with_intf ) { - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); - intfmenu->setTitle( qtr( "Interfaces" ) ); + QMenu *intfmenu = InterfacesMenu( p_intf, menu ); + intfmenu->setTitle( qtr( "Add Interfaces" ) ); + MenuFunc *f = new MenuFunc( intfmenu, 4 ); + CONNECT( intfmenu, aboutToShow(), THEDP->menusUpdateMapper, map() ); + THEDP->menusUpdateMapper->setMapping( intfmenu, f ); menu->addMenu( intfmenu ); menu->addSeparator(); } if( mi ) { /* Minimal View */ - QAction *action=menu->addAction( qtr( "Minimal View..." ), mi, - SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); + QAction *action = menu->addAction( qtr( "Minimal View..." ), mi, + SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) action->setChecked( true ); /* FullScreen View */ action = menu->addAction( qtr( "Toggle Fullscreen Interface" ), mi, - SLOT( toggleFullScreen() ), qtr( "F11" ) ); + SLOT( toggleFullScreen() ), QString( "F11" ) ); /* Advanced Controls */ - action = menu->addAction( qtr( "Advanced controls" ), mi, - SLOT( toggleAdvanced() ) ); + action = menu->addAction( qtr( "Advanced Controls" ), mi, + SLOT( toggleAdvanced() ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) action->setChecked( true ); @@ -330,10 +428,9 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) varnames.push_back( "intf-add" ); objects.push_back( p_intf->i_object_id ); - QMenu *menu = Populate( p_intf, current, varnames, objects ); + QMenu *submenu = new QMenu( current ); + QMenu *menu = Populate( p_intf, submenu, varnames, objects ); - CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); - THEDP->menusUpdateMapper->setMapping( menu, 4 ); return menu; } @@ -344,22 +441,35 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vector objects; vector varnames; + vlc_object_t *p_aout; + input_thread_t *p_input; - vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf, - VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( p_object != NULL ) - { - PUSH_VAR( "audio-es" ); - vlc_object_release( p_object ); - } + if( !current ) current = new QMenu(); - p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); - if( p_object ) + if( current->isEmpty() ) { - AudioAutoMenuBuilder( p_object, objects, varnames ); - vlc_object_release( p_object ); + ACT_ADD( current, "audio-es", qtr( "Audio &Track" ) ); + ACT_ADD( current, "audio-device", qtr( "Audio &Device" ) ); + ACT_ADD( current, "audio-channels", qtr( "Audio &Channels" ) ); + ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) ); + current->addSeparator(); + ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); } + + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_yield( p_input ); + p_aout = ( vlc_object_t * ) vlc_object_find( p_intf, + VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + + AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); + + if( p_aout ) + vlc_object_release( p_aout ); + if( p_input ) + vlc_object_release( p_input ); + return Populate( p_intf, current, varnames, objects ); } @@ -369,26 +479,49 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) **/ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) { - vlc_object_t *p_object; + vlc_object_t *p_vout; + input_thread_t *p_input; vector objects; vector varnames; - p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - if( p_object != NULL ) + if( !current ) current = new QMenu(); + + if( current->isEmpty() ) { - PUSH_VAR( "video-es" ); - PUSH_VAR( "spu-es" ); - vlc_object_release( p_object ); + ACT_ADD( 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( "Load File..." ), "", "", + SLOT( loadSubtitlesFile() ) ); + submenu->addSeparator(); + + ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) ); + ACT_ADD( current, "zoom", qtr( "&Zoom" ) ); + ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) ); + ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); + ACT_ADD( current, "crop", qtr( "&Crop" ) ); + ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) ); + /* ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); */ + ACT_ADD( current, "video-snapshot", qtr( "Snapshot" ) ); + /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */ } - p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_yield( p_input ); + p_vout = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if( p_object != NULL ) - { - VideoAutoMenuBuilder( p_object, objects, varnames ); - vlc_object_release( p_object ); - } + + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); + + if( p_vout ) + vlc_object_release( p_vout ); + if( p_input ) + vlc_object_release( p_input ); + return Populate( p_intf, current, varnames, objects ); } @@ -396,26 +529,40 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) * Navigation Menu * For DVD, MP4, MOV and other chapter based format **/ -QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu ) +QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { vlc_object_t *p_object; vector objects; vector varnames; + if( !menu ) menu = new QMenu(); + + if( menu->isEmpty() ) + { + addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ), "","", + SLOT( gotoTimeDialog() ), "Ctrl+T" ); + menu->addSeparator(); + + ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) ); + ACT_ADD( menu, "title", qtr( "&Title" ) ); + ACT_ADD( menu, "chapter", qtr( "&Chapter" ) ); + ACT_ADD( menu, "program", qtr( "&Program" ) ); + ACT_ADD( menu, "navigation", qtr( "&Navigation" ) ); + } + p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( p_object != NULL ) + InputAutoMenuBuilder( p_object, objects, varnames ); + PUSH_VAR( "prev-title" ); + PUSH_VAR( "next-title" ); + PUSH_VAR( "prev-chapter" ); + PUSH_VAR( "next-chapter" ); + EnableDPStaticEntries( menu, ( p_object != NULL ) ); + if( p_object ) { - InputAutoMenuBuilder( p_object, objects, varnames ); - PUSH_VAR( "prev-title" ); PUSH_VAR ( "next-title" ); - PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" ); vlc_object_release( p_object ); } - navMenu = new QMenu(); - addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","", - SLOT( gotoTimeDialog() ), "Ctrl+T" ); - navMenu->addSeparator(); - return Populate( p_intf, navMenu, varnames, objects, true ); + return Populate( p_intf, menu, varnames, objects, true ); } /** @@ -428,6 +575,9 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) char **ppsz_longnames; char **ppsz_names = services_discovery_GetServicesNames( p_intf, &ppsz_longnames ); + if( !ppsz_names ) + return menu; + char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames; for( ; *ppsz_name; ppsz_name++, ppsz_longname++ ) { @@ -456,13 +606,14 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) /** * Help/About Menu **/ -QMenu *QVLCMenu::HelpMenu() +QMenu *QVLCMenu::HelpMenu( QMenu *current ) { - QMenu *menu = new QMenu(); + QMenu *menu = new QMenu( current ); addDPStaticEntry( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" ); #ifdef UPDATE_CHECK - addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), ""); + addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "", + SLOT( updateDialog() ), ""); #endif menu->addSeparator(); addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ), @@ -470,7 +621,6 @@ QMenu *QVLCMenu::HelpMenu() return menu; } - /***************************************************************************** * Popup menus - Right Click menus * *****************************************************************************/ @@ -502,9 +652,12 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); } - else if( THEPL->items.i_size && THEPL->i_enabled ) + else if( THEPL->items.i_size ) addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + else + addDPStaticEntry( menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( openDialog() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", SLOT( stop() ) ); @@ -512,31 +665,38 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, ":/pixmaps/previous_16px.png", SLOT( prev() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", SLOT( next() ) ); - } +} void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) { - QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); +#if 0 + QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true ); toolsmenu->setTitle( qtr( "Tools" ) ); menu->addMenu( toolsmenu ); +#endif - QMenu *openmenu = new QMenu( qtr( "Open" ) ); - openmenu->addAction( qtr( "Open &File..." ), THEDP, - SLOT( openFileDialog() ) ); - openmenu->addAction( qtr( "Open &Disc..." ), THEDP, - SLOT( openDiscDialog() ) ); - openmenu->addAction( qtr( "Open &Network..." ), THEDP, - SLOT( openNetDialog() ) ); - openmenu->addAction( qtr( "Open &Capture Device..." ), THEDP, - SLOT( openCaptureDialog() ) ); + QMenu *openmenu = new QMenu( qtr( "Open" ), menu ); + addDPStaticEntry( openmenu, qtr( "&Open File..." ), "", + ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ) ); + addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "", + ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "", + ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "", + ":/pixmaps/network_16px.png", SLOT( openNetDialog() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "", + ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ) ); menu->addMenu( openmenu ); menu->addSeparator(); - QMenu *helpmenu = HelpMenu(); +#if 0 + QMenu *helpmenu = HelpMenu( menu ); helpmenu->setTitle( qtr( "Help" ) ); menu->addMenu( helpmenu ); +#endif - addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" ); + addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png", + SLOT( quit() ), "Ctrl+Q" ); } /* Video Tracks and Subtitles tracks */ @@ -546,15 +706,11 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) if( p_input ) { vlc_object_yield( p_input ); - varnames.push_back( "video-es" ); - objects.push_back( p_input->i_object_id ); - varnames.push_back( "spu-es" ); - objects.push_back( p_input->i_object_id ); vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); if( p_vout ) { - VideoAutoMenuBuilder( p_vout, objects, varnames ); + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); vlc_object_release( p_vout ); } vlc_object_release( p_input ); @@ -570,15 +726,11 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) if( p_input ) { vlc_object_yield( p_input ); - varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); if( p_aout ) - { - AudioAutoMenuBuilder( p_aout, objects, varnames ); vlc_object_release( p_aout ); - } vlc_object_release( p_input ); } QMenu *menu = new QMenu(); @@ -616,53 +768,93 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) /* Main Menu that sticks everything together */ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { + MainInterface *mi = p_intf->p_sys->p_mi; if( show ) { - // create a popup if there is none - if( ! p_intf->p_sys->p_popup_menu ) + /* Delete and recreate a popup if there is one */ + if( p_intf->p_sys->p_popup_menu ) + delete p_intf->p_sys->p_popup_menu; + + QMenu *menu = new QMenu(); + QMenu *submenu; + QAction *action; + bool b_isFullscreen = false; + + POPUP_BOILERPLATE; + + PopupMenuControlEntries( menu, p_intf, p_input ); + menu->addSeparator(); + + if( p_input ) { - POPUP_BOILERPLATE; - if( p_input ) + vlc_object_t *p_vout = (vlc_object_t *) + vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); + + /* Add a fullscreen switch button */ + if( p_vout ) { - vlc_object_yield( p_input ); - InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); - - /* Audio menu */ - PUSH_SEPARATOR; - varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_aout = ( vlc_object_t * ) - vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if( p_aout ) - { - AudioAutoMenuBuilder( p_aout, objects, varnames ); - vlc_object_release( p_aout ); - } - - /* Video menu */ - PUSH_SEPARATOR; - varnames.push_back( "video-es" ); - objects.push_back( p_input->i_object_id ); - varnames.push_back( "spu-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_vout = ( vlc_object_t * ) - vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); - if( p_vout ) - { - VideoAutoMenuBuilder( p_vout, objects, varnames ); - vlc_object_release( p_vout ); - } + vlc_value_t val; + var_Get( p_vout, "fullscreen", &val ); + b_isFullscreen = !( !val.b_bool ); + if( b_isFullscreen ) + CreateAndConnect( menu, "fullscreen", + qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL, + p_vout->i_object_id, val, VLC_VAR_BOOL, + b_isFullscreen ); + vlc_object_release( p_vout ); } - QMenu *menu = new QMenu(); - Populate( p_intf, menu, varnames, objects ); - menu->addSeparator(); - PopupMenuControlEntries( menu, p_intf, p_input ); menu->addSeparator(); - PopupMenuStaticEntries( p_intf, menu ); - p_intf->p_sys->p_popup_menu = menu; + vlc_object_yield( p_input ); + InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); + vlc_object_release( p_input ); + + submenu = new QMenu( menu ); + action = menu->addMenu( AudioMenu( p_intf, submenu ) ); + action->setText( qtr( "&Audio" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); + + submenu = new QMenu( menu ); + action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action->setText( qtr( "&Video" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); + + submenu = new QMenu( menu ); + action = menu->addMenu( NavigMenu( p_intf, submenu ) ); + action->setText( qtr( "&Playback" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); } + + menu->addSeparator(); + + /* Add some special entries for windowed mode: Interface Menu */ + if( !b_isFullscreen ) + { + submenu = new QMenu( qtr( "Interface" ), menu ); + submenu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), + qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); + addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "", + ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ) ); + action = submenu->addAction( QIcon( "" ), + qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) ); + action->setCheckable( true ); + action->setChecked( !( mi->getControlsVisibilityStatus() & + CONTROLS_VISIBLE ) ); + action = submenu->addAction( QIcon( "" ), + qtr( "Toggle Fullscreen Interface" ), + mi, SLOT( toggleFullScreen() ) ); + action->setCheckable( true ); + action->setChecked( mi->isFullScreen() ); + menu->addMenu( submenu ); + } + + PopupMenuStaticEntries( p_intf, menu ); + + p_intf->p_sys->p_popup_menu = menu; p_intf->p_sys->p_popup_menu->popup( QCursor::pos() ); } else @@ -673,6 +865,8 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } } +#undef ACT_ADD + /************************************************************************ * Systray Menu * ************************************************************************/ @@ -691,14 +885,14 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, if( mi->isVisible() || b_force_visible ) { sysMenu->addAction( QIcon( ":/vlc16.png" ), - qtr( "Hide VLC media player in taskbar" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + qtr( "Hide VLC media player in taskbar" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); } else { sysMenu->addAction( QIcon( ":/vlc16.png" ), - qtr( "Show VLC media player" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + qtr( "Show VLC media player" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); } sysMenu->addSeparator(); @@ -708,7 +902,7 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", - ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); @@ -717,7 +911,6 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, #undef PUSH_VAR #undef PUSH_SEPARATOR - /************************************************************************* * Builders for automenus *************************************************************************/ @@ -728,58 +921,53 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, bool append ) { QMenu *menu = current; - if( !menu ) - menu = new QMenu(); - else if( !append ) - menu->clear(); + if( !menu ) menu = new QMenu(); + + /* Disable all non static entries */ + QAction *p_action; + foreach( p_action, menu->actions() ) + { + if( p_action->data().toString() != "_static_" ) + p_action->setEnabled( false ); + } currentGroup = NULL; vlc_object_t *p_object; - vlc_bool_t b_section_empty = VLC_FALSE; int i; -#define APPEND_EMPTY { QAction *action = menu->addAction( qtr( "Empty" ) ); \ - action->setEnabled( false ); } - for( i = 0; i < ( int )objects.size() ; i++ ) { if( !varnames[i] || !*varnames[i] ) { - if( b_section_empty ) - APPEND_EMPTY; menu->addSeparator(); - b_section_empty = VLC_TRUE; continue; } if( objects[i] == 0 ) { - /// \bug What is this ? - // Append( menu, varnames[i], NULL ); - b_section_empty = VLC_FALSE; - continue; + p_object = NULL; + } + else + { + p_object = ( vlc_object_t * )vlc_object_get( objects[i] ); + if( !p_object ) + { + msg_Dbg( p_intf, "object %d not found !", objects[i] ); + continue; + } } - p_object = ( vlc_object_t * )vlc_object_get( objects[i] ); - if( p_object == NULL ) continue; - - b_section_empty = VLC_FALSE; /* Ugly specific stuff */ if( strstr( varnames[i], "intf-add" ) ) - CreateItem( menu, varnames[i], p_object, false ); + UpdateItem( p_intf, menu, varnames[i], p_object, false ); else - CreateItem( menu, varnames[i], p_object, true ); - vlc_object_release( p_object ); + UpdateItem( p_intf, menu, varnames[i], p_object, true ); + if( p_object ) + vlc_object_release( p_object ); } - - /* Special case for empty menus */ - if( menu->actions().size() == 0 || b_section_empty ) - APPEND_EMPTY - return menu; } -#undef APPEND_EMPTY /***************************************************************************** * Private methods. @@ -829,14 +1017,27 @@ static bool IsMenuEmpty( const char *psz_var, return i_result; } -void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, - vlc_object_t *p_object, bool b_submenu ) +#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var ) + +void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, + const char *psz_var, vlc_object_t *p_object, bool b_submenu ) { vlc_value_t val, text; int i_type; + QAction *action = FindActionWithVar( menu, psz_var ); + if( action ) + DeleteNonStaticEntries( action->menu() ); + + if( !p_object ) + return; + /* Check the type of the object variable */ - i_type = var_Type( p_object, psz_var ); + if( !strcmp( psz_var, "audio-es" ) + || !strcmp( psz_var, "video-es" ) ) + i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE; + else + i_type = var_Type( p_object, psz_var ); switch( i_type & VLC_VAR_TYPE ) { @@ -853,21 +1054,51 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, } /* Make sure we want to display the variable */ - if( IsMenuEmpty( psz_var, p_object ) ) return; + if( menu->isEmpty() && IsMenuEmpty( psz_var, p_object ) ) + return; /* Get the descriptive name of the variable */ - var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL ); + int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL ); + if( i_ret != VLC_SUCCESS ) + { + text.psz_string = NULL; + } + + if( !action ) + { + action = new QAction( TEXT_OR_VAR, menu ); + menu->addAction( action ); + action->setData( psz_var ); + } + + /* Some specific stuff */ + bool forceDisabled = false; + if( !strcmp( psz_var, "spu-es" ) ) + { + vlc_object_t *p_vout = ( vlc_object_t* )( vlc_object_find( p_intf, + VLC_OBJECT_VOUT, FIND_ANYWHERE ) ); + forceDisabled = ( p_vout == NULL ); + if( p_vout ) + vlc_object_release( p_vout ); + } if( i_type & VLC_VAR_HASCHOICE ) { /* Append choices menu */ if( b_submenu ) { - QMenu *submenu = new QMenu(); - submenu->setTitle( qfu( text.psz_string ? - text.psz_string : psz_var ) ); - if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 ) - menu->addMenu( submenu ); + QMenu *submenu; + submenu = action->menu(); + if( !submenu ) + { + submenu = new QMenu( menu ); + action->setMenu( submenu ); + } + + action->setEnabled( + CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 ); + if( forceDisabled ) + action->setEnabled( false ); } else CreateChoicesMenu( menu, psz_var, p_object, true ); @@ -875,8 +1106,6 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, return; } -#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var ) - switch( i_type & VLC_VAR_TYPE ) { case VLC_VAR_VOID: @@ -906,7 +1135,8 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, i_type = var_Type( p_object, psz_var ); /* Make sure we want to display the variable */ - if( IsMenuEmpty( psz_var, p_object, b_root ) ) return VLC_EGENERIC; + if( submenu->isEmpty() && IsMenuEmpty( psz_var, p_object, b_root ) ) + return VLC_EGENERIC; switch( i_type & VLC_VAR_TYPE ) { @@ -937,7 +1167,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, { vlc_value_t another_val; QString menutext; - QMenu *subsubmenu = new QMenu(); + QMenu *subsubmenu = new QMenu( submenu ); switch( i_type & VLC_VAR_TYPE ) { @@ -950,14 +1180,13 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, case VLC_VAR_STRING: var_Get( p_object, psz_var, &val ); another_val.psz_string = strdup( CURVAL.psz_string ); - menutext = qfu( "Add " ) /* If this function is more used, FIX*/ - + qfu( CURTEXT ? CURTEXT : another_val.psz_string ); + menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string ); CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, p_object->i_object_id, another_val, i_type, NOTCOMMAND && val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); break; case VLC_VAR_INTEGER: @@ -1000,10 +1229,23 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, vlc_value_t val, int i_val_type, bool checked ) { - QAction *action = new QAction( text, menu ); + QAction *action = FindActionWithVar( menu, psz_var ); + if( !action ) + { + /* This is a value */ + action = FindActionWithText( menu, text ); + if( !action ) + { + action = new QAction( text, menu ); + menu->addAction( action ); + } + } + action->setText( text ); action->setToolTip( help ); + action->setEnabled( i_object_id != 0 ); + if( i_item_type == ITEM_CHECK ) { action->setCheckable( true ); @@ -1016,10 +1258,8 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, currentGroup->addAction( action ); } - if( checked ) - { - action->setChecked( true ); - } + action->setChecked( checked ); + MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type, val, psz_var ); CONNECT( action, triggered(), THEDP->menusMapper, map() );