/*****************************************************************************
* 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,
static QActionGroup *currentGroup;
+/* 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;
+
// Add static entries to menus
void addDPStaticEntry( QMenu *menu,
const QString text,
const char *help,
const char *icon,
const char *member,
- const char *shortcut )
+ const char *shortcut = NULL )
{
+ QAction *action = NULL;
if( !EMPTY_STR( icon ) > 0 )
{
if( !EMPTY_STR( shortcut ) > 0 )
- menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) );
+ action = menu->addAction( QIcon( icon ), text, THEDP,
+ member, qtr( shortcut ) );
else
- menu->addAction( QIcon( icon ), text, THEDP, member );
+ action = menu->addAction( QIcon( icon ), text, THEDP, member );
}
else
{
if( !EMPTY_STR( shortcut ) > 0 )
- menu->addAction( text, THEDP, member, qtr( shortcut ) );
+ action = menu->addAction( text, THEDP, member, qtr( shortcut ) );
else
- menu->addAction( text, THEDP, member );
+ action = menu->addAction( text, THEDP, member );
}
+ action->setData( "_static_" );
}
void addMIMStaticEntry( intf_thread_t *p_intf,
}
}
+void EnableDPStaticEntries( QMenu *menu, bool enable = true )
+{
+ if( !menu )
+ return;
+
+ QAction *action;
+ foreach( action, menu->actions() )
+ {
+ if( action->data().toString() == "_static_" )
+ action->setEnabled( enable );
+ }
+}
+
+/**
+ * \return Number of static entries
+ */
+int DeleteNonStaticEntries( QMenu *menu )
+{
+ int i_ret = 0;
+ QAction *action;
+ if( !menu )
+ return VLC_EGENERIC;
+ foreach( action, menu->actions() )
+ {
+ if( action->data().toString() != "_static_" )
+ delete action;
+ else
+ i_ret++;
+ }
+}
+
/*****************************************************************************
* Definitions of variables for the dynamic menus
*****************************************************************************/
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
PUSH_VAR( "visual" );
- PUSH_VAR( "equalizer" );
return VLC_SUCCESS;
}
static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
{
QAction *action;
- Q_FOREACH( action, menu->actions() )
+ foreach( action, menu->actions() )
{
if( action->data().toString() == psz_var )
return action;
static QAction * FindActionWithText( QMenu *menu, QString &text )
{
QAction *action;
- Q_FOREACH( action, menu->actions() )
+ foreach( action, menu->actions() )
{
if( action->text() == text )
return action;
qtr( "&Tools" ) );
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( HelpMenu( NULL ), qtr( "&Help" ) );
}
#undef BAR_ADD
QMenu *menu = new QMenu();
addDPStaticEntry( menu, qtr( "&Open File..." ), "",
- ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" );
+ ":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" );
+ ":/folder-grey", SLOT( PLAppendDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
- ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" );
+ ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
addDPStaticEntry( menu, qtr( "Open &Network..." ), "",
- ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" );
+ ":/network", SLOT( openNetDialog() ), "Ctrl+N" );
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "",
- ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ),
+ ":/capture-card", SLOT( openCaptureDialog() ),
"Ctrl+C" );
menu->addSeparator();
addDPStaticEntry( menu, qtr( "&Streaming..." ), "",
- ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ),
+ ":/stream", SLOT( openThenStreamingDialogs() ),
"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" );
+ ":/quit", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
{
QMenu *menu = new QMenu();
menu->addMenu( SDMenu( p_intf ) );
- menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
- qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+ menu->addAction( QIcon( ":/playlist_menu" ),
+ qtr( "Show P&laylist" ), 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" );
- menu->addSeparator();
- menu->addAction( qtr( "Undock from interface" ), mi,
- SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );
+ /*menu->addSeparator();
+ menu->addAction( qtr( "Undock from Interface" ), mi,
+ SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/
return menu;
}
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" );
+ addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", ":/settings",
+ SLOT( extendedDialog() ), "Ctrl+E" );
menu->addSeparator();
if( with_intf )
{
QMenu *intfmenu = InterfacesMenu( p_intf, menu );
- intfmenu->setTitle( qtr( "Add Interfaces" ) );
- menu->addMenu( intfmenu );
+ MenuFunc *f = new MenuFunc( intfmenu, 4 );
+ CONNECT( intfmenu, aboutToShow(), THEDP->menusUpdateMapper, map() );
+ THEDP->menusUpdateMapper->setMapping( intfmenu, f );
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 */
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_MSG ), "",
- ":/pixmaps/menus_messages_16px.png", SLOT( messagesDialog() ),
+ ":/messages", SLOT( messagesDialog() ),
"Ctrl+M" );
- addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "",
+ addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", ":/info",
SLOT( mediaInfoDialog() ), "Ctrl+I" );
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
- ":/pixmaps/menus_info_16px.png", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+ ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
SLOT( bookmarksDialog() ), "Ctrl+B" );
#ifdef ENABLE_VLM
#endif
menu->addSeparator();
- addDPStaticEntry( menu, qtr( "Preferences..." ), "",
- ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" );
+ addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
+ ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
return menu;
}
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 );
-
- CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
- THEDP->menusUpdateMapper->setMapping( menu, 4 );
- return menu;
+ return Populate( p_intf, current, varnames, objects );
}
/**
{
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" ) );
+ 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 );
+ 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() )
{
ACT_ADD( current, "video-es", qtr( "Video &Track" ) );
+
+ QAction *action;
+ QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
+ action = current->addMenu( submenu );
+ action->setData( "spu-es" );
+ addDPStaticEntry( submenu, qtr( "Load File..." ), "", "",
+ SLOT( loadSubtitlesFile() ) );
+ submenu->addSeparator();
+
ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) );
ACT_ADD( current, "zoom", qtr( "&Zoom" ) );
ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) );
ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
ACT_ADD( current, "crop", qtr( "&Crop" ) );
ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) );
- ACT_ADD( current, "directx-wallpaper", qtr( "&DirectX Wallpaper" ) ); /* FIXME */
- ACT_ADD( current, "video-snapshot", qtr( "&Snapshot" ) );
- ACT_ADD( current, "ffmpeg-pp-q", qtr( "D&ecoder" ) ); /* FIXME */
+ /* ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); */
+ ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
+ /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
}
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->isEmpty() )
+ {
+ addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ), "","",
+ SLOT( gotoTimeDialog() ), "Ctrl+T" );
+ menu->addSeparator();
+
+ ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) );
+ ACT_ADD( menu, "title", qtr( "T&itle" ) );
+ ACT_ADD( menu, "chapter", qtr( "&Chapter" ) );
+ ACT_ADD( menu, "program", qtr( "&Program" ) );
+ ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
+ }
+
p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
InputAutoMenuBuilder( p_object, objects, varnames );
PUSH_VAR( "next-title" );
PUSH_VAR( "prev-chapter" );
PUSH_VAR( "next-chapter" );
+ EnableDPStaticEntries( menu, ( p_object != NULL ) );
if( p_object )
+ {
vlc_object_release( p_object );
- QMenu *navMenu = new QMenu( menu );
- addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","",
- SLOT( gotoTimeDialog() ), "Ctrl+T" );
- navMenu->addSeparator();
- return Populate( p_intf, navMenu, varnames, objects, true );
+ }
+ return Populate( p_intf, menu, varnames, objects, true );
}
/**
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() );
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() ), "Ctrl+F1" );
return menu;
}
-#undef ACT_ADD
-
/*****************************************************************************
* Popup menus - Right Click menus *
*****************************************************************************/
var_Get( p_input, "state", &val );
if( val.i_int == PLAYING_S )
addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "",
- ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) );
+ ":/pause", SLOT( togglePlayPause() ) );
else
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
- ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+ ":/play", SLOT( togglePlayPause() ) );
}
else if( THEPL->items.i_size )
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
- ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+ ":/play", SLOT( togglePlayPause() ) );
+ else
+ addDPStaticEntry( menu, qtr( "Play" ), "",
+ ":/play", SLOT( openDialog() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "",
- ":/pixmaps/stop_16px.png", SLOT( stop() ) );
+ ":/stop", SLOT( stop() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "",
- ":/pixmaps/previous_16px.png", SLOT( prev() ) );
+ ":/previous", SLOT( prev() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "",
- ":/pixmaps/next_16px.png", SLOT( next() ) );
- }
+ ":/next", SLOT( next() ) );
+}
void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
{
+#if 0
QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true );
toolsmenu->setTitle( qtr( "Tools" ) );
menu->addMenu( toolsmenu );
+#endif
QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
- 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..." ), "",
+ ":/file-asym", SLOT( openFileDialog() ) );
+ addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "",
+ ":/folder-grey", SLOT( PLAppendDir() ) );
+ addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "",
+ ":/disc", SLOT( openDiscDialog() ) );
+ addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "",
+ ":/network", SLOT( openNetDialog() ) );
+ addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "",
+ ":/capture-card", SLOT( openCaptureDialog() ) );
menu->addMenu( openmenu );
menu->addSeparator();
+#if 0
QMenu *helpmenu = HelpMenu( menu );
helpmenu->setTitle( qtr( "Help" ) );
menu->addMenu( helpmenu );
+#endif
- addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" );
+ addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit",
+ 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 )
{
- // create a popup if there is none
- if( ! p_intf->p_sys->p_popup_menu )
+ /* Delete and recreate a popup if there is one */
+ if( p_intf->p_sys->p_popup_menu )
+ delete p_intf->p_sys->p_popup_menu;
+
+ QMenu *menu = new QMenu();
+ QMenu *submenu;
+ QAction *action;
+ bool b_isFullscreen = false;
+
+ POPUP_BOILERPLATE;
+
+ PopupMenuControlEntries( menu, p_intf, p_input );
+ menu->addSeparator();
+
+ if( p_input )
{
- 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_object_yield( p_input );
- InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
-
- /* Audio menu */
- PUSH_SEPARATOR;
- 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 );
-
- /* Video menu */
- PUSH_SEPARATOR;
- 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 );
-
- vlc_object_release( p_input );
+ 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 );
}
- QMenu *menu = new QMenu();
- Populate( p_intf, menu, varnames, objects );
- menu->addSeparator();
- PopupMenuControlEntries( menu, p_intf, p_input );
menu->addSeparator();
- PopupMenuStaticEntries( p_intf, menu );
- p_intf->p_sys->p_popup_menu = menu;
+ vlc_object_yield( p_input );
+ InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
+ vlc_object_release( p_input );
+
+ submenu = new QMenu( menu );
+ action = menu->addMenu( AudioMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Audio" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
+
+ submenu = new QMenu( menu );
+ action = menu->addMenu( VideoMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Video" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
+
+ submenu = new QMenu( menu );
+ action = menu->addMenu( NavigMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Playback" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
}
+
+ menu->addSeparator();
+
+ /* Add some special entries for windowed mode: Interface Menu */
+ if( !b_isFullscreen )
+ {
+ submenu = new QMenu( qtr( "Interface" ), menu );
+ submenu->addAction( QIcon( ":/playlist" ),
+ qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+ addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
+ ":/settings", 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;
p_intf->p_sys->p_popup_menu->popup( QCursor::pos() );
}
else
}
}
+#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();
sysMenu->addSeparator();
addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "",
- ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" );
+ ":/file-wide", SLOT( openFileDialog() ), "" );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "",
- ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" );
+ ":/quit", 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;
- Q_FOREACH( p_action, menu->actions() )
+ foreach( p_action, menu->actions() )
{
- p_action->setEnabled( false );
+ if( p_action->data().toString() != "_static_" )
+ p_action->setEnabled( false );
}
currentGroup = NULL;
if( objects[i] == 0 )
{
- continue;
+ p_object = NULL;
}
else
{
}
}
- /* 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 );
+ UpdateItem( p_intf, menu, varnames[i], p_object, true );
if( p_object )
vlc_object_release( p_object );
}
vlc_value_t val, text;
int i_type;
- if( !p_object )
- {
- /* Nothing to do */
- return;
- }
+ QAction *action = FindActionWithVar( menu, psz_var );
+ if( action )
+ DeleteNonStaticEntries( action->menu() );
- if( !strcmp( psz_var, "spu-es" ) )
- {
- /* TODO: add a static entry "Load File..." */
+ if( !p_object )
return;
- }
/* Check the type of the object variable */
if( !strcmp( psz_var, "audio-es" )
}
/* Make sure we want to display the variable */
- if( IsMenuEmpty( psz_var, p_object ) ) return;
+ if( menu->isEmpty() && IsMenuEmpty( psz_var, p_object ) )
+ return;
/* Get the descriptive name of the variable */
int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL );
text.psz_string = NULL;
}
- QAction *action = FindActionWithVar( menu, psz_var );
if( !action )
{
action = new QAction( TEXT_OR_VAR, menu );
menu->addAction( action );
+ action->setData( psz_var );
+ }
+
+ /* Some specific stuff */
+ bool forceDisabled = false;
+ if( !strcmp( psz_var, "spu-es" ) )
+ {
+ vlc_object_t *p_vout = ( vlc_object_t* )( vlc_object_find( p_intf,
+ VLC_OBJECT_VOUT, FIND_ANYWHERE ) );
+ forceDisabled = ( p_vout == NULL );
+ if( p_vout )
+ vlc_object_release( p_vout );
}
if( i_type & VLC_VAR_HASCHOICE )
if( b_submenu )
{
QMenu *submenu;
- action->setEnabled( true );
submenu = action->menu();
if( !submenu )
{
submenu = new QMenu( menu );
action->setMenu( submenu );
}
- submenu->setEnabled( true );
- if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 )
- menu->addMenu( submenu );
+ action->setEnabled(
+ CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 );
+ if( forceDisabled )
+ action->setEnabled( false );
}
else
CreateChoicesMenu( menu, psz_var, p_object, true );
i_type = var_Type( p_object, psz_var );
/* Make sure we want to display the variable */
- if( IsMenuEmpty( psz_var, p_object, b_root ) ) return VLC_EGENERIC;
+ if( submenu->isEmpty() && IsMenuEmpty( psz_var, p_object, b_root ) )
+ return VLC_EGENERIC;
switch( i_type & VLC_VAR_TYPE )
{
projects / vlc / blobdiff