X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=e6cef1905a331ac58de6b5d436c035e1e514e383;hb=1ad23782dd12171220d956b8ab5db1ebb67b7790;hp=4d48e7de1db59b043220e4c1fa8dbdb7d5dad1dc;hpb=387d1ce62402645fab01b05226c5674800fa48cf;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 4d48e7de1d..e6cef1905a 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,15 +165,15 @@ void EnableStaticEntries( QMenu *menu, bool enable = true ) /** * \return Number of static entries - */ -int DeleteNonStaticEntries( QMenu *menu ) + **/ +inline int DeleteNonStaticEntries( QMenu *menu ) { if( !menu ) return VLC_EGENERIC; 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 @@ 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" ); @@ -263,26 +260,43 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, * 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 ); +} -#define ACT_ADDMENU( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setMenu( new QMenu( _menu ) ); _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; +} -#define ACT_ADDCHECK( _menu, val, title ) { \ - QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setCheckable( true ); _menu->addAction( _action ); } +// 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 @@ -295,36 +309,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" ) ); - QMenu *_menu = ViewMenu( p_intf, bar ); - _menu->setTitle( qtr( "V&iew" ) ); - bar->addMenu( _menu ); - ViewMenu( p_intf, _menu, mi ); - BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) ); + 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 ); } -#undef BAR_ADD -#undef BAR_DADD /** * 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..." ), @@ -332,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 ); } @@ -354,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; @@ -381,8 +406,6 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , ":/menu/info", SLOT( mediaCodecDialog() ), "Ctrl+J" ); - addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ),"", - SLOT( bookmarksDialog() ), "Ctrl+B" ); #ifdef ENABLE_VLM addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", SLOT( vlmDialog() ), "Ctrl+W" ); @@ -392,40 +415,25 @@ 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() ) ); menu->addSeparator(); + addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), + ":/menu/preferences", SLOT( toolbarDialog() ) ); + addDPStaticEntry( menu, qtr( "&Preferences" ), ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole ); return menu; } -QMenu *QVLCMenu::ToolsMenu( QWidget *parent ) -{ - return ToolsMenu( new QMenu( parent ) ); -} - -/** - * Dynamic View Menu - * Connect signal "aboutToShow" to the creation of the View Menu - **/ -QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QWidget* parent ) -{ - QMenu *viewMenu = new QMenu( parent ); - MenuFunc *f = new MenuFunc( viewMenu, 4 ); - CONNECT( viewMenu, aboutToShow(), THEDP->menusUpdateMapper, map() ); - THEDP->menusUpdateMapper->setMapping( viewMenu, f ); - return viewMenu; -} - /** * 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 ) { @@ -463,11 +471,8 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface menu->addSeparator(); - QMenu *intfmenu = 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 ) ); @@ -496,21 +501,21 @@ 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(); - addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), - ":/menu/preferences", SLOT( toolbarDialog() ) ); + + InterfacesMenu( p_intf, menu ); + menu->addSeparator(); /* Extensions */ ExtensionsMenu( p_intf, menu ); @@ -523,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 ); } @@ -560,19 +565,19 @@ 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() ) { - ACT_ADDMENU( current, "audio-es", qtr( "Audio &Track" ) ); - ACT_ADDMENU( current, "audio-channels", qtr( "Audio &Channels" ) ); - ACT_ADDMENU( current, "audio-device", qtr( "Audio &Device" ) ); + addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) ); + addActionWithSubmenu( current, "audio-channels", qtr( "Audio &Channels" ) ); + addActionWithSubmenu( current, "audio-device", qtr( "Audio &Device" ) ); current->addSeparator(); - ACT_ADDMENU( current, "visual", qtr( "&Visualizations" ) ); + addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) ); current->addSeparator(); QAction *action = current->addAction( qtr( "Increase Volume" ), @@ -598,52 +603,63 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) return Populate( p_intf, current, varnames, objects ); } -QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QWidget *parent ) +/* Subtitles */ +QMenu *QVLCMenu::SubtitleMenu( QMenu *current ) { - return AudioMenu( p_intf, new QMenu( parent ) ); + 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() ) { - 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" ) ); +#ifdef WIN32 + addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) ); +#endif - ACT_ADDCHECK( current, "fullscreen", qtr( "&Fullscreen" ) ); - ACT_ADDCHECK( current, "video-on-top", qtr( "Always &On Top" ) ); - ACT_ADDCHECK( current, "video-wallpaper", qtr( "DirectX Wallpaper" ) ); #ifdef WIN32 - ACT_ADDCHECK( current, "direct3d-desktop", qtr( "Direct3D Desktop mode" ) ); + addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) ); #endif - ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) ); + 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" ) ); - ACT_ADDMENU( current, "zoom", qtr( "&Zoom" ) ); - ACT_ADDCHECK( current, "autoscale", qtr( "Sca&le" ) ); - 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(); @@ -657,11 +673,6 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } -QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - return VideoMenu( p_intf, new QMenu( parent ) ); -} - /** * Navigation Menu * For DVD, MP4, MOV and other chapter based format @@ -669,19 +680,23 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent ) QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { QAction *action; - - QMenu *submenu = new QMenu( qtr( "&Bookmarks" ), menu ); - addDPStaticEntry( submenu, qtr( "Manage &bookmarks" ), "", - SLOT( bookmarksDialog() ) ); + 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" ); - 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" ) ); - menu->addSeparator(); PopupMenuPlaylistControlEntries( menu, p_intf ); PopupMenuControlEntries( menu, p_intf ); @@ -694,8 +709,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(); @@ -714,42 +729,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) return Populate( p_intf, menu, varnames, objects ); } -QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QWidget *parent ) -{ - return NavigMenu( p_intf, new QMenu( parent ) ); -} - -/** - * 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 **/ @@ -776,16 +755,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, @@ -817,7 +794,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) action = menu->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 ); @@ -836,7 +813,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) action = menu->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 ); @@ -877,12 +854,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 ), @@ -928,7 +906,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 ); @@ -943,9 +921,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(); @@ -1014,11 +992,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 ) ); @@ -1032,25 +1014,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 @@ -1058,8 +1041,8 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } else { - QMenu *viewmenu = menu->addMenu( qtr( "V&iew" ) ); - ViewMenu( p_intf, viewmenu ); + QMenu *bar = menu; // Needed for next macro + BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 ); } menu->addMenu( submenu ); @@ -1071,12 +1054,9 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) 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 /************************************************************************ @@ -1087,9 +1067,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 */ @@ -1117,7 +1094,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() ) ); @@ -1129,33 +1106,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; } @@ -1380,6 +1353,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 for( i = 0; i < val_list.p_list->i_count; i++ ) { @@ -1399,7 +1373,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, 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 ) ); @@ -1409,8 +1383,8 @@ 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 ); - 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 ) && CheckTitle( p_object, psz_var ) ); @@ -1420,7 +1394,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, 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; @@ -1434,6 +1408,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, /* clean up everything */ var_FreeList( &val_list, &text_list ); +#undef RADIO_OR_COMMAND #undef CURVAL #undef CURTEXT return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS; @@ -1510,20 +1485,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();