* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/** \todo
+ * - Remove static currentGroup
+ */
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_intf_strings.h>
const char *member,
const char *shortcut )
{
+ 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;
+ Q_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;
+ Q_FOREACH( action, menu->actions() )
+ {
+ if( action->data().toString() != "_static_" )
+ delete action;
+ else
+ i_ret++;
+ }
+}
+
/*****************************************************************************
* Definitions of variables for the dynamic menus
*****************************************************************************/
#define PUSH_VAR( var ) varnames.push_back( var ); \
- objects.push_back( p_object->i_object_id )
+ objects.push_back( p_object ? p_object->i_object_id : 0 )
+
+#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \
+ objects.push_back( p_input ? p_input->i_object_id : 0 );
#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
objects.push_back( 0 ); varnames.push_back( "" ); \
}
static int VideoAutoMenuBuilder( vlc_object_t *p_object,
+ input_thread_t *p_input,
vector<int> &objects,
vector<const char *> &varnames )
{
+ PUSH_INPUTVAR( "video-es" );
+ PUSH_INPUTVAR( "spu-es" );
PUSH_VAR( "fullscreen" );
PUSH_VAR( "zoom" );
PUSH_VAR( "deinterlace" );
PUSH_VAR( "directx-wallpaper" );
PUSH_VAR( "video-snapshot" );
- vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object,
- VLC_OBJECT_DECODER,
- FIND_PARENT );
- if( p_dec_obj != NULL )
+ if( p_object )
{
- vlc_object_t *p_object = p_dec_obj;
- PUSH_VAR( "ffmpeg-pp-q" );
- vlc_object_release( p_dec_obj );
+ vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object,
+ VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if( p_dec_obj )
+ {
+ vlc_object_t *p_object = p_dec_obj;
+ PUSH_VAR( "ffmpeg-pp-q" );
+ vlc_object_release( p_dec_obj );
+ }
}
return VLC_SUCCESS;
}
static int AudioAutoMenuBuilder( vlc_object_t *p_object,
+ input_thread_t *p_input,
vector<int> &objects,
vector<const char *> &varnames )
{
+ PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
PUSH_VAR( "visual" );
return VLC_SUCCESS;
}
+static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
+{
+ QAction *action;
+ Q_FOREACH( action, menu->actions() )
+ {
+ if( action->data().toString() == psz_var )
+ return action;
+ }
+ return NULL;
+}
+
+static QAction * FindActionWithText( QMenu *menu, QString &text )
+{
+ QAction *action;
+ Q_FOREACH( action, menu->actions() )
+ {
+ if( action->text() == text )
+ return action;
+ }
+ return NULL;
+}
+
/*****************************************************************************
* All normal menus
* Simple Code
*****************************************************************************/
#define BAR_ADD( func, title ) { \
- QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); }
+ QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); }
#define BAR_DADD( func, title, id ) { \
- QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); \
- MenuFunc *f = new MenuFunc( menu, id ); \
- CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \
- THEDP->menusUpdateMapper->setMapping( menu, f ); }
+ QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); \
+ MenuFunc *f = new MenuFunc( _menu, id ); \
+ CONNECT( _menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \
+ THEDP->menusUpdateMapper->setMapping( _menu, f ); }
+
+#define ACT_ADD( _menu, val, title ) { \
+ QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
+ _menu->addAction( _action ); }
/**
* Main Menu Bar Creation
intf_thread_t *p_intf,
bool visual_selector_enabled )
{
+ /* QMainWindows->menuBar()
+ 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, mi, visual_selector_enabled, true ),
+ BAR_ADD( ToolsMenu( p_intf, NULL, 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( 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_ADD( HelpMenu(), qtr( "&Help" ) );
+ BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
}
#undef BAR_ADD
#undef BAR_DADD
* This menu can be an interface menu but also a right click menu.
**/
QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
+ QMenu *current,
MainInterface *mi,
bool visual_selector_enabled,
bool with_intf )
{
- QMenu *menu = new QMenu;
+ QMenu *menu = new QMenu( current );
if( mi )
{
menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
if( with_intf )
{
- QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
- intfmenu->setTitle( qtr( "Interfaces" ) );
+ 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();
}
varnames.push_back( "intf-add" );
objects.push_back( p_intf->i_object_id );
- QMenu *menu = Populate( p_intf, current, varnames, objects );
+ QMenu *submenu = new QMenu( current );
+ QMenu *menu = Populate( p_intf, submenu, varnames, objects );
- if( !p_intf->pf_show_dialog )
- {
- menu->addSeparator();
- menu->addAction( qtr( "Switch to skins" ), THEDP,
- SLOT( switchToSkins() ), QString( "Ctrl+Z" ) );
-#ifdef HAVE_WX
- if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
- {
- menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
- SLOT( switchToWx() ) );
- }
-#endif
- }
-
- CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
- THEDP->menusUpdateMapper->setMapping( menu, 4 );
return menu;
}
{
vector<int> objects;
vector<const char *> varnames;
+ vlc_object_t *p_object;
+ input_thread_t *p_input;
- vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf,
- VLC_OBJECT_INPUT, FIND_ANYWHERE );
- if( p_object != NULL )
+ if( !current )
+ current = new QMenu();
+
+ if( current->isEmpty() )
{
- PUSH_VAR( "audio-es" );
- vlc_object_release( p_object );
+ 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, "visual", qtr( "&Visualizations" ) );
+ ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) );
}
- p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ 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 );
+
+ AudioAutoMenuBuilder( p_object, p_input, objects, varnames );
+
if( p_object )
- {
- AudioAutoMenuBuilder( p_object, objects, varnames );
vlc_object_release( p_object );
- }
+ if( p_input )
+ vlc_object_release( p_input );
+
return Populate( p_intf, current, varnames, objects );
}
QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
{
vlc_object_t *p_object;
+ input_thread_t *p_input;
vector<int> objects;
vector<const char *> varnames;
- p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_object != NULL )
+ if( !current )
+ current = new QMenu();
+
+ if( current->isEmpty() )
{
- PUSH_VAR( "video-es" );
- PUSH_VAR( "spu-es" );
- vlc_object_release( p_object );
+ 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" );
+ action = submenu->addAction( qfu( "Load File..." ), THEDP,
+ SLOT( loadSubtitlesFile() ) );
+ action->setData( "_static_" );
+
+ 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" ) ); */
}
+ 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,
FIND_ANYWHERE );
- if( p_object != NULL )
- {
- VideoAutoMenuBuilder( p_object, objects, varnames );
+
+ VideoAutoMenuBuilder( p_object, p_input, objects, varnames );
+
+ if( p_object )
vlc_object_release( p_object );
- }
+ if( p_input )
+ vlc_object_release( p_input );
+
return Populate( p_intf, current, varnames, objects );
}
* Navigation Menu
* For DVD, MP4, MOV and other chapter based format
**/
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu )
+QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
vlc_object_t *p_object;
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( "&Title" ) );
+ 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 );
- if( p_object != NULL )
+ InputAutoMenuBuilder( p_object, objects, varnames );
+ PUSH_VAR( "prev-title" );
+ PUSH_VAR( "next-title" );
+ PUSH_VAR( "prev-chapter" );
+ PUSH_VAR( "next-chapter" );
+ EnableDPStaticEntries( menu, ( p_object != NULL ) );
+ if( p_object )
{
- 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();
- 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 );
}
/**
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++ )
{
/**
* Help/About Menu
**/
-QMenu *QVLCMenu::HelpMenu()
+QMenu *QVLCMenu::HelpMenu( QMenu *current )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu( current );
addDPStaticEntry( menu, qtr( "Help..." ) , "",
":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
return menu;
}
+#undef ACT_ADD
/*****************************************************************************
* Popup menus - Right Click menus *
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
}
- else if( THEPL->items.i_size && THEPL->i_enabled )
+ else if( THEPL->items.i_size )
addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
{
- QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true );
+ QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true );
toolsmenu->setTitle( qtr( "Tools" ) );
menu->addMenu( toolsmenu );
- QMenu *openmenu = new QMenu( qtr( "Open" ) );
+ QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
openmenu->addAction( qtr( "Open &File..." ), THEDP,
SLOT( openFileDialog() ) );
openmenu->addAction( qtr( "Open &Disc..." ), THEDP,
menu->addMenu( openmenu );
menu->addSeparator();
- QMenu *helpmenu = HelpMenu();
+ QMenu *helpmenu = HelpMenu( menu );
helpmenu->setTitle( qtr( "Help" ) );
menu->addMenu( helpmenu );
if( p_input )
{
vlc_object_yield( p_input );
- varnames.push_back( "video-es" );
- 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 );
if( p_vout )
{
- VideoAutoMenuBuilder( p_vout, objects, varnames );
+ VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
vlc_object_release( p_vout );
}
vlc_object_release( p_input );
if( p_input )
{
vlc_object_yield( p_input );
- 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 );
+ AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
if( p_aout )
- {
- AudioAutoMenuBuilder( p_aout, objects, varnames );
vlc_object_release( p_aout );
- }
vlc_object_release( p_input );
}
QMenu *menu = new QMenu();
/* Audio menu */
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 );
+ AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
if( p_aout )
- {
- AudioAutoMenuBuilder( p_aout, objects, varnames );
vlc_object_release( p_aout );
- }
/* Video menu */
PUSH_SEPARATOR;
- varnames.push_back( "video-es" );
- 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 );
+ VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
if( p_vout )
- {
- VideoAutoMenuBuilder( p_vout, objects, varnames );
vlc_object_release( p_vout );
- }
+
+ vlc_object_release( p_input );
}
QMenu *menu = new QMenu();
#undef PUSH_VAR
#undef PUSH_SEPARATOR
-
/*************************************************************************
* Builders for automenus
*************************************************************************/
QMenu *menu = current;
if( !menu )
menu = new QMenu();
- else if( !append )
- menu->clear();
+
+ /* Disable all non static entries */
+ QAction *p_action;
+ Q_FOREACH( p_action, menu->actions() )
+ {
+ if( p_action->data().toString() != "_static_" )
+ p_action->setEnabled( false );
+ }
currentGroup = NULL;
vlc_object_t *p_object;
- vlc_bool_t b_section_empty = VLC_FALSE;
int i;
-#define APPEND_EMPTY { QAction *action = menu->addAction( qtr( "Empty" ) ); \
- action->setEnabled( false ); }
-
for( i = 0; i < ( int )objects.size() ; i++ )
{
if( !varnames[i] || !*varnames[i] )
{
- if( b_section_empty )
- APPEND_EMPTY;
menu->addSeparator();
- b_section_empty = VLC_TRUE;
continue;
}
if( objects[i] == 0 )
{
- /// \bug What is this ?
- // Append( menu, varnames[i], NULL );
- b_section_empty = VLC_FALSE;
- continue;
+ 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;
+ }
}
- p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
- if( p_object == NULL ) continue;
-
- b_section_empty = VLC_FALSE;
/* Ugly specific stuff */
if( strstr( varnames[i], "intf-add" ) )
- CreateItem( menu, varnames[i], p_object, false );
+ UpdateItem( p_intf, menu, varnames[i], p_object, false );
else
- CreateItem( menu, varnames[i], p_object, true );
- vlc_object_release( p_object );
+ UpdateItem( p_intf, menu, varnames[i], p_object, true );
+ if( p_object )
+ vlc_object_release( p_object );
}
-
- /* Special case for empty menus */
- if( menu->actions().size() == 0 || b_section_empty )
- APPEND_EMPTY
-
return menu;
}
-#undef APPEND_EMPTY
/*****************************************************************************
* Private methods.
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;
}
return i_result;
}
-void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var,
- vlc_object_t *p_object, bool b_submenu )
+#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
+
+void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
+ const char *psz_var, vlc_object_t *p_object, bool b_submenu )
{
vlc_value_t val, text;
int i_type;
+ QAction *action = FindActionWithVar( menu, psz_var );
+ if( action )
+ DeleteNonStaticEntries( action->menu() );
+
+ if( !p_object )
+ return;
+
/* Check the type of the object variable */
- i_type = var_Type( p_object, psz_var );
+ if( !strcmp( psz_var, "audio-es" )
+ || !strcmp( psz_var, "video-es" ) )
+ i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE;
+ else
+ i_type = var_Type( p_object, psz_var );
switch( i_type & VLC_VAR_TYPE )
{
}
/* 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 */
- var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL );
+ int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL );
+ if( i_ret != VLC_SUCCESS )
+ {
+ text.psz_string = NULL;
+ }
+
+ 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 )
{
/* Append choices menu */
if( b_submenu )
{
- QMenu *submenu = new QMenu();
- submenu->setTitle( qfu( text.psz_string ?
- text.psz_string : psz_var ) );
- if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 )
- menu->addMenu( submenu );
+ QMenu *submenu;
+ submenu = action->menu();
+ if( !submenu )
+ {
+ submenu = new QMenu( menu );
+ action->setMenu( submenu );
+ }
+
+ action->setEnabled(
+ CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 );
+ if( forceDisabled )
+ action->setEnabled( false );
}
else
CreateChoicesMenu( menu, psz_var, p_object, true );
return;
}
-#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
-
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_VOID:
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 )
{
{
vlc_value_t another_val;
QString menutext;
- QMenu *subsubmenu = new QMenu();
+ QMenu *subsubmenu = new QMenu( submenu );
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_STRING:
var_Get( p_object, psz_var, &val );
another_val.psz_string = strdup( CURVAL.psz_string );
- menutext = qfu( "Add " ) /* If this function is more used, FIX*/
- + qfu( CURTEXT ? CURTEXT : another_val.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 ) );
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
vlc_value_t val, int i_val_type,
bool checked )
{
- QAction *action = new QAction( text, menu );
+ 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->setText( text );
action->setToolTip( help );
+ action->setEnabled( i_object_id != 0 );
+
if( i_item_type == ITEM_CHECK )
{
action->setCheckable( true );
currentGroup->addAction( action );
}
- if( checked )
- {
- action->setChecked( true );
- }
+ action->setChecked( checked );
+
MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
val, psz_var );
CONNECT( action, triggered(), THEDP->menusMapper, map() );
projects / vlc / blobdiff