X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=f01f0535c09773989ea46ef8cc13bbecd4d097b9;hb=33aa26b1b9d86ef711e120554f5001273020ecae;hp=c198f38758a4a5b61b66e35e0177a446c94f6074;hpb=b879f3e1e8495bdf618a139079739b5545aa444e;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index c198f38758..f01f0535c0 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -22,6 +22,16 @@ * 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 "main_interface.hpp" @@ -46,52 +56,55 @@ enum static QActionGroup *currentGroup; // Add static entries to menus -#define DP_SADD( menu, text, help, icon, slot, shortcut ) \ -{ \ - if( strlen( icon ) > 0 ) \ - { \ - if( strlen( shortcut ) > 0 ) \ - { \ - menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ), \ - qtr( shortcut ) );\ - } \ - else \ - { \ - menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ) );\ - } \ - } \ - else \ - { \ - if( strlen( shortcut ) > 0 ) \ - { \ - menu->addAction( text, THEDP, SLOT( slot ), \ - qtr( shortcut ) ); \ - } \ - else \ - { \ - menu->addAction( text, THEDP, SLOT( slot ) ); \ - } \ - } \ +void addDPStaticEntry( QMenu *menu, + const QString text, + const char *help, + const char *icon, + const char *member, + const char *shortcut ) +{ + if( !EMPTY_STR( icon ) > 0 ) + { + if( !EMPTY_STR( shortcut ) > 0 ) + menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) ); + else + menu->addAction( QIcon( icon ), text, THEDP, member ); + } + else + { + if( !EMPTY_STR( shortcut ) > 0 ) + menu->addAction( text, THEDP, member, qtr( shortcut ) ); + else + menu->addAction( text, THEDP, member ); + } } -#define MIM_SADD( menu, text, help, icon, slot ) \ -{ \ - if( strlen( icon ) > 0 ) \ - { \ - QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \ - action->setIcon( QIcon( icon ) ); \ - } \ - else \ - { \ - menu->addAction( text, THEMIM, SLOT( slot ) ); \ - } \ + +void addMIMStaticEntry( intf_thread_t *p_intf, + QMenu *menu, + const QString text, + const char *help, + const char *icon, + const char *member ) +{ + if( strlen( icon ) > 0 ) + { + QAction *action = menu->addAction( text, THEMIM, member ); + action->setIcon( QIcon( icon ) ); + } + else + { + menu->addAction( text, THEMIM, member ); + } } -#define PL_SADD /***************************************************************************** * 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( "" ); \ @@ -103,7 +116,7 @@ static int InputAutoMenuBuilder( vlc_object_t *p_object, { PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); - PUSH_VAR ( "chapter" ); + PUSH_VAR( "chapter" ); PUSH_VAR( "program" ); PUSH_VAR( "navigation" ); PUSH_VAR( "dvd_menus" ); @@ -111,9 +124,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" ); @@ -123,22 +139,27 @@ 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" ); @@ -146,36 +167,68 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, return VLC_SUCCESS; } +static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) +{ + QAction *action; + Q_FOREACH( action, menu->actions() ) + { + if( action->data().toString() == psz_var ) + return action; + } + return NULL; +} + +static QAction * FindActionWithText( QMenu *menu, QString &text ) +{ + QAction *action; + Q_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 **/ -void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, - bool visual_selector_enabled ) +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 ), qtr( "&Tools" ) ); - BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 ); + BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ), + qtr( "&Tools" ) ); + 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 /** * Media ( File ) Menu @@ -185,30 +238,32 @@ QMenu *QVLCMenu::FileMenu() { QMenu *menu = new QMenu(); - DP_SADD( menu, qtr( "&Open File..." ), "", - ":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" ); - DP_SADD( menu, qtr( I_OPEN_FOLDER ), "", - ":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" ); - DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/disc_16px.png", - openDiscDialog(), "Ctrl+D" ); - DP_SADD( menu, qtr( "Open &Network..." ), "", - ":/pixmaps/network_16px.png", openNetDialog(), "Ctrl+N" ); - DP_SADD( menu, qtr( "Open &Capture Device..." ), "", - ":/pixmaps/capture-card_16px.png", openCaptureDialog(), - "Ctrl+C" ); + addDPStaticEntry( menu, qtr( "&Open File..." ), "", + ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" ); + addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "", + ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" ); + addDPStaticEntry( menu, qtr( "Open &Disc..." ), "", + ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" ); + addDPStaticEntry( menu, qtr( "Open &Network..." ), "", + ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" ); + addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "", + ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ), + "Ctrl+C" ); menu->addSeparator(); - DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/menus_stream_16px.png", - openThenStreamingDialogs(), "Ctrl+S" ); - DP_SADD( menu, qtr( "Conve&rt / Save..." ), "", "", - openThenTranscodingDialogs(), "Ctrl+R" ); - + addDPStaticEntry( menu, qtr( "&Streaming..." ), "", + ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ), + "Ctrl+S" ); + addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "", + SLOT( openThenTranscodingDialogs() ), "Ctrl+R" ); menu->addSeparator(); - DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", quit(), - "Ctrl+Q" ); + + addDPStaticEntry( menu, qtr( "&Quit" ) , "", + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" ); return menu; } +/* Playlist/MediaLibrary Control */ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) { QMenu *menu = new QMenu(); @@ -217,8 +272,10 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); menu->addSeparator(); - DP_SADD( menu, qtr( I_PL_LOAD ), "", "", openAPlaylist(), "Ctrl+X" ); - DP_SADD( menu, qtr( I_PL_SAVE ), "", "", saveAPlaylist(), "Ctrl+Y" ); + addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ), + "Ctrl+X" ); + addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ), + "Ctrl+Y" ); menu->addSeparator(); menu->addAction( qtr( "Undock from interface" ), mi, SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) ); @@ -229,27 +286,34 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) * Tools/View Menu * This is kept in the same menu for now, but could change if it gets much * longer. + * This menu can be an interface menu but also a right click menu. **/ -QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, - bool visual_selector_enabled, - bool with_intf ) +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" ), qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); } - DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/menus_settings_16px.png", - extendedDialog() , "Ctrl+E" ); + addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", + ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ), + "Ctrl+E" ); menu->addSeparator(); if( with_intf ) { - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); + 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(); } @@ -258,18 +322,21 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, /* Minimal View */ QAction *action=menu->addAction( qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); - //FIXME: remove useless thing. But keep it until the release, pls. 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" ) ); + /* Advanced Controls */ action = menu->addAction( qtr( "Advanced controls" ), mi, SLOT( toggleAdvanced() ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) action->setChecked( true ); - #if 0 /* For Visualisations. Not yet working */ +#if 0 /* For Visualisations. Not yet working */ adv = menu->addAction( qtr( "Visualizations selector" ), mi, SLOT( visual() ) ); adv->setCheckable( true ); @@ -279,22 +346,23 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, menu->addSeparator(); - - DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/menus_messages_16px.png", - messagesDialog(), "Ctrl+M" ); - DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" ); - DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/menus_info_16px.png", - mediaCodecDialog(), "Ctrl+J" ); - -#if 0 /* Not Implemented yet */ - DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" ); + addDPStaticEntry( menu, qtr( I_MENU_MSG ), "", + ":/pixmaps/menus_messages_16px.png", SLOT( messagesDialog() ), + "Ctrl+M" ); + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "", + SLOT( mediaInfoDialog() ), "Ctrl+I" ); + addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "", + ":/pixmaps/menus_info_16px.png", 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 - DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" ); - menu->addSeparator(); - DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/menus_preferences_16px.png", - prefsDialog(), "Ctrl+P" ); + addDPStaticEntry( menu, qtr( "Preferences..." ), "", + ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" ); return menu; } @@ -309,17 +377,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 ); - - if( !p_intf->pf_show_dialog ) - { - menu->addSeparator(); - menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ), - QString( "Ctrl+Z" ) ); - } + 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; } @@ -330,22 +390,35 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vector objects; vector varnames; + vlc_object_t *p_object; + input_thread_t *p_input; + + if( !current ) + current = new QMenu(); - vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf, - VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( p_object != NULL ) + if( current->isEmpty() ) { - PUSH_VAR( "audio-es" ); - 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, "visual", qtr( "&Visualizations" ) ); + ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) ); } - p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_yield( p_input ); + p_object = ( vlc_object_t * ) vlc_object_find( p_intf, + VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + + AudioAutoMenuBuilder( p_object, p_input, objects, varnames ); + if( p_object ) - { - AudioAutoMenuBuilder( p_object, objects, varnames ); vlc_object_release( p_object ); - } + if( p_input ) + vlc_object_release( p_input ); + return Populate( p_intf, current, varnames, objects ); } @@ -356,25 +429,40 @@ 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; + 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" ) ); + ACT_ADD( current, "fullscreen", qtr( "&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" ) ); /* FIXME */ + ACT_ADD( current, "video-snapshot", qtr( "&Snapshot" ) ); + ACT_ADD( current, "ffmpeg-pp-q", qtr( "D&ecoder" ) ); /* FIXME */ } + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_yield( p_input ); p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if( p_object != NULL ) - { - VideoAutoMenuBuilder( p_object, objects, varnames ); + + VideoAutoMenuBuilder( p_object, p_input, objects, varnames ); + + if( p_object ) vlc_object_release( p_object ); - } + if( p_input ) + vlc_object_release( p_input ); + return Populate( p_intf, current, varnames, objects ); } @@ -382,25 +470,24 @@ 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; - /* FIXME */ 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" ); + InputAutoMenuBuilder( p_object, objects, varnames ); + PUSH_VAR( "prev-title" ); + PUSH_VAR( "next-title" ); + PUSH_VAR( "prev-chapter" ); + PUSH_VAR( "next-chapter" ); + if( p_object ) vlc_object_release( p_object ); - } - navMenu = new QMenu(); - DP_SADD( navMenu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(), - "Ctrl+T" ); + QMenu *navMenu = new QMenu( menu ); + addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","", + SLOT( gotoTimeDialog() ), "Ctrl+T" ); navMenu->addSeparator(); return Populate( p_intf, navMenu, varnames, objects, true ); } @@ -415,6 +502,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++ ) { @@ -443,17 +533,21 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) /** * Help/About Menu **/ -QMenu *QVLCMenu::HelpMenu() +QMenu *QVLCMenu::HelpMenu( QMenu *current ) { - QMenu *menu = new QMenu(); - DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png", - helpDialog(), "F1" ); - DP_SADD( menu, qtr( "Update" ) , "", "", updateDialog(), ""); + 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() ), ""); +#endif menu->addSeparator(); - DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1" ); + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ), + "Ctrl+F1" ); return menu; } +#undef ACT_ADD /***************************************************************************** * Popup menus - Right Click menus * @@ -471,46 +565,57 @@ QMenu *QVLCMenu::HelpMenu() p_intf->p_sys->p_popup_menu = NULL; \ i_last_separator = 0; -#define POPUP_PLAY_ENTRIES( menu )\ - if( p_input ) \ - { \ - vlc_value_t val; \ - var_Get( p_input, "state", &val ); \ - if( val.i_int == PLAYING_S ) \ - MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/pause_16px.png", \ - togglePlayPause() ) \ - else \ - MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \ - togglePlayPause() ) \ - } \ - else if( THEPL->items.i_size && THEPL->i_enabled ) \ - MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \ - togglePlayPause() ); \ - \ - MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", stop() ); \ - MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/previous_16px.png", \ - prev() ); \ - MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", next() ); - -#define POPUP_STATIC_ENTRIES( menu ) \ - QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); \ - toolsmenu->setTitle( qtr( "Tools" ) ); \ - menu->addMenu( toolsmenu ); \ - \ - 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() ) ); \ - menu->addMenu( openmenu ); \ - \ - menu->addSeparator(); \ - QMenu *helpmenu = HelpMenu(); \ - helpmenu->setTitle( qtr( "Help" ) ); \ - menu->addMenu( helpmenu ); \ - \ - DP_SADD( menu, qtr( "Quit" ), "", "", quit() , "Ctrl+Q" ); +void QVLCMenu::PopupMenuControlEntries( QMenu *menu, + intf_thread_t *p_intf, + input_thread_t *p_input ) +{ + if( p_input ) + { + vlc_value_t val; + var_Get( p_input, "state", &val ); + if( val.i_int == PLAYING_S ) + addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "", + ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) ); + else + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + } + else if( THEPL->items.i_size ) + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + + addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "", + ":/pixmaps/stop_16px.png", SLOT( stop() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "", + ":/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, menu, false, true ); + toolsmenu->setTitle( qtr( "Tools" ) ); + menu->addMenu( toolsmenu ); + + QMenu *openmenu = new QMenu( qtr( "Open" ), menu ); + 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() ) ); + menu->addMenu( openmenu ); + + menu->addSeparator(); + QMenu *helpmenu = HelpMenu( menu ); + helpmenu->setTitle( qtr( "Help" ) ); + menu->addMenu( helpmenu ); + + addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" ); +} /* Video Tracks and Subtitles tracks */ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) @@ -519,15 +624,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 ); @@ -543,15 +644,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(); @@ -576,10 +673,10 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - POPUP_PLAY_ENTRIES( menu ); + PopupMenuControlEntries( menu, p_intf, p_input ); menu->addSeparator(); - POPUP_STATIC_ENTRIES( menu ); + PopupMenuStaticEntries( p_intf, menu ); p_intf->p_sys->p_popup_menu = menu; menu->popup( QCursor::pos() ); @@ -601,38 +698,30 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) 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 ); + PUSH_SEPARATOR; + 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 ); - } /* 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 ); + vlc_object_t *p_vout = ( vlc_object_t * ) + vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); if( p_vout ) - { - VideoAutoMenuBuilder( p_vout, objects, varnames ); vlc_object_release( p_vout ); - } + + vlc_object_release( p_input ); } QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - POPUP_PLAY_ENTRIES( menu ); + PopupMenuControlEntries( menu, p_intf, p_input ); menu->addSeparator(); - POPUP_STATIC_ENTRIES( menu ); + PopupMenuStaticEntries( p_intf, menu ); p_intf->p_sys->p_popup_menu = menu; } @@ -675,13 +764,13 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, } sysMenu->addSeparator(); - POPUP_PLAY_ENTRIES( sysMenu ); + PopupMenuControlEntries( sysMenu, p_intf, p_input ); sysMenu->addSeparator(); - DP_SADD( sysMenu, qtr( "&Open Media" ), "", - ":/pixmaps/file-wide_16px.png", openFileDialog(), "" ); - DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", - quit(), "" ); + addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", + ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" ); + addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); @@ -690,65 +779,60 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, #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, bool append ) +QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, + QMenu *current, + vector< const char *> & varnames, + vector & objects, + bool append ) { QMenu *menu = current; if( !menu ) menu = new QMenu(); - else if( !append ) - menu->clear(); + + QAction *p_action; + Q_FOREACH( p_action, menu->actions() ) + { + 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; } + 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( p_intf, - 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; } @@ -756,8 +840,9 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, * Private methods. *****************************************************************************/ -static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, - bool b_root = TRUE ) +static bool IsMenuEmpty( const char *psz_var, + vlc_object_t *p_object, + bool b_root = true ) { vlc_value_t val, val_list; int i_type, i_result, i; @@ -766,31 +851,29 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, i_type = var_Type( p_object, psz_var ); /* Check if we want to display the variable */ - if( !( i_type & VLC_VAR_HASCHOICE ) ) return FALSE; + if( !( i_type & VLC_VAR_HASCHOICE ) ) return false; var_Change( p_object, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL ); - if( val.i_int == 0 ) return TRUE; + if( val.i_int == 0 ) return true; if( ( i_type & VLC_VAR_TYPE ) != VLC_VAR_VARIABLE ) { - /* Very evil hack ! intf-switch can have only one value */ - if( !strcmp( psz_var, "intf-switch" ) ) return FALSE; - if( val.i_int == 1 && b_root ) return TRUE; - else return FALSE; + if( val.i_int == 1 && b_root ) return true; + else return false; } /* Check children variables in case of VLC_VAR_VARIABLE */ if( var_Change( p_object, psz_var, VLC_VAR_GETLIST, &val_list, NULL ) < 0 ) { - return TRUE; + return true; } - for( i = 0, i_result = TRUE; i < val_list.p_list->i_count; i++ ) + for( i = 0, i_result = true; i < val_list.p_list->i_count; i++ ) { if( !IsMenuEmpty( val_list.p_list->p_values[i].psz_string, - p_object, FALSE ) ) + p_object, false ) ) { - i_result = FALSE; + i_result = false; break; } } @@ -801,14 +884,32 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, 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; + if( !p_object ) + { + /* Nothing to do */ + return; + } + + if( !strcmp( psz_var, "spu-es" ) ) + { + /* TODO: add a static entry "Load File..." */ + 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 ) { @@ -828,16 +929,34 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, if( 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; + } + + QAction *action = FindActionWithVar( menu, psz_var ); + if( !action ) + { + action = new QAction( TEXT_OR_VAR, menu ); + menu->addAction( action ); + } 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 ) ); + QMenu *submenu; + action->setEnabled( true ); + submenu = action->menu(); + if( !submenu ) + { + submenu = new QMenu( menu ); + action->setMenu( submenu ); + } + submenu->setEnabled( true ); + if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 ) menu->addMenu( submenu ); } @@ -847,8 +966,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: @@ -899,6 +1016,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, { return VLC_EGENERIC; } + #define NORMAL_OR_RADIO i_type & VLC_VAR_ISCOMMAND ? ITEM_NORMAL: ITEM_RADIO #define NOTCOMMAND !( i_type & VLC_VAR_ISCOMMAND ) #define CURVAL val_list.p_list->p_values[i] @@ -908,7 +1026,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 ) { @@ -927,7 +1045,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, 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: @@ -970,10 +1088,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 ); @@ -986,10 +1117,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() ); @@ -1000,8 +1129,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data ) { MenuItemData *itemData = qobject_cast( data ); - vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( p_intf, - itemData->i_object_id ); + vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( itemData->i_object_id ); if( p_object == NULL ) return; var_Set( p_object, itemData->psz_var, itemData->val );