#include "menus.hpp"
#include "dialogs_provider.hpp"
#include "input_manager.hpp"
+#include "recents.hpp"
#include <QMenu>
#include <QMenuBar>
#include <QActionGroup>
#include <QSignalMapper>
#include <QSystemTrayIcon>
+#include <QList>
+
+/*
+ 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
{
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,
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() )
}
}
+/***
+ * Same for MIM
+ ***/
+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 );
+ }
+}
+
/*****************************************************************************
* 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<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_VAR( "bookmark" );
static int VideoAutoMenuBuilder( vlc_object_t *p_object,
input_thread_t *p_input,
- vector<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_INPUTVAR( "video-es" );
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 */
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 )
+ {
+ 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,
input_thread_t *p_input,
- vector<int> &objects,
+ vector<vlc_object_t *> &objects,
vector<const char *> &varnames )
{
PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
- PUSH_VAR( "equalizer" );
PUSH_VAR( "visual" );
return VLC_SUCCESS;
}
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
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
* 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" );
+#ifdef WIN32
+ ":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
+ addDPStaticEntry( menu, qtr( "Advanced Open File..." ), "",
+ ":/file-asym", SLOT( openFileDialog() ), "" );
+#else
+ ":/file-asym", SLOT( openFileDialog() ), "Ctrl+0" );
+#endif
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" );
+ ":/folder-grey", SLOT( PLOpenDir() ), "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" );
+
+ 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..." ), "",
- ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ),
+ ":/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" );
+ ":/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 )
{
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
menu->addSeparator();
- menu->addAction( qtr( "Undock from interface" ), mi,
- SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );
+
+ addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
+ ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
+
return menu;
}
* 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,
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();
+
+ 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();
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 */
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;
}
**/
QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
{
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
/** \todo add "switch to XXX" */
varnames.push_back( "intf-add" );
- objects.push_back( p_intf->i_object_id );
+ objects.push_back( VLC_OBJECT(p_intf) );
- QMenu *submenu = new QMenu( current );
- QMenu *menu = Populate( p_intf, submenu, varnames, objects );
-
- return menu;
+ return Populate( p_intf, current, varnames, objects );
}
/**
*/
QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
{
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
vlc_object_t *p_aout;
input_thread_t *p_input;
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, "equalizer", qtr( "&Equalizer" ) );
current->addSeparator();
ACT_ADD( current, "visual", qtr( "&Visualizations" ) );
}
p_input = THEMIM->getInput();
if( p_input )
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
p_aout = ( vlc_object_t * ) vlc_object_find( p_intf,
VLC_OBJECT_AOUT,
FIND_ANYWHERE );
**/
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<vlc_object_t *> objects;
vector<const char *> varnames;
if( !current ) current = new QMenu();
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
action = current->addMenu( submenu );
action->setData( "spu-es" );
- addDPStaticEntry( submenu, qtr( "Load File..." ), "", "",
+ 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,
+ vlc_object_hold( p_input );
+ 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 );
QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
vlc_object_t *p_object;
- vector<int> objects;
+ vector<vlc_object_t *> objects;
vector<const char *> varnames;
if( !menu ) menu = new QMenu();
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" ) );
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..." ) , "", "",
+ 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;
}
*****************************************************************************/
#define POPUP_BOILERPLATE \
unsigned int i_last_separator = 0; \
- vector<int> objects; \
+ vector<vlc_object_t *> objects; \
vector<const char *> varnames; \
input_thread_t *p_input = THEMIM->getInput();
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 )
{
QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
addDPStaticEntry( openmenu, qtr( "&Open File..." ), "",
- ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ) );
+ ":/file-asym", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ) );
+ ":/folder-grey", SLOT( PLOpenDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "",
- ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ) );
+ ":/disc", SLOT( openDiscDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "",
- ":/pixmaps/network_16px.png", SLOT( openNetDialog() ) );
+ ":/network", SLOT( openNetDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "",
- ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ) );
+ ":/capture-card", SLOT( openCaptureDialog() ) );
menu->addMenu( openmenu );
menu->addSeparator();
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png",
+ addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit",
SLOT( quit() ), "Ctrl+Q" );
}
POPUP_BOILERPLATE;
if( p_input )
{
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
POPUP_BOILERPLATE;
if( p_input )
{
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
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_input )
{
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
varnames.push_back( "audio-es" );
InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
PUSH_SEPARATOR;
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 );
+ 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,
+ VLC_OBJECT(p_vout), val, VLC_VAR_BOOL,
+ b_isFullscreen );
+ vlc_object_release( p_vout );
+ }
+
+ menu->addSeparator();
+
+ vlc_object_hold( p_input );
InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
vlc_object_release( p_input );
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() ) );
+ if( mi )
+ {
+ submenu->addAction( QIcon( ":/playlist" ),
+ 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() );
+ ":/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( p_intf, VLC_OBJECT_INTF, 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 );
}
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 );
QMenu * QVLCMenu::Populate( intf_thread_t *p_intf,
QMenu *current,
vector< const char *> & varnames,
- vector<int> & objects,
+ vector<vlc_object_t *> & objects,
bool append )
{
QMenu *menu = current;
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;
}
/* 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 );
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 );
}
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
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;
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:
/* 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;
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 )
{
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 );
void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data )
{
MenuItemData *itemData = qobject_cast<MenuItemData *>( 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<QString> 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( l.at( i ),
+ rmrl->signalMapper,
+ SLOT( map() ) );
+ rmrl->signalMapper->setMapping( action, l.at( i ) );
+ }
+
+ recentsMenu->addSeparator();
+ recentsMenu->addAction( "Clear", rmrl, SLOT( clear() ) );
+ }
+ }
+}
projects / vlc / blobdiff