/*****************************************************************************
* menus.cpp : Qt menus
*****************************************************************************
- * Copyright ( C ) 2006-2007 the VideoLAN team
+ * Copyright © 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
+ * Jean-Philippe André <jpeg@videolan.org>
*
* 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
#include <QSignalMapper>
#include <QSystemTrayIcon>
+/*
+ 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,
const char *help,
const char *icon,
const char *member,
- const char *shortcut )
+ const char *shortcut = NULL )
{
QAction *action = NULL;
if( !EMPTY_STR( icon ) > 0 )
PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
- PUSH_VAR( "visual" );
PUSH_VAR( "equalizer" );
+ PUSH_VAR( "visual" );
return VLC_SUCCESS;
}
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;
}
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 );
{
vector<int> objects;
vector<const char *> 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 );
**/
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<int> objects;
vector<const char *> varnames;
- if( !current )
- current = new QMenu();
+ if( !current ) current = new QMenu();
if( current->isEmpty() )
{
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( "Load File..." ), "", "",
+ SLOT( loadSubtitlesFile() ) );
+ submenu->addSeparator();
- ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) );
+ ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) );
ACT_ADD( current, "zoom", qtr( "&Zoom" ) );
ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) );
ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
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 );
vector<int> objects;
vector<const char *> varnames;
- if( !menu )
- {
- menu = new QMenu();
- }
+ if( !menu ) menu = new QMenu();
if( menu->isEmpty() )
{
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() ),
return menu;
}
-#undef ACT_ADD
-
/*****************************************************************************
* Popup menus - Right Click menus *
*****************************************************************************/
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() ) );
":/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 )
{
#endif
QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
- openmenu->addAction( qtr( "Open &File..." ), THEDP,
- SLOT( openFileDialog() ) );
- openmenu->addAction( qtr( "Open &Disc..." ), THEDP,
- SLOT( openDiscDialog() ) );
- openmenu->addAction( qtr( "Open &Network..." ), THEDP,
- SLOT( openNetDialog() ) );
- openmenu->addAction( qtr( "Open &Capture Device..." ), THEDP,
- SLOT( openCaptureDialog() ) );
+ 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() ) );
menu->addMenu( openmenu );
menu->addSeparator();
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" );
+ addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png",
+ SLOT( quit() ), "Ctrl+Q" );
}
/* Video Tracks and Subtitles tracks */
/* Main Menu that sticks everything together */
void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
{
+ MainInterface *mi = p_intf->p_sys->p_mi;
if( show )
{
/* Delete and recreate a popup if there is one */
QMenu *menu = new QMenu();
QMenu *submenu;
QAction *action;
+ bool b_isFullscreen = false;
POPUP_BOILERPLATE;
if( p_input )
{
+ 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,
+ p_vout->i_object_id, val, VLC_VAR_BOOL,
+ b_isFullscreen );
+ vlc_object_release( p_vout );
+ }
+
+ menu->addSeparator();
+
vlc_object_yield( p_input );
InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
+ vlc_object_release( p_input );
- /* Audio menu */
- 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 )
- 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() )
+ submenu = new QMenu( menu );
+ action = menu->addMenu( AudioMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Audio" ) );
+ if( action->menu()->isEmpty() )
action->setEnabled( false );
- /* Video menu */
- vlc_object_t *p_vout = ( vlc_object_t * )
- vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
- if( p_vout )
- 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: 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() );
+ menu->addMenu( submenu );
+ }
+
PopupMenuStaticEntries( p_intf, menu );
p_intf->p_sys->p_popup_menu = menu;
}
}
+#undef ACT_ADD
+
/************************************************************************
* Systray Menu *
************************************************************************/
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();
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 );
bool append )
{
QMenu *menu = current;
- if( !menu )
- menu = new QMenu();
+ if( !menu ) menu = new QMenu();
/* Disable all non static entries */
QAction *p_action;
projects / vlc / blobdiff