static QActionGroup *currentGroup;
QMenu *VLCMenuBar::recentsMenu = NULL;
+QMenu *VLCMenuBar::audioDeviceMenu = NULL;
/**
* @brief Add static entries to DP in menus
/*****************************************************************************
* Definitions of variables for the dynamic menus
*****************************************************************************/
-#define PUSH_VAR( var ) varnames.append( var ); \
- objects.append( VLC_OBJECT(p_object) )
-
-#define PUSH_INPUTVAR( var ) varnames.append( var ); \
- objects.append( VLC_OBJECT(p_input) );
-
-static int InputAutoMenuBuilder( input_thread_t *p_object,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+#define PUSH_OBJVAR(object,var) \
+ do { \
+ varnames.append(var); \
+ objects.append(VLC_OBJECT(object)); \
+ } while (0)
+
+#define PUSH_VAR(var) PUSH_OBJVAR(p_object, var)
+#define PUSH_INPUTVAR(var) PUSH_OBJVAR(p_input, var)
+#define PUSH_PLVAR(var) PUSH_OBJVAR(pl, var)
+
+static int InputAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
- PUSH_VAR( "bookmark" );
- PUSH_VAR( "title" );
- PUSH_VAR( "chapter" );
- PUSH_VAR( "navigation" );
- PUSH_VAR( "program" );
+ PUSH_INPUTVAR( "bookmark" );
+ PUSH_INPUTVAR( "title" );
+ PUSH_INPUTVAR( "chapter" );
+ PUSH_INPUTVAR( "program" );
+
return VLC_SUCCESS;
}
-static int VideoAutoMenuBuilder( vout_thread_t *p_object,
- input_thread_t *p_input,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+static int VideoAutoMenuBuilder( playlist_t *pl, input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
+ vout_thread_t *p_object = p_input ? input_GetVout( p_input ) : NULL;
+
PUSH_INPUTVAR( "video-es" );
- PUSH_INPUTVAR( "spu-es" );
- PUSH_VAR( "fullscreen" );
- PUSH_VAR( "video-on-top" );
- PUSH_VAR( "video-wallpaper" );
+ PUSH_PLVAR( "fullscreen" );
+ PUSH_PLVAR( "video-on-top" );
+ PUSH_PLVAR( "video-wallpaper" );
PUSH_VAR( "video-snapshot" );
PUSH_VAR( "zoom" );
PUSH_VAR( "autoscale" );
PUSH_VAR( "deinterlace-mode" );
PUSH_VAR( "postprocess" );
+ if( p_object )
+ vlc_object_release( p_object );
+ return VLC_SUCCESS;
+}
+
+static int SubsAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
+{
+ PUSH_INPUTVAR( "spu-es" );
+
return VLC_SUCCESS;
}
-static int AudioAutoMenuBuilder( audio_output_t *p_object,
- input_thread_t *p_input,
- QVector<vlc_object_t *> &objects,
- QVector<const char *> &varnames )
+static int AudioAutoMenuBuilder( input_thread_t *p_input,
+ QVector<vlc_object_t *> &objects, QVector<const char *> &varnames )
{
+ audio_output_t *p_object = p_input ? input_GetAout( p_input ) : NULL;
+
PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "stereo-mode" );
- PUSH_VAR( "audio-device" );
PUSH_VAR( "visual" );
+
+ if( p_object )
+ vlc_object_release( p_object );
return VLC_SUCCESS;
}
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_DADD( SubtitleMenu( p_intf, bar ), qtr( "Subti&tle" ), 5 );
- addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar );
+ addMenuToMainbar( ToolsMenu( p_intf, bar ), qtr( "T&ools" ), bar );
/* View menu, a bit different */
BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
addDPStaticEntry( menu, qtr( "Open &File..." ),
":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
+ addDPStaticEntry( menu, qtr( "&Open Multiple Files..." ),
+ ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
":/type/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ),
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ),
":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" );
- menu->addSeparator();
-
- addDPStaticEntry( menu, qtr( "&Open (advanced)..." ),
- ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
- menu->addSeparator();
-
addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ),
NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
}
menu->addSeparator();
- addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
+ addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( savePlayingToPlaylist() ),
"Ctrl+Y" );
- menu->addSeparator();
#ifdef ENABLE_SOUT
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
action->setCheckable( true );
action->setChecked( THEMIM->getPlayExitState() );
- if( mi->getSysTray() )
+ if( mi && mi->getSysTray() )
{
action = menu->addAction( qtr( "Close to systray"), mi,
SLOT( toggleUpdateSystrayMenu() ) );
}
addDPStaticEntry( menu, qtr( "&Quit" ) ,
- ":/menu/quit", SLOT( quit() ), "Ctrl+Q" );
+ ":/menu/exit", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
/**
* Tools, like Media Information, Preferences or Messages
**/
-QMenu *VLCMenuBar::ToolsMenu( QMenu *menu )
+QMenu *VLCMenuBar::ToolsMenu( intf_thread_t *p_intf, QMenu *menu )
{
addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings",
SLOT( extendedDialog() ), "Ctrl+E" );
"", SLOT( pluginDialog() ) );
menu->addSeparator();
- addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
- ":/menu/preferences", SLOT( toolbarDialog() ) );
+ if( !p_intf->p_sys->b_isDialogProvider )
+ addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
+ ":/menu/preferences", SLOT( toolbarDialog() ) );
addDPStaticEntry( menu, qtr( "&Preferences" ),
":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole );
qtr( "Play&list" ), mi,
SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
+ /* Docked Playlist */
+ action = menu->addAction( qtr( "Docked Playlist" ) );
+ action->setCheckable( true );
+ action->setChecked( mi->isPlDocked() );
+ CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) );
+
if( mi->getPlaylistView() )
menu->addMenu( StandardPLPanel::viewSelectionMenu( mi->getPlaylistView() ) );
+
menu->addSeparator();
/* Minimal View */
action = menu->addAction( qtr( "Mi&nimal Interface" ) );
action->setShortcut( qtr( "Ctrl+H" ) );
action->setCheckable( true );
- action->setChecked( (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) );
+ action->setChecked( (mi->getControlsVisibilityStatus()
+ & MainInterface::CONTROLS_HIDDEN ) );
CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) );
CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) );
action = menu->addAction( qtr( "&Advanced Controls" ), mi,
SLOT( toggleAdvancedButtons() ) );
action->setCheckable( true );
- if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
+ if( mi->getControlsVisibilityStatus() & MainInterface::CONTROLS_ADVANCED )
action->setChecked( true );
- /* Docked Playlist */
- action = menu->addAction( qtr( "Docked Playlist" ) );
- action->setCheckable( true );
- action->setChecked( mi->isPlDocked() );
- CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) );
-
action = menu->addAction( qtr( "Status Bar" ) );
action->setCheckable( true );
action->setChecked( mi->statusBar()->isVisible() );
{
current->addSeparator();
- QAction *action = current->addAction( qtr( "&Increase Volume" ),
+ QAction *action = current->addAction( QIcon( ":/toolbar/volume-high" ), qtr( "&Increase Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( qtr( "&Decrease Volume" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-low" ), qtr( "&Decrease Volume" ),
ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
- action = current->addAction( qtr( "&Mute" ),
+ action = current->addAction( QIcon( ":/toolbar/volume-muted" ), qtr( "&Mute" ),
ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
action->setData( VLCMenuBar::ACTION_STATIC );
}
if( current->isEmpty() )
{
addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) );
+ audioDeviceMenu = new QMenu( qtr( "Audio &Device" ) );
+ current->addMenu( audioDeviceMenu );
addActionWithSubmenu( current, "stereo-mode", qtr( "&Stereo Mode" ) );
- addActionWithSubmenu( current, "audio-device", qtr( "Audio &Device" ) );
current->addSeparator();
addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) );
p_input = THEMIM->getInput();
p_aout = THEMIM->getAout();
EnableStaticEntries( current, ( p_aout != NULL ) );
- AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
+ AudioAutoMenuBuilder( p_input, objects, varnames );
+ updateAudioDevice( p_intf, p_aout, audioDeviceMenu );
if( p_aout )
{
vlc_object_release( p_aout );
}
/* Subtitles */
-QMenu *VLCMenuBar::SubtitleMenu( QMenu *current )
+QMenu *VLCMenuBar::SubtitleMenu( intf_thread_t *p_intf, QMenu *current, bool b_popup )
{
- QAction *action;
- QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
- action = current->addMenu( submenu );
- action->setData( "spu-es" );
- addDPStaticEntry( submenu, qtr( "Open File..." ), "",
- SLOT( loadSubtitlesFile() ) );
- submenu->addSeparator();
- return submenu;
+ input_thread_t *p_input;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
+
+ if( current->isEmpty() || b_popup )
+ {
+ addDPStaticEntry( current, qtr( "Add &Subtitle File..." ), "",
+ SLOT( loadSubtitlesFile() ) );
+ addActionWithSubmenu( current, "spu-es", qtr( "Sub &Track" ) );
+ current->addSeparator();
+ }
+
+ p_input = THEMIM->getInput();
+ SubsAutoMenuBuilder( p_input, objects, varnames );
+
+ return Populate( p_intf, current, varnames, objects );
}
/**
* Main Video Menu
* Subtitles are part of Video.
**/
-QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle )
+QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current )
{
- vout_thread_t *p_vout;
input_thread_t *p_input;
QVector<vlc_object_t *> objects;
QVector<const char *> varnames;
if( current->isEmpty() )
{
addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
- if( b_subtitle)
- SubtitleMenu( current );
current->addSeparator();
/* Surface modifiers */
p_input = THEMIM->getInput();
- p_vout = THEMIM->getVout();
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
-
- if( p_vout )
- vlc_object_release( p_vout );
+ VideoAutoMenuBuilder( THEPL, p_input, objects, varnames );
return Populate( p_intf, current, varnames, objects );
}
QMenu *submenu;
addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
- addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
- submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+ submenu = addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
submenu->setTearOffEnabled( true );
addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
- /* FixMe: sync I_MENU_BOOKMARK string */
- submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ submenu = new QMenu( qtr( I_MENU_BOOKMARK ), menu );
submenu->setTearOffEnabled( true );
addDPStaticEntry( submenu, qtr( "&Manage" ), "",
SLOT( bookmarksDialog() ), "Ctrl+B" );
QMenu *VLCMenuBar::HelpMenu( QWidget *parent )
{
QMenu *menu = new QMenu( parent );
- addDPStaticEntry( menu, qtr( "&Help..." ) ,
+ addDPStaticEntry( menu, qtr( "&Help" ) ,
":/menu/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "",
* Popup menus - Right Click menus *
*****************************************************************************/
#define POPUP_BOILERPLATE \
- static QMenu* menu = NULL; \
- delete menu; menu = NULL; \
- if( !show ) \
- return; \
+ QMenu* menu; \
QVector<vlc_object_t *> objects; \
QVector<const char *> varnames; \
input_thread_t *p_input = THEMIM->getInput();
#define CREATE_POPUP \
menu = new QMenu(); \
Populate( p_intf, menu, varnames, objects ); \
- menu->popup( QCursor::pos() ); \
+ if( show ) \
+ menu->popup( QCursor::pos() ); \
void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
intf_thread_t *p_intf,
action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+ action = menu->addAction( qtr( "Record" ), THEAM, SLOT( record() ) );
+ action->setIcon( QIcon( ":/toolbar/record" ) );
+ if( !p_input )
+ action->setEnabled( false );
+ action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
menu->addSeparator();
}
action->setData( ACTION_STATIC );
}
- action = rateMenu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/faster2" ), qtr( "Faster (fine)" ), THEMIM->getIM(),
SLOT( littlefaster() ) );
action->setData( ACTION_STATIC );
SLOT( normalRate() ) );
action->setData( ACTION_STATIC );
- action = rateMenu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
+ action = rateMenu->addAction( QIcon( ":/toolbar/slower2" ), qtr( "Slower (fine)" ), THEMIM->getIM(),
SLOT( littleslower() ) );
action->setData( ACTION_STATIC );
void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
{
QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
- addDPStaticEntry( openmenu, qtr( "&Open File..." ),
+ addDPStaticEntry( openmenu, qtr( I_OP_OPF ),
":/type/file-asym", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
":/type/folder-grey", SLOT( PLOpenDir() ) );
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit",
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit",
SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
}
/* Video Tracks and Subtitles tracks */
-void VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
if( p_input )
- {
- vout_thread_t *p_vout = THEMIM->getVout();
- if( p_vout )
- {
- VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
- vlc_object_release( p_vout );
- }
- }
+ VideoAutoMenuBuilder( THEPL, p_input, objects, varnames );
CREATE_POPUP
+ return menu;
}
/* Audio Tracks */
-void VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
if( p_input )
- {
- audio_output_t *p_aout = THEMIM->getAout();
- AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
- if( p_aout )
- vlc_object_release( p_aout );
- }
+ AudioAutoMenuBuilder( p_input, objects, varnames );
CREATE_POPUP
+ return menu;
}
/* Navigation stuff, and general menus ( open ), used only for skins */
-void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
menu = new QMenu();
if( p_input )
{
- varnames.append( "audio-es" );
InputAutoMenuBuilder( p_input, objects, varnames );
menu->addSeparator();
}
menu->addSeparator();
PopupMenuStaticEntries( menu );
- menu->popup( QCursor::pos() );
+ if( show )
+ menu->popup( QCursor::pos() );
+ return menu;
}
/* Main Menu that sticks everything together */
-void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
+QMenu* VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
{
POPUP_BOILERPLATE
val.b_bool = false;
CreateAndConnect( menu, "fullscreen",
qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL,
- VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, b_isFullscreen );
+ VLC_OBJECT(THEPL), val, VLC_VAR_BOOL, b_isFullscreen );
}
vlc_object_release( p_vout );
/* Video menu */
submenu = new QMenu( menu );
- action = menu->addMenu( VideoMenu( p_intf, submenu, false ) );
+ action = menu->addMenu( VideoMenu( p_intf, submenu ) );
action->setText( qtr( "&Video" ) );
if( action->menu()->isEmpty() )
action->setEnabled( false );
- submenu = SubtitleMenu( menu );
- submenu->setTitle( qtr( "Subti&tle") );
- UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
+ /* Subtitles menu */
+ submenu = new QMenu( menu );
+ action = menu->addMenu( SubtitleMenu( p_intf, submenu, true ) );
+ action->setText( qtr( "Subti&tle") );
+ UpdateItem( p_intf, submenu, "spu-es", VLC_OBJECT(p_input), true );
/* Playback menu for chapters */
submenu = new QMenu( menu );
/* Add some special entries for windowed mode: Interface Menu */
if( !b_isFullscreen )
{
- QMenu *submenu = new QMenu( qtr( "Tools" ), menu );
- /*QMenu *tools =*/ ToolsMenu( submenu );
+ QMenu *submenu = new QMenu( qtr( "T&ools" ), menu );
+ /*QMenu *tools =*/ ToolsMenu( p_intf, submenu );
submenu->addSeparator();
+ if( mi )
+ {
+ QMenu *bar = menu; // Needed for next macro
+ BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
+ }
+
/* In skins interface, append some items */
- if( !mi )
+ if( p_intf->p_sys->b_isDialogProvider )
{
+ vlc_object_t* p_object = p_intf->p_parent;
submenu->setTitle( qtr( "Interface" ) );
- if( p_intf->p_sys->b_isDialogProvider )
- {
- vlc_object_t* p_object = p_intf->p_parent;
- objects.clear(); varnames.clear();
- objects.append( p_object );
- varnames.append( "intf-skins" );
- Populate( p_intf, submenu, varnames, objects );
+ /* Open skin dialog box */
+ objects.clear(); varnames.clear();
+ objects.append( p_object );
+ varnames.append( "intf-skins-interactive" );
+ Populate( p_intf, submenu, varnames, objects );
+ QAction* action = submenu->actions().back();
+ action->setShortcut( QKeySequence( "Ctrl+Shift+S" ));
- objects.clear(); varnames.clear();
- objects.append( p_object );
- varnames.append( "intf-skins-interactive" );
- Populate( p_intf, submenu, varnames, objects );
- }
- else
- msg_Warn( p_intf, "could not find parent interface" );
- }
- else
- {
- QMenu *bar = menu; // Needed for next macro
- BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
+ /* list of skins available */
+ objects.clear(); varnames.clear();
+ objects.append( p_object );
+ varnames.append( "intf-skins" );
+ Populate( p_intf, submenu, varnames, objects );
+
+ submenu->addSeparator();
+
+ /* list of extensions */
+ ExtensionsMenu( p_intf, submenu );
}
menu->addMenu( submenu );
menu->addMenu( plMenu );
/* Static entries for ending, like open */
- PopupMenuStaticEntries( menu );
+ if( p_intf->p_sys->b_isDialogProvider )
+ {
+ QMenu *openmenu = FileMenu( p_intf, menu );
+ openmenu->setTitle( qtr( "Open Media" ) );
+ menu->addMenu( openmenu );
+
+ menu->addSeparator();
- menu->popup( QCursor::pos() );
+ QMenu *helpmenu = HelpMenu( menu );
+ helpmenu->setTitle( qtr( "Help" ) );
+ menu->addMenu( helpmenu );
+
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/exit",
+ SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
+ }
+ else
+ PopupMenuStaticEntries( menu );
+
+ if( show )
+ menu->popup( QCursor::pos() );
+ return menu;
}
#undef CREATE_POPUP
QMenu *sysMenu = mi->getSysTrayMenu();
sysMenu->clear();
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
/* Hide / Show VLC and cone */
if( mi->isVisible() || b_force_visible )
{
addDPStaticEntry( sysMenu, qtr( "&Open Media" ),
":/type/file-wide", SLOT( openFileDialog() ) );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) ,
- ":/menu/quit", SLOT( quit() ) );
+ ":/menu/exit", SLOT( quit() ) );
/* Set the menu */
mi->getSysTray()->setContextMenu( sysMenu );
return i_result;
}
-#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
+#define TEXT_OR_VAR qfue ( text.psz_string ? text.psz_string : psz_var )
void VLCMenuBar::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
const char *psz_var, vlc_object_t *p_object, bool b_submenu )
{
case VLC_VAR_VARIABLE:
CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false );
- subsubmenu->setTitle( qfu( CURTEXT ? CURTEXT :CURVAL.psz_string ) );
+ subsubmenu->setTitle( qfue( CURTEXT ? CURTEXT :CURVAL.psz_string ) );
submenu->addMenu( subsubmenu );
break;
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 = qfue( CURTEXT ? CURTEXT : another_val.psz_string );
CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, another_val, i_type,
val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) );
case VLC_VAR_INTEGER:
var_Get( p_object, psz_var, &val );
- if( CURTEXT ) menutext = qfu( CURTEXT );
+ if( CURTEXT ) menutext = qfue( CURTEXT );
else menutext = QString::number( CURVAL.i_int );
CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
case VLC_VAR_FLOAT:
var_Get( p_object, psz_var, &val );
- if( CURTEXT ) menutext = qfu( CURTEXT );
+ if( CURTEXT ) menutext = qfue( CURTEXT );
else menutext.sprintf( "%.2f", CURVAL.f_float );
CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
#undef RADIO_OR_COMMAND
#undef CURVAL
#undef CURTEXT
+
return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS;
}
action->setChecked( checked );
- MenuItemData *itemData = qFindChild<MenuItemData*>( action, QString() );
+ MenuItemData *itemData = action->findChild<MenuItemData*>( QString() );
delete itemData;
itemData = new MenuItemData( action, p_obj, i_val_type, val, psz_var );
MenuItemData *itemData = qobject_cast<MenuItemData *>( data );
vlc_object_t *p_object = itemData->p_obj;
if( p_object == NULL ) return;
+ const char *var = itemData->psz_var;
+ vlc_value_t val = itemData->val;
+
+ if ((var_Type( p_object, var) & VLC_VAR_CLASS) == VLC_VAR_VOID)
+ var_TriggerCallback( p_object, var );
+ else
+ var_Set( p_object, var, val );
+
+ if( !strcmp( var, "fullscreen" )
+ || !strcmp( var, "video-on-top" )
+ || !strcmp( var, "video-wallpaper" ) ) /* FIXME: reverse abstraction */
+ { /* Apply playlist variables to current existing vout too */
+ input_thread_t *input = playlist_CurrentInput((playlist_t *)p_object);
+ if( input != NULL )
+ {
+ vout_thread_t *vout = input_GetVout( input );
+ vlc_object_release( input );
+ if( vout != NULL )
+ {
+ var_Set( vout, var, val ); /* never void class */
+ vlc_object_release( vout );
+ }
+ }
+ }
+}
+
+void VLCMenuBar::updateAudioDevice( intf_thread_t * p_intf, audio_output_t *p_aout, QMenu *current )
+{
+ char **ids, **names;
+ char *selected;
- /* Preserve settings across vouts via the playlist object: */
- if( !strcmp( itemData->psz_var, "fullscreen" )
- || !strcmp( itemData->psz_var, "video-on-top" ) )
- var_Set( pl_Get( p_object ), itemData->psz_var, itemData->val );
+ if( !p_aout || !current )
+ return;
+
+ current->clear();
+ int i_result = aout_DevicesList( p_aout, &ids, &names);
+ selected = aout_DeviceGet( p_aout );
+
+ QActionGroup *actionGroup = new QActionGroup(current);
+ QAction *action;
- var_Set( p_object, itemData->psz_var, itemData->val );
+ for( int i = 0; i < i_result; i++ )
+ {
+ action = new QAction( qfue( names[i] ), NULL );
+ action->setData( ids[i] );
+ action->setCheckable( true );
+ if( (selected && !strcmp( ids[i], selected ) ) ||
+ (selected == NULL && ids[i] && ids[i][0] == '\0' ) )
+ action->setChecked( true );
+ actionGroup->addAction( action );
+ current->addAction( action );
+ CONNECT(action, changed(), THEMIM->menusAudioMapper, map());
+ THEMIM->menusAudioMapper->setMapping(action, ids[i]);
+ free( ids[i] );
+ free( names[i] );
+ }
+ free( ids );
+ free( names );
+ free( selected );
}
void VLCMenuBar::updateRecents( intf_thread_t *p_intf )
{
QAction* action;
RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf );
- QStringList l = rmrl->recents();
+ QStringList l = rmrl->recentList();
recentsMenu->clear();
}
else
{
- for( int i = 0; i < l.count(); ++i )
+ for( int i = 0; i < __MIN( l.count(), 10) ; ++i )
{
QString mrl = l.at( i );
char *psz = decode_URI_duplicate( qtu( mrl ) );
QString text = qfu( psz );
+ text.replace("&", "&&");
+#ifdef _WIN32
+# define FILE_SCHEME "file:///"
+#else
+# define FILE_SCHEME "file://"
+#endif
+ if ( text.startsWith( FILE_SCHEME ) )
+ text.remove( 0, strlen( FILE_SCHEME ) );
+#undef FILE_SCHEME
+
free( psz );
action = recentsMenu->addAction(
QString( i < 9 ? "&%1: ": "%1: " ).arg( i + 1 ) +
recentsMenu->addSeparator();
recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) );
+ addDPStaticEntry( recentsMenu, qtr("&Save To Playlist"), "", SLOT( saveRecentsToPlaylist() ), "" );
recentsMenu->setEnabled( true );
}
}
projects / vlc / blobdiff