/*****************************************************************************
* menus.cpp : Qt menus
*****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2011 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* - Remove static currentGroup
*/
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <vlc_common.h>
#include <vlc_intf_strings.h>
-#include <vlc_services_discovery.h>
+#include <vlc_vout.h> /* vout_thread_t */
+#include <vlc_aout.h>
#include "menus.hpp"
-#include "main_interface.hpp" /* View modifications */
-#include "dialogs_provider.hpp" /* Dialogs display */
-#include "input_manager.hpp" /* Input Management */
-#include "recents.hpp" /* Recent Items */
+#include "main_interface.hpp" /* View modifications */
+#include "dialogs_provider.hpp" /* Dialogs display */
+#include "input_manager.hpp" /* Input Management */
+#include "recents.hpp" /* Recent Items */
+#include "actions_manager.hpp" /* Actions Management: play+volume */
+#include "extensions_manager.hpp" /* Extensions menu*/
#include <QMenu>
#include <QMenuBar>
#include <QActionGroup>
#include <QSignalMapper>
#include <QSystemTrayIcon>
-#include <QList>
+#include <QStatusBar>
+#include <QFontMetrics>
/*
This file defines the main menus and the pop-up menu (right-click menu)
and the systray menu (in that order in the file)
- There are 3 menus that have to be rebuilt everytime there are called:
- Audio, Video, Navigation
- 3 functions are building those menus: AudioMenu, VideoMenu, NavigMenu
+ There are 4 menus that have to be rebuilt everytime there are called:
+ Audio, Video, Navigation, view
+ 4 functions are building those menus: AudioMenu, VideoMenu, NavigMenu, View
and 3 functions associated are collecting the objects :
InputAutoMenuBuilder, AudioAutoMenuBuilder, VideoAutoMenuBuilder.
Just before one of those menus are aboutToShow(), they are rebuild.
*/
+#define STATIC_ENTRY "__static__"
+#define ENTRY_ALWAYS_ENABLED "__ignore__"
+
enum
{
- ITEM_NORMAL,
- ITEM_CHECK,
- ITEM_RADIO
+ ITEM_NORMAL, /* not a checkbox, nor a radio */
+ ITEM_CHECK, /* Checkbox */
+ ITEM_RADIO /* Radiobox */
};
static QActionGroup *currentGroup;
-/* 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;
-
QMenu *QVLCMenu::recentsMenu = NULL;
-/****************************************************************************
- * Menu code helpers:
- ****************************************************************************
- * Add static entries to DP in menus
- ***************************************************************************/
-void addDPStaticEntry( QMenu *menu,
- const QString text,
+/**
+ * @brief Add static entries to DP in menus
+ **/
+QAction *addDPStaticEntry( QMenu *menu,
+ const QString& text,
const char *icon,
const char *member,
- const char *shortcut = NULL )
+ const char *shortcut = NULL,
+ QAction::MenuRole = QAction::NoRole
+ )
{
QAction *action = NULL;
- if( !EMPTY_STR( icon ) > 0 )
+#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
+ if( !EMPTY_STR( icon ) )
{
- if( !EMPTY_STR( shortcut ) > 0 )
+ if( !EMPTY_STR( shortcut ) )
action = menu->addAction( QIcon( icon ), text, THEDP,
member, qtr( shortcut ) );
else
action = menu->addAction( QIcon( icon ), text, THEDP, member );
}
else
+#endif
{
- if( !EMPTY_STR( shortcut ) > 0 )
+ if( !EMPTY_STR( shortcut ) )
action = menu->addAction( text, THEDP, member, qtr( shortcut ) );
else
action = menu->addAction( text, THEDP, member );
}
- action->setData( "_static_" );
+ action->setData( STATIC_ENTRY );
+ return action;
}
-void EnableDPStaticEntries( QMenu *menu, bool enable = true )
+/**
+ * @brief Add static entries to MIM in menus
+ **/
+QAction* addMIMStaticEntry( intf_thread_t *p_intf,
+ QMenu *menu,
+ const QString& text,
+ const char *icon,
+ const char *member,
+ bool bStatic = false )
+{
+ QAction *action;
+#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
+ if( !EMPTY_STR( icon ) )
+ {
+ action = menu->addAction( text, THEMIM, member );
+ action->setIcon( QIcon( icon ) );
+ }
+ else
+#endif
+ {
+ action = menu->addAction( text, THEMIM, member );
+ }
+ action->setData( bStatic ? STATIC_ENTRY : ENTRY_ALWAYS_ENABLED );
+ return action;
+}
+
+/**
+ * @brief Enable all static entries of a menu, disable the others
+ * @param menu the menu in which the entries will be disabled
+ * @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.count(); ++i )
{
- if( action->data().toString() == "_static_" )
- action->setEnabled( enable );
+ actions[i]->setEnabled( actions[i]->data().toString()
+ == ENTRY_ALWAYS_ENABLED ||
+ /* Be careful here, because data("string").toBool is true */
+ ( enable && (actions[i]->data().toString() == STATIC_ENTRY ) ) );
}
}
/**
* \return Number of static entries
- */
-int DeleteNonStaticEntries( QMenu *menu )
+ **/
+inline int DeleteNonStaticEntries( QMenu *menu )
{
+ if( !menu ) return VLC_EGENERIC;
+
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.count(); ++i )
{
- if( action->data().toString() != "_static_" )
- delete action;
+ if( actions[i]->data().toString() != STATIC_ENTRY )
+ delete actions[i];
else
i_ret++;
}
return i_ret;
}
-/***
- * Same for MIM
- ***/
-void addMIMStaticEntry( intf_thread_t *p_intf,
- QMenu *menu,
- const QString text,
- const char *icon,
- const char *member )
+/**
+ * \return QAction associated to psz_var variable
+ **/
+static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
{
- if( strlen( icon ) > 0 )
+ QList< QAction* > actions = menu->actions();
+ for( int i = 0; i < actions.count(); ++i )
{
- QAction *action = menu->addAction( text, THEMIM, member );
- action->setIcon( QIcon( icon ) );
- }
- else
- {
- menu->addAction( text, THEMIM, member );
+ if( actions[i]->data().toString() == psz_var )
+ return actions[i];
}
+ return NULL;
}
/*****************************************************************************
* 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_INPUTVAR( var ) varnames.append( var ); \
+ objects.append( 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(); }
-
-static int InputAutoMenuBuilder( vlc_object_t *p_object,
- vector<vlc_object_t *> &objects,
- vector<const char *> &varnames )
+static int InputAutoMenuBuilder( input_thread_t *p_object,
+ QVector<vlc_object_t *> &objects,
+ QVector<const char *> &varnames )
{
PUSH_VAR( "bookmark" );
PUSH_VAR( "title" );
PUSH_VAR( "chapter" );
- PUSH_VAR( "program" );
PUSH_VAR( "navigation" );
- PUSH_VAR( "dvd_menus" );
+ PUSH_VAR( "program" );
return VLC_SUCCESS;
}
-static int VideoAutoMenuBuilder( vlc_object_t *p_object,
+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" );
PUSH_VAR( "fullscreen" );
- PUSH_VAR( "zoom" );
- PUSH_VAR( "deinterlace" );
- PUSH_VAR( "aspect-ratio" );
- PUSH_VAR( "crop" );
PUSH_VAR( "video-on-top" );
+ PUSH_VAR( "video-wallpaper" );
#ifdef WIN32
- PUSH_VAR( "directx-wallpaper" );
+ PUSH_VAR( "direct3d-desktop" );
#endif
PUSH_VAR( "video-snapshot" );
+ PUSH_VAR( "zoom" );
+ PUSH_VAR( "autoscale" );
+ PUSH_VAR( "aspect-ratio" );
+ PUSH_VAR( "crop" );
+ PUSH_VAR( "deinterlace" );
+ PUSH_VAR( "deinterlace-mode" );
+ PUSH_VAR( "postprocess" );
- /* Special case for postproc */
- 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 )
- {
- p_object = p_pp;
- PUSH_VAR( "postproc-q" );
- vlc_object_release( p_pp );
- }
-
- vlc_object_release( p_dec );
- }
- }
return VLC_SUCCESS;
}
-static int AudioAutoMenuBuilder( vlc_object_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-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() )
- {
- if( action->data().toString() == psz_var )
- return action;
- }
- return NULL;
-}
-
/*****************************************************************************
* All normal menus
* Simple Code
*****************************************************************************/
-#define BAR_ADD( func, title ) { \
- QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); }
+// Static menu
+static inline void addMenuToMainbar( QMenu *func, QString title, QMenuBar *bar ) {
+ func->setTitle( title );
+ bar->addMenu( func);
+}
+// Dynamic 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 ); }
-#define ACT_ADD( _menu, val, title ) { \
- QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
- _menu->addAction( _action ); }
+// Add a simple action
+static inline void addAction( QMenu *_menu, QVariant val, QString title ) {
+ QAction *_action = new QAction( title, _menu );
+ _action->setData( val );
+ _menu->addAction( _action );
+}
+
+// Add an action with a submenu
+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( _submenu );
+ _menu->addAction( _action );
+ return _submenu;
+}
+
+// Add an action that is a checkbox
+static inline void addActionWithCheckbox( QMenu *_menu, QVariant val, QString title ) {
+ QAction *_action = new QAction( title, _menu );
+ _action->setData( val );
+ _action->setCheckable( true );
+ _menu->addAction( _action );
+}
/**
* Main Menu Bar Creation
**/
void QVLCMenu::createMenuBar( MainInterface *mi,
- intf_thread_t *p_intf,
- bool visual_selector_enabled )
-/* FIXME remove this visual dependency */
+ intf_thread_t *p_intf )
{
/* QMainWindows->menuBar()
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_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 );
+ 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 );
+ 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( ViewMenu( p_intf, NULL, mi, visual_selector_enabled, true ),
- qtr( "V&iew" ) );
+ addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar );
+
+ /* View menu, a bit different */
+ BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
+
+ addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar );
- BAR_ADD( HelpMenu( NULL ), 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, MainInterface *mi )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu( parent );
+ QAction *action;
- 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( I_OPEN_FOLDER ),
- ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
+ addDPStaticEntry( menu, qtr( "Open &File..." ),
+ ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
+ addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
+ ":/type/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ),
- ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
- addDPStaticEntry( menu, qtr( "Open &Network..." ),
- ":/network", SLOT( openNetDialog() ), "Ctrl+N" );
+ ":/type/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
+ addDPStaticEntry( menu, qtr( "Open &Network Stream..." ),
+ ":/type/network", SLOT( openNetDialog() ), "Ctrl+N" );
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ),
- ":/capture-card", SLOT( openCaptureDialog() ),
- "Ctrl+C" );
+ ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" );
menu->addSeparator();
- recentsMenu = new QMenu( qtr( "Recently &Played" ), menu );
- updateRecents( p_intf );
- menu->addMenu( recentsMenu );
+ 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" );
+
+ if( var_InheritBool( p_intf, "qt-recentplay" ) )
+ {
+ recentsMenu = new QMenu( qtr( "Open &Recent Media" ), menu );
+ updateRecents( p_intf );
+ menu->addMenu( recentsMenu );
+ }
+ menu->addSeparator();
+
+ addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
+ "Ctrl+Y" );
+ menu->addSeparator();
+
+#ifdef ENABLE_SOUT
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
SLOT( openAndTranscodingDialogs() ), "Ctrl+R" );
- addDPStaticEntry( menu, qtr( "&Streaming..." ),
- ":/stream", SLOT( openAndStreamingDialogs() ),
- "Ctrl+S" );
+ addDPStaticEntry( menu, qtr( "&Stream..." ),
+ ":/menu/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" );
menu->addSeparator();
+#endif
+
+ action = addMIMStaticEntry( p_intf, menu, qtr( "Quit at the end of playlist" ), "",
+ SLOT( activatePlayQuit( bool ) ) );
+ action->setCheckable( true );
+ action->setChecked( THEMIM->getPlayExitState() );
+
+ if( mi->getSysTray() )
+ {
+ action = menu->addAction( qtr( "Close to systray"), mi,
+ SLOT( toggleUpdateSystrayMenu() ) );
+ }
addDPStaticEntry( menu, qtr( "&Quit" ) ,
- ":/quit", SLOT( quit() ), "Ctrl+Q" );
+ ":/menu/quit", SLOT( quit() ), "Ctrl+Q" );
return menu;
}
-/* Playlist/MediaLibrary Control */
-QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf )
+/**
+ * Tools, like Media Information, Preferences or Messages
+ **/
+QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
{
- VLC_UNUSED( p_intf ); //TODO remove
- QMenu *menu = new QMenu();
-
- addDPStaticEntry( menu, qtr( I_MENU_EXT ), ":/settings",
+ addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings",
SLOT( extendedDialog() ), "Ctrl+E" );
- addDPStaticEntry( menu, qtr( I_MENU_MSG ),
- ":/messages", SLOT( messagesDialog() ),
- "Ctrl+M" );
- addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/info",
+
+ addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/settings",
+ SLOT( synchroDialog() ), "" );
+
+ addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/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" );
+ ":/menu/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+
#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ),
"Ctrl+W" );
#endif
+
+ addDPStaticEntry( menu, qtr( "Program Guide" ), "", SLOT( epgDialog() ),
+ "" );
+
+ addDPStaticEntry( menu, qtr( I_MENU_MSG ),
+ ":/menu/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..." ),
- ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
+ ":/menu/preferences", SLOT( toolbarDialog() ) );
+
+ addDPStaticEntry( menu, qtr( "&Preferences" ),
+ ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole );
return menu;
}
/**
- * Tools/View Menu
- * This is kept in the same menu for now, but could change if it gets much
- * longer.
- * This menu can be an interface menu but also a right click 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,
- bool visual_selector_enabled,
- bool with_intf )
+QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi )
{
- QMenu *menu = new QMenu( current );
- if( mi )
- {
- QAction *act=
- menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ),
- mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
- act->setData( "_static_" );
- }
- menu->addMenu( SDMenu( p_intf ) );
- menu->addSeparator();
-
- addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", SLOT( openAPlaylist() ),
- "Ctrl+X" );
- addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ),
- "Ctrl+Y" );
- /*menu->addSeparator();
- menu->addAction( qtr( "Undock from Interface" ), mi,
- SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/
-
+ QAction *action;
+ QMenu *menu;
- menu->addSeparator();
+ MainInterface *mi = _mi ? _mi : p_intf->p_sys->p_mi;
+ assert( mi );
- if( with_intf )
+ if( !current )
{
- QMenu *intfmenu = InterfacesMenu( p_intf, menu );
- MenuFunc *f = new MenuFunc( intfmenu, 4 );
- CONNECT( intfmenu, aboutToShow(), THEDP->menusUpdateMapper, map() );
- THEDP->menusUpdateMapper->setMapping( intfmenu, f );
- menu->addSeparator();
+ menu = new QMenu( qtr( "&View" ), mi );
}
- if( mi )
+ else
{
- /* Minimal View */
- QAction *action = menu->addAction( qtr( "Mi&nimal View" ), mi,
- SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
- action->setCheckable( true );
- action->setData( "_static_" );
- 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" ) );
- action->setCheckable( true );
- action->setData( "_static_" );
+ menu = current;
+ //menu->clear();
+ //HACK menu->clear() does not delete submenus
+ QList<QAction*> actions = menu->actions();
+ foreach( QAction *a, actions )
+ {
+ QMenu *m = a->menu();
+ if( a->parent() == menu ) delete a;
+ else menu->removeAction( a );
+ if( m && m->parent() == menu ) delete m;
+ }
+ }
- /* Advanced Controls */
- action = menu->addAction( qtr( "&Advanced Controls" ), mi,
- SLOT( toggleAdvanced() ) );
- action->setCheckable( true );
- action->setData( "_static_" );
- if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
- action->setChecked( true );
+ menu->addAction(
+#ifndef __APPLE__
+ QIcon( ":/menu/playlist_menu" ),
+#endif
+ qtr( "Play&list" ), mi,
+ SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
+
+ 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 ) );
+
+ CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) );
+ CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) );
+
+ /* FullScreen View */
+ action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
+ SLOT( toggleInterfaceFullScreen() ), QString( "F11" ) );
+ action->setCheckable( true );
+ action->setChecked( mi->isInterfaceFullScreen() );
+ CONNECT( mi, fullscreenInterfaceToggled( bool ),
+ action, setChecked( bool ) );
+
+ /* Advanced Controls */
+ action = menu->addAction( qtr( "&Advanced Controls" ), mi,
+ SLOT( toggleAdvancedButtons() ) );
+ action->setCheckable( true );
+ if( mi->getControlsVisibilityStatus() & 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() );
+ CONNECT( action, triggered( bool ), mi, setStatusBarVisibility( bool) );
#if 0 /* For Visualisations. Not yet working */
- adv = menu->addAction( qtr( "Visualizations selector" ),
- mi, SLOT( visual() ) );
- adv->setCheckable( true );
- if( visual_selector_enabled ) adv->setChecked( true );
+ adv = menu->addAction( qtr( "Visualizations selector" ), mi,
+ SLOT( visual() ) );
+ adv->setCheckable( true );
+ if( visual_selector_enabled ) adv->setChecked( true );
#endif
- }
menu->addSeparator();
+ InterfacesMenu( p_intf, menu );
+ menu->addSeparator();
+
+ /* Extensions */
+ ExtensionsMenu( p_intf, menu );
+
return menu;
}
**/
QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
{
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
- /** \todo add "switch to XXX" */
- 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 );
}
+/**
+ * Extensions menu: populate the current menu with extensions
+ **/
+void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu )
+{
+ /* Get ExtensionsManager and load extensions if needed */
+ ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf );
+
+ if( !var_InheritBool( p_intf, "qt-autoload-extensions")
+ && !extMgr->isLoaded() )
+ {
+ return;
+ }
+
+ if( !extMgr->isLoaded() && !extMgr->cannotLoad() )
+ {
+ extMgr->loadExtensions();
+ }
+
+ /* Let the ExtensionsManager build itself the menu */
+ extMenu->addSeparator();
+ extMgr->menu( extMenu );
+}
+
+static inline void VolumeEntries( intf_thread_t *p_intf, QMenu *current )
+{
+ current->addSeparator();
+
+ QAction *action = current->addAction( qtr( "Increase Volume" ),
+ ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
+ action->setData( STATIC_ENTRY );
+ action = current->addAction( qtr( "Decrease Volume" ),
+ ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
+ action->setData( STATIC_ENTRY );
+ action = current->addAction( qtr( "Mute" ),
+ ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
+ action->setData( STATIC_ENTRY );
+}
+
/**
* Main Audio Menu
- */
+ **/
QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
{
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
- vlc_object_t *p_aout;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
+ audio_output_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" ) );
+ addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) );
+ addActionWithSubmenu( current, "audio-channels", qtr( "Audio &Channels" ) );
+ addActionWithSubmenu( current, "audio-device", qtr( "Audio &Device" ) );
current->addSeparator();
- ACT_ADD( current, "visual", qtr( "&Visualizations" ) );
+
+ addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) );
+ VolumeEntries( p_intf, current );
}
p_input = THEMIM->getInput();
- if( p_input )
- vlc_object_hold( p_input );
- p_aout = ( vlc_object_t * ) vlc_object_find( p_intf,
- VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
-
+ p_aout = THEMIM->getAout();
+ EnableStaticEntries( current, ( p_aout != NULL ) );
AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
-
if( p_aout )
+ {
vlc_object_release( p_aout );
- if( p_input )
- vlc_object_release( p_input );
+ }
return Populate( p_intf, current, varnames, objects );
}
+/* Subtitles */
+QMenu *QVLCMenu::SubtitleMenu( QMenu *current )
+{
+ 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;
+}
+
/**
* Main Video Menu
* Subtitles are part of Video.
**/
-QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle )
{
- vlc_object_t *p_vout;
+ vout_thread_t *p_vout;
input_thread_t *p_input;
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
-
- if( !current ) current = new QMenu();
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
if( current->isEmpty() )
{
- 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" );
- addDPStaticEntry( submenu, qtr( "Open File..." ), "",
- SLOT( loadSubtitlesFile() ) );
- submenu->addSeparator();
+ addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
+ if( b_subtitle)
+ SubtitleMenu( current );
- 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" ) );
+ current->addSeparator();
+ /* Surface modifiers */
+ addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) );
+ addActionWithCheckbox( current, "autoscale", qtr( "Always Fit &Window" ) );
+ addActionWithCheckbox( current, "video-on-top", qtr( "Always &on Top" ) );
#ifdef WIN32
- ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
+ addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) );
#endif
- ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
- ACT_ADD( current, "postproc-q", qtr( "Post processing" ) );
+
+#ifdef WIN32
+ addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) );
+#endif
+ current->addSeparator();
+ /* Size modifiers */
+ addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) );
+ addActionWithSubmenu( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
+ addActionWithSubmenu( current, "crop", qtr( "&Crop" ) );
+
+ current->addSeparator();
+ /* Rendering modifiers */
+ addActionWithSubmenu( current, "deinterlace", qtr( "&Deinterlace" ) );
+ addActionWithSubmenu( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) );
+ addActionWithSubmenu( current, "postprocess", qtr( "&Post processing" ) );
+
+ current->addSeparator();
+ /* Other actions */
+ addAction( current, "video-snapshot", qtr( "Take &Snapshot" ) );
}
p_input = THEMIM->getInput();
- if( p_input )
- vlc_object_hold( p_input );
- p_vout = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ p_vout = THEMIM->getVout();
VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
if( p_vout )
vlc_object_release( p_vout );
- if( p_input )
- vlc_object_release( p_input );
return Populate( p_intf, current, varnames, objects );
}
**/
QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
{
- vlc_object_t *p_object;
- vector<vlc_object_t *> objects;
- vector<const char *> varnames;
+ QAction *action;
+ QMenu *submenu;
+
+ addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
+ addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
+ submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+ submenu->setTearOffEnabled( true );
+ addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
+
+ /* FixMe: sync I_MENU_BOOKMARK string */
+ submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ submenu->setTearOffEnabled( true );
+ addDPStaticEntry( submenu, qtr( "&Manage" ), "",
+ SLOT( bookmarksDialog() ), "Ctrl+B" );
+ submenu->addSeparator();
+ action = menu->addMenu( submenu );
+ action->setData( "bookmark" );
- if( !menu ) menu = new QMenu();
+ menu->addSeparator();
+ PopupMenuPlaylistControlEntries( menu, p_intf );
+ PopupMenuControlEntries( menu, p_intf );
- if( menu->isEmpty() )
- {
- addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"",
- SLOT( gotoTimeDialog() ), "Ctrl+T" );
- menu->addSeparator();
+ EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) );
+ return RebuildNavigMenu( p_intf, menu );
+}
- 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" ) );
- }
+QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu )
+{
+ /* */
+ input_thread_t *p_object;
+ QVector<vlc_object_t *> objects;
+ QVector<const char *> varnames;
+
+ /* Get the input and hold it */
+ p_object = THEMIM->getInput();
+
+ InputAutoMenuBuilder( p_object, objects, varnames );
+
+ menu->addSeparator();
- p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- InputAutoMenuBuilder( p_object, objects, varnames );
+ /* Title and so on */
PUSH_VAR( "prev-title" );
PUSH_VAR( "next-title" );
PUSH_VAR( "prev-chapter" );
PUSH_VAR( "next-chapter" );
- EnableDPStaticEntries( menu, ( p_object != NULL ) );
- if( p_object )
- {
- vlc_object_release( p_object );
- }
+
+ EnableStaticEntries( menu, (p_object != NULL ) );
return Populate( p_intf, menu, varnames, objects );
}
-/**
- * Service Discovery SubMenu
- **/
-QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
-{
- QMenu *menu = new QMenu();
- menu->setTitle( qtr( I_PL_SD ) );
- char **ppsz_longnames;
- char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
- if( !ppsz_names )
- return menu;
-
- char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
- for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
- {
- QAction *a = new QAction( qfu( *ppsz_longname ), menu );
- a->setCheckable( true );
- if( playlist_IsServicesDiscoveryLoaded( THEPL, *ppsz_name ) )
- a->setChecked( true );
- CONNECT( a , triggered(), THEDP->SDMapper, map() );
- THEDP->SDMapper->setMapping( a, QString( *ppsz_name ) );
- menu->addAction( a );
-
- if( !strcmp( *ppsz_name, "podcast" ) )
- {
- QAction *b = new QAction( qtr( "Configure podcasts..." ), menu );
- //b->setEnabled( a->isChecked() );
- menu->addAction( b );
- CONNECT( b, triggered(), THEDP, podcastConfigureDialog() );
- }
- free( *ppsz_name );
- free( *ppsz_longname );
- }
- free( ppsz_names );
- 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" );
+ ":/menu/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "",
SLOT( updateDialog() ) );
#endif
menu->addSeparator();
- addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/info",
- SLOT( aboutDialog() ), "Shift+F1" );
+ addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info",
+ SLOT( aboutDialog() ), "Shift+F1", QAction::AboutRole );
return menu;
}
* Popup menus - Right Click menus *
*****************************************************************************/
#define POPUP_BOILERPLATE \
- unsigned int i_last_separator = 0; \
- vector<vlc_object_t *> objects; \
- vector<const char *> varnames; \
+ static QMenu* menu = NULL; \
+ delete menu; menu = NULL; \
+ if( !show ) \
+ return; \
+ 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 ); \
- p_intf->p_sys->p_popup_menu = menu; \
menu->popup( QCursor::pos() ); \
- p_intf->p_sys->p_popup_menu = NULL; \
- i_last_separator = 0;
-void QVLCMenu::PopupMenuControlEntries( QMenu *menu,
+void QVLCMenu::PopupPlayEntries( QMenu *menu,
intf_thread_t *p_intf,
input_thread_t *p_input )
{
- if( p_input )
+ QAction *action;
+
+ /* Play or Pause action and icon */
+ if( !p_input || var_GetInteger( p_input, "state" ) != PLAYING_S )
{
- vlc_value_t val;
- var_Get( p_input, "state", &val );
- if( val.i_int == PLAYING_S )
- addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
- ":/pause", SLOT( togglePlayPause() ) );
- else
- addMIMStaticEntry( p_intf, menu, qtr( "Play" ),
- ":/play", SLOT( togglePlayPause() ) );
+ action = menu->addAction( qtr( "Play" ),
+ ActionsManager::getInstance( p_intf ), SLOT( play() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
+ action->setIcon( QIcon( ":/menu/play" ) );
+#endif
}
- else if( THEPL->items.i_size )
- addMIMStaticEntry( p_intf, menu, qtr( "Play" ),
- ":/play", SLOT( togglePlayPause() ) );
else
- addDPStaticEntry( menu, qtr( "Play" ),
- ":/play", SLOT( openDialog() ) );
-
- addMIMStaticEntry( p_intf, menu, qtr( "Stop" ),
- ":/stop", SLOT( stop() ) );
- addMIMStaticEntry( p_intf, menu, qtr( "Previous" ),
- ":/previous", SLOT( prev() ) );
- addMIMStaticEntry( p_intf, menu, qtr( "Next" ),
- ":/next", SLOT( next() ) );
+ {
+ addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
+ ":/menu/pause", SLOT( togglePlayPause() ) );
+ }
}
-void QVLCMenu::PopupMenuStaticEntries( QMenu *menu )
+void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
+ bool b_normal )
{
-#if 0
- QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true );
- toolsmenu->setTitle( qtr( "Tools" ) );
- menu->addMenu( toolsmenu );
+ QAction *action;
+
+ if( b_normal )
+ {
+ /* Faster/Slower */
+ action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
+ SLOT( faster() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
+ action->setIcon( QIcon( ":/toolbar/faster2") );
+#endif
+ action->setData( STATIC_ENTRY );
+ }
+
+ action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
+ SLOT( littlefaster() ) );
+ action->setData( STATIC_ENTRY );
+
+ action = menu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(),
+ SLOT( normalRate() ) );
+ action->setData( STATIC_ENTRY );
+
+ action = menu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
+ SLOT( littleslower() ) );
+ action->setData( STATIC_ENTRY );
+
+ if( b_normal )
+ {
+ action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
+ SLOT( slower() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
+ action->setIcon( QIcon( ":/toolbar/slower2") );
+#endif
+ action->setData( STATIC_ENTRY );
+ }
+
+ menu->addSeparator();
+
+ if( !b_normal ) return;
+
+ action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(),
+ SLOT( jumpFwd() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
+ action->setIcon( QIcon( ":/toolbar/skip_fw") );
#endif
+ action->setData( STATIC_ENTRY );
+
+ action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(),
+ SLOT( jumpBwd() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
+ action->setIcon( QIcon( ":/toolbar/skip_back") );
+#endif
+ action->setData( STATIC_ENTRY );
+ addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"",
+ SLOT( gotoTimeDialog() ), "Ctrl+T" );
+ menu->addSeparator();
+}
+
+
+void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu,
+ intf_thread_t *p_intf )
+{
+ bool bEnable = THEMIM->getInput() != NULL;
+ QAction *action =
+ addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/menu/stop",
+ SLOT( stop() ), true );
+ /* Disable Stop in the right-click popup menu */
+ if( !bEnable )
+ action->setEnabled( false );
+
+ /* Next / Previous */
+ addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
+ ":/menu/previous", SLOT( prev() ) );
+ addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
+ ":/menu/next", SLOT( next() ) );
+
+ menu->addSeparator();
+}
- QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
+void QVLCMenu::PopupMenuStaticEntries( QMenu *menu )
+{
+ QMenu *openmenu = new QMenu( qtr( "Open a Media" ), menu );
addDPStaticEntry( openmenu, qtr( "&Open File..." ),
- ":/file-asym", SLOT( openFileDialog() ) );
- addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ),
- ":/folder-grey", SLOT( PLOpenDir() ) );
+ ":/type/file-asym", SLOT( openFileDialog() ) );
+ addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
+ ":/type/folder-grey", SLOT( PLOpenDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ),
- ":/disc", SLOT( openDiscDialog() ) );
+ ":/type/disc", SLOT( openDiscDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Network..." ),
- ":/network", SLOT( openNetDialog() ) );
+ ":/type/network", SLOT( openNetDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ),
- ":/capture-card", SLOT( openCaptureDialog() ) );
+ ":/type/capture-card", SLOT( openCaptureDialog() ) );
menu->addMenu( openmenu );
menu->addSeparator();
menu->addMenu( helpmenu );
#endif
- addDPStaticEntry( menu, qtr( "Quit" ), ":/quit",
- SLOT( quit() ), "Ctrl+Q" );
+ addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit",
+ SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
}
/* Video Tracks and Subtitles tracks */
-void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
+void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
- vlc_object_hold( p_input );
- vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input,
- VLC_OBJECT_VOUT, FIND_CHILD );
+ vout_thread_t *p_vout = THEMIM->getVout();
if( p_vout )
{
VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
vlc_object_release( p_vout );
}
- vlc_object_release( p_input );
}
- QMenu *menu = new QMenu();
- CREATE_POPUP;
+ CREATE_POPUP
}
/* Audio Tracks */
-void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf )
+void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
- vlc_object_hold( p_input );
- vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ audio_output_t *p_aout = THEMIM->getAout();
AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
if( p_aout )
vlc_object_release( p_aout );
- vlc_object_release( p_input );
}
- QMenu *menu = new QMenu();
- CREATE_POPUP;
+ CREATE_POPUP
}
-/* Navigation stuff, and general menus ( open ) */
-void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf )
+/* Navigation stuff, and general menus ( open ), used only for skins */
+void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
- vlc_object_hold( p_input );
- varnames.push_back( "audio-es" );
- InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
- PUSH_SEPARATOR;
+ varnames.append( "audio-es" );
+ InputAutoMenuBuilder( p_input, objects, varnames );
+ menu->addSeparator();
}
- QMenu *menu = new QMenu();
+ menu = new QMenu();
Populate( p_intf, menu, varnames, objects );
menu->addSeparator();
- PopupMenuControlEntries( menu, p_intf, p_input );
+ PopupPlayEntries( menu, p_intf, p_input );
+ PopupMenuPlaylistControlEntries( menu, p_intf);
+
+ menu->addSeparator();
+ PopupMenuControlEntries( menu, p_intf );
menu->addSeparator();
PopupMenuStaticEntries( menu );
- p_intf->p_sys->p_popup_menu = menu;
menu->popup( QCursor::pos() );
- p_intf->p_sys->p_popup_menu = NULL;
}
/* Main Menu that sticks everything together */
void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
{
- MainInterface *mi = p_intf->p_sys->p_mi;
- if( show )
- {
- /* Delete and recreate a popup if there is one */
- if( p_intf->p_sys->p_popup_menu )
- delete p_intf->p_sys->p_popup_menu;
+ POPUP_BOILERPLATE
- QMenu *menu = new QMenu();
- QMenu *submenu;
- QAction *action;
- bool b_isFullscreen = false;
+ /* */
+ menu = new QMenu( );
+ QAction *action;
+ bool b_isFullscreen = false;
+ MainInterface *mi = p_intf->p_sys->p_mi;
- POPUP_BOILERPLATE;
+ PopupPlayEntries( menu, p_intf, p_input );
+ PopupMenuPlaylistControlEntries( menu, p_intf );
+ menu->addSeparator();
- PopupMenuControlEntries( menu, p_intf, p_input );
- menu->addSeparator();
+ if( p_input )
+ {
+ QMenu *submenu;
+ vout_thread_t *p_vout = THEMIM->getVout();
- if( p_input )
+ /* Add a fullscreen switch button, since it is the most used function */
+ if( p_vout )
{
- vlc_object_t *p_vout = (vlc_object_t *)
- vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+ vlc_value_t val; var_Get( p_vout, "fullscreen", &val );
- /* Add a fullscreen switch button */
- if( p_vout )
+ b_isFullscreen = !( !val.b_bool );
+ if( b_isFullscreen )
{
- vlc_value_t val;
- var_Get( p_vout, "fullscreen", &val );
- b_isFullscreen = !( !val.b_bool );
- if( b_isFullscreen )
- CreateAndConnect( menu, "fullscreen",
- qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL,
- VLC_OBJECT(p_vout), val, VLC_VAR_BOOL,
- b_isFullscreen );
- vlc_object_release( p_vout );
+ val.b_bool = false;
+ CreateAndConnect( menu, "fullscreen",
+ qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL,
+ VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, b_isFullscreen );
}
+ vlc_object_release( p_vout );
menu->addSeparator();
+ }
- vlc_object_hold( p_input );
- InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
- vlc_object_release( p_input );
+ /* Input menu */
+ InputAutoMenuBuilder( p_input, objects, varnames );
- submenu = new QMenu( menu );
- action = menu->addMenu( AudioMenu( p_intf, submenu ) );
- action->setText( qtr( "&Audio" ) );
- if( action->menu()->isEmpty() )
- action->setEnabled( false );
+ /* Audio menu */
+ submenu = new QMenu( menu );
+ action = menu->addMenu( AudioMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Audio" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
- submenu = new QMenu( menu );
- action = menu->addMenu( VideoMenu( p_intf, submenu ) );
- action->setText( qtr( "&Video" ) );
- if( action->menu()->isEmpty() )
- action->setEnabled( false );
+ /* Video menu */
+ submenu = new QMenu( menu );
+ action = menu->addMenu( VideoMenu( p_intf, submenu, false ) );
+ action->setText( qtr( "&Video" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
- submenu = new QMenu( menu );
- action = menu->addMenu( NavigMenu( p_intf, submenu ) );
- action->setText( qtr( "&Playback" ) );
- 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 );
- menu->addSeparator();
+ /* Playback menu for chapters */
+ submenu = new QMenu( menu );
+ action = menu->addMenu( NavigMenu( p_intf, submenu ) );
+ action->setText( qtr( "&Playback" ) );
+ if( action->menu()->isEmpty() )
+ action->setEnabled( false );
+ }
+
+ menu->addSeparator();
- /* Add some special entries for windowed mode: Interface Menu */
- if( !b_isFullscreen )
+ /* Add some special entries for windowed mode: Interface Menu */
+ if( !b_isFullscreen )
+ {
+ QMenu *submenu = new QMenu( qtr( "Tools" ), menu );
+ /*QMenu *tools =*/ ToolsMenu( submenu );
+ submenu->addSeparator();
+
+ /* In skins interface, append some items */
+ if( !mi )
{
- submenu = new QMenu( qtr( "Interface" ), menu );
- if( mi )
- {
- 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" ),
- mi, SLOT( toggleFullScreen() ) );
- action->setCheckable( true );
- action->setChecked( mi->isFullScreen() );
- }
- else /* We are using the skins interface.
- If not, this entry will not show. */
+ submenu->setTitle( qtr( "Interface" ) );
+ if( p_intf->p_sys->b_isDialogProvider )
{
- addDPStaticEntry( submenu, qtr( "&Preferences..." ),
- ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
- submenu->addSeparator();
- objects.clear();
- varnames.clear();
- vlc_object_t *p_object = ( vlc_object_t* )
- vlc_object_find( p_intf, VLC_OBJECT_INTF, FIND_PARENT );
- if( p_object )
- {
- objects.push_back( p_object );
- varnames.push_back( "intf-skins" );
- Populate( p_intf, submenu, varnames, objects );
- vlc_object_release( p_object );
- }
- else
- {
- msg_Dbg( p_intf, "could not find parent interface" );
- }
+ 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 );
+
+ objects.clear(); varnames.clear();
+ objects.append( p_object );
+ varnames.append( "intf-skins-interactive" );
+ Populate( p_intf, submenu, varnames, objects );
}
- menu->addMenu( submenu );
+ 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 );
}
- PopupMenuStaticEntries( menu );
-
- p_intf->p_sys->p_popup_menu = menu;
- p_intf->p_sys->p_popup_menu->popup( QCursor::pos() );
- }
- else
- {
- // destroy popup if there is one
- delete p_intf->p_sys->p_popup_menu;
- p_intf->p_sys->p_popup_menu = NULL;
+ menu->addMenu( submenu );
}
+
+ /* Static entries for ending, like open */
+ PopupMenuStaticEntries( menu );
+
+ menu->popup( QCursor::pos() );
}
-#undef ACT_ADD
+#undef CREATE_POPUP
+#undef POPUP_BOILERPLATE
+#undef BAR_DADD
+#ifndef HAVE_MAEMO
/************************************************************************
* Systray Menu *
************************************************************************/
intf_thread_t *p_intf,
bool b_force_visible )
{
- POPUP_BOILERPLATE;
+ input_thread_t *p_input = THEMIM->getInput();
/* Get the systray menu and clean it */
QMenu *sysMenu = mi->getSysTrayMenu();
sysMenu->clear();
+#ifndef Q_WS_MAC
/* Hide / Show VLC and cone */
if( mi->isVisible() || b_force_visible )
{
- sysMenu->addAction( QIcon( ":/vlc16.png" ),
+ sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
qtr( "Hide VLC media player in taskbar" ), mi,
- SLOT( toggleUpdateSystrayMenu() ) );
+ SLOT( hideUpdateSystrayMenu() ) );
}
else
{
- sysMenu->addAction( QIcon( ":/vlc16.png" ),
+ sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
qtr( "Show VLC media player" ), mi,
- SLOT( toggleUpdateSystrayMenu() ) );
+ SLOT( showUpdateSystrayMenu() ) );
}
-
sysMenu->addSeparator();
- PopupMenuControlEntries( sysMenu, p_intf, p_input );
+#endif
+ PopupPlayEntries( sysMenu, p_intf, p_input );
+ PopupMenuPlaylistControlEntries( sysMenu, p_intf);
+ PopupMenuControlEntries( sysMenu, p_intf, false );
+
+ VolumeEntries( p_intf, sysMenu );
sysMenu->addSeparator();
- addDPStaticEntry( sysMenu, qtr( "&Open Media" ),
- ":/file-wide", SLOT( openFileDialog() ) );
+ addDPStaticEntry( sysMenu, qtr( "&Open a Media" ),
+ ":/type/file-wide", SLOT( openFileDialog() ) );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) ,
- ":/quit", SLOT( quit() ) );
+ ":/menu/quit", SLOT( quit() ) );
/* Set the menu */
mi->getSysTray()->setContextMenu( sysMenu );
}
+#endif
+
#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;
- if( !menu ) menu = new QMenu();
-
- /* Disable all non static entries */
- QAction *p_action;
- foreach( p_action, menu->actions() )
- {
- if( p_action->data().toString() != "_static_" )
- p_action->setEnabled( false );
- }
+ assert( menu );
currentGroup = NULL;
- vlc_object_t *p_object;
- int i;
-
- for( i = 0; i < ( int )objects.size() ; i++ )
+ for( int i = 0; i < (int)objects.count() ; i++ )
{
if( !varnames[i] || !*varnames[i] )
{
menu->addSeparator();
continue;
}
- p_object = objects[i];
- UpdateItem( p_intf, menu, varnames[i], p_object, true );
+ UpdateItem( p_intf, menu, varnames[i], objects[i], true );
}
return menu;
}
}
/* clean up everything */
- var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, NULL );
+ var_FreeList( &val_list, NULL );
return i_result;
}
DeleteNonStaticEntries( action->menu() );
if( !p_object )
+ {
+ if( action )
+ action->setEnabled( false );
return;
+ }
/* Check the type of the object variable */
+ /* This HACK is needed so we have a radio button for audio and video tracks
+ instread of a checkbox */
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 );
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 );
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 ) );
+ vout_thread_t *p_vout = THEMIM->getVout();
forceDisabled = ( p_vout == NULL );
if( p_vout )
vlc_object_release( p_vout );
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;
}
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_VOID:
- var_Get( p_object, psz_var, &val );
+ val.i_int = 0; // Prevent the copy of an uninitialized value
CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL,
p_object, val, i_type );
break;
FREENULL( text.psz_string );
}
+#undef TEXT_OR_VAR
+
+/** HACK for the navigation submenu:
+ * "title %2i" variables take the value 0 if not set
+ */
+static bool CheckTitle( vlc_object_t *p_object, const char *psz_var )
+{
+ int i_title = 0;
+ if( sscanf( psz_var, "title %2i", &i_title ) <= 0 )
+ return true;
+
+ int i_current_title = var_GetInteger( p_object, "title" );
+ return ( i_title == i_current_title );
+}
+
int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
vlc_object_t *p_object, bool b_root )
#define CURVAL val_list.p_list->p_values[i]
#define CURTEXT text_list.p_list->p_values[i].psz_string
+#define RADIO_OR_COMMAND ( i_type & VLC_VAR_ISCOMMAND ) ? ITEM_NORMAL : ITEM_RADIO
for( i = 0; i < val_list.p_list->i_count; i++ )
{
var_Get( p_object, psz_var, &val );
another_val.psz_string = strdup( CURVAL.psz_string );
menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
- CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
+ 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 );
- else menutext.sprintf( "%d", CURVAL.i_int );
- CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
+ 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 );
+ ( CURVAL.i_int == val.i_int )
+ && CheckTitle( p_object, psz_var ) );
break;
case VLC_VAR_FLOAT:
var_Get( p_object, psz_var, &val );
if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%.2f", CURVAL.f_float );
- CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
+ CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
CURVAL.f_float == val.f_float );
break;
currentGroup = NULL;
/* clean up everything */
- var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, &text_list );
+ var_FreeList( &val_list, &text_list );
+#undef RADIO_OR_COMMAND
#undef CURVAL
#undef CURTEXT
- return VLC_SUCCESS;
+ return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS;
}
void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
- QString text, QString help,
+ const QString& text, const QString& help,
int i_item_type, vlc_object_t *p_obj,
vlc_value_t val, int i_val_type,
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 );
action->setChecked( checked );
- MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type,
- val, psz_var );
+ MenuItemData *itemData = qFindChild<MenuItemData*>( action, QString() );
+ delete itemData;
+ itemData = new MenuItemData( action, p_obj, i_val_type, val, psz_var );
+
+ /* remove previous signal-slot connection(s) if any */
+ action->disconnect( );
+
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 )
vlc_object_t *p_object = itemData->p_obj;
if( p_object == NULL ) return;
+ /* 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 );
+
var_Set( p_object, itemData->psz_var, itemData->val );
}
void QVLCMenu::updateRecents( intf_thread_t *p_intf )
{
- if (recentsMenu)
+ if( recentsMenu )
{
QAction* action;
RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf );
- QList<QString> l = rmrl->recents();
+ QStringList l = rmrl->recents();
recentsMenu->clear();
- if( !l.size() )
+
+ if( !l.count() )
{
- action = recentsMenu->addAction( " - Empty - " );
+ 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 ),
- rmrl->signalMapper,
- SLOT( map() ) );
+ 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();
- recentsMenu->addAction( "&Clear", rmrl, SLOT( clear() ) );
+ recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) );
}
}
}
projects / vlc / blobdiff