X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=45a1d904864c876910e1d033cb5bfd6386bbe250;hb=65ff356649bff059a949570b4cf85f54867b75f9;hp=67e84856cd6e4e028ea3c3bd13bb7f87bc5fbf88;hpb=a25fb17cf5f100fac972b1e2826ded6ccd25ca9b;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 67e84856cd..45a1d90486 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright © 2006-2009 the VideoLAN team + * Copyright © 2006-2011 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -34,35 +34,37 @@ # include "config.h" #endif +#include #include -#include -#include -#include +#include /* vout_thread_t */ +#include /* audio_output_t */ #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 "actions_manager.hpp" -#include "extensions_manager.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 "actions_manager.hpp" /* Actions Management: play+volume */ +#include "extensions_manager.hpp" /* Extensions menu */ +#include "util/qmenuview.hpp" /* Simple Playlist menu */ +#include "components/playlist/playlist_model.hpp" /* PLModel getter */ +#include "components/playlist/standardpanel.hpp" /* PLView getter */ #include #include #include #include #include -#include -#include +#include /* 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. @@ -70,31 +72,26 @@ 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; -QMenu *QVLCMenu::recentsMenu = NULL; +QMenu *VLCMenuBar::recentsMenu = NULL; -/**************************************************************************** - * Menu code helpers: - **************************************************************************** - * Add static entries to DP in menus - ***************************************************************************/ -void addDPStaticEntry( QMenu *menu, +/** + * @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, - QAction::MenuRole = QAction::NoRole + QAction::MenuRole role = QAction::NoRole ) { QAction *action = NULL; @@ -115,12 +112,18 @@ void addDPStaticEntry( QMenu *menu, else action = menu->addAction( text, THEDP, member ); } - action->setData( STATIC_ENTRY ); +#ifdef __APPLE__ + action->setMenuRole( role ); +#else + Q_UNUSED( role ); +#endif + action->setData( VLCMenuBar::ACTION_STATIC ); + return action; } -/*** - * Same for MIM - ***/ +/** + * @brief Add static entries to MIM in menus + **/ QAction* addMIMStaticEntry( intf_thread_t *p_intf, QMenu *menu, const QString& text, @@ -140,31 +143,38 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf, { action = menu->addAction( text, THEMIM, member ); } - action->setData( bStatic ? STATIC_ENTRY : ENTRY_ALWAYS_ENABLED ); + action->setData( VLCMenuBar::ACTION_STATIC | + ( bStatic ) ? VLCMenuBar::ACTION_ALWAYS_ENABLED + : VLCMenuBar::ACTION_NONE + ); return action; } /** - * @brief Enable all static entries, disable the others + * @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 ) + **/ +void VLCMenuBar::EnableStaticEntries( QMenu *menu, bool enable = true ) { 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 || - /* Be careful here, because data("string").toBool is true */ - ( enable && (actions[i]->data().toString() == STATIC_ENTRY ) ) ); + int actionflags = actions[i]->data().toInt(); + if ( actionflags & ACTION_MANAGED ) + actions[i]->setEnabled( + ( actionflags & ACTION_ALWAYS_ENABLED ) + || + enable + ); } } /** * \return Number of static entries - */ + **/ inline int DeleteNonStaticEntries( QMenu *menu ) { if( !menu ) return VLC_EGENERIC; @@ -172,12 +182,12 @@ inline int DeleteNonStaticEntries( QMenu *menu ) 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]; - else + if( actions[i]->data().toInt() & VLCMenuBar::ACTION_NO_CLEANUP ) i_ret++; + else + delete actions[i]; } return i_ret; } @@ -188,7 +198,7 @@ inline int DeleteNonStaticEntries( QMenu *menu ) 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]; @@ -199,19 +209,15 @@ static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) /***************************************************************************** * Definitions of variables for the dynamic menus *****************************************************************************/ -#define PUSH_VAR( var ) varnames.push_back( var ); \ - objects.push_back( VLC_OBJECT(p_object) ) - -#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ - objects.push_back( VLC_OBJECT(p_input) ); +#define PUSH_VAR( var ) varnames.append( var ); \ + objects.append( VLC_OBJECT(p_object) ) -#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 &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); @@ -223,17 +229,14 @@ static int InputAutoMenuBuilder( input_thread_t *p_object, static int VideoAutoMenuBuilder( vout_thread_t *p_object, input_thread_t *p_input, - vector &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_INPUTVAR( "video-es" ); PUSH_INPUTVAR( "spu-es" ); PUSH_VAR( "fullscreen" ); PUSH_VAR( "video-on-top" ); PUSH_VAR( "video-wallpaper" ); -#ifdef WIN32 - PUSH_VAR( "direct3d-desktop" ); -#endif PUSH_VAR( "video-snapshot" ); PUSH_VAR( "zoom" ); PUSH_VAR( "autoscale" ); @@ -246,14 +249,14 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, 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 &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_INPUTVAR( "audio-es" ); - PUSH_VAR( "audio-channels" ); - PUSH_VAR( "audio-device" ); + PUSH_VAR( "stereo-mode" ); + PUSH_VAR( "device" ); PUSH_VAR( "visual" ); return VLC_SUCCESS; } @@ -264,8 +267,10 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, *****************************************************************************/ // Static menu -#define BAR_ADD( func, title ) { \ - QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _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 ) { \ @@ -275,24 +280,34 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, THEDP->menusUpdateMapper->setMapping( _menu, f ); } // Add a simple action -#define ACT_ADD( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _menu->addAction( _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 -#define ACT_ADDMENU( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setMenu( new QMenu( _menu ) ); _menu->addAction( _action ); } +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 -#define ACT_ADDCHECK( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setCheckable( true ); _menu->addAction( _action ); } +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, +void VLCMenuBar::createMenuBar( MainInterface *mi, intf_thread_t *p_intf ) { /* QMainWindows->menuBar() @@ -300,36 +315,33 @@ void QVLCMenu::createMenuBar( MainInterface *mi, setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); - BAR_ADD( FileMenu( p_intf, bar ), qtr( "&Media" ) ); + 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( bar ), qtr( "&Tools" ) ); + 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 ); - BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) ); + addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar ); } -#undef BAR_ADD -//#undef BAR_DADD /** * Media ( File ) Menu * Opening, streaming and quit **/ -QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) +QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterface *mi ) { QMenu *menu = new QMenu( parent ); + QAction *action; - addDPStaticEntry( menu, qtr( "&Open File..." ), + addDPStaticEntry( menu, qtr( "Open &File..." ), ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); - addDPStaticEntry( menu, qtr( "Advanced Open File..." ), - ":/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..." ), @@ -337,16 +349,20 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) addDPStaticEntry( menu, qtr( "Open &Network Stream..." ), ":/type/network", SLOT( openNetDialog() ), "Ctrl+N" ); addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), - ":/type/capture-card", SLOT( openCaptureDialog() ), - "Ctrl+C" ); + ":/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" ); if( var_InheritBool( p_intf, "qt-recentplay" ) ) { - recentsMenu = new QMenu( qtr( "&Recent Media" ), menu ); + recentsMenu = new QMenu( qtr( "Open &Recent Media" ), menu ); updateRecents( p_intf ); menu->addMenu( recentsMenu ); } @@ -359,12 +375,22 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) #ifdef ENABLE_SOUT addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", SLOT( openAndTranscodingDialogs() ), "Ctrl+R" ); - addDPStaticEntry( menu, qtr( "&Streaming..." ), - ":/menu/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" ) , ":/menu/quit", SLOT( quit() ), "Ctrl+Q" ); return menu; @@ -373,7 +399,7 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) /** * Tools, like Media Information, Preferences or Messages **/ -QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) +QMenu *VLCMenuBar::ToolsMenu( QMenu *menu ) { addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings", SLOT( extendedDialog() ), "Ctrl+E" ); @@ -388,15 +414,14 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) #ifdef ENABLE_VLM addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ), - "Ctrl+W" ); + "Ctrl+Shift+W" ); #endif addDPStaticEntry( menu, qtr( "Program Guide" ), "", SLOT( epgDialog() ), "" ); addDPStaticEntry( menu, qtr( I_MENU_MSG ), - ":/menu/messages", SLOT( messagesDialog() ), - "Ctrl+M" ); + ":/menu/messages", SLOT( messagesDialog() ), "Ctrl+M" ); addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ), "", SLOT( pluginDialog() ) ); @@ -414,8 +439,9 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *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 ) +QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi ) { QAction *action; QMenu *menu; @@ -449,16 +475,16 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface qtr( "Play&list" ), mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); - menu->addSeparator(); - - QMenu *intfmenu = InterfacesMenu( p_intf, menu ); + if( mi->getPlaylistView() ) + menu->addMenu( StandardPLPanel::viewSelectionMenu( mi->getPlaylistView() ) ); menu->addSeparator(); /* Minimal View */ - action = menu->addAction( qtr( "Mi&nimal 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 ) ); @@ -475,7 +501,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface 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 */ @@ -484,19 +510,22 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface action->setChecked( mi->isPlDocked() ); CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) ); - action = menu->addAction( qtr( "Quit after Playback" ) ); + action = menu->addAction( qtr( "Status Bar" ) ); action->setCheckable( true ); - action->setChecked( THEMIM->getPlayExitState() ); - CONNECT( action, triggered( bool ), THEMIM, activatePlayQuit( bool ) ); - + 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 = 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 ); @@ -506,12 +535,12 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface /** * Interface Sub-Menu, to list extras interface and skins **/ -QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) +QMenu *VLCMenuBar::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) { - vector objects; - vector varnames; - varnames.push_back( "intf-add" ); - objects.push_back( VLC_OBJECT(p_intf) ); + QVector objects; + QVector varnames; + varnames.append( "intf-add" ); + objects.append( VLC_OBJECT(p_intf) ); return Populate( p_intf, current, varnames, objects ); } @@ -519,7 +548,7 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) /** * Extensions menu: populate the current menu with extensions **/ -void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) +void VLCMenuBar::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) { /* Get ExtensionsManager and load extensions if needed */ ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf ); @@ -540,35 +569,40 @@ void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) 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( VLCMenuBar::ACTION_STATIC ); + action = current->addAction( qtr( "&Decrease Volume" ), + ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) ); + action->setData( VLCMenuBar::ACTION_STATIC ); + action = current->addAction( qtr( "&Mute" ), + ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) ); + action->setData( VLCMenuBar::ACTION_STATIC ); +} + /** * Main Audio Menu **/ -QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) +QMenu *VLCMenuBar::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { - vector objects; - vector varnames; - aout_instance_t *p_aout; + QVector objects; + QVector varnames; + audio_output_t *p_aout; input_thread_t *p_input; if( current->isEmpty() ) { - ACT_ADDMENU( current, "audio-es", qtr( "Audio &Track" ) ); - ACT_ADDMENU( current, "audio-channels", qtr( "Audio &Channels" ) ); - ACT_ADDMENU( current, "audio-device", qtr( "Audio &Device" ) ); - current->addSeparator(); - - ACT_ADDMENU( current, "visual", qtr( "&Visualizations" ) ); + addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) ); + addActionWithSubmenu( current, "stereo-mode", qtr( "&Stereo Mode" ) ); + addActionWithSubmenu( current, "device", qtr( "Audio &Device" ) ); 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 ); + addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) ); + VolumeEntries( p_intf, current ); } p_input = THEMIM->getInput(); @@ -583,48 +617,58 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) return Populate( p_intf, current, varnames, objects ); } +/* Subtitles */ +QMenu *VLCMenuBar::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 *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle ) { vout_thread_t *p_vout; input_thread_t *p_input; - vector objects; - vector varnames; + QVector objects; + QVector varnames; if( current->isEmpty() ) { - ACT_ADDMENU( 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 ); + 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" ) ); + addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) ); + + current->addSeparator(); + /* Size modifiers */ + addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) ); + addActionWithSubmenu( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); + addActionWithSubmenu( current, "crop", qtr( "&Crop" ) ); - ACT_ADDCHECK( current, "fullscreen", qtr( "&Fullscreen" ) ); - ACT_ADDCHECK( current, "autoscale", qtr( "Always Fit &Window" ) ); - ACT_ADDCHECK( current, "video-on-top", qtr( "Always &on Top" ) ); -#ifdef WIN32 - ACT_ADDCHECK( current, "direct3d-desktop", qtr( "Display on &Desktop" ) ); -#endif - ACT_ADD( current, "video-snapshot", qtr( "Take &Snapshot" ) ); -#ifdef WIN32 - ACT_ADDCHECK( current, "video-wallpaper", qtr( "Set as Wall&paper" ) ); -#endif current->addSeparator(); + /* Rendering modifiers */ + addActionWithSubmenu( current, "deinterlace", qtr( "&Deinterlace" ) ); + addActionWithSubmenu( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) ); + addActionWithSubmenu( current, "postprocess", qtr( "&Post processing" ) ); - ACT_ADDMENU( current, "zoom", qtr( "&Zoom" ) ); - ACT_ADDMENU( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); - ACT_ADDMENU( current, "crop", qtr( "&Crop" ) ); - ACT_ADDMENU( current, "deinterlace", qtr( "&Deinterlace" ) ); - ACT_ADDMENU( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) ); - ACT_ADDMENU( current, "postprocess", qtr( "&Post processing" ) ); + current->addSeparator(); + /* Other actions */ + addAction( current, "video-snapshot", qtr( "Take &Snapshot" ) ); } p_input = THEMIM->getInput(); @@ -642,17 +686,20 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) * Navigation Menu * For DVD, MP4, MOV and other chapter based format **/ -QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) +QMenu *VLCMenuBar::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { QAction *action; + QMenu *submenu; - ACT_ADDMENU( menu, "title", qtr( "T&itle" ) ); - ACT_ADDMENU( menu, "chapter", qtr( "&Chapter" ) ); - ACT_ADDMENU( menu, "navigation", qtr( "&Navigation" ) ); - ACT_ADDMENU( menu, "program", qtr( "&Program" ) ); + 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 */ - 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(); @@ -660,72 +707,53 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) action->setData( "bookmark" ); menu->addSeparator(); - PopupMenuPlaylistControlEntries( menu, p_intf ); + PopupMenuControlEntries( menu, p_intf ); EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) ); - return RebuildNavigMenu( p_intf, menu ); + return RebuildNavigMenu( p_intf, menu, true ); } -QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) +QMenu *VLCMenuBar::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu, bool b_keep ) { /* */ input_thread_t *p_object; - vector objects; - vector varnames; + QVector objects; + QVector varnames; /* Get the input and hold it */ p_object = THEMIM->getInput(); InputAutoMenuBuilder( p_object, objects, varnames ); - menu->addSeparator(); - /* Title and so on */ PUSH_VAR( "prev-title" ); PUSH_VAR( "next-title" ); PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" ); + /* */ EnableStaticEntries( menu, (p_object != NULL ) ); - return Populate( p_intf, menu, varnames, objects ); -} - -/** - * Service Discovery SubMenu - **/ -QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - QMenu *menu = new QMenu( parent ); - menu->setTitle( qtr( I_PL_SD ) ); - - char **ppsz_longnames; - char **ppsz_names = vlc_sd_GetNames( p_intf, &ppsz_longnames, NULL ); - if( !ppsz_names ) - return menu; + Populate( p_intf, menu, varnames, objects ); - char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames; - for( ; *ppsz_name; ppsz_name++, ppsz_longname++ ) + /* Remove playback actions to recreate them */ + if( !b_keep ) { - 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 ); + QList< QAction* > actions = menu->actions(); + for( int i = 0; i < actions.count(); i++ ) + if( actions[i]->data().toInt() & ACTION_DELETE_ON_REBUILD ) + delete actions[i]; } - free( ppsz_names ); - free( ppsz_longnames ); + + PopupMenuPlaylistEntries( menu, p_intf, p_object ); + return menu; } /** * Help/About Menu **/ -QMenu *QVLCMenu::HelpMenu( QWidget *parent ) +QMenu *VLCMenuBar::HelpMenu( QWidget *parent ) { QMenu *menu = new QMenu( parent ); addDPStaticEntry( menu, qtr( "&Help..." ) , @@ -748,18 +776,16 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent ) delete menu; menu = NULL; \ if( !show ) \ return; \ - unsigned int i_last_separator = 0; \ - vector objects; \ - vector varnames; \ + QVector objects; \ + QVector 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, +void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu, intf_thread_t *p_intf, input_thread_t *p_input ) { @@ -768,7 +794,7 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu, /* Play or Pause action and icon */ if( !p_input || var_GetInteger( p_input, "state" ) != PLAYING_S ) { - action = menu->addAction( qtr( "Play" ), + action = menu->addAction( qtr( "&Play" ), ActionsManager::getInstance( p_intf ), SLOT( play() ) ); #ifndef __APPLE__ /* No icons in menus in Mac */ action->setIcon( QIcon( ":/menu/play" ) ); @@ -776,83 +802,103 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu, } else { - addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), - ":/menu/pause", SLOT( togglePlayPause() ) ); + action = addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), + ":/menu/pause", SLOT( togglePlayPause() ) ); } + action->setData( ACTION_DELETE_ON_REBUILD ); + + /* Stop */ + action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), + ":/menu/stop", SLOT( stop() ), true ); + if( !p_input ) + action->setEnabled( false ); + action->setData( ACTION_DELETE_ON_REBUILD ); + + /* Next / Previous */ + bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist(); + action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ), + ":/menu/previous", SLOT( prev() ), true ); + action->setEnabled( !bPlaylistEmpty ); + action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); + + action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), + ":/menu/next", SLOT( next() ), true ); + action->setEnabled( !bPlaylistEmpty ); + action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); + + menu->addSeparator(); } -void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) +void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, + bool b_normal ) { QAction *action; + QMenu *rateMenu = new QMenu( qtr( "Sp&eed" ), menu ); + rateMenu->setTearOffEnabled( true ); - /* Faster/Slower */ - action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), - SLOT( faster() ) ); + if( b_normal ) + { + /* Faster/Slower */ + action = rateMenu->addAction( qtr( "&Faster" ), THEMIM->getIM(), + SLOT( faster() ) ); #ifndef __APPLE__ /* No icons in menus in Mac */ - action->setIcon( QIcon( ":/toolbar/faster") ); + action->setIcon( QIcon( ":/toolbar/faster2") ); #endif - action->setData( STATIC_ENTRY ); + action->setData( ACTION_STATIC ); + } - action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(), + action = rateMenu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(), SLOT( littlefaster() ) ); - action->setData( STATIC_ENTRY ); + action->setData( ACTION_STATIC ); - action = menu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(), + action = rateMenu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(), SLOT( normalRate() ) ); - action->setData( STATIC_ENTRY ); + action->setData( ACTION_STATIC ); - action = menu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(), + action = rateMenu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(), SLOT( littleslower() ) ); - action->setData( STATIC_ENTRY ); + action->setData( ACTION_STATIC ); - action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), - SLOT( slower() ) ); + if( b_normal ) + { + action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), + SLOT( slower() ) ); #ifndef __APPLE__ /* No icons in menus in Mac */ - action->setIcon( QIcon( ":/toolbar/slower") ); + action->setIcon( QIcon( ":/toolbar/slower2") ); #endif - action->setData( STATIC_ENTRY ); + action->setData( ACTION_STATIC ); + } + + action = menu->addMenu( rateMenu ); + action->setData( ACTION_STATIC ); 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->setData( ACTION_STATIC ); 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(); -} + action->setData( ACTION_STATIC ); + action = menu->addAction( qtr( I_MENU_GOTOTIME ), THEDP, SLOT( gotoTimeDialog() ), qtr( "Ctrl+T" ) ); + action->setData( ACTION_ALWAYS_ENABLED ); -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(); } -void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) +void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu ) { QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); addDPStaticEntry( openmenu, qtr( "&Open File..." ), @@ -879,7 +925,7 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) } /* Video Tracks and Subtitles tracks */ -void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show ) +void VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show ) { POPUP_BOILERPLATE if( p_input ) @@ -895,12 +941,12 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show ) } /* Audio Tracks */ -void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show ) +void VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show ) { 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 ); @@ -909,23 +955,22 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show ) } /* Navigation stuff, and general menus ( open ), used only for skins */ -void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show ) +void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show ) { POPUP_BOILERPLATE + menu = new QMenu(); if( p_input ) { - varnames.push_back( "audio-es" ); + varnames.append( "audio-es" ); InputAutoMenuBuilder( p_input, objects, varnames ); - PUSH_SEPARATOR; + menu->addSeparator(); } - menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - PopupPlayEntries( menu, p_intf, p_input ); - PopupMenuPlaylistControlEntries( menu, p_intf); + PopupMenuPlaylistEntries( menu, p_intf, p_input ); menu->addSeparator(); PopupMenuControlEntries( menu, p_intf ); @@ -937,18 +982,17 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show ) } /* Main Menu that sticks everything together */ -void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) +void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show ) { POPUP_BOILERPLATE /* */ - menu = new QMenu( ); + menu = new QMenu(); QAction *action; bool b_isFullscreen = false; MainInterface *mi = p_intf->p_sys->p_mi; - PopupPlayEntries( menu, p_intf, p_input ); - PopupMenuPlaylistControlEntries( menu, p_intf ); + PopupMenuPlaylistEntries( menu, p_intf, p_input ); menu->addSeparator(); if( p_input ) @@ -986,11 +1030,15 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Video menu */ submenu = new QMenu( menu ); - action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action = menu->addMenu( VideoMenu( p_intf, submenu, false ) ); 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 ); + /* Playback menu for chapters */ submenu = new QMenu( menu ); action = menu->addMenu( NavigMenu( p_intf, submenu ) ); @@ -1004,25 +1052,26 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Add some special entries for windowed mode: Interface Menu */ if( !b_isFullscreen ) { - QMenu *submenu = new QMenu( qtr( "Interface" ), menu ); + QMenu *submenu = new QMenu( qtr( "Tools" ), menu ); /*QMenu *tools =*/ ToolsMenu( submenu ); submenu->addSeparator(); /* In skins interface, append some items */ if( !mi ) { + 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.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 @@ -1030,38 +1079,40 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } else { - QMenu *bar = menu; - BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 ); + QMenu *bar = menu; // Needed for next macro + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); } menu->addMenu( submenu ); } + /* */ + QMenuView *plMenu = new QMenuView( menu, 25 ); + plMenu->setTitle( qtr("Playlist") ); + PLModel *model = PLModel::getPLModel( p_intf ); + plMenu->setModel( model ); + CONNECT( plMenu, activated(const QModelIndex&), + model, activateItem(const QModelIndex&)); + menu->addMenu( plMenu ); + /* Static entries for ending, like open */ PopupMenuStaticEntries( menu ); menu->popup( QCursor::pos() ); } -#undef ACT_ADD -#undef ACT_ADDMENU -#undef ACT_ADDCHECK - #undef CREATE_POPUP #undef POPUP_BOILERPLATE +#undef BAR_DADD -#ifndef HAVE_MAEMO /************************************************************************ * Systray Menu * ************************************************************************/ -void QVLCMenu::updateSystrayMenu( MainInterface *mi, +void VLCMenuBar::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, bool b_force_visible ) { - unsigned int i_last_separator = 0; - vector objects; - vector varnames; input_thread_t *p_input = THEMIM->getInput(); /* Get the systray menu and clean it */ @@ -1073,22 +1124,23 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, if( mi->isVisible() || b_force_visible ) { sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), - qtr( "Hide VLC media player in taskbar" ), mi, + qtr( "&Hide VLC media player in taskbar" ), mi, SLOT( hideUpdateSystrayMenu() ) ); } else { sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), - qtr( "Show VLC media player" ), mi, + qtr( "Sho&w VLC media player" ), mi, SLOT( showUpdateSystrayMenu() ) ); } sysMenu->addSeparator(); #endif - PopupPlayEntries( sysMenu, p_intf, p_input ); - PopupMenuPlaylistControlEntries( sysMenu, p_intf); - PopupMenuControlEntries( sysMenu, p_intf); + PopupMenuPlaylistEntries( sysMenu, p_intf, p_input ); + PopupMenuControlEntries( sysMenu, p_intf, false ); + VolumeEntries( p_intf, sysMenu ); + sysMenu->addSeparator(); addDPStaticEntry( sysMenu, qtr( "&Open Media" ), ":/type/file-wide", SLOT( openFileDialog() ) ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , @@ -1097,37 +1149,32 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, /* 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 * VLCMenuBar::Populate( intf_thread_t *p_intf, QMenu *current, - vector< const char *> & varnames, - vector & objects ) + QVector< const char *> & varnames, + QVector & objects ) { QMenu *menu = current; assert( menu ); currentGroup = NULL; - vlc_object_t *p_object; - - for( int 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; } @@ -1182,7 +1229,7 @@ static bool IsMenuEmpty( const char *psz_var, #define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var ) -void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, +void VLCMenuBar::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; @@ -1317,7 +1364,7 @@ static bool CheckTitle( vlc_object_t *p_object, const char *psz_var ) } -int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, +int VLCMenuBar::CreateChoicesMenu( QMenu *submenu, const char *psz_var, vlc_object_t *p_object, bool b_root ) { vlc_value_t val, val_list, text_list; @@ -1352,7 +1399,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, #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 +#define RADIO_OR_COMMAND ( i_type & ( VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE ) ) ? ITEM_RADIO : ITEM_NORMAL for( i = 0; i < val_list.p_list->i_count; i++ ) { @@ -1382,7 +1429,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, 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 ) @@ -1413,7 +1460,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS; } -void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, +void VLCMenuBar::CreateAndConnect( QMenu *menu, const char *psz_var, const QString& text, const QString& help, int i_item_type, vlc_object_t *p_obj, vlc_value_t val, int i_val_type, @@ -1460,7 +1507,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, menu->addAction( action ); } -void QVLCMenu::DoAction( QObject *data ) +void VLCMenuBar::DoAction( QObject *data ) { MenuItemData *itemData = qobject_cast( data ); vlc_object_t *p_object = itemData->p_obj; @@ -1474,7 +1521,7 @@ void QVLCMenu::DoAction( QObject *data ) var_Set( p_object, itemData->psz_var, itemData->val ); } -void QVLCMenu::updateRecents( intf_thread_t *p_intf ) +void VLCMenuBar::updateRecents( intf_thread_t *p_intf ) { if( recentsMenu ) { @@ -1484,24 +1531,31 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf ) recentsMenu->clear(); - if( !l.size() ) + if( !l.count() ) { - action = recentsMenu->addAction( qtr(" - Empty - ") ); - action->setEnabled( false ); + recentsMenu->setEnabled( false ); } else { - for( int i = 0; i < l.size(); ++i ) + for( int i = 0; i < l.count(); ++i ) { + QString mrl = l.at( i ); + char *psz = decode_URI_duplicate( qtu( mrl ) ); + QString text = qfu( psz ); + + free( psz ); action = recentsMenu->addAction( - QString( "&%1: " ).arg( i + 1 ) + l.at( i ), + QString( i < 9 ? "&%1: ": "%1: " ).arg( i + 1 ) + + QApplication::fontMetrics().elidedText( text, + Qt::ElideLeft, 400 ), rmrl->signalMapper, SLOT( map() ), - i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" ); + i < 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" ); rmrl->signalMapper->setMapping( action, l.at( i ) ); } recentsMenu->addSeparator(); recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) ); + recentsMenu->setEnabled( true ); } } }