/*****************************************************************************
* menus.cpp : Qt menus
*****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include "dialogs_provider.hpp" /* Dialogs display */
#include "input_manager.hpp" /* Input Management */
#include "recents.hpp" /* Recent Items */
+#include "actions_manager.hpp"
#include <QMenu>
#include <QMenuBar>
/* 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;
+QAction *QVLCMenu::fullscreenViewAction = NULL;
QMenu *QVLCMenu::recentsMenu = NULL;
else
action = menu->addAction( text, THEDP, member );
}
- action->setData( "_static_" );
+ action->setData( true );
}
-void EnableDPStaticEntries( QMenu *menu, bool enable = true )
+/**
+ * @brief Enable all static entries, disable the others
+ * @param enable if false, disable all entries
+ */
+void EnableStaticEntries( QMenu *menu, bool enable = true )
{
if( !menu ) return;
- QAction *action;
- foreach( action, menu->actions() )
+ QList< QAction* > actions = menu->actions();
+ for( int i = 0; i < actions.size(); ++i )
{
- if( action->data().toString() == "_static_" )
- action->setEnabled( enable );
+ actions[i]->setEnabled( enable && actions[i]->data().toBool() );
}
}
int DeleteNonStaticEntries( QMenu *menu )
{
int i_ret = 0;
- QAction *action;
if( !menu )
return VLC_EGENERIC;
- foreach( action, menu->actions() )
+ QList< QAction* > actions = menu->actions();
+ for( int i = 0; i < actions.size(); ++i )
{
- if( action->data().toString() != "_static_" )
- delete action;
+ if( !actions[i]->data().toBool() )
+ delete actions[i];
else
i_ret++;
}
PUSH_VAR( "bookmark" );
PUSH_VAR( "title" );
PUSH_VAR( "chapter" );
- PUSH_VAR( "program" );
PUSH_VAR( "navigation" );
+ PUSH_VAR( "program" );
PUSH_VAR( "dvd_menus" );
return VLC_SUCCESS;
}
PUSH_INPUTVAR( "video-es" );
PUSH_INPUTVAR( "spu-es" );
PUSH_VAR( "fullscreen" );
- PUSH_VAR( "zoom" );
- PUSH_VAR( "deinterlace" );
- PUSH_VAR( "aspect-ratio" );
- PUSH_VAR( "crop" );
PUSH_VAR( "video-on-top" );
#ifdef WIN32
PUSH_VAR( "directx-wallpaper" );
#endif
PUSH_VAR( "video-snapshot" );
+ PUSH_VAR( "zoom" );
+ PUSH_VAR( "autoscale" );
+ PUSH_VAR( "aspect-ratio" );
+ PUSH_VAR( "crop" );
+ PUSH_VAR( "deinterlace" );
/* Special case for postproc */
// FIXME
vlc_object_release( p_dec );
}
}
+
return VLC_SUCCESS;
}
vector<const char *> &varnames )
{
PUSH_INPUTVAR( "audio-es" );
- PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
+ PUSH_VAR( "audio-device" );
PUSH_VAR( "visual" );
return VLC_SUCCESS;
}
static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
{
- QAction *action;
- foreach( action, menu->actions() )
+ QList< QAction* > actions = menu->actions();
+ for( int i = 0; i < actions.size(); ++i )
{
- if( action->data().toString() == psz_var )
- return action;
+ if( actions[i]->data().toString() == psz_var )
+ return actions[i];
}
return NULL;
}
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
**/
gives the QProcess::destroyed timeout issue on Cleanlooks style with
setDesktopAware set to false */
QMenuBar *bar = mi->menuBar();
- BAR_ADD( FileMenu( p_intf ), qtr( "&Media" ) );
+ BAR_ADD( FileMenu( p_intf, bar ), 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( "P&layback" ), 3 );
+ BAR_DADD( NavigMenu( p_intf, bar ), qtr( "P&layback" ), 3 );
+ BAR_DADD( AudioMenu( p_intf, bar ), qtr( "&Audio" ), 1 );
+ BAR_DADD( VideoMenu( p_intf, bar ), qtr( "&Video" ), 2 );
- BAR_ADD( ToolsMenu( p_intf ), qtr( "&Tools" ) );
+ BAR_ADD( ToolsMenu( bar ), qtr( "&Tools" ) );
BAR_ADD( ViewMenu( p_intf, NULL, mi, visual_selector_enabled, true ),
qtr( "V&iew" ) );
- BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
+ BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) );
}
#undef BAR_ADD
#undef BAR_DADD
* Media ( File ) Menu
* Opening, streaming and quit
**/
-QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf )
+QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu( parent );
addDPStaticEntry( menu, qtr( "&Open File..." ),
-#ifdef WIN32
":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( "Advanced Open File..." ),
- ":/file-asym", SLOT( openFileDialog() ) );
-#else
- ":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
-#endif
- addDPStaticEntry( menu, qtr( "Open &URL" ),
- NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
+ ":/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ),
":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ),
"Ctrl+C" );
menu->addSeparator();
+ addDPStaticEntry( menu, qtr( "Paste &MRL" ),
+ NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
- addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", SLOT( openAPlaylist() ),
- "Ctrl+X" );
- addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
- "Ctrl+Y" );
-
- menu->addSeparator();
-
- recentsMenu = new QMenu( qtr( "Recently &Played" ), menu );
+ recentsMenu = new QMenu( qtr( "&Recent Media" ), menu );
updateRecents( p_intf );
menu->addMenu( recentsMenu );
menu->addSeparator();
+ menu->addMenu( SDMenu( p_intf, menu ) );
+ menu->addSeparator();
+
+ addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
+ "Ctrl+Y" );
+ menu->addSeparator();
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
SLOT( openAndTranscodingDialogs() ), "Ctrl+R" );
}
/* Playlist/MediaLibrary Control */
-QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf )
+QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
{
- VLC_UNUSED( p_intf ); //TODO remove
- QMenu *menu = new QMenu();
-
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
+
+ addDPStaticEntry( menu, qtr( I_MENU_MSG ),
+ ":/messages", SLOT( messagesDialog() ),
+ "Ctrl+M" );
+
addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ),
"", SLOT( pluginDialog() ) );
menu->addSeparator();
- addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
- ":/preferences", SLOT( toolbarDialog() ) );
- addDPStaticEntry( menu, qtr( "&Preferences..." ),
+ addDPStaticEntry( menu, qtr( "&Preferences" ),
":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
return menu;
}
+QMenu *QVLCMenu::ToolsMenu( QWidget *parent )
+{
+ return ToolsMenu( new QMenu( parent ) );
+}
+
/**
- * Tools/View Menu
- * This is kept in the same menu for now, but could change if it gets much
- * longer.
+ * View Menu
* This menu can be an interface menu but also a right click menu.
**/
QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
bool visual_selector_enabled,
bool with_intf )
{
- QMenu *menu = new QMenu( current );
+ QMenu *menu;
+ if( current )
+ menu = new QMenu( current );
+ else
+ menu = new QMenu( mi );
QAction *act;
if( mi )
{
act = menu->addAction( QIcon( ":/playlist_menu" ),
- qtr( "Play&list..." ), mi,
+ qtr( "Play&list" ), mi,
SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
- act->setData( "_static_" );
+ act->setData( true );
}
- act = menu->addMenu( SDMenu( p_intf ) );
- act->setData( "_static_" );
/*menu->addSeparator();
menu->addAction( qtr( "Undock from Interface" ), mi,
SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/
QAction *action = menu->addAction( qtr( "Mi&nimal View" ), mi,
SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
action->setCheckable( true );
- action->setData( "_static_" );
+ action->setData( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE )
action->setChecked( true );
minimalViewAction = action; /* HACK for minimalView */
/* FullScreen View */
action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
SLOT( toggleFullScreen() ), QString( "F11" ) );
+ fullscreenViewAction = action;
action->setCheckable( true );
- action->setData( "_static_" );
+ action->setData( true );
/* Advanced Controls */
action = menu->addAction( qtr( "&Advanced Controls" ), mi,
SLOT( toggleAdvanced() ) );
action->setCheckable( true );
- action->setData( "_static_" );
+ action->setData( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
action->setChecked( true );
#if 0 /* For Visualisations. Not yet working */
}
menu->addSeparator();
+ addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
+ ":/preferences", SLOT( toolbarDialog() ) );
+ menu->addSeparator();
return menu;
}
aout_instance_t *p_aout;
input_thread_t *p_input;
- 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_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" ),
+ ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
+ action->setData( true );
+ action = current->addAction( qtr( "Decrease Volume" ),
+ ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
+ action->setData( true );
+ action = current->addAction( qtr( "Mute" ),
+ ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
+ action->setData( true );
}
p_input = THEMIM->getInput();
if( p_input )
vlc_object_hold( p_input );
p_aout = THEMIM->getAout();
+ AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
+ EnableStaticEntries( current, ( p_aout != NULL ) );
if( p_aout )
{
- AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
vlc_object_release( p_aout );
}
if( p_input )
return Populate( p_intf, current, varnames, objects );
}
+QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QWidget *parent )
+{
+ return AudioMenu( p_intf, new QMenu( parent ) );
+}
+
/**
* Main Video Menu
* Subtitles are part of Video.
vector<vlc_object_t *> objects;
vector<const char *> varnames;
- if( !current ) current = new QMenu();
-
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 );
addDPStaticEntry( submenu, qtr( "Open File..." ), "",
SLOT( loadSubtitlesFile() ) );
submenu->addSeparator();
+ current->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_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" ) );
- ACT_ADD( current, "postproc-q", qtr( "Post processing" ) );
+
+ current->addSeparator();
+
+ 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, "postproc-q", qtr( "&Post processing" ) );
}
p_input = THEMIM->getInput();
vlc_object_hold( p_input );
p_vout = THEMIM->getVout();
+ VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
+ EnableStaticEntries( current, ( p_vout != NULL ) );
if( p_vout )
{
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
vlc_object_release( p_vout );
}
if( p_input )
return Populate( p_intf, current, varnames, objects );
}
+QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent )
+{
+ return VideoMenu( p_intf, new QMenu( parent ) );
+}
+
/**
* Navigation Menu
* For DVD, MP4, MOV and other chapter based format
**/
QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
- if( !menu ) menu = new QMenu();
-
if( menu->isEmpty() )
{
+ ACT_ADDMENU( menu, "bookmark", qtr( "&Bookmarks" ) );
+ 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 ),"",
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" ) );
}
input_thread_t *p_object;
PUSH_VAR( "next-title" );
PUSH_VAR( "prev-chapter" );
PUSH_VAR( "next-chapter" );
- EnableDPStaticEntries( menu, ( p_object != NULL ) );
+ EnableStaticEntries( menu, ( p_object != NULL ) );
if( p_object )
{
vlc_object_release( p_object );
return Populate( p_intf, menu, varnames, objects );
}
+QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QWidget *parent )
+{
+ return NavigMenu( p_intf, new QMenu( parent ) );
+}
+
/**
* Service Discovery SubMenu
**/
-QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
+QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu( parent );
menu->setTitle( qtr( I_PL_SD ) );
char **ppsz_longnames;
char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
free( ppsz_longnames );
return menu;
}
+
/**
* Help/About Menu
**/
-QMenu *QVLCMenu::HelpMenu( QMenu *current )
+QMenu *QVLCMenu::HelpMenu( QWidget *parent )
{
- QMenu *menu = new QMenu( current );
+ QMenu *menu = new QMenu( parent );
addDPStaticEntry( menu, qtr( "&Help..." ) ,
":/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
void QVLCMenu::PopupMenuStaticEntries( 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 );
+ QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
addDPStaticEntry( openmenu, qtr( "&Open File..." ),
":/file-asym", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ),
menu->addSeparator();
+ /* Input menu */
vlc_object_hold( p_input );
InputAutoMenuBuilder( p_input, objects, varnames );
vlc_object_release( p_input );
+ /* Audio menu */
submenu = new QMenu( menu );
action = menu->addMenu( AudioMenu( p_intf, submenu ) );
action->setText( qtr( "&Audio" ) );
if( action->menu()->isEmpty() )
action->setEnabled( false );
+ /* Video menu */
submenu = new QMenu( menu );
action = menu->addMenu( VideoMenu( p_intf, submenu ) );
action->setText( qtr( "&Video" ) );
if( action->menu()->isEmpty() )
action->setEnabled( false );
+ /* Playback menu for chapters */
submenu = new QMenu( menu );
action = menu->addMenu( NavigMenu( p_intf, submenu ) );
action->setText( qtr( "&Playback" ) );
{
submenu->addAction( QIcon( ":/playlist" ),
qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
- }
- addDPStaticEntry( submenu, qtr( I_MENU_EXT ),
- ":/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" ),
+ qtr( "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" );
+
+ QMenu *tools = ToolsMenu( submenu );
submenu->addSeparator();
objects.clear();
varnames.clear();
vlc_object_release( p_object );
}
else
- {
msg_Dbg( p_intf, "could not find parent interface" );
- }
}
menu->addMenu( submenu );
}
+ /* Static entries for ending, like open */
PopupMenuStaticEntries( menu );
p_intf->p_sys->p_popup_menu = menu;
}
#undef ACT_ADD
+#undef ACT_ADDMENU
+#undef ACT_ADDCHECK
/************************************************************************
* Systray Menu *
vector<vlc_object_t *> & objects )
{
QMenu *menu = current;
- if( !menu ) menu = new QMenu();
-
- /* Disable all non static entries */
- QAction *p_action;
- foreach( p_action, menu->actions() )
+ if( !menu )
{
- if( p_action->data().toString() != "_static_" )
- p_action->setEnabled( false );
+ msg_Warn( p_intf, "%s leaking a menu", __func__ );
+ menu = new QMenu();
}
currentGroup = NULL;
vlc_object_t *p_object;
- int i;
- for( i = 0; i < ( int )objects.size() ; i++ )
+ for( int i = 0; i < ( int )objects.size() ; i++ )
{
if( !varnames[i] || !*varnames[i] )
{
DeleteNonStaticEntries( action->menu() );
if( !p_object )
+ {
+ if( action )
+ action->setEnabled( false );
return;
+ }
/* 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" ) )
break;
default:
/* Variable doesn't exist or isn't handled */
+ if( action )
+ action->setEnabled( false );
return;
}
/* Make sure we want to display the variable */
if( menu->isEmpty() && IsMenuEmpty( psz_var, p_object ) )
+ {
+ if( action )
+ action->setEnabled( false );
return;
+ }
/* Get the descriptive name of the variable */
int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL );
action->setEnabled( false );
}
else
- CreateChoicesMenu( menu, psz_var, p_object, true );
+ {
+ action->setEnabled(
+ CreateChoicesMenu( menu, psz_var, p_object, true ) == 0 );
+ }
FREENULL( text.psz_string );
return;
}
#undef CURVAL
#undef CURTEXT
- return VLC_SUCCESS;
+ return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS;
}
void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
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 )
recentsMenu->clear();
if( !l.size() )
{
- action = recentsMenu->addAction( " - Empty - " );
+ action = recentsMenu->addAction( qtr(" - Empty - ") );
action->setEnabled( false );
}
else
}
recentsMenu->addSeparator();
- recentsMenu->addAction( "&Clear", rmrl, SLOT( clear() ) );
+ recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) );
}
}
}
projects / vlc / blobdiff