#endif
PUSH_VAR( "video-snapshot" );
PUSH_VAR( "zoom" );
- PUSH_VAR( "scale" );
+ PUSH_VAR( "autoscale" );
PUSH_VAR( "aspect-ratio" );
PUSH_VAR( "crop" );
PUSH_VAR( "deinterlace" );
+ PUSH_VAR( "postprocess" );
- /* Special case for postproc */
- // FIXME
- if( p_object )
- {
- /* 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_pp = (vlc_object_t *)
- vlc_object_find_name( p_dec, "postproc",
- FIND_CHILD );
- if( p_pp )
- {
- vlc_object_t *p_object = p_pp;
- PUSH_VAR( "postproc-q" );
- vlc_object_release( p_pp );
- }
-
- vlc_object_release( p_dec );
- }
- }
return VLC_SUCCESS;
}
QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
_menu->addAction( _action ); }
+#define ACT_ADDMENU( _menu, val, title ) { \
+ QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
+ _action->setMenu( new QMenu() ); _menu->addAction( _action ); }
+
+#define ACT_ADDCHECK( _menu, val, title ) { \
+ QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
+ _action->setCheckable( true ); _menu->addAction( _action ); }
+
/**
* Main Menu Bar Creation
**/
if( current->isEmpty() )
{
- ACT_ADD( current, "audio-es", qtr( "Audio &Track" ) );
- ACT_ADD( current, "audio-channels", qtr( "Audio &Channels" ) );
- ACT_ADD( current, "audio-device", qtr( "Audio &Device" ) );
+ ACT_ADDMENU( current, "audio-es", qtr( "Audio &Track" ) );
+ ACT_ADDMENU( current, "audio-channels", qtr( "Audio &Channels" ) );
+ ACT_ADDMENU( current, "audio-device", qtr( "Audio &Device" ) );
current->addSeparator();
- ACT_ADD( current, "visual", qtr( "&Visualizations" ) );
+ ACT_ADDMENU( current, "visual", qtr( "&Visualizations" ) );
current->addSeparator();
QAction *action = current->addAction( qtr( "Increase Volume" ),
if( current->isEmpty() )
{
- ACT_ADD( current, "video-es", qtr( "Video &Track" ) );
+ ACT_ADDMENU( current, "video-es", qtr( "Video &Track" ) );
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
submenu->addSeparator();
current->addSeparator();
- ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) );
- ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) );
+ ACT_ADDCHECK( current, "fullscreen", qtr( "&Fullscreen" ) );
+ ACT_ADDCHECK( current, "video-on-top", qtr( "Always &On Top" ) );
#ifdef WIN32
- ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
+ ACT_ADDCHECK( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
#endif
ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
current->addSeparator();
- ACT_ADD( current, "zoom", qtr( "&Zoom" ) );
- ACT_ADD( current, "scale", qtr( "Sca&le" ) );
- ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
- ACT_ADD( current, "crop", qtr( "&Crop" ) );
- ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) );
- ACT_ADD( current, "postproc-q", qtr( "&Post processing" ) );
+ ACT_ADDMENU( current, "zoom", qtr( "&Zoom" ) );
+ ACT_ADDCHECK( current, "autoscale", qtr( "Sca&le" ) );
+ ACT_ADDMENU( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
+ ACT_ADDMENU( current, "crop", qtr( "&Crop" ) );
+ ACT_ADDMENU( current, "deinterlace", qtr( "&Deinterlace" ) );
+ ACT_ADDMENU( current, "postprocess", qtr( "&Post processing" ) );
}
p_input = THEMIM->getInput();
{
if( menu->isEmpty() )
{
- ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) );
- ACT_ADD( menu, "title", qtr( "T&itle" ) );
- ACT_ADD( menu, "chapter", qtr( "&Chapter" ) );
- ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
- ACT_ADD( menu, "program", qtr( "&Program" ) );
+ QAction *action;
+ QMenu *submenu = new QMenu( qtr( "&Bookmarks" ), menu );
+ addDPStaticEntry( submenu, qtr( "Manage &bookmarks" ), "",
+ SLOT( bookmarksDialog() ) );
+ submenu->addSeparator();
+ action = menu->addMenu( submenu );
+ action->setData( "bookmark" );
+ ACT_ADDMENU( menu, "title", qtr( "T&itle" ) );
+ ACT_ADDMENU( menu, "chapter", qtr( "&Chapter" ) );
+ ACT_ADDMENU( menu, "navigation", qtr( "&Navigation" ) );
+ ACT_ADDMENU( menu, "program", qtr( "&Program" ) );
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"",
}
#undef ACT_ADD
+#undef ACT_ADDMENU
+#undef ACT_ADDCHECK
/************************************************************************
* Systray Menu *
/* Check the type of the object variable */
/* What is the following HACK needed for? */
if( !strcmp( psz_var, "audio-es" )
- || !strcmp( psz_var, "video-es" )
- || !strcmp( psz_var, "postproc-q" ) )
+ || !strcmp( psz_var, "video-es" ) )
i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE;
else
i_type = var_Type( p_object, psz_var );
action->setEnabled( false );
}
else
+ {
action->setEnabled(
CreateChoicesMenu( menu, psz_var, p_object, true ) == 0 );
+ }
FREENULL( text.psz_string );
return;
}
bool checked )
{
QAction *action = FindActionWithVar( menu, psz_var );
+
+ bool b_new = false;
if( !action )
{
action = new QAction( text, menu );
menu->addAction( action );
+ b_new = true;
}
action->setToolTip( help );
val, psz_var );
CONNECT( action, triggered(), THEDP->menusMapper, map() );
THEDP->menusMapper->setMapping( action, itemData );
- menu->addAction( action );
+
+ if( b_new )
+ menu->addAction( action );
}
void QVLCMenu::DoAction( QObject *data )