#include <vlc_common.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h> /* vout_thread_t */
+#include <vlc_aout.h>
#include "menus.hpp"
#include <QActionGroup>
#include <QSignalMapper>
#include <QSystemTrayIcon>
+#include <QStatusBar>
+#include <QFontMetrics>
/*
This file defines the main menus and the pop-up menu (right-click menu)
if( !menu ) return;
QList< QAction* > actions = menu->actions();
- for( int i = 0; i < actions.size(); ++i )
+ for( int i = 0; i < actions.count(); ++i )
{
actions[i]->setEnabled( actions[i]->data().toString()
== ENTRY_ALWAYS_ENABLED ||
int i_ret = 0;
QList< QAction* > actions = menu->actions();
- for( int i = 0; i < actions.size(); ++i )
+ for( int i = 0; i < actions.count(); ++i )
{
if( actions[i]->data().toString() != STATIC_ENTRY )
delete actions[i];
static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
{
QList< QAction* > actions = menu->actions();
- for( int i = 0; i < actions.size(); ++i )
+ for( int i = 0; i < actions.count(); ++i )
{
if( actions[i]->data().toString() == psz_var )
return actions[i];
/*****************************************************************************
* Definitions of variables for the dynamic menus
*****************************************************************************/
-#define PUSH_VAR( var ) varnames.push_back( var ); \
- objects.push_back( VLC_OBJECT(p_object) )
+#define PUSH_VAR( var ) varnames.append( var ); \
+ objects.append( VLC_OBJECT(p_object) )
-#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \
- objects.push_back( VLC_OBJECT(p_input) );
-
-#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
- objects.push_back( 0 ); varnames.push_back( "" ); \
- i_last_separator = objects.size(); }
+#define PUSH_INPUTVAR( var ) varnames.append( var ); \
+ objects.append( VLC_OBJECT(p_input) );
static int InputAutoMenuBuilder( input_thread_t *p_object,
- vector<vlc_object_t *> &objects,
- vector<const char *> &varnames )
+ QVector<vlc_object_t *> &objects,
+ QVector<const char *> &varnames )
{
PUSH_VAR( "bookmark" );
PUSH_VAR( "title" );
static int VideoAutoMenuBuilder( vout_thread_t *p_object,
input_thread_t *p_input,
- vector<vlc_object_t *> &objects,
- vector<const char *> &varnames )
+ QVector<vlc_object_t *> &objects,
+ QVector<const char *> &varnames )
{
PUSH_INPUTVAR( "video-es" );
PUSH_INPUTVAR( "spu-es" );
return VLC_SUCCESS;
}
-static int AudioAutoMenuBuilder( aout_instance_t *p_object,
+static int AudioAutoMenuBuilder( audio_output_t *p_object,
input_thread_t *p_input,
- vector<vlc_object_t *> &objects,
- vector<const char *> &varnames )
+ QVector<vlc_object_t *> &objects,
+ QVector<const char *> &varnames )
{
PUSH_INPUTVAR( "audio-es" );
PUSH_VAR( "audio-channels" );
}
// Add an action with a submenu
-static inline void addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
+static inline QMenu *addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
QAction *_action = new QAction( title, _menu );
+ QMenu *_submenu = new QMenu( _menu );
_action->setData( val );
- _action->setMenu( new QMenu( _menu ) );
+ _action->setMenu( _submenu );
_menu->addAction( _action );
+ return _submenu;
}
// Add an action that is a checkbox
setDesktopAware set to false */
QMenuBar *bar = mi->menuBar();
- addMenuToMainbar( FileMenu( p_intf, bar ), qtr( "&Media" ), bar );
+ addMenuToMainbar( FileMenu( p_intf, bar, mi ), qtr( "&Media" ), bar );
/* Dynamic menus, rebuilt before being showed */
BAR_DADD( NavigMenu( p_intf, bar ), qtr( "P&layback" ), 3 );
addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar );
/* View menu, a bit different */
- BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+ BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar );
* Media ( File ) Menu
* Opening, streaming and quit
**/
-QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
+QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterface *mi )
{
QMenu *menu = new QMenu( parent );
QAction *action;
action->setCheckable( true );
action->setChecked( THEMIM->getPlayExitState() );
+ if( mi->getSysTray() )
+ {
+ action = menu->addAction( qtr( "Close to systray"), mi,
+ SLOT( toggleUpdateSystrayMenu() ) );
+ }
+
addDPStaticEntry( menu, qtr( "&Quit" ) ,
":/menu/quit", SLOT( quit() ), "Ctrl+Q" );
return menu;
/**
* View Menu
* Interface modification, load other interfaces, activate Extensions
+ * \param current, set to NULL for menu creation, else for menu update
**/
QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi )
{
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() );
+ CONNECT( action, triggered( bool ), mi, setStatusBarVisibility( bool) );
#if 0 /* For Visualisations. Not yet working */
adv = menu->addAction( qtr( "Visualizations selector" ), mi,
SLOT( visual() ) );
**/
QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
{
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
- varnames.push_back( "intf-add" );
- objects.push_back( VLC_OBJECT(p_intf) );
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
+ varnames.append( "intf-add" );
+ objects.append( VLC_OBJECT(p_intf) );
return Populate( p_intf, current, varnames, objects );
}
**/
QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
{
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
- aout_instance_t *p_aout;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
+ audio_output_t *p_aout;
input_thread_t *p_input;
if( current->isEmpty() )
}
/* Subtitles */
-QMenu *QVLCMenu::SubMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *QVLCMenu::SubtitleMenu( QMenu *current )
{
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
{
vout_thread_t *p_vout;
input_thread_t *p_input;
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
if( current->isEmpty() )
{
addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
if( b_subtitle)
- SubMenu( p_intf, current );
+ SubtitleMenu( current );
current->addSeparator();
QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
QAction *action;
+ QMenu *submenu;
addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
- addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+ submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+ submenu->setTearOffEnabled( true );
addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
/* FixMe: sync I_MENU_BOOKMARK string */
- QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ submenu->setTearOffEnabled( true );
addDPStaticEntry( submenu, qtr( "&Manage" ), "",
SLOT( bookmarksDialog() ), "Ctrl+B" );
submenu->addSeparator();
{
/* */
input_thread_t *p_object;
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
/* Get the input and hold it */
p_object = THEMIM->getInput();
delete menu; menu = NULL; \
if( !show ) \
return; \
- unsigned int i_last_separator = 0; \
- vector<vlc_object_t *> objects; \
- vector<const char *> varnames; \
+ 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() ); \
- i_last_separator = 0;
void QVLCMenu::PopupPlayEntries( QMenu *menu,
intf_thread_t *p_intf,
POPUP_BOILERPLATE
if( p_input )
{
- aout_instance_t *p_aout = THEMIM->getAout();
+ audio_output_t *p_aout = THEMIM->getAout();
AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
if( p_aout )
vlc_object_release( p_aout );
if( p_input )
{
- varnames.push_back( "audio-es" );
+ varnames.append( "audio-es" );
InputAutoMenuBuilder( p_input, objects, varnames );
- PUSH_SEPARATOR;
+ menu->addSeparator();
}
menu = new QMenu();
if( action->menu()->isEmpty() )
action->setEnabled( false );
- SubMenu( p_intf, menu )->setTitle( qtr( "Subti&tle") );
+ submenu = SubtitleMenu( menu );
+ submenu->setTitle( qtr( "Subti&tle") );
+ UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
/* Playback menu for chapters */
submenu = new QMenu( menu );
vlc_object_t* p_object = p_intf->p_parent;
objects.clear(); varnames.clear();
- objects.push_back( p_object );
- varnames.push_back( "intf-skins" );
+ objects.append( p_object );
+ varnames.append( "intf-skins" );
Populate( p_intf, submenu, varnames, objects );
objects.clear(); varnames.clear();
- objects.push_back( p_object );
- varnames.push_back( "intf-skins-interactive" );
+ objects.append( p_object );
+ varnames.append( "intf-skins-interactive" );
Populate( p_intf, submenu, varnames, objects );
}
else
else
{
QMenu *bar = menu; // Needed for next macro
- BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+ BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
}
menu->addMenu( submenu );
#undef PUSH_VAR
-#undef PUSH_SEPARATOR
/*************************************************************************
* Builders for automenus
*************************************************************************/
QMenu * QVLCMenu::Populate( intf_thread_t *p_intf,
QMenu *current,
- vector< const char *> & varnames,
- vector<vlc_object_t *> & objects )
+ QVector< const char *> & varnames,
+ QVector<vlc_object_t *> & objects )
{
QMenu *menu = current;
assert( menu );
currentGroup = NULL;
- for( int i = 0; i < (int)objects.size() ; i++ )
+ for( int i = 0; i < (int)objects.count() ; i++ )
{
if( !varnames[i] || !*varnames[i] )
{
case VLC_VAR_INTEGER:
var_Get( p_object, psz_var, &val );
if( CURTEXT ) menutext = qfu( CURTEXT );
- else menutext.sprintf( "%"PRId64, CURVAL.i_int );
+ else menutext = QString::number( CURVAL.i_int );
CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
( CURVAL.i_int == val.i_int )
recentsMenu->clear();
- if( !l.size() )
+ if( !l.count() )
{
action = recentsMenu->addAction( qtr(" - Empty - ") );
action->setEnabled( false );
}
else
{
- for( int i = 0; i < l.size(); ++i )
+ for( int i = 0; i < l.count(); ++i )
{
+ char *psz_temp = decode_URI_duplicate( qtu( l.at( i ) ) );
+
action = recentsMenu->addAction(
- QString( "&%1: " ).arg( i + 1 ) + l.at( i ),
+ QString( "&%1: " ).arg( i + 1 ) +
+ QApplication::fontMetrics().elidedText( psz_temp, Qt::ElideLeft, 400 ),
rmrl->signalMapper, SLOT( map() ),
i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" );
rmrl->signalMapper->setMapping( action, l.at( i ) );
+
+ free( psz_temp );
}
recentsMenu->addSeparator();
projects / vlc / blobdiff