X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=4ea62c352fd743ea5da9f7f3cdf8f3adda7e0e48;hb=0338befbcd074652c5e20faccd843686843c27d0;hp=31360272eea0c2b7b45390e321768569091a0d1d;hpb=180a5255d6f2881bb3a1ece1030cec265d800908;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 31360272ee..4ea62c352f 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -5,6 +5,7 @@ * $Id$ * * Authors: Clément Stenac + * Jean-Baptiste Kempf * * 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 @@ -21,12 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include -#include - #ifndef WIN32 # include #endif @@ -38,6 +33,13 @@ #include "dialogs_provider.hpp" #include "input_manager.hpp" +#include +#include +#include +#include +#include +#include + enum { ITEM_NORMAL, @@ -48,60 +50,60 @@ enum static QActionGroup *currentGroup; // Add static entries to menus -#define DP_SADD( text, help, icon, slot, shortcut ) \ - { \ - if( strlen(icon) > 0 ) \ +#define DP_SADD( menu, text, help, icon, slot, shortcut ) \ +{ \ + if( strlen( icon ) > 0 ) \ { \ - if( strlen(shortcut) > 0 ) \ + if( strlen( shortcut ) > 0 ) \ { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ), \ - tr(shortcut) );\ + menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ), \ + qtr( shortcut ) );\ } \ else \ { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ) );\ + menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ) );\ } \ } \ else \ { \ - if( strlen(shortcut) > 0 ) \ + if( strlen( shortcut ) > 0 ) \ { \ menu->addAction( text, THEDP, SLOT( slot ), \ - qtr(shortcut) ); \ + qtr( shortcut ) ); \ } \ else \ { \ menu->addAction( text, THEDP, SLOT( slot ) ); \ } \ } \ - } -#define MIM_SADD( text, help, icon, slot ) \ - { \ - if( strlen(icon) > 0 ) \ +} +#define MIM_SADD( menu, text, help, icon, slot ) \ +{ \ + if( strlen( icon ) > 0 ) \ { \ QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \ - action->setIcon(QIcon(icon)); \ + action->setIcon( QIcon( icon ) ); \ } \ else \ { \ menu->addAction( text, THEMIM, SLOT( slot ) ); \ } \ - } +} #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->i_object_id ) #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( "title" ); @@ -113,8 +115,8 @@ static int InputAutoMenuBuilder( vlc_object_t *p_object, } static int VideoAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, - vector &varnames ) + vector &objects, + vector &varnames ) { PUSH_VAR( "fullscreen" ); PUSH_VAR( "zoom" ); @@ -126,8 +128,8 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, PUSH_VAR( "video-snapshot" ); vlc_object_t *p_dec_obj = (vlc_object_t *)vlc_object_find( p_object, - VLC_OBJECT_DECODER, - FIND_PARENT ); + VLC_OBJECT_DECODER, + FIND_PARENT ); if( p_dec_obj != NULL ) { vlc_object_t *p_object = p_dec_obj; @@ -138,8 +140,8 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, } static int AudioAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, - vector &varnames ) + vector &objects, + vector &varnames ) { PUSH_VAR( "audio-device" ); PUSH_VAR( "audio-channels" ); @@ -162,49 +164,55 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, THEDP->menusUpdateMapper->setMapping( menu, f ); } void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, - bool playlist, bool adv_controls_enabled, - bool visual_selector_enabled ) + bool playlist, bool adv_controls_enabled, + bool visual_selector_enabled ) { -#ifndef WIN32 - /* Uglu klugde +#ifndef WIN32 + /* Ugly klugde * Remove SIGCHLD from the ignored signal the time to initialise * Qt because it call gconf to get the icon theme */ sigset_t set; sigemptyset( &set ); sigaddset( &set, SIGCHLD ); - pthread_sigmask (SIG_UNBLOCK, &set, NULL); + pthread_sigmask( SIG_UNBLOCK, &set, NULL ); #endif QMenuBar *bar = mi->menuBar(); -#ifndef WIN32 - pthread_sigmask (SIG_BLOCK, &set, NULL); +#ifndef WIN32 + pthread_sigmask( SIG_BLOCK, &set, NULL ); #endif - BAR_ADD( FileMenu(), qtr("Media") ); + BAR_ADD( FileMenu(), qtr("&Media") ); if( playlist ) { - BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("Playlist" ) ); + BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("&Playlist" ) ); } BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled, - visual_selector_enabled ), 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 ); + visual_selector_enabled ), 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_ADD( HelpMenu(), qtr("Help" ) ); + BAR_ADD( HelpMenu(), qtr("&Help" ) ); } QMenu *QVLCMenu::FileMenu() { QMenu *menu = new QMenu(); -/* DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );*/ - DP_SADD( qtr("Open &File..." ), "", "", openFileDialog(), "Ctrl+O" ); - DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" ); - DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog(), "Ctrl+N" ); - DP_SADD( qtr("Open &Capture Device..." ), "", "", openCaptureDialog(), - "Ctrl+A" ); + DP_SADD( menu, qtr("Open &File..." ), "", + ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" ); + DP_SADD( menu, qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" ); + DP_SADD( menu, qtr("Open &Network..." ), "", + ":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" ); + DP_SADD( menu, qtr("Open &Capture Device..." ), "", + ":/pixmaps/vlc_capture-card_16px.png", openCaptureDialog(), + "Ctrl+C" ); menu->addSeparator(); - DP_SADD( qtr("&Streaming..."), "", "", streamingDialog(), "Ctrl+S" ); + DP_SADD( menu, qtr("&Streaming..."), "", ":/pixmaps/vlc_stream_16px.png", + openThenStreamingDialogs(), "Ctrl+S" ); + DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", + openThenTranscodingDialogs(), "Ctrl+R" ); menu->addSeparator(); - DP_SADD( qtr("&Quit") , "", "", quit(), "Ctrl+Q"); + DP_SADD( menu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", quit(), + "Ctrl+Q"); return menu; } @@ -214,17 +222,17 @@ QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf ) menu->addMenu( SDMenu( p_intf ) ); menu->addSeparator(); - DP_SADD( qtr(I_PL_LOAD), "", "", openPlaylist(), "Ctrl+L" ); - DP_SADD( qtr(I_PL_SAVE), "", "", savePlaylist(), "Ctrl+P" ); + DP_SADD( menu, qtr( I_PL_LOAD ), "", "", openPlaylist(), "Ctrl+L" ); + DP_SADD( menu, qtr( I_PL_SAVE ), "", "", savePlaylist(), "Ctrl+K" ); menu->addSeparator(); menu->addAction( qtr("Undock from interface"), mi, - SLOT( undockPlaylist() ), qtr("Ctrl+U") ); + SLOT( undockPlaylist() ), qtr("Ctrl+U") ); return menu; } QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, - bool adv_controls_enabled, - bool visual_selector_enabled, bool with_intf ) + bool adv_controls_enabled, + bool visual_selector_enabled, bool with_intf ) { QMenu *menu = new QMenu(); if( with_intf ) @@ -234,26 +242,35 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, menu->addMenu( intfmenu ); menu->addSeparator(); } - DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog(), "Ctrl+M" ); - DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog(), "Ctrl+J" ); - DP_SADD( qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog(), "Ctrl+I" ); - DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog(), "Ctrl+G" ); + DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/vlc_messages_16px.png", + messagesDialog(), "Ctrl+M" ); + DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+J" ); + DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/vlc_info_16px.png", + mediaCodecDialog(), "Ctrl+I" ); + DP_SADD( menu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(), "Ctrl+T" ); + DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" ); + DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" ); + + menu->addSeparator(); if( mi ) { - menu->addSeparator(); QAction *adv = menu->addAction( qtr("Advanced controls" ), - mi, SLOT( advanced() ) ); + mi, SLOT( advanced() ) ); adv->setCheckable( true ); if( adv_controls_enabled ) adv->setChecked( true ); #if 0 adv = menu->addAction( qtr("Visualizations selector" ), - mi, SLOT( visual() ) ); + mi, SLOT( visual() ) ); adv->setCheckable( true ); if( visual_selector_enabled ) adv->setChecked( true ); #endif + menu->addAction ( qtr( "Playlist"), mi, SLOT( playlist() ) ); } + DP_SADD( menu, qtr( I_MENU_EXT ), "","",extendedDialog(), "Ctrl+E" ); + DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" ); menu->addSeparator(); - DP_SADD( qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" ); + DP_SADD( menu, qtr("Preferences"), "", ":/pixmaps/vlc_preferences_16px.png", + prefsDialog(), "Ctrl+P" ); return menu; } @@ -270,7 +287,8 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) if( !p_intf->pf_show_dialog ) { menu->addSeparator(); - menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()) ); + menu->addAction( qtr("Switch to skins"), THEDP, SLOT( switchToSkins() ), + QString("Ctrl+Z") ); } CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); @@ -284,7 +302,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) vector varnames; vlc_object_t *p_object = (vlc_object_t *)vlc_object_find( p_intf, - VLC_OBJECT_INPUT, FIND_ANYWHERE ); + VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_object != NULL ) { PUSH_VAR( "audio-es" ); @@ -292,7 +310,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) } p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + FIND_ANYWHERE ); if( p_object ) { AudioAutoMenuBuilder( p_object, objects, varnames ); @@ -309,7 +327,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) vector varnames; p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); + FIND_ANYWHERE ); if( p_object != NULL ) { PUSH_VAR( "video-es" ); @@ -318,7 +336,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) } p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); + FIND_ANYWHERE ); if( p_object != NULL ) { VideoAutoMenuBuilder( p_object, objects, varnames ); @@ -335,7 +353,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current ) /* FIXME */ p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); + FIND_ANYWHERE ); if( p_object != NULL ) { InputAutoMenuBuilder( p_object, objects, varnames ); @@ -349,9 +367,9 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current ) QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); - menu->setTitle( qtr(I_PL_SD) ); + menu->setTitle( qtr( I_PL_SD ) ); vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, - FIND_ANYWHERE ); + FIND_ANYWHERE ); int i_num = 0; for( int i_index = 0 ; i_index < p_list->i_count; i_index++ ) { @@ -371,13 +389,13 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) while( p_parser->pp_shortcuts[++i] != NULL ); i--; if( playlist_IsServicesDiscoveryLoaded( THEPL, - i>=0?p_parser->pp_shortcuts[i] : p_parser->psz_object_name ) ) + i>=0?p_parser->pp_shortcuts[i] : p_parser->psz_object_name ) ) { a->setChecked( true ); } CONNECT( a , triggered(), THEDP->SDMapper, map() ); THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] : - p_parser->psz_object_name ); + p_parser->psz_object_name ); menu->addAction( a ); } } @@ -388,15 +406,15 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) QMenu *QVLCMenu::HelpMenu() { QMenu *menu = new QMenu(); - DP_SADD( qtr("Help") , "", "", helpDialog(), "F1" ); + DP_SADD( menu, qtr("Help") , "", ":/pixmaps/vlc_help_16px.png", helpDialog(), "F1" ); menu->addSeparator(); - DP_SADD( qtr(I_MENU_ABOUT), "", "", aboutDialog(), "Ctrl+Shift+F1"); + DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1"); return menu; } /***************************************************************************** - * Popup menus + * Popup menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ unsigned int i_last_separator = 0; \ @@ -412,29 +430,53 @@ QMenu *QVLCMenu::HelpMenu() p_intf->p_sys->p_popup_menu = NULL; \ i_last_separator = 0; -#define POPUP_STATIC_ENTRIES \ +#define POPUP_PLAY_ENTRIES( menu )\ 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() ) \ + if( val.i_int == PLAYING_S ) \ + MIM_SADD( menu, qtr("Pause"), "", ":/pixmaps/vlc_pause_16px.png", \ + togglePlayPause() ) \ else \ - MIM_SADD( qtr("Pause"), "", "", togglePlayPause() ) \ + MIM_SADD( menu, qtr("Play"), "", ":/pixmaps/vlc_play_16px.png", \ + togglePlayPause() ) \ } \ else if( THEPL->items.i_size && THEPL->i_enabled ) \ - MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \ + MIM_SADD( menu, qtr("Play"), "", ":/pixmaps/vlc_play_16px.png", \ + togglePlayPause() ); \ + \ + MIM_SADD( menu, qtr("Stop"), "", ":/pixmaps/vlc_stop_16px.png", stop() ); \ + MIM_SADD( menu, qtr("Previous"), "", ":/pixmaps/vlc_previous_16px.png", \ + prev() ); \ + MIM_SADD( menu, qtr("Next"), "", ":/pixmaps/vlc_next_16px.png", next() ); + +#define POPUP_STATIC_ENTRIES \ + POPUP_PLAY_ENTRIES( menu ); \ \ + menu->addSeparator(); \ QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \ intfmenu->setTitle( qtr("Interfaces" ) ); \ menu->addMenu( intfmenu ); \ \ - QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \ + QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false, false ); \ 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::VideoPopupMenu( intf_thread_t *p_intf ) { @@ -447,7 +489,7 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) 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_VOUT, FIND_CHILD ); if( p_vout ) { VideoAutoMenuBuilder( p_vout, objects, varnames ); @@ -467,7 +509,7 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) 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_AOUT, FIND_ANYWHERE ); if( p_aout ) { AudioAutoMenuBuilder( p_aout, objects, varnames ); @@ -500,59 +542,105 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) p_intf->p_sys->p_popup_menu = NULL; } -void QVLCMenu::PopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; - if( p_input ) + if( show ) { - vlc_object_yield( p_input ); - InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); - - /* 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 ) + // create a popup if there is none + if( ! p_intf->p_sys->p_popup_menu ) { - VideoAutoMenuBuilder( p_vout, objects, varnames ); - vlc_object_release( p_vout ); - } - /* Audio menu */ - PUSH_SEPARATOR - varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if( p_aout ) - { - AudioAutoMenuBuilder( p_aout, objects, varnames ); - vlc_object_release( p_aout ); + POPUP_BOILERPLATE; + if( p_input ) + { + vlc_object_yield( p_input ); + InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); + + /* Video menu */ + PUSH_SEPARATOR; + varnames.push_back( "video-es" ); + objects.push_back( p_input->i_object_id ); + varnames.push_back( "spu-es" ); + objects.push_back( p_input->i_object_id ); + vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_input, + VLC_OBJECT_VOUT, FIND_CHILD ); + if( p_vout ) + { + VideoAutoMenuBuilder( p_vout, objects, varnames ); + vlc_object_release( p_vout ); + } + /* Audio menu */ + PUSH_SEPARATOR + varnames.push_back( "audio-es" ); + objects.push_back( p_input->i_object_id ); + vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, + VLC_OBJECT_AOUT, FIND_ANYWHERE ); + if( p_aout ) + { + AudioAutoMenuBuilder( p_aout, objects, varnames ); + vlc_object_release( p_aout ); + } + } + + QMenu *menu = new QMenu(); + Populate( p_intf, menu, varnames, objects ); + menu->addSeparator(); + POPUP_STATIC_ENTRIES; + + 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; +/************************************************************************ + * Systray Menu * + ************************************************************************/ - p_intf->p_sys->p_popup_menu = menu; - menu->popup( QCursor::pos() ); - p_intf->p_sys->p_popup_menu = NULL; +void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, + bool b_force_visible ) +{ + POPUP_BOILERPLATE; + QMenu *sysMenu = mi->getSysTrayMenu(); + sysMenu->clear(); + if( mi->isVisible() || b_force_visible ) + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr("Hide VLC media player"), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + else + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr("Show VLC media player"), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + sysMenu->addSeparator(); + POPUP_PLAY_ENTRIES( sysMenu ); + sysMenu->addSeparator(); + DP_SADD( sysMenu, qtr("&Open Media" ), "", + ":/pixmaps/vlc_file-wide_16px.png", openFileDialog(), "" ); + DP_SADD( sysMenu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", + quit(), "" ); + + mi->getSysTray()->setContextMenu( sysMenu ); } #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 ) + vector< const char *> & varnames, + vector & objects, bool append ) { QMenu *menu = current; if( !menu ) @@ -567,7 +655,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, int i; #define APPEND_EMPTY { QAction *action = menu->addAction( qtr("Empty" ) ); \ - action->setEnabled( false ); } + action->setEnabled( false ); } for( i = 0; i < (int)objects.size() ; i++ ) { @@ -589,7 +677,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, } p_object = (vlc_object_t *)vlc_object_get( p_intf, - objects[i] ); + objects[i] ); if( p_object == NULL ) continue; b_section_empty = VLC_FALSE; @@ -605,7 +693,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, if( menu->actions().size() == 0 || b_section_empty ) APPEND_EMPTY - return menu; + return menu; } /***************************************************************************** @@ -613,7 +701,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, *****************************************************************************/ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, - bool b_root = TRUE ) + bool b_root = TRUE ) { vlc_value_t val, val_list; int i_type, i_result, i; @@ -644,7 +732,7 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, 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; break; @@ -658,7 +746,7 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, } void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, - vlc_object_t *p_object, bool b_submenu ) + vlc_object_t *p_object, bool b_submenu ) { vlc_value_t val, text; int i_type; @@ -668,16 +756,16 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *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 */ @@ -693,7 +781,7 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, { QMenu *submenu = new QMenu(); submenu->setTitle( qfu( text.psz_string ? - text.psz_string : psz_var ) ); + text.psz_string : psz_var ) ); if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0) menu->addMenu( submenu ); } @@ -707,24 +795,25 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *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->i_object_id, val, i_type ); + break; - case VLC_VAR_BOOL: - var_Get( p_object, psz_var, &val ); - 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->i_object_id, val, i_type, !val.b_bool ); + break; } FREENULL( text.psz_string ); } int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, - vlc_object_t *p_object, bool b_root ) + vlc_object_t *p_object, bool b_root ) { vlc_value_t val, val_list, text_list; int i_type, i; @@ -737,20 +826,20 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *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 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, - &val_list, &text_list ) < 0 ) + &val_list, &text_list ) < 0 ) { return VLC_EGENERIC; } @@ -767,44 +856,44 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, switch( i_type & VLC_VAR_TYPE ) { - 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, "", 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 = 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 ); - 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 ); - 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, "", 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 = 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 ); + 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 ); + break; + + default: + break; } } currentGroup = NULL; @@ -820,10 +909,10 @@ 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, - vlc_value_t val, int i_val_type, - bool checked ) + QString text, QString help, + int i_item_type, int i_object_id, + vlc_value_t val, int i_val_type, + bool checked ) { QAction *action = new QAction( text, menu ); action->setText( text ); @@ -837,7 +926,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, { action->setCheckable( true ); if( !currentGroup ) - currentGroup = new QActionGroup(menu); + currentGroup = new QActionGroup( menu ); currentGroup->addAction( action ); } @@ -846,7 +935,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, action->setChecked( true ); } MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type, - val, psz_var ); + val, psz_var ); CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); menu->addAction( action ); @@ -856,9 +945,8 @@ 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 ); + itemData->i_object_id ); if( p_object == NULL ) return; var_Set( p_object, itemData->psz_var, itemData->val ); - vlc_object_release( p_object ); -} + vlc_object_release( p_object );}