X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=5962c192d2c540098a64a7b7da9dcb7b78501a8d;hb=223419069363b3eab712cff2d0ac671a94d8fc65;hp=6e1403980052867e37e26f16ca738e0008c34ba0;hpb=a28bdff5986161bc5e762c6d29540e6d384a825f;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 6e14039800..5962c192d2 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 @@ -47,6 +47,22 @@ #include #include +/* + This file defines the main menus and the pop-up menu (right-click menu) + and the systray menu (in that order in the file) + + There are 3 menus that have to be rebuilt everytime there are called: + Audio, Video, Navigation + 3 functions are building those menus: AudioMenu, VideoMenu, NavigMenu + and 3 functions associated are collecting the objects : + InputAutoMenuBuilder, AudioAutoMenuBuilder, VideoAutoMenuBuilder. + + A QSignalMapper decides when to rebuild those menus cf MenuFunc in the .hpp + Just before one of those menus are aboutToShow(), they are rebuild. + + + */ + enum { ITEM_NORMAL, @@ -197,8 +213,8 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, PUSH_INPUTVAR( "audio-es" ); PUSH_VAR( "audio-device" ); PUSH_VAR( "audio-channels" ); - PUSH_VAR( "visual" ); PUSH_VAR( "equalizer" ); + PUSH_VAR( "visual" ); return VLC_SUCCESS; } @@ -312,7 +328,7 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ), "Ctrl+Y" ); menu->addSeparator(); - menu->addAction( qtr( "Undock from interface" ), mi, + menu->addAction( qtr( "Undock from Interface" ), mi, SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) ); return menu; } @@ -355,19 +371,19 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, if( mi ) { /* Minimal View */ - QAction *action=menu->addAction( qtr( "Minimal View..." ), mi, - SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); + QAction *action = menu->addAction( qtr( "Minimal View..." ), mi, + SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) action->setChecked( true ); /* FullScreen View */ action = menu->addAction( qtr( "Toggle Fullscreen Interface" ), mi, - SLOT( toggleFullScreen() ), qtr( "F11" ) ); + SLOT( toggleFullScreen() ), QString( "F11" ) ); /* Advanced Controls */ - action = menu->addAction( qtr( "Advanced controls" ), mi, - SLOT( toggleAdvanced() ) ); + action = menu->addAction( qtr( "Advanced Controls" ), mi, + SLOT( toggleAdvanced() ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) action->setChecked( true ); @@ -425,32 +441,32 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vector objects; vector varnames; - vlc_object_t *p_object; + vlc_object_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" ) ); - ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) ); + current->addSeparator(); + ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); } p_input = THEMIM->getInput(); if( p_input ) vlc_object_yield( p_input ); - p_object = ( vlc_object_t * ) vlc_object_find( p_intf, - VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + p_aout = ( vlc_object_t * ) vlc_object_find( p_intf, + VLC_OBJECT_AOUT, + FIND_ANYWHERE ); - AudioAutoMenuBuilder( p_object, p_input, objects, varnames ); + AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); - if( p_object ) - vlc_object_release( p_object ); + if( p_aout ) + vlc_object_release( p_aout ); if( p_input ) vlc_object_release( p_input ); @@ -463,13 +479,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; + vlc_object_t *p_vout; input_thread_t *p_input; vector objects; vector varnames; - if( !current ) - current = new QMenu(); + if( !current ) current = new QMenu(); if( current->isEmpty() ) { @@ -481,6 +496,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) action->setData( "spu-es" ); addDPStaticEntry( submenu, qtr( "Load File..." ), "", "", SLOT( loadSubtitlesFile() ) ); + submenu->addSeparator(); ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) ); ACT_ADD( current, "zoom", qtr( "&Zoom" ) ); @@ -496,13 +512,13 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) 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, + p_vout = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - VideoAutoMenuBuilder( p_object, p_input, objects, varnames ); + VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); - if( p_object ) - vlc_object_release( p_object ); + if( p_vout ) + vlc_object_release( p_vout ); if( p_input ) vlc_object_release( p_input ); @@ -519,10 +535,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) vector objects; vector varnames; - if( !menu ) - { - menu = new QMenu(); - } + if( !menu ) menu = new QMenu(); if( menu->isEmpty() ) { @@ -599,7 +612,8 @@ QMenu *QVLCMenu::HelpMenu( QMenu *current ) addDPStaticEntry( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" ); #ifdef UPDATE_CHECK - addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), ""); + addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "", + SLOT( updateDialog() ), ""); #endif menu->addSeparator(); addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ), @@ -641,6 +655,9 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, else if( THEPL->items.i_size ) addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + else + addDPStaticEntry( menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( openDialog() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", SLOT( stop() ) ); @@ -648,7 +665,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, ":/pixmaps/previous_16px.png", SLOT( prev() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", SLOT( next() ) ); - } +} void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) { @@ -761,21 +778,16 @@ 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_t *p_vout = (vlc_object_t *) vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); /* Add a fullscreen switch button */ @@ -783,56 +795,50 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { 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, + p_vout->i_object_id, 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() ) - action->setEnabled( false ); + menu->addSeparator(); - /* Video menu */ - submenu = new QMenu(); - ACT_ADD( submenu, "video-es", qtr( "Video Track" ) ); - QMenu *subsubmenu = new QMenu( qtr( "&Subtitles Track" ), submenu ); - addDPStaticEntry( subsubmenu, qtr( "Load File..." ), "", "", - SLOT( loadSubtitlesFile() ) ); - action = submenu->addMenu( subsubmenu ); - action->setData( "spu-es" ); + vlc_object_yield( p_input ); + InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); + vlc_object_release( p_input ); - VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); - if( p_vout ) - vlc_object_release( p_vout ); - Populate( p_intf, submenu, varnames, objects ); - varnames.clear(); objects.clear(); - action = menu->addMenu( submenu ); - action->setText( qtr( "Video" ) ); - if( submenu->isEmpty() ) + submenu = new QMenu( menu ); + action = menu->addMenu( AudioMenu( p_intf, submenu ) ); + action->setText( qtr( "&Audio" ) ); + if( action->menu()->isEmpty() ) action->setEnabled( false ); - vlc_object_release( p_input ); + submenu = new QMenu( menu ); + action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action->setText( qtr( "&Video" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); + + submenu = new QMenu( menu ); + action = menu->addMenu( NavigMenu( p_intf, submenu ) ); + action->setText( qtr( "&Playback" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); } menu->addSeparator(); - /* Add some special entries for windowed mode */ - 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() ) ); + qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "", - ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ) ); + ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ) ); action = submenu->addAction( QIcon( "" ), qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) ); action->setCheckable( true ); @@ -879,14 +885,14 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, if( mi->isVisible() || b_force_visible ) { sysMenu->addAction( QIcon( ":/vlc16.png" ), - qtr( "Hide VLC media player in taskbar" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + qtr( "Hide VLC media player in taskbar" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); } else { sysMenu->addAction( QIcon( ":/vlc16.png" ), - qtr( "Show VLC media player" ), mi, - SLOT( toggleUpdateSystrayMenu() ) ); + qtr( "Show VLC media player" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); } sysMenu->addSeparator(); @@ -896,7 +902,7 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", - ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); @@ -915,8 +921,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, bool append ) { QMenu *menu = current; - if( !menu ) - menu = new QMenu(); + if( !menu ) menu = new QMenu(); /* Disable all non static entries */ QAction *p_action;