X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=a2be35a3baf2181d0e2a19dd4143ee826c747dbc;hb=9a38b276e6ddecdd032d5a1f2128530d2e3478ca;hp=3cf4f599a1c12a14eecdc8e4e51f4a7ebfc78185;hpb=f15c486bef6a06353326f24387a527e4b6b72088;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 3cf4f599a1..28f1802f0d 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,15 +1,17 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright © 2006-2008 the VideoLAN team * $Id$ * - * Authors: ClÃment Stenac + * 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 * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * ( at your option ) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,14 +23,45 @@ * 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" #include "menus.hpp" #include "dialogs_provider.hpp" #include "input_manager.hpp" +#include "recents.hpp" + #include #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 + 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 { @@ -39,356 +72,898 @@ enum static QActionGroup *currentGroup; -// Add static entries to menus -#define DP_SADD( text, help, icon, slot ) { if( strlen(icon) > 0 ) { QAction *action = menu->addAction( text, THEDP, SLOT( slot ) ); action->setIcon(QIcon(icon));} else { menu->addAction( text, THEDP, SLOT( slot ) ); } } -#define MIM_SADD( 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 ) ); } } +/* HACK for minimalView to go around a Qt bug/feature + * that doesn't update the QAction checked state when QMenu is hidden */ +QAction *QVLCMenu::minimalViewAction = NULL; + +QMenu *QVLCMenu::recentsMenu = NULL; + +/**************************************************************************** + * Menu code helpers: + **************************************************************************** + * Add static entries to DP in menus + ***************************************************************************/ +void addDPStaticEntry( QMenu *menu, + const QString text, + const char *help, + const char *icon, + const char *member, + const char *shortcut = NULL ) +{ + QAction *action = NULL; + if( !EMPTY_STR( icon ) > 0 ) + { + if( !EMPTY_STR( shortcut ) > 0 ) + action = menu->addAction( QIcon( icon ), text, THEDP, + member, qtr( shortcut ) ); + else + action = menu->addAction( QIcon( icon ), text, THEDP, member ); + } + else + { + if( !EMPTY_STR( shortcut ) > 0 ) + action = menu->addAction( text, THEDP, member, qtr( shortcut ) ); + else + action = menu->addAction( text, THEDP, member ); + } + action->setData( "_static_" ); +} + +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++; + } +} + +/*** + * Same for MIM + ***/ +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 ); + } +} /***************************************************************************** * 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( VLC_OBJECT(p_object) ) + +#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ + objects.push_back( VLC_OBJECT(p_input) ); #define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \ - objects.push_back( 0 ); varnames.push_back( "" ); \ - i_last_separator = objects.size(); } + objects.push_back( 0 ); varnames.push_back( "" ); \ + i_last_separator = objects.size(); } static int InputAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, - vector &varnames ) + vector &objects, + vector &varnames ) { - PUSH_VAR( "bookmark"); + PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); - PUSH_VAR ("chapter" ); + PUSH_VAR( "chapter" ); PUSH_VAR( "program" ); PUSH_VAR( "navigation" ); PUSH_VAR( "dvd_menus" ); return VLC_SUCCESS; } -static int VideoAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, - vector &varnames ) +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" ); PUSH_VAR( "aspect-ratio" ); PUSH_VAR( "crop" ); PUSH_VAR( "video-on-top" ); +#ifdef WIN32 PUSH_VAR( "directx-wallpaper" ); +#endif 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 ) + /* Special case for postproc */ + if( p_object ) { - PUSH_VAR( "ffmpeg-pp-q" ); - vlc_object_release( p_dec_obj ); + /* p_object is the vout, so the decoder is our parent and the + * postproc filter one of the decoder's children */ + vlc_object_t *p_dec = (vlc_object_t *) + vlc_object_find( p_object, VLC_OBJECT_DECODER, + FIND_PARENT ); + if( p_dec ) + { + vlc_object_t *p_pp = (vlc_object_t *) + vlc_object_find_name( p_dec, "postproc", + FIND_CHILD ); + if( p_pp ) + { + p_object = p_pp; + PUSH_VAR( "postproc-q" ); + vlc_object_release( p_pp ); + } + + vlc_object_release( p_dec ); + } } return VLC_SUCCESS; } static int AudioAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, - vector &varnames ) + 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" ); 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; +} + /***************************************************************************** * All normal menus + * Simple Code *****************************************************************************/ -void QVLCMenu::createMenuBar( QMenuBar *bar, intf_thread_t *p_intf ) -{ #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, SIGNAL( aboutToShow() ), \ - THEDP->menusUpdateMapper, SLOT(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 ) +{ + /* QMainWindows->menuBar() + gives the QProcess::destroyed timeout issue on Cleanlooks style with + setDesktopAware set to false */ + QMenuBar *bar = mi->menuBar(); + BAR_ADD( FileMenu( p_intf ), qtr( "&Media" ) ); - BAR_ADD( FileMenu(), qtr("File") ); - BAR_ADD( ToolsMenu( p_intf ), qtr("Tools") ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr("Video"), 1 ); - BAR_DADD( AudioMenu( p_intf, NULL ), qtr("Audio"), 2 ); - BAR_DADD( NavigMenu( p_intf, NULL ), qtr("Navigation"), 3 ); + 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( "P&layback" ), 3 ); - // BAR_ADD( HelpMenu(), qtr("Help" ) ); -} + BAR_ADD( ToolsMenu( p_intf ), qtr( "&Tools" ) ); + BAR_ADD( ViewMenu( p_intf, NULL, mi, visual_selector_enabled, true ), + qtr( "V&iew" ) ); -QMenu *QVLCMenu::FileMenu() + BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) ); +} +#undef BAR_ADD +#undef BAR_DADD + +/** + * Media ( File ) Menu + * Opening, streaming and quit + **/ +QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); - DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() ); - DP_SADD( qtr("&Advanced Open..." ), "", "", openDialog() ); + + addDPStaticEntry( menu, qtr( "&Open File..." ), "", +#ifdef WIN32 + ":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); + addDPStaticEntry( menu, qtr( "Advanced Open File..." ), "", + ":/file-asym", SLOT( openFileDialog() ), "" ); +#else + ":/file-asym", SLOT( openFileDialog() ), "Ctrl+0" ); +#endif + addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "", + ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" ); + addDPStaticEntry( menu, qtr( "Open &Disc..." ), "", + ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" ); + addDPStaticEntry( menu, qtr( "Open &Network..." ), "", + ":/network", SLOT( openNetDialog() ), "Ctrl+N" ); + addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "", + ":/capture-card", SLOT( openCaptureDialog() ), + "Ctrl+C" ); + + recentsMenu = new QMenu( qtr( "Recently played" ), menu ); + updateRecents( p_intf ); + menu->addMenu( recentsMenu ); menu->addSeparator(); - DP_SADD( qtr("Streaming..."), "", "", streamingDialog() ); + + addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "", + SLOT( openAndTranscodingDialogs() ), "Ctrl+R" ); + addDPStaticEntry( menu, qtr( "&Streaming..." ), "", + ":/stream", SLOT( openAndStreamingDialogs() ), + "Ctrl+S" ); menu->addSeparator(); - DP_SADD( qtr("&Quit") , "", "", quit() ); + + addDPStaticEntry( menu, qtr( "&Quit" ) , "", + ":/quit", SLOT( quit() ), "Ctrl+Q" ); return menu; } -QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, bool with_intf ) +/* Playlist/MediaLibrary Control */ +QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); + + addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", ":/settings", + SLOT( extendedDialog() ), "Ctrl+E" ); + addDPStaticEntry( menu, qtr( I_MENU_MSG ), "", + ":/messages", SLOT( messagesDialog() ), + "Ctrl+M" ); + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", ":/info", + SLOT( mediaInfoDialog() ), "Ctrl+I" ); + addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "", + ":/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 + menu->addSeparator(); + + addDPStaticEntry( menu, qtr( "&Preferences..." ), "", + ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + + return menu; +} + +/** + * 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::ViewMenu( intf_thread_t *p_intf, + QMenu *current, + MainInterface *mi, + bool visual_selector_enabled, + bool with_intf ) +{ + QMenu *menu = new QMenu( current ); + if( mi ) + { + QAction *act= + menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ), + mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); + act->setData( "_static_" ); + } + menu->addMenu( SDMenu( p_intf ) ); + menu->addSeparator(); + + 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" ) );*/ + + + menu->addSeparator(); + if( with_intf ) { - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); - intfmenu->setTitle( qtr("Interfaces" ) ); - menu->addMenu( intfmenu ); - /** \todo ADD EXT GUI HERE */ + 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(); } - DP_SADD( qtr("Messages" ), "", "", messagesDialog() ); - DP_SADD( qtr("Information") , "", "", streaminfoDialog() ); - DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() ); + if( mi ) + { + /* Minimal View */ + QAction *action = menu->addAction( qtr( "Mi&nimal View" ), mi, + SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); + action->setCheckable( true ); + action->setData( "_static_" ); + if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) + action->setChecked( true ); + minimalViewAction = action; /* HACK for minimalView */ + + /* FullScreen View */ + action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, + SLOT( toggleFullScreen() ), QString( "F11" ) ); + action->setCheckable( true ); + action->setData( "_static_" ); + + /* Advanced Controls */ + action = menu->addAction( qtr( "&Advanced Controls" ), mi, + SLOT( toggleAdvanced() ) ); + action->setCheckable( true ); + action->setData( "_static_" ); + if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) + action->setChecked( true ); +#if 0 /* For Visualisations. Not yet working */ + adv = menu->addAction( qtr( "Visualizations selector" ), + mi, SLOT( visual() ) ); + adv->setCheckable( true ); + if( visual_selector_enabled ) adv->setChecked( true ); +#endif + } + menu->addSeparator(); - DP_SADD( qtr("Preferences"), "", "", prefsDialog() ); + return menu; } +/** + * Interface Sub-Menu, to list extras interface and skins + **/ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) { - vector objects; + vector objects; vector varnames; /** \todo add "switch to XXX" */ varnames.push_back( "intf-add" ); - objects.push_back( p_intf->i_object_id ); - - QMenu *menu = Populate( p_intf, current, varnames, objects ); - connect( menu, SIGNAL( aboutToShow() ), - THEDP->menusUpdateMapper, SLOT(map()) ); - THEDP->menusUpdateMapper->setMapping( menu, 4 ); + objects.push_back( VLC_OBJECT(p_intf) ); - return menu; + return Populate( p_intf, current, varnames, objects ); } +/** + * Main Audio Menu + */ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { - vector objects; + 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" ) ); + current->addSeparator(); + ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); } + + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_hold( 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 ); } - +/** + * Main Video Menu + * Subtitles are part of Video. + **/ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) { - vlc_object_t *p_object; - vector objects; + 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 ) - { - PUSH_VAR( "video-es" ); - PUSH_VAR( "spu-es" ); - vlc_object_release( p_object ); - } + if( !current ) current = new QMenu(); - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - if( p_object != NULL ) + if( current->isEmpty() ) { - VideoAutoMenuBuilder( p_object, objects, varnames ); - 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( "Open File..." ), "", "", + SLOT( loadSubtitlesFile() ) ); + submenu->addSeparator(); + + 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" ) ); +#ifdef WIN32 + ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); +#endif + ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) ); + ACT_ADD( current, "postproc-q", qtr( "Post processing" ) ); } + + p_input = THEMIM->getInput(); + if( p_input ) + vlc_object_hold( p_input ); + p_vout = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + + 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 ); } -QMenu *QVLCMenu::NavigMenu( 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 *menu ) { vlc_object_t *p_object; - vector objects; + vector objects; vector varnames; - /* FIXME */ - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - if( p_object != NULL ) + 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( "T&itle" ) ); + 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 ); + 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 ); } - return Populate( p_intf, current, varnames, objects ); + return Populate( p_intf, menu, varnames, objects, true ); } +/** + * Service Discovery SubMenu + **/ +QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) +{ + QMenu *menu = new QMenu(); + menu->setTitle( qtr( I_PL_SD ) ); + 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++ ) + { + 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 ); + + 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 +**/ +QMenu *QVLCMenu::HelpMenu( QMenu *current ) +{ + QMenu *menu = new QMenu( current ); + addDPStaticEntry( menu, qtr( "&Help..." ) , "", + ":/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" ); + return menu; +} /***************************************************************************** - * Popup menus + * Popup menus - Right Click menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ unsigned int i_last_separator = 0; \ - vector objects; \ + vector objects; \ vector varnames; \ input_thread_t *p_input = THEMIM->getInput(); #define CREATE_POPUP \ - QMenu *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; -#define POPUP_STATIC_ENTRIES \ - vlc_value_t val; \ - MIM_SADD( qtr("Stop"), "", "", stop() ); \ - MIM_SADD( qtr("Previous"), "", "", prev() ); \ - MIM_SADD( qtr("Next"), "", "", next() ); \ - if( p_input ) \ - { \ - var_Get( p_input, "state", &val ); \ - if( val.i_int == PAUSE_S ) \ - MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \ - else \ - MIM_SADD( qtr("Pause"), "", "", togglePlayPause() ) \ - } \ - else if( THEPL->i_size && THEPL->i_enabled ) \ - MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \ - \ - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \ - intfmenu->setTitle( qtr("Interfaces" ) ); \ - menu->addMenu( intfmenu ); \ - \ - QMenu *toolsmenu = ToolsMenu( p_intf, false ); \ - toolsmenu->setTitle( qtr("Tools" ) ); \ - menu->addMenu( toolsmenu ); \ - +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" ), "", + ":/pause", SLOT( togglePlayPause() ) ); + else + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/play", SLOT( togglePlayPause() ) ); + } + else if( THEPL->items.i_size ) + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/play", SLOT( togglePlayPause() ) ); + else + addDPStaticEntry( menu, qtr( "Play" ), "", + ":/play", SLOT( openDialog() ) ); + + addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "", + ":/stop", SLOT( stop() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "", + ":/previous", SLOT( prev() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "", + ":/next", SLOT( next() ) ); +} + +void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) +{ +#if 0 + QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true ); + toolsmenu->setTitle( qtr( "Tools" ) ); + menu->addMenu( toolsmenu ); +#endif + + QMenu *openmenu = new QMenu( qtr( "Open" ), menu ); + addDPStaticEntry( openmenu, qtr( "&Open File..." ), "", + ":/file-asym", SLOT( openFileDialog() ) ); + addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "", + ":/folder-grey", SLOT( PLOpenDir() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "", + ":/disc", SLOT( openDiscDialog() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "", + ":/network", SLOT( openNetDialog() ) ); + addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "", + ":/capture-card", SLOT( openCaptureDialog() ) ); + menu->addMenu( openmenu ); + + menu->addSeparator(); +#if 0 + QMenu *helpmenu = HelpMenu( menu ); + helpmenu->setTitle( qtr( "Help" ) ); + menu->addMenu( helpmenu ); +#endif + + addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit", + SLOT( quit() ), "Ctrl+Q" ); +} + +/* Video Tracks and Subtitles tracks */ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; 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 ); + vlc_object_hold( p_input ); + 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 ); } + QMenu *menu = new QMenu(); CREATE_POPUP; } +/* Audio Tracks */ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; 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 ); + vlc_object_hold( p_input ); + 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(); CREATE_POPUP; } -/* Navigation stuff, and general */ +/* Navigation stuff, and general menus ( open ) */ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) { + vlc_value_t val; POPUP_BOILERPLATE; + if( p_input ) { - vlc_object_yield( p_input ); + vlc_object_hold( p_input ); varnames.push_back( "audio-es" ); - InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); + InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); PUSH_SEPARATOR; } QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); + + menu->addSeparator(); + PopupMenuControlEntries( menu, p_intf, p_input ); + menu->addSeparator(); - POPUP_STATIC_ENTRIES; + PopupMenuStaticEntries( p_intf, menu ); p_intf->p_sys->p_popup_menu = menu; menu->popup( QCursor::pos() ); p_intf->p_sys->p_popup_menu = NULL; } -void QVLCMenu::PopupMenu( intf_thread_t *p_intf ) +/* Main Menu that sticks everything together */ +void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; - if( p_input ) + MainInterface *mi = p_intf->p_sys->p_mi; + if( show ) { - vlc_object_yield( p_input ); - InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); + /* 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; - /* 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 ) + 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 ) { - VideoAutoMenuBuilder( p_vout, objects, varnames ); - vlc_object_release( p_vout ); + 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_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, + VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, + b_isFullscreen ); + vlc_object_release( p_vout ); + } + + menu->addSeparator(); + + vlc_object_hold( 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 ); } - /* 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 ) + + menu->addSeparator(); + + /* Add some special entries for windowed mode: Interface Menu */ + if( !b_isFullscreen ) { - AudioAutoMenuBuilder( p_aout, objects, varnames ); - vlc_object_release( p_aout ); + submenu = new QMenu( qtr( "Interface" ), menu ); + if( mi ) + { + submenu->addAction( QIcon( ":/playlist" ), + qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); + } + addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "", + ":/settings", SLOT( extendedDialog() ) ); + addDPStaticEntry( submenu, qtr( I_MENU_INFO ) , "", ":/info", + SLOT( mediaInfoDialog() ), "Ctrl+I" ); + if( mi ) + { + 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() ); + } + else /* We are using the skins interface. + If not, this entry will not show. */ + { + addDPStaticEntry( submenu, qtr( "&Preferences..." ), "", + ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + submenu->addSeparator(); + objects.clear(); + varnames.clear(); + vlc_object_t *p_object = ( vlc_object_t* ) + vlc_object_find( p_intf, VLC_OBJECT_INTF, FIND_PARENT ); + if( p_object ) + { + objects.push_back( p_object ); + varnames.push_back( "intf-skins" ); + Populate( p_intf, submenu, varnames, objects ); + vlc_object_release( p_object ); + } + else + { + msg_Dbg( p_intf, "could not find parent interface" ); + } + } + 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 + { + // destroy popup if there is one + delete p_intf->p_sys->p_popup_menu; + p_intf->p_sys->p_popup_menu = NULL; } +} - QMenu *menu = new QMenu(); - Populate( p_intf, menu, varnames, objects ); - menu->addSeparator(); - POPUP_STATIC_ENTRIES; +#undef ACT_ADD - p_intf->p_sys->p_popup_menu = menu; - menu->popup( QCursor::pos() ); - p_intf->p_sys->p_popup_menu = NULL; +/************************************************************************ + * Systray Menu * + ************************************************************************/ + +void QVLCMenu::updateSystrayMenu( MainInterface *mi, + intf_thread_t *p_intf, + bool b_force_visible ) +{ + POPUP_BOILERPLATE; + + /* Get the systray menu and clean it */ + QMenu *sysMenu = mi->getSysTrayMenu(); + sysMenu->clear(); + + /* Hide / Show VLC and cone */ + if( mi->isVisible() || b_force_visible ) + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr( "Hide VLC media player in taskbar" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + else + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr( "Show VLC media player" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + + sysMenu->addSeparator(); + PopupMenuControlEntries( sysMenu, p_intf, p_input ); + + sysMenu->addSeparator(); + addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", + ":/file-wide", SLOT( openFileDialog() ), "" ); + addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", + ":/quit", SLOT( quit() ), "" ); + + /* Set the menu */ + mi->getSysTray()->setContextMenu( sysMenu ); } #undef PUSH_VAR @@ -397,61 +972,39 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf ) /************************************************************************* * Builders for automenus *************************************************************************/ -QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, +QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, + QMenu *current, vector< const char *> & varnames, - vector & objects, bool append ) + vector & objects, + 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++ ) + 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; } + p_object = objects[i]; - if( objects[i] == 0 ) - { - /// \bug What is this ? - // Append( menu, varnames[i], NULL ); - b_section_empty = VLC_FALSE; - 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 ); - else - CreateItem( menu, varnames[i], p_object, true ); - vlc_object_release( p_object ); + UpdateItem( p_intf, menu, varnames[i], p_object, true ); } - - /* Special case for empty menus */ - if( menu->actions().size() == 0 || b_section_empty ) - APPEND_EMPTY - return menu; } @@ -459,10 +1012,9 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, * Private methods. *****************************************************************************/ -#define FREE(x) if(x) { free(x);x=NULL;} - -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; @@ -471,31 +1023,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 ) + 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; } } @@ -506,76 +1056,117 @@ 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; + 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" ) + || !strcmp( psz_var, "postproc-q" ) ) + i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE; + else + i_type = var_Type( p_object, psz_var ); switch( i_type & VLC_VAR_TYPE ) { - case VLC_VAR_VOID: - case VLC_VAR_BOOL: - case VLC_VAR_VARIABLE: - case VLC_VAR_STRING: - case VLC_VAR_INTEGER: - case VLC_VAR_FLOAT: - break; - default: - /* Variable doesn't exist or isn't handled */ - return; + case VLC_VAR_VOID: + case VLC_VAR_BOOL: + case VLC_VAR_VARIABLE: + case VLC_VAR_STRING: + case VLC_VAR_INTEGER: + case VLC_VAR_FLOAT: + break; + default: + /* Variable doesn't exist or isn't handled */ + return; } /* 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( QString::fromUtf8( 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 ); - FREE( text.psz_string ); + FREENULL( text.psz_string ); return; } -#define TEXT_OR_VAR QString::fromUtf8 ( text.psz_string ? text.psz_string : \ - psz_var ) - switch( i_type & VLC_VAR_TYPE ) { - case VLC_VAR_VOID: - var_Get( p_object, psz_var, &val ); - CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL, - p_object->i_object_id, val, i_type ); - break; + case VLC_VAR_VOID: + var_Get( p_object, psz_var, &val ); + CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL, + p_object, val, i_type ); + break; - case VLC_VAR_BOOL: - var_Get( p_object, psz_var, &val ); - val.b_bool = !val.b_bool; - CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_CHECK, - p_object->i_object_id, val, i_type, val.b_bool ); - break; + case VLC_VAR_BOOL: + var_Get( p_object, psz_var, &val ); + val.b_bool = !val.b_bool; + CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_CHECK, + p_object, val, i_type, !val.b_bool ); + break; } - FREE( text.psz_string ); + FREENULL( text.psz_string ); } -int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, - vlc_object_t *p_object, bool b_root ) +int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, + vlc_object_t *p_object, bool b_root ) { vlc_value_t val, val_list, text_list; int i_type, i; @@ -584,20 +1175,21 @@ 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 ) { - case VLC_VAR_VOID: - case VLC_VAR_BOOL: - case VLC_VAR_VARIABLE: - case VLC_VAR_STRING: - case VLC_VAR_INTEGER: - case VLC_VAR_FLOAT: - break; - default: - /* Variable doesn't exist or isn't handled */ - return VLC_EGENERIC; + case VLC_VAR_VOID: + case VLC_VAR_BOOL: + case VLC_VAR_VARIABLE: + case VLC_VAR_STRING: + case VLC_VAR_INTEGER: + case VLC_VAR_FLOAT: + break; + default: + /* Variable doesn't exist or isn't handled */ + return VLC_EGENERIC; } if( var_Change( p_object, psz_var, VLC_VAR_GETLIST, @@ -605,8 +1197,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] #define CURTEXT text_list.p_list->p_values[i].psz_string @@ -614,107 +1205,131 @@ 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 ) { - case VLC_VAR_VARIABLE: - CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false ); - subsubmenu->setTitle( QString::fromUtf8( CURTEXT ? CURTEXT : - CURVAL.psz_string ) ); - submenu->addMenu( subsubmenu ); - break; - - case VLC_VAR_STRING: - var_Get( p_object, psz_var, &val ); - another_val.psz_string = strdup( CURVAL.psz_string ); - - menutext = 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 ); - break; - - case VLC_VAR_INTEGER: - var_Get( p_object, psz_var, &val ); - if( CURTEXT ) menutext = CURTEXT; - else menutext.sprintf( "%d", CURVAL.i_int); - CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, CURVAL, i_type, - NOTCOMMAND && CURVAL.i_int == val.i_int ); - break; - - case VLC_VAR_FLOAT: - var_Get( p_object, psz_var, &val ); - if( CURTEXT ) menutext = CURTEXT ; - else menutext.sprintf( "%.2f", CURVAL.f_float ); - CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, CURVAL, i_type, - NOTCOMMAND && CURVAL.f_float == val.f_float ); - break; - - default: - break; + case VLC_VAR_VARIABLE: + CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false ); + subsubmenu->setTitle( qfu( CURTEXT ? CURTEXT :CURVAL.psz_string ) ); + submenu->addMenu( subsubmenu ); + break; + + case VLC_VAR_STRING: + 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, + p_object, another_val, i_type, + val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) ); + + free( val.psz_string ); + break; + + 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, + p_object, CURVAL, i_type, + CURVAL.i_int == val.i_int ); + 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, + p_object, CURVAL, i_type, + CURVAL.f_float == val.f_float ); + break; + + default: + break; } } + currentGroup = NULL; /* clean up everything */ var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, &text_list ); -#undef NORMAL_OR_RADIO -#undef NOTCOMMAND #undef CURVAL #undef CURTEXT return VLC_SUCCESS; } void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, - QString text, QString help, - int i_item_type, int i_object_id, - vlc_value_t val, int i_val_type, - bool checked ) + QString text, QString help, + int i_item_type, vlc_object_t *p_obj, + vlc_value_t val, int i_val_type, + bool checked ) { - QAction *action = new QAction( text, menu ); - action->setText( text ); + QAction *action = FindActionWithVar( menu, psz_var ); + if( !action ) + { + action = new QAction( text, menu ); + menu->addAction( action ); + } + action->setToolTip( help ); + action->setEnabled( p_obj != NULL ); if( i_item_type == ITEM_CHECK ) { action->setCheckable( true ); - currentGroup = NULL; } else if( i_item_type == ITEM_RADIO ) { action->setCheckable( true ); if( !currentGroup ) - currentGroup = new QActionGroup(menu); + currentGroup = new QActionGroup( menu ); currentGroup->addAction( action ); } - else - currentGroup = NULL; - if( checked ) action->setChecked( true ); - MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type, - val, psz_var ); - connect( action, SIGNAL(triggered()), THEDP->menusMapper, SLOT(map()) ); + action->setChecked( checked ); + + MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type, + val, psz_var ); + CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); - menu->addAction( action ); } 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 ); + MenuItemData *itemData = qobject_cast( data ); + vlc_object_t *p_object = itemData->p_obj; if( p_object == NULL ) return; - fprintf( stderr, "Setting %s on %i\n", itemData->psz_var, - p_object->i_object_id ); var_Set( p_object, itemData->psz_var, itemData->val ); - vlc_object_release( p_object ); +} + +void QVLCMenu::updateRecents( intf_thread_t *p_intf ) +{ + if (recentsMenu) + { + QAction* action; + RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf ); + QList l = rmrl->recents(); + + recentsMenu->clear(); + if( !l.size() ) + { + action = recentsMenu->addAction( " - Empty - " ); + action->setEnabled( false ); + } + else + { + for( int i = 0; i < l.size(); ++i ) + { + action = recentsMenu->addAction( l.at( i ), + rmrl->signalMapper, + SLOT( map() ) ); + rmrl->signalMapper->setMapping( action, l.at( i ) ); + } + + recentsMenu->addSeparator(); + recentsMenu->addAction( "Clear", rmrl, SLOT( clear() ) ); + } + } }