X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=0ce2c2efba03421ce7c8d75c75d638a0ff9231a3;hb=fc3b9a8e6d706f547d10010556a76e4de76b8e3c;hp=d2198c6b289bc1899a79baebabf8494e2d4e4f28;hpb=cf346f17bcc061da1143bd89386ed32dfce60978;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index d2198c6b28..0ce2c2efba 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,19 +34,19 @@ # include "config.h" #endif +#include #include -#include +#include /* vout_thread_t */ #include -#include #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 #include @@ -54,15 +54,16 @@ #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. @@ -75,21 +76,19 @@ 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; -/**************************************************************************** - * 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, @@ -116,11 +115,12 @@ void addDPStaticEntry( QMenu *menu, action = menu->addAction( text, THEDP, member ); } action->setData( STATIC_ENTRY ); + 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, @@ -145,15 +145,16 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf, } /** - * @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 ) { 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 || @@ -164,7 +165,7 @@ void EnableStaticEntries( QMenu *menu, bool enable = true ) /** * \return Number of static entries - */ + **/ inline int DeleteNonStaticEntries( QMenu *menu ) { if( !menu ) return VLC_EGENERIC; @@ -172,7 +173,7 @@ 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]; @@ -188,7 +189,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 +200,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_VAR( var ) varnames.append( var ); \ + objects.append( VLC_OBJECT(p_object) ) -#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \ - objects.push_back( VLC_OBJECT(p_input) ); - -#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \ - objects.push_back( 0 ); varnames.push_back( "" ); \ - i_last_separator = objects.size(); } +#define PUSH_INPUTVAR( var ) varnames.append( var ); \ + objects.append( VLC_OBJECT(p_input) ); static int InputAutoMenuBuilder( input_thread_t *p_object, - vector &objects, - vector &varnames ) + QVector &objects, + QVector &varnames ) { PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); @@ -223,8 +220,8 @@ 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" ); @@ -246,10 +243,10 @@ 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" ); @@ -284,11 +281,13 @@ static inline void addAction( QMenu *_menu, QVariant val, QString title ) { } // Add an action with a submenu -static inline void addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) { +static inline QMenu *addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) { QAction *_action = new QAction( title, _menu ); + QMenu *_submenu = new QMenu( _menu ); _action->setData( val ); - _action->setMenu( new QMenu( _menu ) ); + _action->setMenu( _submenu ); _menu->addAction( _action ); + return _submenu; } // Add an action that is a checkbox @@ -310,7 +309,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi, setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); - addMenuToMainbar( FileMenu( p_intf, bar ), qtr( "&Media" ), bar ); + addMenuToMainbar( FileMenu( p_intf, bar, mi ), qtr( "&Media" ), bar ); /* Dynamic menus, rebuilt before being showed */ BAR_DADD( NavigMenu( p_intf, bar ), qtr( "P&layback" ), 3 ); @@ -320,7 +319,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi, addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar ); /* View menu, a bit different */ - BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 ); + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar ); @@ -330,14 +329,13 @@ void QVLCMenu::createMenuBar( MainInterface *mi, * Media ( File ) Menu * Opening, streaming and quit **/ -QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) +QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterface *mi ) { QMenu *menu = new QMenu( parent ); + QAction *action; - 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..." ), @@ -345,16 +343,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 ); } @@ -367,12 +369,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; @@ -403,8 +415,7 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) "" ); 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() ) ); @@ -422,6 +433,7 @@ 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 ) { @@ -459,11 +471,8 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface menu->addSeparator(); - InterfacesMenu( p_intf, menu ); - 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 ) ); @@ -492,19 +501,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 ); @@ -516,10 +528,10 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface **/ QMenu *QVLCMenu::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 ); } @@ -553,9 +565,9 @@ void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) **/ QMenu *QVLCMenu::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() ) @@ -591,28 +603,36 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) 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 ) { vout_thread_t *p_vout; input_thread_t *p_input; - vector objects; - vector varnames; + QVector objects; + QVector varnames; if( current->isEmpty() ) { addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) ); + if( b_subtitle) + SubtitleMenu( 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(); current->addSeparator(); addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) ); @@ -653,14 +673,17 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { QAction *action; + QMenu *submenu; addActionWithSubmenu( menu, "title", qtr( "T&itle" ) ); addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) ); - addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) ); + submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) ); + submenu->setTearOffEnabled( true ); addActionWithSubmenu( menu, "program", qtr( "&Program" ) ); /* FixMe: sync I_MENU_BOOKMARK string */ - QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu ); + submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu ); + submenu->setTearOffEnabled( true ); addDPStaticEntry( submenu, qtr( "&Manage" ), "", SLOT( bookmarksDialog() ), "Ctrl+B" ); submenu->addSeparator(); @@ -679,8 +702,8 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) { /* */ input_thread_t *p_object; - vector objects; - vector varnames; + QVector objects; + QVector varnames; /* Get the input and hold it */ p_object = THEMIM->getInput(); @@ -699,37 +722,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) 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; - - char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames; - for( ; *ppsz_name; ppsz_name++, ppsz_longname++ ) - { - 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 **/ @@ -756,16 +748,14 @@ 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, intf_thread_t *p_intf, @@ -857,12 +847,13 @@ void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu, ":/menu/previous", SLOT( prev() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), ":/menu/next", SLOT( next() ) ); + menu->addSeparator(); } void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) { - QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); + QMenu *openmenu = new QMenu( qtr( "Open a Media" ), menu ); addDPStaticEntry( openmenu, qtr( "&Open File..." ), ":/type/file-asym", SLOT( openFileDialog() ) ); addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ), @@ -908,7 +899,7 @@ void QVLCMenu::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 ); @@ -923,9 +914,9 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show ) if( p_input ) { - varnames.push_back( "audio-es" ); + varnames.append( "audio-es" ); InputAutoMenuBuilder( p_input, objects, varnames ); - PUSH_SEPARATOR; + menu->addSeparator(); } menu = new QMenu(); @@ -994,11 +985,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 ) ); @@ -1012,25 +1007,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 @@ -1039,7 +1035,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) else { QMenu *bar = menu; // Needed for next macro - BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 ); + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); } menu->addMenu( submenu ); @@ -1064,9 +1060,6 @@ void QVLCMenu::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 */ @@ -1094,7 +1087,7 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, PopupMenuPlaylistControlEntries( sysMenu, p_intf); PopupMenuControlEntries( sysMenu, p_intf); - addDPStaticEntry( sysMenu, qtr( "&Open Media" ), + addDPStaticEntry( sysMenu, qtr( "&Open a Media" ), ":/type/file-wide", SLOT( openFileDialog() ) ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , ":/menu/quit", SLOT( quit() ) ); @@ -1106,33 +1099,29 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, #undef PUSH_VAR -#undef PUSH_SEPARATOR /************************************************************************* * Builders for automenus *************************************************************************/ QMenu * QVLCMenu::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; } @@ -1387,7 +1376,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 ) @@ -1489,20 +1478,25 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf ) recentsMenu->clear(); - if( !l.size() ) + if( !l.count() ) { action = recentsMenu->addAction( qtr(" - Empty - ") ); action->setEnabled( false ); } else { - for( int i = 0; i < l.size(); ++i ) + for( int i = 0; i < l.count(); ++i ) { + char *psz_temp = decode_URI_duplicate( qtu( l.at( i ) ) ); + action = recentsMenu->addAction( - QString( "&%1: " ).arg( i + 1 ) + l.at( i ), + QString( "&%1: " ).arg( i + 1 ) + + QApplication::fontMetrics().elidedText( psz_temp, Qt::ElideLeft, 400 ), rmrl->signalMapper, SLOT( map() ), i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" ); rmrl->signalMapper->setMapping( action, l.at( i ) ); + + free( psz_temp ); } recentsMenu->addSeparator();