X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=5c45aba10c88c407177e07e57820936dc61aace8;hb=1c6b27d3715a074504fdb46617fd0876b870019e;hp=0a5dbd059393459803162141c7c3ce4b135886c1;hpb=5dd029ec8dd6975324a93e6c80487b522993d939;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 0a5dbd0593..5c45aba10c 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright ( C ) 2006-2007 the VideoLAN team + * Copyright © 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -31,14 +31,15 @@ # include "config.h" #endif -#include - #include +#include -#include "main_interface.hpp" #include "menus.hpp" -#include "dialogs_provider.hpp" -#include "input_manager.hpp" + +#include "main_interface.hpp" /* View modifications */ +#include "dialogs_provider.hpp" /* Dialogs display */ +#include "input_manager.hpp" /* Input Management */ +#include "recents.hpp" /* Recent Items */ #include #include @@ -46,6 +47,21 @@ #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 { @@ -56,10 +72,19 @@ enum static QActionGroup *currentGroup; -// Add static entries to menus +/* 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 ) @@ -83,28 +108,9 @@ void addDPStaticEntry( QMenu *menu, action->setData( "_static_" ); } -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 ); - } -} - void EnableDPStaticEntries( QMenu *menu, bool enable = true ) { - if( !menu ) - return; + if( !menu ) return; QAction *action; foreach( action, menu->actions() ) @@ -130,23 +136,44 @@ int DeleteNonStaticEntries( QMenu *menu ) else i_ret++; } + return i_ret; +} + +/*** + * Same for MIM + ***/ +void addMIMStaticEntry( intf_thread_t *p_intf, + QMenu *menu, + const QString text, + 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 ? p_object->i_object_id : 0 ) + objects.push_back( VLC_OBJECT(p_object) ) #define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ - objects.push_back( p_input ? p_input->i_object_id : 0 ); + 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(); } -static int InputAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, +static int InputAutoMenuBuilder( input_thread_t *p_object, + vector &objects, vector &varnames ) { PUSH_VAR( "bookmark" ); @@ -158,9 +185,9 @@ static int InputAutoMenuBuilder( vlc_object_t *p_object, return VLC_SUCCESS; } -static int VideoAutoMenuBuilder( vlc_object_t *p_object, +static int VideoAutoMenuBuilder( vout_thread_t *p_object, input_thread_t *p_input, - vector &objects, + vector &objects, vector &varnames ) { PUSH_INPUTVAR( "video-es" ); @@ -171,34 +198,47 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, PUSH_VAR( "aspect-ratio" ); PUSH_VAR( "crop" ); PUSH_VAR( "video-on-top" ); +#ifdef WIN32 PUSH_VAR( "directx-wallpaper" ); +#endif PUSH_VAR( "video-snapshot" ); + /* Special case for postproc */ + // FIXME if( p_object ) { - vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object, - VLC_OBJECT_DECODER, - FIND_PARENT ); - if( 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_object = p_dec_obj; - PUSH_VAR( "ffmpeg-pp-q" ); - vlc_object_release( p_dec_obj ); + vlc_object_t *p_pp = (vlc_object_t *) + vlc_object_find_name( p_dec, "postproc", + FIND_CHILD ); + if( p_pp ) + { + vlc_object_t *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, +static int AudioAutoMenuBuilder( aout_instance_t *p_object, input_thread_t *p_input, - vector &objects, + 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; } @@ -213,17 +253,6 @@ static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) 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 @@ -248,18 +277,22 @@ static QAction * FindActionWithText( QMenu *menu, QString &text ) void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, bool visual_selector_enabled ) +/* FIXME remove this visual dependency */ { /* 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, NULL, mi, visual_selector_enabled, true ), - qtr( "&Tools" ) ); + BAR_ADD( FileMenu( p_intf ), qtr( "&Media" ) ); + 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_DADD( NavigMenu( p_intf, NULL ), qtr( "P&layback" ), 3 ); + + BAR_ADD( ToolsMenu( p_intf ), qtr( "&Tools" ) ); + BAR_ADD( ViewMenu( p_intf, NULL, mi, visual_selector_enabled, true ), + qtr( "V&iew" ) ); + BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) ); } #undef BAR_ADD @@ -269,51 +302,86 @@ void QVLCMenu::createMenuBar( MainInterface *mi, * Media ( File ) Menu * Opening, streaming and quit **/ -QMenu *QVLCMenu::FileMenu() +QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); - 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() ), + 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+O" ); +#endif + addDPStaticEntry( menu, qtr( "Open &URL" ), + NULL, SLOT( openUrlDialog() ), "Ctrl+V" ); + 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" ); + + menu->addSeparator(); + + addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", SLOT( openAPlaylist() ), + "Ctrl+X" ); + addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ), + "Ctrl+Y" ); + menu->addSeparator(); - addDPStaticEntry( menu, qtr( "&Streaming..." ), "", - ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ), + recentsMenu = new QMenu( qtr( "Recently &Played" ), menu ); + updateRecents( p_intf ); + menu->addMenu( recentsMenu ); + menu->addSeparator(); + + addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", + SLOT( openAndTranscodingDialogs() ), "Ctrl+R" ); + addDPStaticEntry( menu, qtr( "&Streaming..." ), + ":/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" ); - addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "", - SLOT( openThenTranscodingDialogs() ), "Ctrl+R" ); menu->addSeparator(); - addDPStaticEntry( menu, qtr( "&Quit" ) , "", - ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" ); + addDPStaticEntry( menu, qtr( "&Quit" ) , + ":/quit", SLOT( quit() ), "Ctrl+Q" ); return menu; } /* Playlist/MediaLibrary Control */ -QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) +QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf ) { + VLC_UNUSED( p_intf ); //TODO remove QMenu *menu = new QMenu(); - menu->addMenu( SDMenu( p_intf ) ); - menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), - qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); - menu->addSeparator(); - addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ), - "Ctrl+X" ); - addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ), - "Ctrl+Y" ); + 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 + addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ), + "", SLOT( pluginDialog() ) ); menu->addSeparator(); - menu->addAction( qtr( "Undock from interface" ), mi, - SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) ); + + addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), + ":/preferences", SLOT( toolbarDialog() ) ); + addDPStaticEntry( menu, qtr( "&Preferences..." ), + ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + return menu; } @@ -323,7 +391,7 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) * longer. * This menu can be an interface menu but also a right click menu. **/ -QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, +QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *mi, bool visual_selector_enabled, @@ -332,43 +400,49 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, QMenu *menu = new QMenu( current ); if( mi ) { - menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), - qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ), - qtr( "Ctrl+L" ) ); + QAction *act= + menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ), + mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); + act->setData( "_static_" ); } - addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", - ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ), - "Ctrl+E" ); + menu->addMenu( SDMenu( p_intf ) ); + /*menu->addSeparator(); + menu->addAction( qtr( "Undock from Interface" ), mi, + SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/ + menu->addSeparator(); if( with_intf ) { QMenu *intfmenu = InterfacesMenu( p_intf, menu ); - 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( "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( "Toggle Fullscreen Interface" ), mi, - SLOT( toggleFullScreen() ), qtr( "F11" ) ); + 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 = 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 */ @@ -381,23 +455,6 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, menu->addSeparator(); - 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 - - menu->addSeparator(); - addDPStaticEntry( menu, qtr( "Preferences..." ), "", - ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" ); return menu; } @@ -406,16 +463,13 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, **/ 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 *submenu = new QMenu( current ); - QMenu *menu = Populate( p_intf, submenu, varnames, objects ); + objects.push_back( VLC_OBJECT(p_intf) ); - return menu; + return Populate( p_intf, current, varnames, objects ); } /** @@ -423,34 +477,31 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) */ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { - vector objects; + vector objects; vector varnames; - vlc_object_t *p_object; + aout_instance_t *p_aout; input_thread_t *p_input; - if( !current ) - current = new QMenu(); + if( !current ) current = new QMenu(); if( current->isEmpty() ) { 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" ) ); - ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) ); } 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 ) - vlc_object_release( p_object ); + vlc_object_hold( p_input ); + p_aout = THEMIM->getAout(); + if( p_aout ) + { + AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); + vlc_object_release( p_aout ); + } if( p_input ) vlc_object_release( p_input ); @@ -463,13 +514,12 @@ 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; + vout_thread_t *p_vout; input_thread_t *p_input; - vector objects; + vector objects; vector varnames; - if( !current ) - current = new QMenu(); + if( !current ) current = new QMenu(); if( current->isEmpty() ) { @@ -479,31 +529,33 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); action = current->addMenu( submenu ); action->setData( "spu-es" ); - action = submenu->addAction( qfu( "Load File..." ), THEDP, - SLOT( loadSubtitlesFile() ) ); - action->setData( "_static_" ); + addDPStaticEntry( submenu, qtr( "Open File..." ), "", + SLOT( loadSubtitlesFile() ) ); + submenu->addSeparator(); - ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) ); + 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" ) ); */ - ACT_ADD( current, "video-snapshot", qtr( "Snapshot" ) ); - /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */ +#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_yield( p_input ); - p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - - VideoAutoMenuBuilder( p_object, p_input, objects, varnames ); + vlc_object_hold( p_input ); - if( p_object ) - vlc_object_release( p_object ); + p_vout = THEMIM->getVout(); + if( p_vout ) + { + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); + vlc_object_release( p_vout ); + } if( p_input ) vlc_object_release( p_input ); @@ -516,31 +568,29 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) **/ 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 ) menu = new QMenu(); if( menu->isEmpty() ) { - addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ), "","", + 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, "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 ); + input_thread_t *p_object; + vector objects; + vector varnames; + + p_object = THEMIM->getInput(); + if( p_object ) + vlc_object_hold( p_object ); + InputAutoMenuBuilder( p_object, objects, varnames ); PUSH_VAR( "prev-title" ); PUSH_VAR( "next-title" ); PUSH_VAR( "prev-chapter" ); @@ -550,7 +600,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { vlc_object_release( p_object ); } - return Populate( p_intf, menu, varnames, objects, true ); + return Populate( p_intf, menu, varnames, objects ); } /** @@ -561,8 +611,7 @@ 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 ); + char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames ); if( !ppsz_names ) return menu; @@ -579,7 +628,7 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) if( !strcmp( *ppsz_name, "podcast" ) ) { - QAction *b = new QAction( qfu( "Configure podcasts..." ), menu ); + QAction *b = new QAction( qtr( "Configure podcasts..." ), menu ); //b->setEnabled( a->isChecked() ); menu->addAction( b ); CONNECT( b, triggered(), THEDP, podcastConfigureDialog() ); @@ -597,25 +646,24 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) QMenu *QVLCMenu::HelpMenu( QMenu *current ) { QMenu *menu = new QMenu( current ); - addDPStaticEntry( menu, qtr( "Help..." ) , "", - ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" ); + addDPStaticEntry( menu, qtr( "&Help..." ) , + ":/help", 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() ), - "Ctrl+F1" ); + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/info", + SLOT( aboutDialog() ), "Shift+F1" ); return menu; } -#undef ACT_ADD - /***************************************************************************** * 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(); @@ -635,25 +683,28 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, 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() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), + ":/pause", SLOT( togglePlayPause() ) ); else - addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", - ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), + ":/play", 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() ) ); - } + 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 ) +void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) { #if 0 QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true ); @@ -662,16 +713,16 @@ void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) #endif 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() ) ); + 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(); @@ -681,7 +732,7 @@ void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) menu->addMenu( helpmenu ); #endif - addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png", + addDPStaticEntry( menu, qtr( "Quit" ), ":/quit", SLOT( quit() ), "Ctrl+Q" ); } @@ -691,9 +742,8 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) POPUP_BOILERPLATE; if( p_input ) { - vlc_object_yield( p_input ); - vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input, - VLC_OBJECT_VOUT, FIND_CHILD ); + vlc_object_hold( p_input ); + vout_thread_t *p_vout = THEMIM->getVout(); if( p_vout ) { VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); @@ -711,9 +761,8 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) POPUP_BOILERPLATE; if( p_input ) { - vlc_object_yield( p_input ); - vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); + vlc_object_hold( p_input ); + aout_instance_t *p_aout = THEMIM->getAout(); AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); if( p_aout ) vlc_object_release( p_aout ); @@ -726,14 +775,13 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) /* 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( p_input, objects, varnames ); PUSH_SEPARATOR; } @@ -744,7 +792,7 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) PopupMenuControlEntries( menu, p_intf, p_input ); menu->addSeparator(); - PopupMenuStaticEntries( p_intf, menu ); + PopupMenuStaticEntries( menu ); p_intf->p_sys->p_popup_menu = menu; menu->popup( QCursor::pos() ); @@ -764,84 +812,110 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) QMenu *menu = new QMenu(); QMenu *submenu; QAction *action; + bool b_isFullscreen = false; POPUP_BOILERPLATE; PopupMenuControlEntries( menu, p_intf, p_input ); menu->addSeparator(); - bool b_fullscreen; if( p_input ) { - vlc_object_yield( p_input ); - InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); - - vlc_object_t *p_aout = ( vlc_object_t * ) - vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - vlc_object_t *p_vout = ( vlc_object_t * ) - vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); + vout_thread_t *p_vout = THEMIM->getVout(); /* Add a fullscreen switch button */ if( p_vout ) { vlc_value_t val; var_Get( p_vout, "fullscreen", &val ); - val.b_bool = !val.b_bool; - CreateAndConnect( menu, "fullscreen", qtr( "Fullscreen" ), "", - ITEM_CHECK, p_vout->i_object_id, val, VLC_VAR_BOOL, - !val.b_bool ); - b_fullscreen = !val.b_bool; + 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 ); } - /* Audio menu */ - AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); - if( p_aout ) - vlc_object_release( p_aout ); - submenu = Populate( p_intf, NULL, varnames, objects ); - varnames.clear(); objects.clear(); - action = menu->addMenu( submenu ); - action->setText( qtr( "Audio" ) ); - if( submenu->isEmpty() ) + menu->addSeparator(); + + vlc_object_hold( p_input ); + InputAutoMenuBuilder( 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 ); - /* Video menu */ - VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); - if( p_vout ) - vlc_object_release( p_vout ); - submenu = Populate( p_intf, NULL, varnames, objects ); - varnames.clear(); objects.clear(); - action = menu->addMenu( submenu ); - action->setText( qtr( "Video" ) ); - if( submenu->isEmpty() ) + submenu = new QMenu( menu ); + action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action->setText( qtr( "&Video" ) ); + if( action->menu()->isEmpty() ) action->setEnabled( false ); - vlc_object_release( p_input ); + 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 */ - if( !b_fullscreen ) + /* 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() ); + 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_name( p_intf, "skins2", 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 ); + PopupMenuStaticEntries( menu ); p_intf->p_sys->p_popup_menu = menu; p_intf->p_sys->p_popup_menu->popup( QCursor::pos() ); @@ -854,6 +928,8 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } } +#undef ACT_ADD + /************************************************************************ * Systray Menu * ************************************************************************/ @@ -872,24 +948,24 @@ 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(); PopupMenuControlEntries( sysMenu, p_intf, p_input ); sysMenu->addSeparator(); - addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", - ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" ); - addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", - ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); + addDPStaticEntry( sysMenu, qtr( "&Open Media" ), + ":/file-wide", SLOT( openFileDialog() ) ); + addDPStaticEntry( sysMenu, qtr( "&Quit" ) , + ":/quit", SLOT( quit() ) ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); @@ -904,12 +980,10 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, vector< const char *> & varnames, - vector & objects, - bool append ) + vector & objects ) { QMenu *menu = current; - if( !menu ) - menu = new QMenu(); + if( !menu ) menu = new QMenu(); /* Disable all non static entries */ QAction *p_action; @@ -931,28 +1005,9 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, menu->addSeparator(); continue; } + p_object = objects[i]; - if( objects[i] == 0 ) - { - 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; - } - } - - /* Ugly specific stuff */ - if( strstr( varnames[i], "intf-add" ) ) - UpdateItem( p_intf, menu, varnames[i], p_object, false ); - else - UpdateItem( p_intf, menu, varnames[i], p_object, true ); - if( p_object ) - vlc_object_release( p_object ); + UpdateItem( p_intf, menu, varnames[i], p_object, true ); } return menu; } @@ -1022,7 +1077,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, /* Check the type of the object variable */ if( !strcmp( psz_var, "audio-es" ) - || !strcmp( psz_var, "video-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 ); @@ -1063,8 +1119,7 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, 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 ) ); + vout_thread_t *p_vout = THEMIM->getVout(); forceDisabled = ( p_vout == NULL ); if( p_vout ) vlc_object_release( p_vout ); @@ -1099,14 +1154,14 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, 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 ); + 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 ); + p_object, val, i_type, !val.b_bool ); break; } FREENULL( text.psz_string ); @@ -1141,13 +1196,11 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, } if( var_Change( p_object, psz_var, VLC_VAR_GETLIST, - &val_list, &text_list ) < 0 ) + &val_list, &text_list ) < 0 ) { 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 @@ -1169,10 +1222,9 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, var_Get( p_object, psz_var, &val ); another_val.psz_string = strdup( CURVAL.psz_string ); menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string ); - CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, another_val, i_type, - NOTCOMMAND && val.psz_string && - !strcmp( val.psz_string, CURVAL.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; @@ -1181,18 +1233,18 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, var_Get( p_object, psz_var, &val ); if( CURTEXT ) menutext = qfu( 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 ); + 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, "", NORMAL_OR_RADIO, - p_object->i_object_id, CURVAL, i_type, - NOTCOMMAND && CURVAL.f_float == val.f_float ); + CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, + p_object, CURVAL, i_type, + CURVAL.f_float == val.f_float ); break; default: @@ -1204,8 +1256,6 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, /* 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; @@ -1213,26 +1263,19 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, QString text, QString help, - int i_item_type, int i_object_id, + int i_item_type, vlc_object_t *p_obj, vlc_value_t val, int i_val_type, bool checked ) { 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 = new QAction( text, menu ); + menu->addAction( action ); } - action->setText( text ); action->setToolTip( help ); - - action->setEnabled( i_object_id != 0 ); + action->setEnabled( p_obj != NULL ); if( i_item_type == ITEM_CHECK ) { @@ -1248,20 +1291,49 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, action->setChecked( checked ); - MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type, + 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 ) +void QVLCMenu::DoAction( QObject *data ) { MenuItemData *itemData = qobject_cast( data ); - vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( itemData->i_object_id ); + vlc_object_t *p_object = itemData->p_obj; if( p_object == NULL ) return; 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( + QString( "&%1: " ).arg( i + 1 ) + l.at( i ), + rmrl->signalMapper, + SLOT( map() ) ); + rmrl->signalMapper->setMapping( action, l.at( i ) ); + } + + recentsMenu->addSeparator(); + recentsMenu->addAction( "&Clear", rmrl, SLOT( clear() ) ); + } + } +}