X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=fb874ffb21266d7b153076289eb6a59f74991459;hb=965c64221f5d91443e9ee2993b758beb132d00d5;hp=65226dd054dfc422a16460a1c38dd5f46d1e840a;hpb=916aa463af5260cac06cce80c1c84b3b6be5f331;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 65226dd054..fb874ffb21 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -33,6 +33,8 @@ #include #include +#include +#include #include "menus.hpp" @@ -41,6 +43,7 @@ #include "input_manager.hpp" /* Input Management */ #include "recents.hpp" /* Recent Items */ #include "actions_manager.hpp" +#include "extensions_manager.hpp" #include #include @@ -64,6 +67,9 @@ Just before one of those menus are aboutToShow(), they are rebuild. */ +#define STATIC_ENTRY "__static__" +#define ENTRY_ALWAYS_ENABLED "__ignore__" + enum { ITEM_NORMAL, @@ -73,10 +79,6 @@ enum static QActionGroup *currentGroup; -/* HACK for minimalView to go around a Qt bug/feature - * that doesn't update the QAction checked state when QMenu is hidden */ -QAction *QVLCMenu::fullscreenViewAction = NULL; - QMenu *QVLCMenu::recentsMenu = NULL; /**************************************************************************** @@ -85,15 +87,15 @@ QMenu *QVLCMenu::recentsMenu = NULL; * Add static entries to DP in menus ***************************************************************************/ void addDPStaticEntry( QMenu *menu, - const QString text, + const QString& text, const char *icon, const char *member, const char *shortcut = NULL ) { QAction *action = NULL; - if( !EMPTY_STR( icon ) > 0 ) + if( !EMPTY_STR( icon ) ) { - if( !EMPTY_STR( shortcut ) > 0 ) + if( !EMPTY_STR( shortcut ) ) action = menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) ); else @@ -101,22 +103,23 @@ void addDPStaticEntry( QMenu *menu, } else { - if( !EMPTY_STR( shortcut ) > 0 ) + if( !EMPTY_STR( shortcut ) ) action = menu->addAction( text, THEDP, member, qtr( shortcut ) ); else action = menu->addAction( text, THEDP, member ); } - action->setData( true ); + action->setData( STATIC_ENTRY ); } /*** * Same for MIM ***/ -void addMIMStaticEntry( intf_thread_t *p_intf, - QMenu *menu, - const QString text, - const char *icon, - const char *member ) +QAction* addMIMStaticEntry( intf_thread_t *p_intf, + QMenu *menu, + const QString& text, + const char *icon, + const char *member, + bool bStatic = false ) { QAction *action; if( strlen( icon ) > 0 ) @@ -126,9 +129,10 @@ void addMIMStaticEntry( intf_thread_t *p_intf, } else { - menu->addAction( text, THEMIM, member ); + action = menu->addAction( text, THEMIM, member ); } - action->setData( "ignore" ); + action->setData( bStatic ? STATIC_ENTRY : ENTRY_ALWAYS_ENABLED ); + return action; } /** @@ -142,9 +146,10 @@ void EnableStaticEntries( QMenu *menu, bool enable = true ) QList< QAction* > actions = menu->actions(); for( int i = 0; i < actions.size(); ++i ) { - actions[i]->setEnabled( actions[i]->data().toString() == "ignore" || - /* Be careful here, because data("string").toBool is true */ - ( enable && (actions[i]->data().toString() == "true" ) ) ); + 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 ) ) ); } } @@ -160,7 +165,7 @@ int DeleteNonStaticEntries( QMenu *menu ) QList< QAction* > actions = menu->actions(); for( int i = 0; i < actions.size(); ++i ) { - if( !actions[i]->data().toBool() ) + if( actions[i]->data().toString() != STATIC_ENTRY ) delete actions[i]; else i_ret++; @@ -216,8 +221,9 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, PUSH_INPUTVAR( "spu-es" ); PUSH_VAR( "fullscreen" ); PUSH_VAR( "video-on-top" ); + PUSH_VAR( "video-wallpaper" ); #ifdef WIN32 - PUSH_VAR( "directx-wallpaper" ); + PUSH_VAR( "direct3d-desktop" ); #endif PUSH_VAR( "video-snapshot" ); PUSH_VAR( "zoom" ); @@ -225,6 +231,7 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, PUSH_VAR( "aspect-ratio" ); PUSH_VAR( "crop" ); PUSH_VAR( "deinterlace" ); + PUSH_VAR( "deinterlace-mode" ); PUSH_VAR( "postprocess" ); return VLC_SUCCESS; @@ -262,7 +269,7 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, #define ACT_ADDMENU( _menu, val, title ) { \ QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ - _action->setMenu( new QMenu() ); _menu->addAction( _action ); } + _action->setMenu( new QMenu( _menu ) ); _menu->addAction( _action ); } #define ACT_ADDCHECK( _menu, val, title ) { \ QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ @@ -287,8 +294,12 @@ void QVLCMenu::createMenuBar( MainInterface *mi, BAR_DADD( VideoMenu( p_intf, bar ), qtr( "&Video" ), 2 ); BAR_ADD( ToolsMenu( bar ), qtr( "&Tools" ) ); - BAR_ADD( ViewMenu( p_intf, mi ), qtr( "V&iew" ) ); + 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" ) ); + } #undef BAR_ADD #undef BAR_DADD @@ -302,57 +313,64 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) QMenu *menu = new QMenu( parent ); addDPStaticEntry( menu, qtr( "&Open File..." ), - ":/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); + ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" ); addDPStaticEntry( menu, qtr( "Advanced Open File..." ), - ":/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" ); - addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" ); + ":/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..." ), - ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" ); - addDPStaticEntry( menu, qtr( "Open &Network..." ), - ":/network", SLOT( openNetDialog() ), "Ctrl+N" ); + ":/type/disc", SLOT( openDiscDialog() ), "Ctrl+D" ); + addDPStaticEntry( menu, qtr( "Open &Network Stream..." ), + ":/type/network", SLOT( openNetDialog() ), "Ctrl+N" ); addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), - ":/capture-card", SLOT( openCaptureDialog() ), + ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" ); menu->addSeparator(); - addDPStaticEntry( menu, qtr( "Paste &Location" ), + addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ), NULL, SLOT( openUrlDialog() ), "Ctrl+V" ); - recentsMenu = new QMenu( qtr( "&Recent Media" ), menu ); - updateRecents( p_intf ); - menu->addMenu( recentsMenu ); - menu->addMenu( SDMenu( p_intf, menu ) ); + if( var_InheritBool( p_intf, "qt-recentplay" ) ) + { + recentsMenu = new QMenu( qtr( "&Recent Media" ), menu ); + updateRecents( p_intf ); + menu->addMenu( recentsMenu ); + } menu->addSeparator(); addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ), "Ctrl+Y" ); menu->addSeparator(); +#ifdef ENABLE_SOUT addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", SLOT( openAndTranscodingDialogs() ), "Ctrl+R" ); addDPStaticEntry( menu, qtr( "&Streaming..." ), - ":/stream", SLOT( openAndStreamingDialogs() ), + ":/menu/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" ); menu->addSeparator(); +#endif addDPStaticEntry( menu, qtr( "&Quit" ) , - ":/quit", SLOT( quit() ), "Ctrl+Q" ); + ":/menu/quit", SLOT( quit() ), "Ctrl+Q" ); return menu; } /** - * Tools, like Media Information, Preferences or Messages + * Tools, like Media Information, Preferences or Messages **/ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) { - addDPStaticEntry( menu, qtr( I_MENU_EXT ), ":/settings", + addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings", SLOT( extendedDialog() ), "Ctrl+E" ); - addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/info", + addDPStaticEntry( menu, qtr( "&Track Synchronization"), ":/menu/settings", + SLOT( synchroDialog() ), "" ); + + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/menu/info", SLOT( mediaInfoDialog() ), "Ctrl+I" ); addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , - ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" ); + ":/menu/info", SLOT( mediaCodecDialog() ), "Ctrl+J" ); addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ),"", SLOT( bookmarksDialog() ), "Ctrl+B" ); @@ -361,8 +379,11 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) "Ctrl+W" ); #endif + addDPStaticEntry( menu, qtr( "Program Guide" ), "", SLOT( epgDialog() ), + "" ); + addDPStaticEntry( menu, qtr( I_MENU_MSG ), - ":/messages", SLOT( messagesDialog() ), + ":/menu/messages", SLOT( messagesDialog() ), "Ctrl+M" ); addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ), @@ -370,7 +391,7 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) menu->addSeparator(); addDPStaticEntry( menu, qtr( "&Preferences" ), - ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); return menu; } @@ -380,43 +401,64 @@ 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 + * Interface modification, load other interfaces, activate Extensions **/ -QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, - MainInterface *mi, - bool with_intf ) +QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi ) { + QAction *action; + QMenu *menu; + + MainInterface *mi = _mi ? _mi : p_intf->p_sys->p_mi; assert( mi ); - QMenu *menu = new QMenu( qtr( "V&iew" ), mi ); + if( !current ) + { + menu = new QMenu( qtr( "&View" ), mi ); + } + else + { + menu = current; + //menu->clear(); + //HACK menu->clear() does not delete submenus + QList actions = menu->actions(); + foreach( QAction *a, actions ) + { + QMenu *m = a->menu(); + if( a->parent() == menu ) delete a; + else menu->removeAction( a ); + if( m && m->parent() == menu ) delete m; + } + } - QAction *act = menu->addAction( QIcon( ":/playlist_menu" ), + menu->addAction( QIcon( ":/menu/playlist_menu" ), qtr( "Play&list" ), mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); - /*menu->addSeparator(); - menu->addAction( qtr( "Undock from Interface" ), mi, - SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/ - menu->addSeparator(); - if( with_intf ) - { - QMenu *intfmenu = InterfacesMenu( p_intf, menu ); - MenuFunc *f = new MenuFunc( intfmenu, 4 ); - CONNECT( intfmenu, aboutToShow(), THEDP->menusUpdateMapper, map() ); - THEDP->menusUpdateMapper->setMapping( intfmenu, f ); - menu->addSeparator(); - } + QMenu *intfmenu = InterfacesMenu( p_intf, menu ); + menu->addSeparator(); /* Minimal View */ - QAction *action = menu->addAction( qtr( "Mi&nimal View" ) ); + action = menu->addAction( qtr( "Mi&nimal View" ) ); action->setShortcut( qtr( "Ctrl+H" ) ); action->setCheckable( true ); - action->setChecked( !with_intf && - (mi->getControlsVisibilityStatus() && CONTROLS_HIDDEN ) ); + action->setChecked( !current && (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) ); CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) ); CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) ); @@ -424,16 +466,32 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, /* FullScreen View */ action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, SLOT( toggleFullScreen() ), QString( "F11" ) ); - fullscreenViewAction = action; action->setCheckable( true ); + action->setChecked( mi->isFullScreen() ); + CONNECT( mi, fullscreenInterfaceToggled( bool ), + action, setChecked( bool ) ); /* Advanced Controls */ action = menu->addAction( qtr( "&Advanced Controls" ), mi, - SLOT( toggleAdvanced() ) ); + SLOT( toggleAdvancedButtons() ) ); action->setCheckable( true ); if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) action->setChecked( true ); + /* Docked Playlist */ + action = menu->addAction( qtr( "Docked Playlist" ) ); + action->setCheckable( true ); + action->setChecked( mi->isPlDocked() ); + CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) ); + + if( !current ) + // I don't want to manage consistency between menus, so no popup-menu + { + action = menu->addAction( qtr( "Quit after Playback" ) ); + action->setCheckable( true ); + CONNECT( action, triggered( bool ), THEMIM, activatePlayQuit( bool ) ); + } + #if 0 /* For Visualisations. Not yet working */ adv = menu->addAction( qtr( "Visualizations selector" ), mi, SLOT( visual() ) ); @@ -443,8 +501,10 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, menu->addSeparator(); addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), - ":/preferences", SLOT( toolbarDialog() ) ); - menu->addSeparator(); + ":/menu/preferences", SLOT( toolbarDialog() ) ); + + /* Extensions */ + ExtensionsMenu( p_intf, menu ); return menu; } @@ -462,6 +522,30 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } +/** + * Extensions menu: populate the current menu with extensions + **/ +void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) +{ + /* Get ExtensionsManager and load extensions if needed */ + ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf ); + + if( !var_InheritBool( p_intf, "qt-autoload-extensions") + && !extMgr->isLoaded() ) + { + return; + } + + if( !extMgr->isLoaded() && !extMgr->cannotLoad() ) + { + extMgr->loadExtensions(); + } + + /* Let the ExtensionsManager build itself the menu */ + extMenu->addSeparator(); + extMgr->menu( extMenu ); +} + /** * Main Audio Menu **/ @@ -484,18 +568,16 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) QAction *action = current->addAction( qtr( "Increase Volume" ), ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) ); - action->setData( true ); + action->setData( STATIC_ENTRY ); action = current->addAction( qtr( "Decrease Volume" ), ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) ); - action->setData( true ); + action->setData( STATIC_ENTRY ); action = current->addAction( qtr( "Mute" ), ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) ); - action->setData( true ); + action->setData( STATIC_ENTRY ); } p_input = THEMIM->getInput(); - if( p_input ) - vlc_object_hold( p_input ); p_aout = THEMIM->getAout(); EnableStaticEntries( current, ( p_aout != NULL ) ); AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); @@ -503,8 +585,6 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vlc_object_release( p_aout ); } - if( p_input ) - vlc_object_release( p_input ); return Populate( p_intf, current, varnames, objects ); } @@ -540,8 +620,9 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) 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, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); + ACT_ADDCHECK( current, "direct3d-desktop", qtr( "Direct3D Desktop mode" ) ); #endif ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) ); @@ -552,12 +633,11 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) 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" ) ); } p_input = THEMIM->getInput(); - if( p_input ) - vlc_object_hold( p_input ); p_vout = THEMIM->getVout(); VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); @@ -565,9 +645,6 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) if( p_vout ) vlc_object_release( p_vout ); - if( p_input ) - vlc_object_release( p_input ); - return Populate( p_intf, current, varnames, objects ); } @@ -600,7 +677,8 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) PopupMenuPlaylistControlEntries( menu, p_intf ); PopupMenuControlEntries( menu, p_intf ); - return menu; + EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) ); + return RebuildNavigMenu( p_intf, menu ); } QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) @@ -612,8 +690,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) /* Get the input and hold it */ p_object = THEMIM->getInput(); - if( p_object ) - vlc_object_hold( p_object ); InputAutoMenuBuilder( p_object, objects, varnames ); @@ -625,9 +701,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" ); - if( p_object ) - vlc_object_release( p_object ); - EnableStaticEntries( menu, (p_object != NULL ) ); return Populate( p_intf, menu, varnames, objects ); } @@ -646,22 +719,13 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent ) menu->setTitle( qtr( I_PL_SD ) ); char **ppsz_longnames; - char **ppsz_names = vlc_sd_GetNames( &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++ ) { - QAction *a = new QAction( qfu( *ppsz_longname ), menu ); - a->setCheckable( true ); - if( playlist_IsServicesDiscoveryLoaded( THEPL, *ppsz_name ) ) - a->setChecked( true ); - CONNECT( a, triggered(), THEDP->SDMapper, map() ); - THEDP->SDMapper->setMapping( a, QString( *ppsz_name ) ); - menu->addAction( a ); - - /* Special case for podcast */ if( !strcmp( *ppsz_name, "podcast" ) ) { QAction *b = new QAction( qtr( "Configure podcasts..." ), menu ); @@ -684,13 +748,13 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent ) { QMenu *menu = new QMenu( parent ); addDPStaticEntry( menu, qtr( "&Help..." ) , - ":/help", SLOT( helpDialog() ), "F1" ); + ":/menu/help", SLOT( helpDialog() ), "F1" ); #ifdef UPDATE_CHECK addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", SLOT( updateDialog() ) ); #endif menu->addSeparator(); - addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/info", + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info", SLOT( aboutDialog() ), "Shift+F1" ); return menu; } @@ -699,16 +763,19 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent ) * Popup menus - Right Click menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ + static QMenu* menu = NULL; \ + delete menu; menu = NULL; \ + if( !show ) \ + return; \ unsigned int i_last_separator = 0; \ vector objects; \ vector varnames; \ input_thread_t *p_input = THEMIM->getInput(); #define CREATE_POPUP \ + menu = new QMenu(); \ Populate( p_intf, menu, varnames, objects ); \ - p_intf->p_sys->p_popup_menu = menu; \ menu->popup( QCursor::pos() ); \ - p_intf->p_sys->p_popup_menu = NULL; \ i_last_separator = 0; void QVLCMenu::PopupPlayEntries( QMenu *menu, @@ -722,12 +789,12 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu, { action = menu->addAction( qtr( "Play" ), ActionsManager::getInstance( p_intf ), SLOT( play() ) ); - action->setIcon( QIcon( ":/play" ) ); + action->setIcon( QIcon( ":/menu/play" ) ); } else { addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), - ":/pause", SLOT( togglePlayPause() ) ); + ":/menu/pause", SLOT( togglePlayPause() ) ); } } @@ -738,29 +805,37 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) /* Faster/Slower */ action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), SLOT( faster() ) ); - action->setIcon( QIcon( ":/faster") ); - action->setData( true ); + action->setIcon( QIcon( ":/toolbar/faster") ); + action->setData( STATIC_ENTRY ); + + action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(), + SLOT( littlefaster() ) ); + action->setData( STATIC_ENTRY ); action = menu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(), SLOT( normalRate() ) ); - action->setData( true ); + action->setData( STATIC_ENTRY ); + + action = menu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(), + SLOT( littleslower() ) ); + action->setData( STATIC_ENTRY ); action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(), SLOT( slower() ) ); - action->setIcon( QIcon( ":/slower") ); - action->setData( true ); + action->setIcon( QIcon( ":/toolbar/slower") ); + action->setData( STATIC_ENTRY ); menu->addSeparator(); action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(), SLOT( jumpFwd() ) ); - action->setIcon( QIcon( ":/skip_fw") ); - action->setData( true ); + action->setIcon( QIcon( ":/toolbar/skip_fw") ); + action->setData( STATIC_ENTRY ); action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(), SLOT( jumpBwd() ) ); - action->setIcon( QIcon( ":/skip_back") ); - action->setData( true ); + action->setIcon( QIcon( ":/toolbar/skip_back") ); + action->setData( STATIC_ENTRY ); addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"", SLOT( gotoTimeDialog() ), "Ctrl+T" ); menu->addSeparator(); @@ -770,13 +845,19 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu, intf_thread_t *p_intf ) { - addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/stop", SLOT( stop() ) ); + 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" ), - ":/previous", SLOT( prev() ) ); + ":/menu/previous", SLOT( prev() ) ); addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), - ":/next", SLOT( next() ) ); + ":/menu/next", SLOT( next() ) ); menu->addSeparator(); } @@ -784,15 +865,15 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) { QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); addDPStaticEntry( openmenu, qtr( "&Open File..." ), - ":/file-asym", SLOT( openFileDialog() ) ); - addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ) ); + ":/type/file-asym", SLOT( openFileDialog() ) ); + addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ), + ":/type/folder-grey", SLOT( PLOpenDir() ) ); addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), - ":/disc", SLOT( openDiscDialog() ) ); + ":/type/disc", SLOT( openDiscDialog() ) ); addDPStaticEntry( openmenu, qtr( "Open &Network..." ), - ":/network", SLOT( openNetDialog() ) ); + ":/type/network", SLOT( openNetDialog() ) ); addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), - ":/capture-card", SLOT( openCaptureDialog() ) ); + ":/type/capture-card", SLOT( openCaptureDialog() ) ); menu->addMenu( openmenu ); menu->addSeparator(); @@ -802,60 +883,53 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) menu->addMenu( helpmenu ); #endif - addDPStaticEntry( menu, qtr( "Quit" ), ":/quit", + addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit", SLOT( quit() ), "Ctrl+Q" ); } /* Video Tracks and Subtitles tracks */ -void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { - vlc_object_hold( p_input ); vout_thread_t *p_vout = THEMIM->getVout(); if( p_vout ) { VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); vlc_object_release( p_vout ); } - vlc_object_release( p_input ); } - QMenu *menu = new QMenu(); - CREATE_POPUP; + CREATE_POPUP } /* Audio Tracks */ -void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { - vlc_object_hold( p_input ); aout_instance_t *p_aout = THEMIM->getAout(); AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); if( p_aout ) vlc_object_release( p_aout ); - vlc_object_release( p_input ); } - QMenu *menu = new QMenu(); - CREATE_POPUP; + CREATE_POPUP } /* Navigation stuff, and general menus ( open ), used only for skins */ -void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) +void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show ) { - POPUP_BOILERPLATE; + POPUP_BOILERPLATE if( p_input ) { - vlc_object_hold( p_input ); varnames.push_back( "audio-es" ); InputAutoMenuBuilder( p_input, objects, varnames ); PUSH_SEPARATOR; } - QMenu *menu = new QMenu(); + menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); @@ -868,41 +942,27 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) menu->addSeparator(); PopupMenuStaticEntries( menu ); - p_intf->p_sys->p_popup_menu = menu; menu->popup( QCursor::pos() ); - p_intf->p_sys->p_popup_menu = NULL; } /* Main Menu that sticks everything together */ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { - /* Destroy popup menu if there is one */ - if( !show ) - { - delete p_intf->p_sys->p_popup_menu; - p_intf->p_sys->p_popup_menu = NULL; - return; - } - - /* Delete and recreate a popup if there is one */ - if( p_intf->p_sys->p_popup_menu ) - delete p_intf->p_sys->p_popup_menu; + POPUP_BOILERPLATE /* */ - QMenu *menu = new QMenu(); - QMenu *submenu; + menu = new QMenu( ); QAction *action; bool b_isFullscreen = false; MainInterface *mi = p_intf->p_sys->p_mi; - POPUP_BOILERPLATE; - PopupPlayEntries( menu, p_intf, p_input ); PopupMenuPlaylistControlEntries( menu, p_intf ); menu->addSeparator(); if( p_input ) { + QMenu *submenu; vout_thread_t *p_vout = THEMIM->getVout(); /* Add a fullscreen switch button, since it is the most used function */ @@ -921,9 +981,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) } /* Input menu */ - vlc_object_hold( p_input ); InputAutoMenuBuilder( p_input, objects, varnames ); - vlc_object_release( p_input ); /* Audio menu */ submenu = new QMenu( menu ); @@ -952,29 +1010,35 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Add some special entries for windowed mode: Interface Menu */ if( !b_isFullscreen ) { - submenu = new QMenu( qtr( "Interface" ), menu ); - QMenu *tools = ToolsMenu( submenu ); + QMenu *submenu = new QMenu( qtr( "Interface" ), menu ); + /*QMenu *tools =*/ ToolsMenu( submenu ); submenu->addSeparator(); /* In skins interface, append some items */ if( !mi ) { - objects.clear(); varnames.clear(); - - vlc_object_t *p_object = ( vlc_object_t* ) - vlc_object_find_name( p_intf, "skins2", FIND_PARENT ); - if( p_object ) + 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" ); Populate( p_intf, submenu, varnames, objects ); - vlc_object_release( p_object ); + + objects.clear(); varnames.clear(); + objects.push_back( p_object ); + varnames.push_back( "intf-skins-interactive" ); + Populate( p_intf, submenu, varnames, objects ); } else msg_Warn( p_intf, "could not find parent interface" ); } else - menu->addMenu( ViewMenu( p_intf, mi, false )); + { + QMenu *viewmenu = menu->addMenu( qtr( "V&iew" ) ); + ViewMenu( p_intf, viewmenu ); + } menu->addMenu( submenu ); } @@ -982,14 +1046,17 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) /* Static entries for ending, like open */ PopupMenuStaticEntries( menu ); - p_intf->p_sys->p_popup_menu = menu; - p_intf->p_sys->p_popup_menu->popup( QCursor::pos() ); + menu->popup( QCursor::pos() ); } #undef ACT_ADD #undef ACT_ADDMENU #undef ACT_ADDCHECK +#undef CREATE_POPUP +#undef POPUP_BOILERPLATE + +#ifndef HAVE_MAEMO /************************************************************************ * Systray Menu * ************************************************************************/ @@ -998,7 +1065,10 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, bool b_force_visible ) { - POPUP_BOILERPLATE; + unsigned int i_last_separator = 0; + vector objects; + vector varnames; + input_thread_t *p_input = THEMIM->getInput(); /* Get the systray menu and clean it */ QMenu *sysMenu = mi->getSysTrayMenu(); @@ -1007,13 +1077,13 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, /* Hide / Show VLC and cone */ if( mi->isVisible() || b_force_visible ) { - sysMenu->addAction( QIcon( ":/vlc16.png" ), + sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), qtr( "Hide VLC media player in taskbar" ), mi, SLOT( toggleUpdateSystrayMenu() ) ); } else { - sysMenu->addAction( QIcon( ":/vlc16.png" ), + sysMenu->addAction( QIcon( ":/logo/vlc16.png" ), qtr( "Show VLC media player" ), mi, SLOT( toggleUpdateSystrayMenu() ) ); } @@ -1025,13 +1095,15 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, sysMenu->addSeparator(); addDPStaticEntry( sysMenu, qtr( "&Open Media" ), - ":/file-wide", SLOT( openFileDialog() ) ); + ":/type/file-wide", SLOT( openFileDialog() ) ); addDPStaticEntry( sysMenu, qtr( "&Quit" ) , - ":/quit", SLOT( quit() ) ); + ":/menu/quit", SLOT( quit() ) ); /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); } +#endif + #undef PUSH_VAR #undef PUSH_SEPARATOR @@ -1108,7 +1180,7 @@ static bool IsMenuEmpty( const char *psz_var, } /* clean up everything */ - var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, NULL ); + var_FreeList( &val_list, NULL ); return i_result; } @@ -1133,7 +1205,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, } /* Check the type of the object variable */ - /* What is the following HACK needed for? */ + /* This HACK is needed so we have a radio button for audio and video tracks + instread of a checkbox */ if( !strcmp( psz_var, "audio-es" ) || !strcmp( psz_var, "video-es" ) ) i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE; @@ -1218,7 +1291,7 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, switch( i_type & VLC_VAR_TYPE ) { case VLC_VAR_VOID: - var_Get( p_object, psz_var, &val ); + val.i_int = 0; // Prevent the copy of an uninitialized value CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL, p_object, val, i_type ); break; @@ -1233,6 +1306,21 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, FREENULL( text.psz_string ); } +#undef TEXT_OR_VAR + +/** HACK for the navigation submenu: + * "title %2i" variables take the value 0 if not set + */ +static bool CheckTitle( vlc_object_t *p_object, const char *psz_var ) +{ + int i_title = 0; + if( sscanf( psz_var, "title %2i", &i_title ) <= 0 ) + return true; + + int i_current_title = var_GetInteger( p_object, "title" ); + return ( i_title == i_current_title ); +} + int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, vlc_object_t *p_object, bool b_root ) @@ -1301,7 +1389,8 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, else menutext.sprintf( "%d", CURVAL.i_int ); CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO, p_object, CURVAL, i_type, - CURVAL.i_int == val.i_int ); + ( CURVAL.i_int == val.i_int ) + && CheckTitle( p_object, psz_var ) ); break; case VLC_VAR_FLOAT: @@ -1320,7 +1409,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, currentGroup = NULL; /* clean up everything */ - var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, &text_list ); + var_FreeList( &val_list, &text_list ); #undef CURVAL #undef CURTEXT @@ -1328,7 +1417,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, } void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, - QString text, QString help, + const QString& text, const QString& help, int i_item_type, vlc_object_t *p_obj, vlc_value_t val, int i_val_type, bool checked ) @@ -1360,8 +1449,13 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, action->setChecked( checked ); - MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type, - val, psz_var ); + MenuItemData *itemData = qFindChild( action, QString() ); + delete itemData; + itemData = new MenuItemData( action, p_obj, i_val_type, val, psz_var ); + + /* remove previous signal-slot connection(s) if any */ + action->disconnect( ); + CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); @@ -1375,18 +1469,24 @@ void QVLCMenu::DoAction( QObject *data ) vlc_object_t *p_object = itemData->p_obj; if( p_object == NULL ) return; + /* Preserve settings across vouts via the playlist object: */ + if( !strcmp( itemData->psz_var, "fullscreen" ) + || !strcmp( itemData->psz_var, "video-on-top" ) ) + var_Set( pl_Get( p_object ), itemData->psz_var, itemData->val ); + var_Set( p_object, itemData->psz_var, itemData->val ); } void QVLCMenu::updateRecents( intf_thread_t *p_intf ) { - if (recentsMenu) + if( recentsMenu ) { QAction* action; RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf ); - QList l = rmrl->recents(); + QStringList l = rmrl->recents(); recentsMenu->clear(); + if( !l.size() ) { action = recentsMenu->addAction( qtr(" - Empty - ") ); @@ -1398,8 +1498,8 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf ) { action = recentsMenu->addAction( QString( "&%1: " ).arg( i + 1 ) + l.at( i ), - rmrl->signalMapper, - SLOT( map() ) ); + rmrl->signalMapper, SLOT( map() ), + i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" ); rmrl->signalMapper->setMapping( action, l.at( i ) ); }