* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+
#include <vlc_intf_strings.h>
#include "main_interface.hpp"
static QActionGroup *currentGroup;
// Add static entries to menus
-#define DP_SADD( menu, text, help, icon, slot, shortcut ) \
-{ \
- if( strlen( icon ) > 0 ) \
- { \
- if( strlen( shortcut ) > 0 ) \
- { \
- menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ), \
- qtr( shortcut ) );\
- } \
- else \
- { \
- menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ) );\
- } \
- } \
- else \
- { \
- if( strlen( shortcut ) > 0 ) \
- { \
- menu->addAction( text, THEDP, SLOT( slot ), \
- qtr( shortcut ) ); \
- } \
- else \
- { \
- menu->addAction( text, THEDP, SLOT( slot ) ); \
- } \
- } \
+void addDPStaticEntry( QMenu *menu,
+ const QString text,
+ const char *help,
+ const char *icon,
+ const char *member,
+ const char *shortcut )
+{
+ if( !EMPTY_STR( icon ) > 0 )
+ {
+ if( !EMPTY_STR( shortcut ) > 0 )
+ menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) );
+ else
+ menu->addAction( QIcon( icon ), text, THEDP, member );
+ }
+ else
+ {
+ if( !EMPTY_STR( shortcut ) > 0 )
+ menu->addAction( text, THEDP, member, qtr( shortcut ) );
+ else
+ menu->addAction( text, THEDP, member );
+ }
}
-#define MIM_SADD( menu, text, help, icon, slot ) \
-{ \
- if( strlen( icon ) > 0 ) \
- { \
- QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \
- action->setIcon( QIcon( icon ) ); \
- } \
- else \
- { \
- menu->addAction( text, THEMIM, SLOT( slot ) ); \
- } \
+
+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 );
+ }
}
-#define PL_SADD
/*****************************************************************************
* Definitions of variables for the dynamic menus
{
PUSH_VAR( "bookmark" );
PUSH_VAR( "title" );
- PUSH_VAR ( "chapter" );
+ PUSH_VAR( "chapter" );
PUSH_VAR( "program" );
PUSH_VAR( "navigation" );
PUSH_VAR( "dvd_menus" );
/**
* Main Menu Bar Creation
**/
-void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
- bool visual_selector_enabled )
+void QVLCMenu::createMenuBar( MainInterface *mi,
+ intf_thread_t *p_intf,
+ bool visual_selector_enabled )
{
QMenuBar *bar = mi->menuBar();
BAR_ADD( FileMenu(), qtr( "&Media" ) );
BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
- BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), qtr( "&Tools" ) );
+ BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ),
+ qtr( "&Tools" ) );
BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 );
BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 );
BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
BAR_ADD( HelpMenu(), qtr( "&Help" ) );
}
+#undef BAR_ADD
+#undef BAR_DADD
/**
* Media ( File ) Menu
{
QMenu *menu = new QMenu();
- DP_SADD( menu, qtr( "&Open File..." ), "",
- ":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" );
- DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
- ":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
- DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/disc_16px.png",
- openDiscDialog(), "Ctrl+D" );
- DP_SADD( menu, qtr( "Open &Network..." ), "",
- ":/pixmaps/network_16px.png", openNetDialog(), "Ctrl+N" );
- DP_SADD( menu, qtr( "Open &Capture Device..." ), "",
- ":/pixmaps/capture-card_16px.png", openCaptureDialog(),
- "Ctrl+C" );
+ addDPStaticEntry( menu, qtr( "&Open File..." ), "",
+ ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" );
+ addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
+ ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" );
+ addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
+ ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" );
+ addDPStaticEntry( menu, qtr( "Open &Network..." ), "",
+ ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" );
+ addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "",
+ ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ),
+ "Ctrl+C" );
menu->addSeparator();
- DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/menus_stream_16px.png",
- openThenStreamingDialogs(), "Ctrl+S" );
- DP_SADD( menu, qtr( "Conve&rt / Save..." ), "", "",
- openThenTranscodingDialogs(), "Ctrl+R" );
-
+ addDPStaticEntry( menu, qtr( "&Streaming..." ), "",
+ ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ),
+ "Ctrl+S" );
+ addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "",
+ SLOT( openThenTranscodingDialogs() ), "Ctrl+R" );
menu->addSeparator();
- DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", quit(),
- "Ctrl+Q" );
+
+ addDPStaticEntry( menu, qtr( "&Quit" ) , "",
+ ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
+/* Playlist/MediaLibrary Control */
QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
{
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( ":/pixmaps/playlist_16px.png" ),
+ qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
menu->addSeparator();
- DP_SADD( menu, qtr( I_PL_LOAD ), "", "", openPlaylist(), "Ctrl+X" );
- DP_SADD( menu, qtr( I_PL_SAVE ), "", "", savePlaylist(), "Ctrl+Y" );
+ 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" ) );
+ SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );
return menu;
}
* Tools/View Menu
* This is kept in the same menu for now, but could change if it gets much
* longer.
+ * This menu can be an interface menu but also a right click menu.
**/
-QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
- bool visual_selector_enabled,
- bool with_intf )
+QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
+ MainInterface *mi,
+ bool visual_selector_enabled,
+ bool with_intf )
{
QMenu *menu = new QMenu;
if( mi )
qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
qtr( "Ctrl+L" ) );
}
- DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/menus_settings_16px.png",
- extendedDialog() , "Ctrl+E" );
+ addDPStaticEntry( menu, qtr( I_MENU_EXT ), "",
+ ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ),
+ "Ctrl+E" );
menu->addSeparator();
if( with_intf )
{
QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
- intfmenu->setTitle( qtr( "Add Interfaces" ) );
+ intfmenu->setTitle( qtr( "Interfaces" ) );
menu->addMenu( intfmenu );
menu->addSeparator();
}
/* Minimal View */
QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
- //FIXME: remove useless thing. But keep it until the release, pls.
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" ) );
+
/* Advanced Controls */
action = menu->addAction( qtr( "Advanced controls" ), mi,
SLOT( toggleAdvanced() ) );
action->setCheckable( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
action->setChecked( true );
- #if 0 /* For Visualisations. Not yet working */
+#if 0 /* For Visualisations. Not yet working */
adv = menu->addAction( qtr( "Visualizations selector" ),
mi, SLOT( visual() ) );
adv->setCheckable( true );
menu->addSeparator();
-
- DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/menus_messages_16px.png",
- messagesDialog(), "Ctrl+M" );
- DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" );
- DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/menus_info_16px.png",
- mediaCodecDialog(), "Ctrl+J" );
-
-#if 0 /* Not Implemented yet */
- DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" );
+ 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
- DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" );
-
menu->addSeparator();
- DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/menus_preferences_16px.png",
- prefsDialog(), "Ctrl+P" );
+ addDPStaticEntry( menu, qtr( "Preferences..." ), "",
+ ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" );
return menu;
}
QMenu *menu = Populate( p_intf, current, varnames, objects );
- if( !p_intf->pf_show_dialog )
- {
- menu->addSeparator();
- menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
- QString( "Ctrl+Z" ) );
- }
-
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
THEDP->menusUpdateMapper->setMapping( menu, 4 );
return menu;
vector<int> objects;
vector<const char *> varnames;
- /* FIXME */
p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
if( p_object != NULL )
{
- InputAutoMenuBuilder( p_object, objects, varnames );
+ InputAutoMenuBuilder( p_object, objects, varnames );
PUSH_VAR( "prev-title" ); PUSH_VAR ( "next-title" );
PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" );
vlc_object_release( p_object );
}
navMenu = new QMenu();
- DP_SADD( navMenu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(),
- "Ctrl+T" );
+ addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","",
+ SLOT( gotoTimeDialog() ), "Ctrl+T" );
navMenu->addSeparator();
return Populate( p_intf, navMenu, varnames, objects, true );
}
{
QMenu *menu = new QMenu();
menu->setTitle( qtr( I_PL_SD ) );
- vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
- FIND_ANYWHERE );
- int i_num = 0;
- for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
- {
- module_t * p_parser = ( module_t * )p_list->p_values[i_index].p_object ;
- if( module_IsCapable( p_parser, "services_discovery" ) )
- i_num++;
- }
- for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
+ char **ppsz_longnames;
+ char **ppsz_names = services_discovery_GetServicesNames( p_intf,
+ &ppsz_longnames );
+ if( !ppsz_names )
+ return menu;
+
+ char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
+ for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
{
- module_t * p_parser = ( module_t * )p_list->p_values[i_index].p_object;
- if( !module_IsCapable( p_parser, "services_discovery" ) )
- continue;
-
- QAction *a = new QAction( qfu( module_GetLongName( p_parser ) ), menu );
+ QAction *a = new QAction( qfu( *ppsz_longname ), menu );
a->setCheckable( true );
- /* hack to handle submodules properly */
- int i = -1;
- while( p_parser->pp_shortcuts[++i] != NULL );
- i--;
- if( playlist_IsServicesDiscoveryLoaded( THEPL,
- i>=0?p_parser->pp_shortcuts[i]
- : module_GetObjName( p_parser ) ) )
+ if( playlist_IsServicesDiscoveryLoaded( THEPL, *ppsz_name ) )
a->setChecked( true );
CONNECT( a , triggered(), THEDP->SDMapper, map() );
- THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
- module_GetObjName( p_parser ) );
+ THEDP->SDMapper->setMapping( a, QString( *ppsz_name ) );
menu->addAction( a );
- if( !strcmp( p_parser->psz_object_name, "podcast" ) )
+ if( !strcmp( *ppsz_name, "podcast" ) )
{
QAction *b = new QAction( qfu( "Configure podcasts..." ), menu );
//b->setEnabled( a->isChecked() );
menu->addAction( b );
CONNECT( b, triggered(), THEDP, podcastConfigureDialog() );
}
+ free( *ppsz_name );
+ free( *ppsz_longname );
}
- vlc_list_release( p_list );
+ free( ppsz_names );
+ free( ppsz_longnames );
return menu;
}
/**
QMenu *QVLCMenu::HelpMenu()
{
QMenu *menu = new QMenu();
- DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png",
- helpDialog(), "F1" );
+ addDPStaticEntry( menu, qtr( "Help..." ) , "",
+ ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
+#ifdef UPDATE_CHECK
+ addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), "");
+#endif
menu->addSeparator();
- DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1" );
+ addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
+ "Ctrl+F1" );
return menu;
}
p_intf->p_sys->p_popup_menu = NULL; \
i_last_separator = 0;
-#define POPUP_PLAY_ENTRIES( menu )\
- if( p_input ) \
- { \
- vlc_value_t val; \
- var_Get( p_input, "state", &val ); \
- if( val.i_int == PLAYING_S ) \
- MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/pause_16px.png", \
- togglePlayPause() ) \
- else \
- MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
- togglePlayPause() ) \
- } \
- else if( THEPL->items.i_size && THEPL->i_enabled ) \
- MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
- togglePlayPause() ); \
- \
- MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", stop() ); \
- MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/previous_16px.png", \
- prev() ); \
- MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", next() );
-
-#define POPUP_STATIC_ENTRIES( menu ) \
- QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); \
- 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::PopupMenuControlEntries( QMenu *menu,
+ intf_thread_t *p_intf,
+ input_thread_t *p_input )
+{
+ if( p_input )
+ {
+ vlc_value_t val;
+ var_Get( p_input, "state", &val );
+ if( val.i_int == PLAYING_S )
+ addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "",
+ ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) );
+ else
+ addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
+ ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+ }
+ else if( THEPL->items.i_size && THEPL->i_enabled )
+ addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
+ ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+
+ addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "",
+ ":/pixmaps/stop_16px.png", SLOT( stop() ) );
+ addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "",
+ ":/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 )
+{
+ QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true );
+ 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 );
+
+ addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" );
+}
/* Video Tracks and Subtitles tracks */
void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
Populate( p_intf, menu, varnames, objects );
menu->addSeparator();
- POPUP_PLAY_ENTRIES( menu );
+ PopupMenuControlEntries( menu, p_intf, p_input );
menu->addSeparator();
- POPUP_STATIC_ENTRIES( menu );
+ PopupMenuStaticEntries( p_intf, menu );
p_intf->p_sys->p_popup_menu = menu;
menu->popup( QCursor::pos() );
InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
/* Audio menu */
- PUSH_SEPARATOR
- varnames.push_back( "audio-es" );
+ 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 );
+ 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 );
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 );
+ 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 );
QMenu *menu = new QMenu();
Populate( p_intf, menu, varnames, objects );
menu->addSeparator();
- POPUP_PLAY_ENTRIES( menu );
+ PopupMenuControlEntries( menu, p_intf, p_input );
menu->addSeparator();
- POPUP_STATIC_ENTRIES( menu );
+ PopupMenuStaticEntries( p_intf, menu );
p_intf->p_sys->p_popup_menu = menu;
}
}
sysMenu->addSeparator();
- POPUP_PLAY_ENTRIES( sysMenu );
+ PopupMenuControlEntries( sysMenu, p_intf, p_input );
sysMenu->addSeparator();
- DP_SADD( sysMenu, qtr( "&Open Media" ), "",
- ":/pixmaps/file-wide_16px.png", openFileDialog(), "" );
- DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png",
- quit(), "" );
+ addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "",
+ ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" );
+ addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "",
+ ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" );
/* Set the menu */
mi->getSysTray()->setContextMenu( sysMenu );
/*************************************************************************
* Builders for automenus
*************************************************************************/
-QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current,
- vector< const char *> & varnames,
- vector<int> & objects, bool append )
+QMenu * QVLCMenu::Populate( intf_thread_t *p_intf,
+ QMenu *current,
+ vector< const char *> & varnames,
+ vector<int> & objects,
+ bool append )
{
QMenu *menu = current;
if( !menu )
continue;
}
- p_object = ( vlc_object_t * )vlc_object_get( p_intf,
- objects[i] );
+ p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
return menu;
}
+#undef APPEND_EMPTY
/*****************************************************************************
* Private methods.
*****************************************************************************/
-static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object,
- bool b_root = TRUE )
+static bool IsMenuEmpty( const char *psz_var,
+ vlc_object_t *p_object,
+ bool b_root = true )
{
vlc_value_t val, val_list;
int i_type, i_result, i;
i_type = var_Type( p_object, psz_var );
/* Check if we want to display the variable */
- if( !( i_type & VLC_VAR_HASCHOICE ) ) return FALSE;
+ if( !( i_type & VLC_VAR_HASCHOICE ) ) return false;
var_Change( p_object, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL );
- if( val.i_int == 0 ) return TRUE;
+ if( val.i_int == 0 ) return true;
if( ( i_type & VLC_VAR_TYPE ) != VLC_VAR_VARIABLE )
{
- /* Very evil hack ! intf-switch can have only one value */
- if( !strcmp( psz_var, "intf-switch" ) ) return FALSE;
- if( val.i_int == 1 && b_root ) return TRUE;
- else return FALSE;
+ if( val.i_int == 1 && b_root ) return true;
+ else return false;
}
/* Check children variables in case of VLC_VAR_VARIABLE */
if( var_Change( p_object, psz_var, VLC_VAR_GETLIST, &val_list, NULL ) < 0 )
{
- return TRUE;
+ return true;
}
- for( i = 0, i_result = TRUE; i < val_list.p_list->i_count; i++ )
+ 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;
+ i_result = false;
break;
}
}
{
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]
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 );
+ menutext = qfu( "Add " ) /* If this function is more used, FIX*/
+ + 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 );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
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( p_intf,
- itemData->i_object_id );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( itemData->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, itemData->psz_var, itemData->val );
projects / vlc / blobdiff