X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=21c294c09e253c9a278acbd8b22e1dc44ca1fb3e;hb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;hp=e519e22ae752e7a7d74b05aacbc22f552e684721;hpb=2b60288a8db042caf7d6499aff78f1ffbdf2876c;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index e519e22ae7..21c294c09e 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -1,16 +1,16 @@ /***************************************************************************** * menus.cpp : Qt menus ***************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright ( C ) 2006-2007 the VideoLAN team * $Id$ * - * Authors: Clément Stenac + * Authors: Clément Stenac * Jean-Baptiste Kempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * ( at your option ) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,17 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include -#include -#include - -#ifndef WIN32 -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif +#include + #include #include "main_interface.hpp" @@ -40,6 +35,13 @@ #include "dialogs_provider.hpp" #include "input_manager.hpp" +#include +#include +#include +#include +#include +#include + enum { ITEM_NORMAL, @@ -50,64 +52,64 @@ enum static QActionGroup *currentGroup; // Add static entries to menus -#define DP_SADD( menu, text, help, icon, slot, shortcut ) \ -{ \ - if( strlen(icon) > 0 ) \ - { \ - if( strlen(shortcut) > 0 ) \ - { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ), \ - qtr(shortcut) );\ - } \ - else \ - { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ) );\ - } \ - } \ - else \ - { \ - if( strlen(shortcut) > 0 ) \ - { \ - menu->addAction( text, THEDP, SLOT( slot ), \ - qtr(shortcut) ); \ - } \ - else \ - { \ - menu->addAction( text, THEDP, SLOT( slot ) ); \ - } \ - } \ +void addDPStaticEntry( QMenu *menu, + const QString text, + const char *help, + const char *icon, + const char *member, + const char *shortcut ) +{ + if( !EMPTY_STR( icon ) > 0 ) + { + if( !EMPTY_STR( shortcut ) > 0 ) + menu->addAction( QIcon( icon ), text, THEDP, member, qtr( shortcut ) ); + else + menu->addAction( QIcon( icon ), text, THEDP, member ); + } + else + { + if( !EMPTY_STR( shortcut ) > 0 ) + menu->addAction( text, THEDP, member, qtr( shortcut ) ); + else + menu->addAction( text, THEDP, member ); + } } -#define MIM_SADD( menu, text, help, icon, slot ) \ -{ \ - if( strlen(icon) > 0 ) \ - { \ - QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \ - action->setIcon(QIcon(icon)); \ - } \ - else \ - { \ - menu->addAction( text, THEMIM, SLOT( slot ) ); \ - } \ + +void addMIMStaticEntry( intf_thread_t *p_intf, + QMenu *menu, + const QString text, + const char *help, + const char *icon, + const char *member ) +{ + if( strlen( icon ) > 0 ) + { + QAction *action = menu->addAction( text, THEMIM, member ); + action->setIcon( QIcon( icon ) ); + } + else + { + menu->addAction( text, THEMIM, member ); + } } -#define PL_SADD /***************************************************************************** * Definitions of variables for the dynamic menus *****************************************************************************/ #define PUSH_VAR( var ) varnames.push_back( var ); \ - objects.push_back( p_object->i_object_id ) + objects.push_back( p_object ) #define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \ - objects.push_back( 0 ); varnames.push_back( "" ); \ + objects.push_back( NULL ); varnames.push_back( "" ); \ i_last_separator = objects.size(); } static int InputAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, + vector &objects, vector &varnames ) { - PUSH_VAR( "bookmark"); + PUSH_VAR( "bookmark" ); PUSH_VAR( "title" ); - PUSH_VAR ("chapter" ); + PUSH_VAR( "chapter" ); PUSH_VAR( "program" ); PUSH_VAR( "navigation" ); PUSH_VAR( "dvd_menus" ); @@ -115,7 +117,7 @@ static int InputAutoMenuBuilder( vlc_object_t *p_object, } static int VideoAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, + vector &objects, vector &varnames ) { PUSH_VAR( "fullscreen" ); @@ -127,7 +129,7 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, PUSH_VAR( "directx-wallpaper" ); PUSH_VAR( "video-snapshot" ); - vlc_object_t *p_dec_obj = (vlc_object_t *)vlc_object_find( p_object, + vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object, VLC_OBJECT_DECODER, FIND_PARENT ); if( p_dec_obj != NULL ) @@ -140,7 +142,7 @@ static int VideoAutoMenuBuilder( vlc_object_t *p_object, } static int AudioAutoMenuBuilder( vlc_object_t *p_object, - vector &objects, + vector &objects, vector &varnames ) { PUSH_VAR( "audio-device" ); @@ -152,149 +154,203 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, /***************************************************************************** * All normal menus + * Simple Code *****************************************************************************/ #define BAR_ADD( func, title ) { \ - QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); } + QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); } #define BAR_DADD( func, title, id ) { \ - QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); \ + 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 ); } -void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, - bool playlist, bool adv_controls_enabled, - bool visual_selector_enabled ) +/** + * Main Menu Bar Creation + **/ +void QVLCMenu::createMenuBar( MainInterface *mi, + intf_thread_t *p_intf, + bool visual_selector_enabled ) { -#ifndef WIN32 - /* Ugly klugde - * Remove SIGCHLD from the ignored signal the time to initialise - * Qt because it call gconf to get the icon theme */ - sigset_t set; - - sigemptyset( &set ); - sigaddset( &set, SIGCHLD ); - pthread_sigmask (SIG_UNBLOCK, &set, NULL); -#endif + /* QMainWindows->menuBar() + gives the QProcess::destroyed timeout issue on Cleanlooks style with + setDesktopAware set to false */ QMenuBar *bar = mi->menuBar(); -#ifndef WIN32 - pthread_sigmask (SIG_BLOCK, &set, NULL); -#endif - BAR_ADD( FileMenu(), qtr("&Media") ); - if( playlist ) - { - BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("&Playlist" ) ); - } - BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled, - visual_selector_enabled ), qtr("&Tools") ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr("&Video"), 1 ); - BAR_DADD( AudioMenu( p_intf, NULL ), qtr("&Audio"), 2 ); - BAR_DADD( NavigMenu( p_intf, NULL ), qtr("&Navigation"), 3 ); - - BAR_ADD( HelpMenu(), qtr("&Help" ) ); + BAR_ADD( FileMenu(), qtr( "&Media" ) ); + BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) ); + BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ), + qtr( "&Tools" ) ); + BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 ); + BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 ); + BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 ); + + BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) ); } +#undef BAR_ADD +#undef BAR_DADD + +/** + * Media ( File ) Menu + * Opening, streaming and quit + **/ QMenu *QVLCMenu::FileMenu() { QMenu *menu = new QMenu(); - DP_SADD( menu, qtr("Open &File..." ), "", "", openFileDialog(), "Ctrl+O" ); - DP_SADD( menu, qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" ); - DP_SADD( menu, qtr("Open &Network..." ), "", "", openNetDialog(), "Ctrl+N" ); - DP_SADD( menu, qtr("Open &Capture Device..." ), "", "", openCaptureDialog(), - "Ctrl+C" ); + + addDPStaticEntry( menu, qtr( "&Open File..." ), "", + ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" ); + addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "", + ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" ); + addDPStaticEntry( menu, qtr( "Open &Disc..." ), "", + ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" ); + addDPStaticEntry( menu, qtr( "Open &Network..." ), "", + ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" ); + addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "", + ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ), + "Ctrl+C" ); menu->addSeparator(); - DP_SADD( menu, qtr("&Streaming..."), "", "", openThenStreamingDialogs(), - "Ctrl+S" ); - DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", openThenTranscodingDialogs(), - "Ctrl+R" ); + + addDPStaticEntry( menu, qtr( "&Streaming..." ), "", + ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ), + "Ctrl+S" ); + addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "", + SLOT( openThenTranscodingDialogs() ), "Ctrl+R" ); menu->addSeparator(); - DP_SADD( menu, qtr("&Quit") , "", "", quit(), "Ctrl+Q"); + + addDPStaticEntry( menu, qtr( "&Quit" ) , "", + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" ); return menu; } -QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf ) +/* Playlist/MediaLibrary Control */ +QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi ) { QMenu *menu = new QMenu(); menu->addMenu( SDMenu( p_intf ) ); + menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), + qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) ); menu->addSeparator(); - DP_SADD( menu, qtr(I_PL_LOAD), "", "", openPlaylist(), "Ctrl+L" ); - DP_SADD( menu, qtr(I_PL_SAVE), "", "", savePlaylist(), "Ctrl+K" ); + addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ), + "Ctrl+X" ); + addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ), + "Ctrl+Y" ); menu->addSeparator(); - menu->addAction( qtr("Undock from interface"), mi, - SLOT( undockPlaylist() ), qtr("Ctrl+U") ); + menu->addAction( qtr( "Undock from interface" ), mi, + SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) ); return menu; } -QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, - bool adv_controls_enabled, - bool visual_selector_enabled, bool with_intf ) +/** + * Tools/View Menu + * This is kept in the same menu for now, but could change if it gets much + * longer. + * This menu can be an interface menu but also a right click menu. + **/ +QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, + QMenu *current, + MainInterface *mi, + bool visual_selector_enabled, + bool with_intf ) { - QMenu *menu = new QMenu(); + QMenu *menu = new QMenu( current ); + if( mi ) + { + menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ), + qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ), + qtr( "Ctrl+L" ) ); + } + addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", + ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ), + "Ctrl+E" ); + + menu->addSeparator(); + if( with_intf ) { - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); - intfmenu->setTitle( qtr("Interfaces" ) ); + QMenu *intfmenu = InterfacesMenu( p_intf, menu ); + intfmenu->setTitle( qtr( "Add Interfaces" ) ); menu->addMenu( intfmenu ); menu->addSeparator(); } - DP_SADD( menu, qtr(I_MENU_MSG), "", "", messagesDialog(), "Ctrl+M" ); - DP_SADD( menu, qtr(I_MENU_INFO) , "", "", mediaInfoDialog(), "Ctrl+J" ); - DP_SADD( menu, qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog(), "Ctrl+I" ); - DP_SADD( menu, qtr(I_MENU_GOTOTIME), "","", gotoTimeDialog(), "Ctrl+T" ); - DP_SADD( menu, qtr(I_MENU_BOOKMARK), "","", bookmarksDialog(), "Ctrl+B" ); - DP_SADD( menu, qtr(I_MENU_VLM), "","", vlmDialog(), "Ctrl+V" ); - - menu->addSeparator(); if( mi ) { - QAction *adv = menu->addAction( qtr("Advanced controls" ), - mi, SLOT( advanced() ) ); - adv->setCheckable( true ); - if( adv_controls_enabled ) adv->setChecked( true ); -#if 0 - adv = menu->addAction( qtr("Visualizations selector" ), + /* Minimal View */ + QAction *action=menu->addAction( qtr( "Minimal View..." ), mi, + SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); + action->setCheckable( true ); + if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) + action->setChecked( true ); + + /* FullScreen View */ + action = menu->addAction( qtr( "Toggle Fullscreen Interface" ), mi, + SLOT( toggleFullScreen() ), qtr( "F11" ) ); + + /* Advanced Controls */ + action = menu->addAction( qtr( "Advanced controls" ), mi, + SLOT( toggleAdvanced() ) ); + action->setCheckable( 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 ); #endif - menu->addAction ( qtr( "Playlist"), mi, SLOT( playlist() ) ); } - DP_SADD( menu, qtr(I_MENU_EXT), "","",extendedDialog(), "Ctrl+E" ); - DP_SADD( menu, qtr("Hide Menus..."), "","",hideMenus(), "Ctrl+H" ); + menu->addSeparator(); - DP_SADD( menu, qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" ); + + addDPStaticEntry( menu, qtr( I_MENU_MSG ), "", + ":/pixmaps/menus_messages_16px.png", SLOT( messagesDialog() ), + "Ctrl+M" ); + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "", + SLOT( mediaInfoDialog() ), "Ctrl+I" ); + addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "", + ":/pixmaps/menus_info_16px.png", 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" ); +#endif + + menu->addSeparator(); + addDPStaticEntry( menu, qtr( "Preferences..." ), "", + ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" ); return menu; } +/** + * Interface Sub-Menu, to list extras interface and skins + **/ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) { - vector objects; + vector objects; vector varnames; /** \todo add "switch to XXX" */ varnames.push_back( "intf-add" ); - objects.push_back( p_intf->i_object_id ); - - QMenu *menu = Populate( p_intf, current, varnames, objects ); + objects.push_back( VLC_OBJECT(p_intf) ); - if( !p_intf->pf_show_dialog ) - { - menu->addSeparator(); - menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()), - qtr("Ctrl+Z") ); - } + QMenu *submenu = new QMenu( current ); + QMenu *menu = Populate( p_intf, submenu, varnames, objects ); CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); THEDP->menusUpdateMapper->setMapping( menu, 4 ); return menu; } +/** + * Main Audio Menu + */ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { - vector objects; + vector objects; vector varnames; - vlc_object_t *p_object = (vlc_object_t *)vlc_object_find( p_intf, + vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_object != NULL ) { @@ -302,7 +358,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) vlc_object_release( p_object ); } - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT, + p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE ); if( p_object ) { @@ -312,14 +368,17 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) return Populate( p_intf, current, varnames, objects ); } - +/** + * Main Video Menu + * Subtitles are part of Video. + **/ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) { vlc_object_t *p_object; - vector objects; + vector objects; vector varnames; - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, + p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_object != NULL ) { @@ -328,7 +387,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) vlc_object_release( p_object ); } - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, + p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); if( p_object != NULL ) { @@ -338,135 +397,157 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } -QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current ) +/** + * Navigation Menu + * For DVD, MP4, MOV and other chapter based format + **/ +QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) { vlc_object_t *p_object; - vector objects; + vector objects; vector varnames; - /* FIXME */ - p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, + p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_object != NULL ) { - InputAutoMenuBuilder( p_object, objects, varnames ); - PUSH_VAR( "prev-title"); PUSH_VAR ( "next-title" ); - PUSH_VAR( "prev-chapter"); PUSH_VAR( "next-chapter" ); + InputAutoMenuBuilder( p_object, objects, varnames ); + PUSH_VAR( "prev-title" ); PUSH_VAR ( "next-title" ); + PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" ); vlc_object_release( p_object ); } - return Populate( p_intf, current, varnames, objects ); + QMenu *navMenu = new QMenu( menu ); + addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","", + SLOT( gotoTimeDialog() ), "Ctrl+T" ); + navMenu->addSeparator(); + return Populate( p_intf, navMenu, varnames, objects, true ); } +/** + * Service Discovery SubMenu + **/ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); - menu->setTitle( qtr(I_PL_SD) ); - vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, - FIND_ANYWHERE ); - int i_num = 0; - for( int i_index = 0 ; i_index < p_list->i_count; i_index++ ) - { - module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ; - if( !strcmp( p_parser->psz_capability, "services_discovery" ) ) - i_num++; - } - for( int i_index = 0 ; i_index < p_list->i_count; i_index++ ) + menu->setTitle( qtr( I_PL_SD ) ); + char **ppsz_longnames; + char **ppsz_names = services_discovery_GetServicesNames( 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++ ) { - module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object; - if( !strcmp( p_parser->psz_capability, "services_discovery" ) ) + 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 *a = new QAction( qfu( p_parser->psz_longname ), menu ); - a->setCheckable( true ); - /* hack to handle submodules properly */ - int i = -1; - while( p_parser->pp_shortcuts[++i] != NULL ); - i--; - if( playlist_IsServicesDiscoveryLoaded( THEPL, - i>=0?p_parser->pp_shortcuts[i] : p_parser->psz_object_name ) ) - { - a->setChecked( true ); - } - CONNECT( a , triggered(), THEDP->SDMapper, map() ); - THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] : - p_parser->psz_object_name ); - menu->addAction( a ); + QAction *b = new QAction( qfu( "Configure podcasts..." ), menu ); + //b->setEnabled( a->isChecked() ); + menu->addAction( b ); + CONNECT( b, triggered(), THEDP, podcastConfigureDialog() ); } + free( *ppsz_name ); + free( *ppsz_longname ); } - vlc_list_release( p_list ); + free( ppsz_names ); + free( ppsz_longnames ); return menu; } - -QMenu *QVLCMenu::HelpMenu() +/** + * Help/About Menu +**/ +QMenu *QVLCMenu::HelpMenu( QMenu *current ) { - QMenu *menu = new QMenu(); - DP_SADD( menu, qtr("Help") , "", "", helpDialog(), "F1" ); + QMenu *menu = new QMenu( current ); + addDPStaticEntry( menu, qtr( "Help..." ) , "", + ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" ); +#ifdef UPDATE_CHECK + addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), ""); +#endif menu->addSeparator(); - DP_SADD( menu, qtr(I_MENU_ABOUT), "", "", aboutDialog(), "Ctrl+F1"); + addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ), + "Ctrl+F1" ); return menu; } /***************************************************************************** - * Popup menus * + * Popup menus - Right Click menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ unsigned int i_last_separator = 0; \ - vector objects; \ + vector objects; \ vector varnames; \ input_thread_t *p_input = THEMIM->getInput(); #define CREATE_POPUP \ - QMenu *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; -#define POPUP_PLAY_ENTRIES( menu )\ - vlc_value_t val; \ - if( p_input ) \ - { \ - var_Get( p_input, "state", &val ); \ - if( val.i_int == PAUSE_S ) \ - MIM_SADD( menu, qtr("Play"), "", "", togglePlayPause() ) \ - else \ - MIM_SADD( menu, qtr("Pause"), "", "", togglePlayPause() ) \ - } \ - else if( THEPL->items.i_size && THEPL->i_enabled ) \ - MIM_SADD( menu, qtr("Play"), "", "", togglePlayPause() ); \ - \ - MIM_SADD( menu, qtr("Stop"), "", "", stop() ); \ - MIM_SADD( menu, qtr("Previous"), "", "", prev() ); \ - MIM_SADD( menu, qtr("Next"), "", "", next() ); - -#define POPUP_STATIC_ENTRIES \ - POPUP_PLAY_ENTRIES( menu ); \ - \ - menu->addSeparator(); \ - QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \ - intfmenu->setTitle( qtr("Interfaces" ) ); \ - menu->addMenu( intfmenu ); \ - \ - QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false, false ); \ - toolsmenu->setTitle( qtr("Tools" ) ); \ - menu->addMenu( toolsmenu ); \ - \ - QMenu *openmenu = new QMenu( qtr("Open") ); \ - openmenu->addAction( qtr("Open &File..." ), THEDP, SLOT( openFileDialog() ) ); \ - openmenu->addAction( qtr("Open &Disc..." ), THEDP, SLOT( openDiscDialog() ) ); \ - openmenu->addAction( qtr("Open &Network..." ), THEDP, SLOT( openNetDialog() ) ); \ - openmenu->addAction( qtr("Open &Capture Device..." ), THEDP, \ - SLOT( openCaptureDialog() ) ); \ - menu->addMenu( openmenu ); \ - \ - menu->addSeparator(); \ - QMenu *helpmenu = HelpMenu(); \ - helpmenu->setTitle( qtr("Help") ); \ - menu->addMenu( helpmenu ); \ - \ - DP_SADD( menu, qtr("Quit"), "", "", quit() , "Ctrl+Q" ); +void QVLCMenu::PopupMenuControlEntries( QMenu *menu, + intf_thread_t *p_intf, + input_thread_t *p_input ) +{ + if( p_input ) + { + vlc_value_t val; + var_Get( p_input, "state", &val ); + if( val.i_int == PLAYING_S ) + addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "", + ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) ); + else + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + } + else if( THEPL->items.i_size ) + addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "", + ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) ); + + addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "", + ":/pixmaps/stop_16px.png", SLOT( stop() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "", + ":/pixmaps/previous_16px.png", SLOT( prev() ) ); + addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "", + ":/pixmaps/next_16px.png", SLOT( next() ) ); + } +void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ) +{ + QMenu *toolsmenu = ToolsMenu( p_intf, menu, false, true ); + toolsmenu->setTitle( qtr( "Tools" ) ); + menu->addMenu( toolsmenu ); + + QMenu *openmenu = new QMenu( qtr( "Open" ), menu ); + openmenu->addAction( qtr( "Open &File..." ), THEDP, + SLOT( openFileDialog() ) ); + openmenu->addAction( qtr( "Open &Disc..." ), THEDP, + SLOT( openDiscDialog() ) ); + openmenu->addAction( qtr( "Open &Network..." ), THEDP, + SLOT( openNetDialog() ) ); + openmenu->addAction( qtr( "Open &Capture Device..." ), THEDP, + SLOT( openCaptureDialog() ) ); + menu->addMenu( openmenu ); + + menu->addSeparator(); + QMenu *helpmenu = HelpMenu( menu ); + helpmenu->setTitle( qtr( "Help" ) ); + menu->addMenu( helpmenu ); + + addDPStaticEntry( menu, qtr( "Quit" ), "", "", SLOT( quit() ) , "Ctrl+Q" ); +} + +/* Video Tracks and Subtitles tracks */ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; @@ -474,10 +555,10 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) { vlc_object_yield( p_input ); varnames.push_back( "video-es" ); - objects.push_back( p_input->i_object_id ); + objects.push_back( VLC_OBJECT(p_input) ); varnames.push_back( "spu-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_input, + objects.push_back( VLC_OBJECT(p_input) ); + vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); if( p_vout ) { @@ -486,9 +567,11 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) } vlc_object_release( p_input ); } + QMenu *menu = new QMenu(); CREATE_POPUP; } +/* Audio Tracks */ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; @@ -496,8 +579,8 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) { vlc_object_yield( p_input ); varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, + objects.push_back( VLC_OBJECT(p_input) ); + vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE ); if( p_aout ) { @@ -506,31 +589,39 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) } vlc_object_release( p_input ); } + QMenu *menu = new QMenu(); CREATE_POPUP; } -/* Navigation stuff, and general */ +/* Navigation stuff, and general menus ( open ) */ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) { + vlc_value_t val; POPUP_BOILERPLATE; + if( p_input ) { vlc_object_yield( p_input ); varnames.push_back( "audio-es" ); - InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); + InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); PUSH_SEPARATOR; } QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); + + menu->addSeparator(); + PopupMenuControlEntries( menu, p_intf, p_input ); + menu->addSeparator(); - POPUP_STATIC_ENTRIES; + PopupMenuStaticEntries( p_intf, 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 ) { if( show ) @@ -542,38 +633,43 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) if( p_input ) { vlc_object_yield( p_input ); - InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); + InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames ); + + /* Audio menu */ + PUSH_SEPARATOR; + varnames.push_back( "audio-es" ); + objects.push_back( VLC_OBJECT(p_input) ); + vlc_object_t *p_aout = ( vlc_object_t * ) + vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + if( p_aout ) + { + AudioAutoMenuBuilder( p_aout, objects, varnames ); + vlc_object_release( p_aout ); + } /* Video menu */ PUSH_SEPARATOR; varnames.push_back( "video-es" ); - objects.push_back( p_input->i_object_id ); + objects.push_back( VLC_OBJECT(p_input) ); varnames.push_back( "spu-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_input, - VLC_OBJECT_VOUT, FIND_CHILD ); + objects.push_back( VLC_OBJECT(p_input) ); + vlc_object_t *p_vout = ( vlc_object_t * ) + vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); if( p_vout ) { VideoAutoMenuBuilder( p_vout, objects, varnames ); vlc_object_release( p_vout ); } - /* Audio menu */ - PUSH_SEPARATOR - varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if( p_aout ) - { - AudioAutoMenuBuilder( p_aout, objects, varnames ); - vlc_object_release( p_aout ); - } + + vlc_object_release( p_input ); } QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - POPUP_STATIC_ENTRIES; + PopupMenuControlEntries( menu, p_intf, p_input ); + menu->addSeparator(); + PopupMenuStaticEntries( p_intf, menu ); p_intf->p_sys->p_popup_menu = menu; } @@ -591,18 +687,40 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) * Systray Menu * ************************************************************************/ -void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf - ) +void QVLCMenu::updateSystrayMenu( MainInterface *mi, + intf_thread_t *p_intf, + bool b_force_visible ) { POPUP_BOILERPLATE; + + /* Get the systray menu and clean it */ QMenu *sysMenu = mi->getSysTrayMenu(); sysMenu->clear(); - POPUP_PLAY_ENTRIES( sysMenu ); + + /* Hide / Show VLC and cone */ + if( mi->isVisible() || b_force_visible ) + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr( "Hide VLC media player in taskbar" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + else + { + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr( "Show VLC media player" ), mi, + SLOT( toggleUpdateSystrayMenu() ) ); + } + sysMenu->addSeparator(); + PopupMenuControlEntries( sysMenu, p_intf, p_input ); - /* FIXME DP_SADD( menu, qtr("&Hide/show") , "", "", quit(), "" );*/ - DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" ); + sysMenu->addSeparator(); + addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "", + ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" ); + addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "", + ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" ); + /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); } @@ -613,9 +731,11 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf /************************************************************************* * Builders for automenus *************************************************************************/ -QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, - vector< const char *> & varnames, - vector & objects, bool append ) +QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, + QMenu *current, + vector< const char *> & varnames, + vector & objects, + bool append ) { QMenu *menu = current; if( !menu ) @@ -626,57 +746,49 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current, currentGroup = NULL; vlc_object_t *p_object; - vlc_bool_t b_section_empty = VLC_FALSE; + bool b_section_empty = false; int i; -#define APPEND_EMPTY { QAction *action = menu->addAction( qtr("Empty" ) ); \ +#define APPEND_EMPTY { QAction *action = menu->addAction( qtr( "Empty" ) ); \ action->setEnabled( false ); } - for( i = 0; i < (int)objects.size() ; i++ ) + for( i = 0; i < ( int )objects.size() ; i++ ) { if( !varnames[i] || !*varnames[i] ) { if( b_section_empty ) APPEND_EMPTY; menu->addSeparator(); - b_section_empty = VLC_TRUE; + b_section_empty = true; continue; } - if( objects[i] == 0 ) - { - /// \bug What is this ? - // Append( menu, varnames[i], NULL ); - b_section_empty = VLC_FALSE; - continue; - } - - p_object = (vlc_object_t *)vlc_object_get( p_intf, - objects[i] ); + p_object = objects[i]; if( p_object == NULL ) continue; - b_section_empty = VLC_FALSE; + b_section_empty = false; /* Ugly specific stuff */ - if( strstr(varnames[i], "intf-add" ) ) + if( strstr( varnames[i], "intf-add" ) ) CreateItem( menu, varnames[i], p_object, false ); else CreateItem( menu, varnames[i], p_object, true ); - vlc_object_release( p_object ); } /* Special case for empty menus */ if( menu->actions().size() == 0 || b_section_empty ) APPEND_EMPTY - return menu; + return menu; } +#undef APPEND_EMPTY /***************************************************************************** * Private methods. *****************************************************************************/ -static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, - bool b_root = TRUE ) +static bool IsMenuEmpty( const char *psz_var, + vlc_object_t *p_object, + bool b_root = true ) { vlc_value_t val, val_list; int i_type, i_result, i; @@ -685,31 +797,29 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object, i_type = var_Type( p_object, psz_var ); /* Check if we want to display the variable */ - if( !(i_type & VLC_VAR_HASCHOICE) ) return FALSE; + if( !( i_type & VLC_VAR_HASCHOICE ) ) return false; var_Change( p_object, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL ); - if( val.i_int == 0 ) return TRUE; + if( val.i_int == 0 ) return true; - if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE ) + if( ( i_type & VLC_VAR_TYPE ) != VLC_VAR_VARIABLE ) { - /* Very evil hack ! intf-switch can have only one value */ - if( !strcmp( psz_var, "intf-switch" ) ) return FALSE; - if( val.i_int == 1 && b_root ) return TRUE; - else return FALSE; + if( val.i_int == 1 && b_root ) return true; + else return false; } /* Check children variables in case of VLC_VAR_VARIABLE */ if( var_Change( p_object, psz_var, VLC_VAR_GETLIST, &val_list, NULL ) < 0 ) { - return TRUE; + return true; } - for( i = 0, i_result = TRUE; i < val_list.p_list->i_count; i++ ) + for( i = 0, i_result = true; i < val_list.p_list->i_count; i++ ) { if( !IsMenuEmpty( val_list.p_list->p_values[i].psz_string, - p_object, FALSE ) ) + p_object, false ) ) { - i_result = FALSE; + i_result = false; break; } } @@ -754,10 +864,10 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, /* Append choices menu */ if( b_submenu ) { - QMenu *submenu = new QMenu(); + QMenu *submenu = new QMenu( menu ); submenu->setTitle( qfu( text.psz_string ? text.psz_string : psz_var ) ); - if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0) + if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 ) menu->addMenu( submenu ); } else @@ -773,14 +883,14 @@ void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var, case VLC_VAR_VOID: var_Get( p_object, psz_var, &val ); CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL, - p_object->i_object_id, val, i_type ); + p_object, val, i_type ); break; case VLC_VAR_BOOL: var_Get( p_object, psz_var, &val ); val.b_bool = !val.b_bool; CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_CHECK, - p_object->i_object_id, val, i_type, !val.b_bool ); + p_object, val, i_type, !val.b_bool ); break; } FREENULL( text.psz_string ); @@ -818,8 +928,9 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, { return VLC_EGENERIC; } + #define NORMAL_OR_RADIO i_type & VLC_VAR_ISCOMMAND ? ITEM_NORMAL: ITEM_RADIO -#define NOTCOMMAND !(i_type & VLC_VAR_ISCOMMAND) +#define NOTCOMMAND !( i_type & VLC_VAR_ISCOMMAND ) #define CURVAL val_list.p_list->p_values[i] #define CURTEXT text_list.p_list->p_values[i].psz_string @@ -827,7 +938,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, { vlc_value_t another_val; QString menutext; - QMenu *subsubmenu = new QMenu(); + QMenu *subsubmenu = new QMenu( submenu ); switch( i_type & VLC_VAR_TYPE ) { @@ -842,19 +953,19 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, another_val.psz_string = strdup( CURVAL.psz_string ); menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string ); CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, another_val, i_type, + p_object, another_val, i_type, NOTCOMMAND && val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); break; case VLC_VAR_INTEGER: var_Get( p_object, psz_var, &val ); if( CURTEXT ) menutext = qfu( CURTEXT ); - else menutext.sprintf( "%d", CURVAL.i_int); + else menutext.sprintf( "%d", CURVAL.i_int ); CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, CURVAL, i_type, + p_object, CURVAL, i_type, NOTCOMMAND && CURVAL.i_int == val.i_int ); break; @@ -863,7 +974,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, if( CURTEXT ) menutext = qfu( CURTEXT ); else menutext.sprintf( "%.2f", CURVAL.f_float ); CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO, - p_object->i_object_id, CURVAL, i_type, + p_object, CURVAL, i_type, NOTCOMMAND && CURVAL.f_float == val.f_float ); break; @@ -885,7 +996,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, QString text, QString help, - int i_item_type, int i_object_id, + int i_item_type, vlc_object_t *object, vlc_value_t val, int i_val_type, bool checked ) { @@ -901,7 +1012,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, { action->setCheckable( true ); if( !currentGroup ) - currentGroup = new QActionGroup(menu); + currentGroup = new QActionGroup( menu ); currentGroup->addAction( action ); } @@ -909,7 +1020,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, { action->setChecked( true ); } - MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type, + MenuItemData *itemData = new MenuItemData( object, i_val_type, val, psz_var ); CONNECT( action, triggered(), THEDP->menusMapper, map() ); THEDP->menusMapper->setMapping( action, itemData ); @@ -918,10 +1029,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data ) { - MenuItemData *itemData = qobject_cast(data); - vlc_object_t *p_object = (vlc_object_t *)vlc_object_get( p_intf, - itemData->i_object_id ); - if( p_object == NULL ) return; + MenuItemData *itemData = qobject_cast( data ); + var_Set( itemData->obj, itemData->psz_var, itemData->val ); +} - var_Set( p_object, itemData->psz_var, itemData->val ); - vlc_object_release( p_object );}