X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=28be14dafca37eebbcbb08fb169824ecf392dfe4;hb=3834b98eedc37503d888a8bffa03eb48536b1e1f;hp=9d55d264fa2d6f4db430c3c38723dbcecbcaa7ce;hpb=5a4afbeb5bcdf6515871efdd0bd9fe4d435a2be9;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 9d55d264fa..28be14dafc 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::minimalViewAction = 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,12 +103,36 @@ 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 + ***/ +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 ) + { + action = menu->addAction( text, THEMIM, member ); + action->setIcon( QIcon( icon ) ); + } + else + { + action = menu->addAction( text, THEMIM, member ); + } + action->setData( bStatic ? STATIC_ENTRY : ENTRY_ALWAYS_ENABLED ); + return action; } /** @@ -120,7 +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( enable && actions[i]->data().toBool() ); + 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 ) ) ); } } @@ -129,13 +158,14 @@ void EnableStaticEntries( QMenu *menu, bool enable = true ) */ int DeleteNonStaticEntries( QMenu *menu ) { + if( !menu ) return VLC_EGENERIC; + int i_ret = 0; - if( !menu ) - return VLC_EGENERIC; + 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++; @@ -143,24 +173,18 @@ int DeleteNonStaticEntries( QMenu *menu ) return i_ret; } -/*** - * Same for MIM - ***/ -void addMIMStaticEntry( intf_thread_t *p_intf, - QMenu *menu, - const QString text, - const char *icon, - const char *member ) +/** + * \return QAction associated to psz_var variable + **/ +static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) { - if( strlen( icon ) > 0 ) - { - QAction *action = menu->addAction( text, THEMIM, member ); - action->setIcon( QIcon( icon ) ); - } - else + QList< QAction* > actions = menu->actions(); + for( int i = 0; i < actions.size(); ++i ) { - menu->addAction( text, THEMIM, member ); + if( actions[i]->data().toString() == psz_var ) + return actions[i]; } + return NULL; } /***************************************************************************** @@ -183,9 +207,8 @@ static int InputAutoMenuBuilder( input_thread_t *p_object, PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); PUSH_VAR( "chapter" ); - PUSH_VAR( "program" ); PUSH_VAR( "navigation" ); - PUSH_VAR( "dvd_menus" ); + PUSH_VAR( "program" ); return VLC_SUCCESS; } @@ -197,41 +220,20 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, PUSH_INPUTVAR( "video-es" ); PUSH_INPUTVAR( "spu-es" ); PUSH_VAR( "fullscreen" ); - PUSH_VAR( "zoom" ); - PUSH_VAR( "scaling" ); - PUSH_VAR( "deinterlace" ); - PUSH_VAR( "aspect-ratio" ); - PUSH_VAR( "crop" ); PUSH_VAR( "video-on-top" ); + PUSH_VAR( "video-wallpaper" ); #ifdef WIN32 - PUSH_VAR( "directx-wallpaper" ); + PUSH_VAR( "direct3d-desktop" ); #endif PUSH_VAR( "video-snapshot" ); + PUSH_VAR( "zoom" ); + PUSH_VAR( "autoscale" ); + PUSH_VAR( "aspect-ratio" ); + PUSH_VAR( "crop" ); + PUSH_VAR( "deinterlace" ); + PUSH_VAR( "deinterlace-mode" ); + PUSH_VAR( "postprocess" ); - /* Special case for postproc */ - // FIXME - if( p_object ) - { - /* p_object is the vout, so the decoder is our parent and the - * postproc filter one of the decoder's children */ - vlc_object_t *p_dec = (vlc_object_t *) - vlc_object_find( p_object, VLC_OBJECT_DECODER, - FIND_PARENT ); - if( p_dec ) - { - vlc_object_t *p_pp = (vlc_object_t *) - vlc_object_find_name( p_dec, "postproc", - FIND_CHILD ); - if( p_pp ) - { - vlc_object_t *p_object = p_pp; - PUSH_VAR( "postproc-q" ); - vlc_object_release( p_pp ); - } - - vlc_object_release( p_dec ); - } - } return VLC_SUCCESS; } @@ -240,24 +242,13 @@ static int AudioAutoMenuBuilder( aout_instance_t *p_object, vector &objects, vector &varnames ) { - PUSH_VAR( "visual" ); PUSH_INPUTVAR( "audio-es" ); - PUSH_VAR( "audio-device" ); PUSH_VAR( "audio-channels" ); + PUSH_VAR( "audio-device" ); + PUSH_VAR( "visual" ); return VLC_SUCCESS; } -static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) -{ - QList< QAction* > actions = menu->actions(); - for( int i = 0; i < actions.size(); ++i ) - { - if( actions[i]->data().toString() == psz_var ) - return actions[i]; - } - return NULL; -} - /***************************************************************************** * All normal menus * Simple Code @@ -276,29 +267,35 @@ static QAction * FindActionWithVar( QMenu *menu, const char *psz_var ) 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 ); } + +#define ACT_ADDCHECK( _menu, val, title ) { \ + QAction *_action = new QAction( title, _menu ); _action->setData( val ); \ + _action->setCheckable( true ); _menu->addAction( _action ); } + /** * Main Menu Bar Creation **/ void QVLCMenu::createMenuBar( MainInterface *mi, - intf_thread_t *p_intf, - bool visual_selector_enabled ) -/* FIXME remove this visual dependency */ + intf_thread_t *p_intf ) { /* QMainWindows->menuBar() gives the QProcess::destroyed timeout issue on Cleanlooks style with setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); - BAR_ADD( FileMenu( p_intf ), qtr( "&Media" ) ); - BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 1 ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 ); - BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "P&layback" ), 3 ); + BAR_ADD( FileMenu( p_intf, bar ), qtr( "&Media" ) ); - BAR_ADD( ToolsMenu( NULL ), qtr( "&Tools" ) ); - BAR_ADD( ViewMenu( p_intf, NULL, mi, visual_selector_enabled, true ), - qtr( "V&iew" ) ); + /* 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( HelpMenu( NULL ), qtr( "&Help" ) ); + BAR_ADD( ToolsMenu( bar ), qtr( "&Tools" ) ); + BAR_ADD( ViewMenu( p_intf, bar ), qtr( "V&iew" ) ); + BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) ); } #undef BAR_ADD #undef BAR_DADD @@ -307,67 +304,69 @@ void QVLCMenu::createMenuBar( MainInterface *mi, * Media ( File ) Menu * Opening, streaming and quit **/ -QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf ) +QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent ) { - QMenu *menu = new QMenu(); + 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" ); + ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" ); addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" ); + ":/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 &MRL" ), + addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ), NULL, SLOT( openUrlDialog() ), "Ctrl+V" ); - addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", SLOT( openAPlaylist() ), - "Ctrl+X" ); - addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", SLOT( saveAPlaylist() ), - "Ctrl+Y" ); - + if( var_InheritBool( p_intf, "qt-recentplay" ) ) + { + recentsMenu = new QMenu( qtr( "&Recent Media" ), menu ); + updateRecents( p_intf ); + menu->addMenu( recentsMenu ); + } menu->addSeparator(); - recentsMenu = new QMenu( qtr( "Recently &Played" ), menu ); - updateRecents( p_intf ); - menu->addMenu( recentsMenu ); + 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; } -/* Playlist/MediaLibrary Control */ -QMenu *QVLCMenu::ToolsMenu( QMenu *parent ) +/** + * Tools, like Media Information, Preferences or Messages + **/ +QMenu *QVLCMenu::ToolsMenu( QMenu *menu ) { - QMenu *menu; - if( parent == NULL ) - menu = new QMenu(); - else - menu = parent; - 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" ); @@ -376,8 +375,11 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *parent ) "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" ), @@ -385,83 +387,113 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *parent ) menu->addSeparator(); addDPStaticEntry( menu, qtr( "&Preferences" ), - ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); + ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); 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 - * This menu can be an interface menu but also a right click menu. + * Interface modification, load other interfaces, activate Extensions **/ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, - QMenu *current, - MainInterface *mi, - bool visual_selector_enabled, - bool with_intf ) + QMenu *current, + bool with_intf ) { - QMenu *menu = new QMenu( current ); - QAction *act; - if( mi ) + QAction *action; + + QMenu *menu; + if( !with_intf ) + menu = new QMenu( qtr( "&View" ), current ); + else { - act = menu->addAction( QIcon( ":/playlist_menu" ), - qtr( "Play&list" ), mi, - SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) ); - act->setData( true ); + menu = current; + menu->clear(); } - act = menu->addMenu( SDMenu( p_intf ) ); - act->setData( true ); + + MainInterface *mi = p_intf->p_sys->p_mi; + assert( mi ); + + 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(); } - if( mi ) + + /* Minimal View */ + action = menu->addAction( qtr( "Mi&nimal View" ) ); + action->setShortcut( qtr( "Ctrl+H" ) ); + action->setCheckable( true ); + action->setChecked( !with_intf && + (mi->getControlsVisibilityStatus() & CONTROLS_HIDDEN ) ); + + CONNECT( action, triggered( bool ), mi, toggleMinimalView( bool ) ); + CONNECT( mi, minimalViewToggled( bool ), action, setChecked( bool ) ); + + /* FullScreen View */ + action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, + SLOT( toggleFullScreen() ), QString( "F11" ) ); + 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() ) ); + action->setCheckable( true ); + if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) + action->setChecked( true ); + + if( with_intf ) + // I don't want to manage consistency between menus, so no popup-menu { - /* Minimal View */ - QAction *action = menu->addAction( qtr( "Mi&nimal View" ), mi, - SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); - action->setCheckable( true ); - action->setData( true ); - if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) - action->setChecked( true ); - minimalViewAction = action; /* HACK for minimalView */ - - /* FullScreen View */ - action = menu->addAction( qtr( "&Fullscreen Interface" ), mi, - SLOT( toggleFullScreen() ), QString( "F11" ) ); + action = menu->addAction( qtr( "Quit after Playback" ) ); action->setCheckable( true ); - action->setData( true ); + CONNECT( action, triggered( bool ), THEMIM, activatePlayQuit( bool ) ); + } - /* Advanced Controls */ - action = menu->addAction( qtr( "&Advanced Controls" ), mi, - SLOT( toggleAdvanced() ) ); - action->setCheckable( true ); - action->setData( true ); - if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED ) - action->setChecked( true ); #if 0 /* For Visualisations. Not yet working */ - adv = menu->addAction( qtr( "Visualizations selector" ), - mi, SLOT( visual() ) ); - adv->setCheckable( true ); - if( visual_selector_enabled ) adv->setChecked( true ); + adv = menu->addAction( qtr( "Visualizations selector" ), + mi, SLOT( visual() ) ); + adv->setCheckable( true ); + if( visual_selector_enabled ) adv->setChecked( true ); #endif - } menu->addSeparator(); addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), - ":/preferences", SLOT( toolbarDialog() ) ); - menu->addSeparator(); + ":/menu/preferences", SLOT( toolbarDialog() ) ); + + /* Extensions */ + ExtensionsMenu( p_intf, menu ); return menu; } @@ -473,16 +505,39 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) { vector objects; vector varnames; - /** \todo add "switch to XXX" */ varnames.push_back( "intf-add" ); objects.push_back( VLC_OBJECT(p_intf) ); return Populate( p_intf, current, varnames, objects ); } +/** + * Extensions menu: populate the current menu with extensions + **/ +void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu ) +{ + /* Get ExtensionsManager and load extensions if needed */ + ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf ); + + if( !var_InheritBool( p_intf, "qt-autoload-extensions") + && !extMgr->isLoaded() ) + { + return; + } + + if( !extMgr->isLoaded() && !extMgr->cannotLoad() ) + { + extMgr->loadExtensions(); + } + + /* Let the ExtensionsManager build itself the menu */ + extMenu->addSeparator(); + extMgr->menu( extMenu ); +} + /** * Main Audio Menu - */ + **/ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vector objects; @@ -490,44 +545,44 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) aout_instance_t *p_aout; input_thread_t *p_input; - if( !current ) current = new QMenu(); - if( current->isEmpty() ) { - QAction *action = current->addAction( qtr( "Mute Audio" ), - ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) ); - action->setData( true ); - action = current->addAction( qtr( "Increase Volume" ), + 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" ) ); + current->addSeparator(); + + 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 ); - - current->addSeparator(); - ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); - current->addSeparator(); - ACT_ADD( current, "audio-es", qtr( "Audio &Track" ) ); - ACT_ADD( current, "audio-device", qtr( "Audio &Device" ) ); - ACT_ADD( current, "audio-channels", qtr( "Audio &Channels" ) ); + action->setData( STATIC_ENTRY ); + action = current->addAction( qtr( "Mute" ), + ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) ); + action->setData( STATIC_ENTRY ); } p_input = THEMIM->getInput(); - if( p_input ) - vlc_object_hold( p_input ); p_aout = THEMIM->getAout(); - AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); EnableStaticEntries( current, ( p_aout != NULL ) ); + AudioAutoMenuBuilder( p_aout, p_input, objects, varnames ); if( p_aout ) { vlc_object_release( p_aout ); } - if( p_input ) - vlc_object_release( p_input ); return Populate( p_intf, current, varnames, objects ); } +QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QWidget *parent ) +{ + return AudioMenu( p_intf, new QMenu( parent ) ); +} + /** * Main Video Menu * Subtitles are part of Video. @@ -539,11 +594,9 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) vector objects; vector varnames; - if( !current ) current = new QMenu(); - if( current->isEmpty() ) { - ACT_ADD( current, "video-es", qtr( "Video &Track" ) ); + ACT_ADDMENU( current, "video-es", qtr( "Video &Track" ) ); QAction *action; QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); @@ -552,101 +605,116 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) addDPStaticEntry( submenu, qtr( "Open File..." ), "", SLOT( loadSubtitlesFile() ) ); submenu->addSeparator(); + current->addSeparator(); - ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) ); - ACT_ADD( current, "zoom", qtr( "&Zoom" ) ); - ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) ); - ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) ); - ACT_ADD( current, "crop", qtr( "&Crop" ) ); - ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) ); + 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_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); + ACT_ADDCHECK( current, "direct3d-desktop", qtr( "Direct3D Desktop mode" ) ); #endif ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) ); - ACT_ADD( current, "postproc-q", qtr( "Post processing" ) ); + + current->addSeparator(); + + 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" ) ); } p_input = THEMIM->getInput(); - if( p_input ) - vlc_object_hold( p_input ); p_vout = THEMIM->getVout(); VideoAutoMenuBuilder( p_vout, p_input, objects, varnames ); - EnableStaticEntries( current, ( p_vout != NULL ) ); + if( p_vout ) - { vlc_object_release( p_vout ); - } - if( p_input ) - vlc_object_release( p_input ); return Populate( p_intf, current, varnames, objects ); } +QMenu *QVLCMenu::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 **/ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { - if( !menu ) menu = new QMenu(); + QAction *action; - if( menu->isEmpty() ) - { - addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"", - SLOT( gotoTimeDialog() ), "Ctrl+T" ); - menu->addSeparator(); + QMenu *submenu = new QMenu( qtr( "&Bookmarks" ), menu ); + addDPStaticEntry( submenu, qtr( "Manage &bookmarks" ), "", + SLOT( bookmarksDialog() ) ); + submenu->addSeparator(); + action = menu->addMenu( submenu ); + action->setData( "bookmark" ); - ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) ); - ACT_ADD( menu, "title", qtr( "T&itle" ) ); - ACT_ADD( menu, "chapter", qtr( "&Chapter" ) ); - ACT_ADD( menu, "program", qtr( "&Program" ) ); - ACT_ADD( menu, "navigation", qtr( "&Navigation" ) ); - } + 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 ); + + EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) ); + return RebuildNavigMenu( p_intf, menu ); +} + +QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu ) +{ + /* */ input_thread_t *p_object; vector objects; vector varnames; + /* Get the input and hold it */ p_object = THEMIM->getInput(); - if( p_object ) - vlc_object_hold( p_object ); + 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 ) ); - if( p_object ) - { - vlc_object_release( p_object ); - } + + EnableStaticEntries( menu, (p_object != NULL ) ); 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 ) +QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent ) { - QMenu *menu = new QMenu(); + QMenu *menu = new QMenu( 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 ); if( !ppsz_names ) return menu; char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames; for( ; *ppsz_name; ppsz_name++, ppsz_longname++ ) { - QAction *a = new QAction( qfu( *ppsz_longname ), menu ); - a->setCheckable( true ); - if( playlist_IsServicesDiscoveryLoaded( THEPL, *ppsz_name ) ) - a->setChecked( true ); - CONNECT( a , triggered(), THEDP->SDMapper, map() ); - THEDP->SDMapper->setMapping( a, QString( *ppsz_name ) ); - menu->addAction( a ); - if( !strcmp( *ppsz_name, "podcast" ) ) { QAction *b = new QAction( qtr( "Configure podcasts..." ), menu ); @@ -661,20 +729,21 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) free( ppsz_longnames ); return menu; } + /** * Help/About Menu **/ -QMenu *QVLCMenu::HelpMenu( QMenu *current ) +QMenu *QVLCMenu::HelpMenu( QWidget *parent ) { - QMenu *menu = new QMenu( current ); + QMenu *menu = new QMenu( parent ); addDPStaticEntry( menu, qtr( "&Help..." ) , - ":/help", SLOT( helpDialog() ), "F1" ); + ":/menu/help", SLOT( helpDialog() ), "F1" ); #ifdef UPDATE_CHECK addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", SLOT( updateDialog() ) ); #endif menu->addSeparator(); - addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/info", + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info", SLOT( aboutDialog() ), "Shift+F1" ); return menu; } @@ -695,49 +764,102 @@ QMenu *QVLCMenu::HelpMenu( QMenu *current ) p_intf->p_sys->p_popup_menu = NULL; \ i_last_separator = 0; -void QVLCMenu::PopupMenuControlEntries( QMenu *menu, +void QVLCMenu::PopupPlayEntries( QMenu *menu, intf_thread_t *p_intf, input_thread_t *p_input ) { - if( p_input ) + QAction *action; + + /* Play or Pause action and icon */ + if( !p_input || var_GetInteger( p_input, "state" ) != PLAYING_S ) { - vlc_value_t val; - var_Get( p_input, "state", &val ); - if( val.i_int == PLAYING_S ) - addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), - ":/pause", SLOT( togglePlayPause() ) ); - else - addMIMStaticEntry( p_intf, menu, qtr( "Play" ), - ":/play", SLOT( togglePlayPause() ) ); + action = menu->addAction( qtr( "Play" ), + ActionsManager::getInstance( p_intf ), SLOT( play() ) ); + action->setIcon( QIcon( ":/menu/play" ) ); } - else if( THEPL->items.i_size ) - addMIMStaticEntry( p_intf, menu, qtr( "Play" ), - ":/play", SLOT( togglePlayPause() ) ); else - addDPStaticEntry( menu, qtr( "Play" ), - ":/play", SLOT( openDialog() ) ); - - addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), - ":/stop", SLOT( stop() ) ); - addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), - ":/previous", SLOT( prev() ) ); - addMIMStaticEntry( p_intf, menu, qtr( "Next" ), - ":/next", SLOT( next() ) ); + { + addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), + ":/menu/pause", SLOT( togglePlayPause() ) ); + } +} + +void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf ) +{ + QAction *action; + + /* Faster/Slower */ + action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(), + SLOT( faster() ) ); + 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( 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( ":/toolbar/slower") ); + action->setData( STATIC_ENTRY ); + + menu->addSeparator(); + + action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(), + SLOT( jumpFwd() ) ); + action->setIcon( QIcon( ":/toolbar/skip_fw") ); + action->setData( STATIC_ENTRY ); + + action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(), + SLOT( jumpBwd() ) ); + action->setIcon( QIcon( ":/toolbar/skip_back") ); + action->setData( STATIC_ENTRY ); + addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"", + SLOT( gotoTimeDialog() ), "Ctrl+T" ); + menu->addSeparator(); +} + + +void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu, + intf_thread_t *p_intf ) +{ + bool bEnable = THEMIM->getInput() != NULL; + QAction *action = + addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/menu/stop", + SLOT( stop() ), true ); + /* Disable Stop in the right-click popup menu */ + if( !bEnable ) + action->setEnabled( false ); + + /* Next / Previous */ + addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ), + ":/menu/previous", SLOT( prev() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), + ":/menu/next", SLOT( next() ) ); + menu->addSeparator(); } void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) { QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); addDPStaticEntry( openmenu, qtr( "&Open File..." ), - ":/file-asym", SLOT( openFileDialog() ) ); + ":/type/file-asym", SLOT( openFileDialog() ) ); addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), - ":/folder-grey", SLOT( PLOpenDir() ) ); + ":/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(); @@ -747,7 +869,7 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu ) menu->addMenu( helpmenu ); #endif - addDPStaticEntry( menu, qtr( "Quit" ), ":/quit", + addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit", SLOT( quit() ), "Ctrl+Q" ); } @@ -757,14 +879,12 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) 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; @@ -776,25 +896,22 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) 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; } -/* Navigation stuff, and general menus ( open ) */ +/* Navigation stuff, and general menus ( open ), used only for skins */ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; if( p_input ) { - vlc_object_hold( p_input ); varnames.push_back( "audio-es" ); InputAutoMenuBuilder( p_input, objects, varnames ); PUSH_SEPARATOR; @@ -804,7 +921,11 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - PopupMenuControlEntries( menu, p_intf, p_input ); + PopupPlayEntries( menu, p_intf, p_input ); + PopupMenuPlaylistControlEntries( menu, p_intf); + + menu->addSeparator(); + PopupMenuControlEntries( menu, p_intf ); menu->addSeparator(); PopupMenuStaticEntries( menu ); @@ -817,130 +938,119 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) /* Main Menu that sticks everything together */ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { - MainInterface *mi = p_intf->p_sys->p_mi; - if( show ) + /* Delete old popup if there is one */ + delete p_intf->p_sys->p_popup_menu; + + if( !show ) { - /* Delete and recreate a popup if there is one */ - if( p_intf->p_sys->p_popup_menu ) - delete p_intf->p_sys->p_popup_menu; + p_intf->p_sys->p_popup_menu = NULL; + return; + } - QMenu *menu = new QMenu(); - QMenu *submenu; - QAction *action; - bool b_isFullscreen = false; + /* */ + QMenu *menu = new QMenu(); + QAction *action; + bool b_isFullscreen = false; + MainInterface *mi = p_intf->p_sys->p_mi; - POPUP_BOILERPLATE; + POPUP_BOILERPLATE; - PopupMenuControlEntries( menu, p_intf, p_input ); - menu->addSeparator(); + PopupPlayEntries( menu, p_intf, p_input ); + PopupMenuPlaylistControlEntries( menu, p_intf ); + menu->addSeparator(); + + if( p_input ) + { + QMenu *submenu; + vout_thread_t *p_vout = THEMIM->getVout(); - if( p_input ) + /* Add a fullscreen switch button, since it is the most used function */ + if( p_vout ) { - vout_thread_t *p_vout = THEMIM->getVout(); + vlc_value_t val; var_Get( p_vout, "fullscreen", &val ); - /* Add a fullscreen switch button */ - if( p_vout ) - { - vlc_value_t val; - var_Get( p_vout, "fullscreen", &val ); - b_isFullscreen = !( !val.b_bool ); - if( b_isFullscreen ) - CreateAndConnect( menu, "fullscreen", - qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL, - VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, - b_isFullscreen ); - vlc_object_release( p_vout ); - } + b_isFullscreen = !( !val.b_bool ); + if( b_isFullscreen ) + CreateAndConnect( menu, "fullscreen", + qtr( "Leave Fullscreen" ),"" , ITEM_NORMAL, + VLC_OBJECT(p_vout), val, VLC_VAR_BOOL, b_isFullscreen ); + vlc_object_release( p_vout ); menu->addSeparator(); + } - /* Input menu */ - vlc_object_hold( p_input ); - InputAutoMenuBuilder( p_input, objects, varnames ); - vlc_object_release( p_input ); + /* Input menu */ + InputAutoMenuBuilder( p_input, objects, varnames ); - /* Audio menu */ - submenu = new QMenu( menu ); - action = menu->addMenu( AudioMenu( p_intf, submenu ) ); - action->setText( qtr( "&Audio" ) ); - if( action->menu()->isEmpty() ) - action->setEnabled( false ); + /* Audio menu */ + submenu = new QMenu( menu ); + action = menu->addMenu( AudioMenu( p_intf, submenu ) ); + action->setText( qtr( "&Audio" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); - /* Video menu */ - submenu = new QMenu( menu ); - action = menu->addMenu( VideoMenu( p_intf, submenu ) ); - action->setText( qtr( "&Video" ) ); - if( action->menu()->isEmpty() ) - action->setEnabled( false ); + /* Video menu */ + submenu = new QMenu( menu ); + action = menu->addMenu( VideoMenu( p_intf, submenu ) ); + action->setText( qtr( "&Video" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); - /* Playback menu for chapters */ - submenu = new QMenu( menu ); - action = menu->addMenu( NavigMenu( p_intf, submenu ) ); - action->setText( qtr( "&Playback" ) ); - if( action->menu()->isEmpty() ) - action->setEnabled( false ); - } + /* Playback menu for chapters */ + submenu = new QMenu( menu ); + action = menu->addMenu( NavigMenu( p_intf, submenu ) ); + action->setText( qtr( "&Playback" ) ); + if( action->menu()->isEmpty() ) + action->setEnabled( false ); + } - menu->addSeparator(); + menu->addSeparator(); - /* Add some special entries for windowed mode: Interface Menu */ - if( !b_isFullscreen ) + /* Add some special entries for windowed mode: Interface Menu */ + if( !b_isFullscreen ) + { + QMenu *submenu = new QMenu( qtr( "Interface" ), menu ); + /*QMenu *tools =*/ ToolsMenu( submenu ); + submenu->addSeparator(); + + /* In skins interface, append some items */ + if( !mi ) { - submenu = new QMenu( qtr( "Interface" ), menu ); - if( mi ) - { - submenu->addAction( QIcon( ":/playlist" ), - qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); - action = submenu->addAction( QIcon( "" ), - qtr( "Minimal View" ), mi, SLOT( toggleMinimalView() ) ); - action->setCheckable( true ); - action->setChecked( !( mi->getControlsVisibilityStatus() & - CONTROLS_VISIBLE ) ); - action = submenu->addAction( QIcon( "" ), - qtr( "Toggle Fullscreen Interface" ), - mi, SLOT( toggleFullScreen() ) ); - action->setCheckable( true ); - action->setChecked( mi->isFullScreen() ); - } - else /* We are using the skins interface. - If not, this entry will not show. */ + if( p_intf->p_sys->b_isDialogProvider ) { + vlc_object_t* p_object = p_intf->p_parent; - QMenu *tools = ToolsMenu( submenu ); - submenu->addSeparator(); - objects.clear(); - varnames.clear(); - vlc_object_t *p_object = ( vlc_object_t* ) - vlc_object_find_name( p_intf, "skins2", FIND_PARENT ); - if( p_object ) - { - objects.push_back( p_object ); - varnames.push_back( "intf-skins" ); - Populate( p_intf, submenu, varnames, objects ); - vlc_object_release( p_object ); - } - else - msg_Dbg( p_intf, "could not find parent interface" ); + objects.clear(); varnames.clear(); + objects.push_back( p_object ); + varnames.push_back( "intf-skins" ); + Populate( p_intf, submenu, varnames, objects ); + + objects.clear(); varnames.clear(); + objects.push_back( p_object ); + varnames.push_back( "intf-skins-interactive" ); + Populate( p_intf, submenu, varnames, objects ); } - menu->addMenu( submenu ); + else + msg_Warn( p_intf, "could not find parent interface" ); } + else + menu->addMenu( ViewMenu( p_intf, menu, false )); - /* 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() ); - } - else - { - // destroy popup if there is one - delete p_intf->p_sys->p_popup_menu; - p_intf->p_sys->p_popup_menu = NULL; + menu->addMenu( submenu ); } + + /* Static entries for ending, like open */ + PopupMenuStaticEntries( menu ); + + p_intf->p_sys->p_popup_menu = menu; + p_intf->p_sys->p_popup_menu->popup( QCursor::pos() ); } #undef ACT_ADD +#undef ACT_ADDMENU +#undef ACT_ADDCHECK +#ifndef HAVE_MAEMO /************************************************************************ * Systray Menu * ************************************************************************/ @@ -958,29 +1068,35 @@ 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() ) ); } sysMenu->addSeparator(); - PopupMenuControlEntries( sysMenu, p_intf, p_input ); + PopupPlayEntries( sysMenu, p_intf, p_input ); + PopupMenuPlaylistControlEntries( sysMenu, p_intf); + PopupMenuControlEntries( sysMenu, p_intf); 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 CREATE_POPUP +#undef POPUP_BOILERPLATE #undef PUSH_VAR #undef PUSH_SEPARATOR @@ -994,7 +1110,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, vector & objects ) { QMenu *menu = current; - if( !menu ) menu = new QMenu(); + assert( menu ); currentGroup = NULL; @@ -1057,7 +1173,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; } @@ -1082,10 +1198,10 @@ 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" ) - || !strcmp( psz_var, "postproc-q" ) ) + || !strcmp( psz_var, "video-es" ) ) i_type = VLC_VAR_INTEGER | VLC_VAR_HASCHOICE; else i_type = var_Type( p_object, psz_var ); @@ -1157,8 +1273,10 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, action->setEnabled( false ); } else + { action->setEnabled( CreateChoicesMenu( menu, psz_var, p_object, true ) == 0 ); + } FREENULL( text.psz_string ); return; } @@ -1181,6 +1299,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 ) @@ -1249,7 +1382,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: @@ -1268,7 +1402,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 @@ -1276,16 +1410,19 @@ 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 ) { QAction *action = FindActionWithVar( menu, psz_var ); + + bool b_new = false; if( !action ) { action = new QAction( text, menu ); menu->addAction( action ); + b_new = true; } action->setToolTip( help ); @@ -1307,9 +1444,15 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type, val, psz_var ); + + /* remove previous signal-slot connection(s) if any */ + action->disconnect( ); + CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); - menu->addAction( action ); + + if( b_new ) + menu->addAction( action ); } void QVLCMenu::DoAction( QObject *data ) @@ -1323,13 +1466,14 @@ void QVLCMenu::DoAction( QObject *data ) 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 - ") ); @@ -1341,8 +1485,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 ) ); }