X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=055534b7e0f63fe41a2fae5d05f6ebd6efee9b85;hb=fc63146c8032cc927aca5e2e21d08f2b32135c79;hp=0766020abd0cc143ad11f7f72d3756874a29179e;hpb=4646b8a45d15d6842e42fc488bb1a338ec7a1d27;p=vlc diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 0766020abd..055534b7e0 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -4,7 +4,7 @@ * 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 @@ -22,10 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef WIN32 -# include -#endif - #include #include "main_interface.hpp" @@ -52,24 +48,24 @@ static QActionGroup *currentGroup; // Add static entries to menus #define DP_SADD( menu, text, help, icon, slot, shortcut ) \ { \ - if( strlen(icon) > 0 ) \ + if( strlen( icon ) > 0 ) \ { \ - if( strlen(shortcut) > 0 ) \ + if( strlen( shortcut ) > 0 ) \ { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ), \ - qtr(shortcut) );\ + menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ), \ + qtr( shortcut ) );\ } \ else \ { \ - menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ) );\ + menu->addAction( QIcon( icon ), text, THEDP, SLOT( slot ) );\ } \ } \ else \ { \ - if( strlen(shortcut) > 0 ) \ + if( strlen( shortcut ) > 0 ) \ { \ menu->addAction( text, THEDP, SLOT( slot ), \ - qtr(shortcut) ); \ + qtr( shortcut ) ); \ } \ else \ { \ @@ -79,10 +75,10 @@ static QActionGroup *currentGroup; } #define MIM_SADD( menu, text, help, icon, slot ) \ { \ - if( strlen(icon) > 0 ) \ + if( strlen( icon ) > 0 ) \ { \ QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \ - action->setIcon(QIcon(icon)); \ + action->setIcon( QIcon( icon ) ); \ } \ else \ { \ @@ -152,6 +148,7 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, /***************************************************************************** * All normal menus + * Simple Code *****************************************************************************/ #define BAR_ADD( func, title ) { \ @@ -163,24 +160,14 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \ THEDP->menusUpdateMapper->setMapping( menu, f ); } +/** + * Main Menu Bar Creation + **/ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, bool playlist, bool adv_controls_enabled, 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 QMenuBar *bar = mi->menuBar(); -#ifndef WIN32 - pthread_sigmask (SIG_BLOCK, &set, NULL); -#endif BAR_ADD( FileMenu(), qtr("&Media") ); if( playlist ) { @@ -194,38 +181,66 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, BAR_ADD( HelpMenu(), qtr("&Help" ) ); } + +/** + * 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(), + DP_SADD( menu, qtr("Open &File..." ), "", + ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" ); + + /* Folder vs. Directory */ +#ifdef WIN32 + DP_SADD( menu, qtr( "Open Folder..." ), "", + ":/pixmaps/vlc_folder-grey_16px.png", openDirDialog(), "Ctrl+F" ); +#else + DP_SADD( menu, qtr( "Open Directory..." ), "", + ":/pixmaps/vlc_folder-grey_16px.png", openDirDialog(), "Ctrl+F" ); +#endif /* WIN32 */ + + DP_SADD( menu, qtr("Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png", + openDiscDialog(), "Ctrl+D" ); + DP_SADD( menu, qtr("Open &Network..." ), "", + ":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" ); + DP_SADD( menu, qtr("Open &Capture Device..." ), "", + ":/pixmaps/vlc_capture-card_16px.png", openCaptureDialog(), "Ctrl+C" ); menu->addSeparator(); - DP_SADD( menu, qtr("&Streaming..."), "", "", openThenStreamingDialogs(), - "Ctrl+S" ); - DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", openThenTranscodingDialogs(), - "Ctrl+R" ); + DP_SADD( menu, qtr("&Streaming..."), "", ":/pixmaps/vlc_stream_16px.png", + openThenStreamingDialogs(), "Ctrl+S" ); + DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", + openThenTranscodingDialogs(), "Ctrl+R" ); menu->addSeparator(); - DP_SADD( menu, qtr("&Quit") , "", "", quit(), "Ctrl+Q"); + DP_SADD( menu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", quit(), + "Ctrl+Q"); return menu; } +/* Playlist Menu, undocked when playlist is undocked */ QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); menu->addMenu( SDMenu( p_intf ) ); + menu->addAction ( QIcon(":/pixmaps/vlc_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" ); + DP_SADD( menu, qtr( I_PL_LOAD ), "", "", openPlaylist(), "Ctrl+X" ); + DP_SADD( menu, qtr( I_PL_SAVE ), "", "", savePlaylist(), "Ctrl+Y" ); menu->addSeparator(); menu->addAction( qtr("Undock from interface"), mi, SLOT( undockPlaylist() ), qtr("Ctrl+U") ); return menu; } +/** + * Tools/View Menu + * This is kept in the same menu for now, but could change if it gets much + * longer. + **/ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, bool adv_controls_enabled, bool visual_selector_enabled, bool with_intf ) @@ -238,37 +253,51 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, menu->addMenu( intfmenu ); menu->addSeparator(); } - DP_SADD( menu, qtr(I_MENU_MSG), "", ":/pixmaps/vlc_messages_16px.png", + DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/vlc_messages_16px.png", messagesDialog(), "Ctrl+M" ); - DP_SADD( menu, qtr(I_MENU_INFO) , "", ":/pixmaps/vlc_info_16px.png", - 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" ); + DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+J" ); + DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/vlc_info_16px.png", + mediaCodecDialog(), "Ctrl+I" ); + DP_SADD( menu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(), "Ctrl+T" ); +#if 0 /* Not Implemented yet */ + DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" ); + DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" ); +#endif menu->addSeparator(); if( mi ) { QAction *adv = menu->addAction( qtr("Advanced controls" ), - mi, SLOT( advanced() ) ); + mi, SLOT( toggleAdvanced() ) ); adv->setCheckable( true ); if( adv_controls_enabled ) adv->setChecked( true ); -#if 0 + + menu->addAction( qtr( "Hide Menus..." ), mi, SLOT( toggleMenus() ), + qtr( "Ctrl+H") ); + menu->addSeparator(); + +#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() ) ); + menu->addAction ( QIcon(":/pixmaps/vlc_playlist_16px.png"), + qtr( "Playlist"), mi, SLOT( togglePlaylist() ), + qtr( "Ctrl+L") ); } - DP_SADD( menu, qtr(I_MENU_EXT), "","",extendedDialog(), "Ctrl+E" ); - DP_SADD( menu, qtr("Hide Menus..."), "","",hideMenus(), "Ctrl+H" ); + DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/vlc_settings_16px.png", + extendedDialog() , "Ctrl+E" ); + menu->addSeparator(); - DP_SADD( menu, qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" ); + DP_SADD( menu, qtr("Preferences"), "", ":/pixmaps/vlc_preferences_16px.png", + 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; @@ -282,7 +311,7 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) if( !p_intf->pf_show_dialog ) { menu->addSeparator(); - menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()), + menu->addAction( qtr("Switch to skins"), THEDP, SLOT( switchToSkins() ), QString("Ctrl+Z") ); } @@ -291,6 +320,9 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current ) return menu; } +/** + * Main Audio Menu + */ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) { vector objects; @@ -314,7 +346,10 @@ 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; @@ -340,6 +375,10 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } +/** + * Navigation Menu + * For DVD, MP4, MOV and other chapter based format + **/ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current ) { vlc_object_t *p_object; @@ -359,57 +398,70 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current ) return Populate( p_intf, current, varnames, objects ); } +/** + * Service Discovery Menu + **/ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) { QMenu *menu = new QMenu(); - menu->setTitle( qtr(I_PL_SD) ); + 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" ) ) + if( module_IsCapable( p_parser, "services_discovery" ) ) i_num++; } 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" ) ) + if( !module_IsCapable( p_parser, "services_discovery" ) ) + continue; + + QAction *a = new QAction( qfu( module_GetLongName( p_parser ) ), 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] + : module_GetObjName( p_parser ) ) ) + a->setChecked( true ); + CONNECT( a , triggered(), THEDP->SDMapper, map() ); + THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] : + module_GetObjName( p_parser ) ); + menu->addAction( a ); + + if( !strcmp( p_parser->psz_object_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() ); } } vlc_list_release( p_list ); return menu; } - +/** + * Help/About Menu +**/ QMenu *QVLCMenu::HelpMenu() { QMenu *menu = new QMenu(); - DP_SADD( menu, qtr("Help") , "", ":/pixmaps/vlc_help_16px.png", helpDialog(), "F1" ); + DP_SADD( menu, qtr("Help") , "", ":/pixmaps/vlc_help_16px.png", + helpDialog(), "F1" ); menu->addSeparator(); - DP_SADD( menu, qtr(I_MENU_ABOUT), "", "", aboutDialog(), "Ctrl+F1"); + DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1"); return menu; } /***************************************************************************** - * Popup menus * + * Popup menus - Right Click menus * *****************************************************************************/ #define POPUP_BOILERPLATE \ unsigned int i_last_separator = 0; \ @@ -426,9 +478,9 @@ QMenu *QVLCMenu::HelpMenu() i_last_separator = 0; #define POPUP_PLAY_ENTRIES( menu )\ - vlc_value_t val; \ if( p_input ) \ { \ + vlc_value_t val; \ var_Get( p_input, "state", &val ); \ if( val.i_int == PLAYING_S ) \ MIM_SADD( menu, qtr("Pause"), "", ":/pixmaps/vlc_pause_16px.png", \ @@ -446,10 +498,7 @@ QMenu *QVLCMenu::HelpMenu() prev() ); \ MIM_SADD( menu, qtr("Next"), "", ":/pixmaps/vlc_next_16px.png", next() ); -#define POPUP_STATIC_ENTRIES \ - POPUP_PLAY_ENTRIES( menu ); \ - \ - menu->addSeparator(); \ +#define POPUP_STATIC_ENTRIES( menu ) \ QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \ intfmenu->setTitle( qtr("Interfaces" ) ); \ menu->addMenu( intfmenu ); \ @@ -473,6 +522,7 @@ QMenu *QVLCMenu::HelpMenu() \ DP_SADD( menu, qtr("Quit"), "", "", quit() , "Ctrl+Q" ); +/* Video Tracks and Subtitles tracks */ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; @@ -495,6 +545,7 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf ) CREATE_POPUP; } +/* Audio Tracks */ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) { POPUP_BOILERPLATE; @@ -515,10 +566,12 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf ) 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 ); @@ -529,14 +582,19 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf ) QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); + + menu->addSeparator(); + POPUP_PLAY_ENTRIES( menu ); + menu->addSeparator(); - POPUP_STATIC_ENTRIES; + POPUP_STATIC_ENTRIES( 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 ) @@ -579,7 +637,9 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) QMenu *menu = new QMenu(); Populate( p_intf, menu, varnames, objects ); menu->addSeparator(); - POPUP_STATIC_ENTRIES; + POPUP_PLAY_ENTRIES( menu ); + menu->addSeparator(); + POPUP_STATIC_ENTRIES( menu ); p_intf->p_sys->p_popup_menu = menu; } @@ -597,28 +657,40 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) * Systray Menu * ************************************************************************/ -void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, - bool b_force_visible ) +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(); + + /* Hide / Show VLC and cone */ if( mi->isVisible() || b_force_visible ) { - sysMenu->addAction( qtr("Hide VLC media player"), mi, + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr("Hide VLC media player"), mi, SLOT( toggleUpdateSystrayMenu() ) ); } else { - sysMenu->addAction( qtr("Show VLC media player"), mi, + sysMenu->addAction( QIcon( ":/vlc16.png" ), + qtr("Show VLC media player"), mi, SLOT( toggleUpdateSystrayMenu() ) ); } + sysMenu->addSeparator(); POPUP_PLAY_ENTRIES( sysMenu ); + sysMenu->addSeparator(); - DP_SADD( sysMenu, qtr("&Open Media" ), "", "", openFileDialog(), "" ); - DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" ); + DP_SADD( sysMenu, qtr("&Open Media" ), "", + ":/pixmaps/vlc_file-wide_16px.png", openFileDialog(), "" ); + DP_SADD( sysMenu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", + quit(), "" ); + /* Set the menu */ mi->getSysTray()->setContextMenu( sysMenu ); } @@ -917,7 +989,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 ); } @@ -940,4 +1012,6 @@ void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data ) if( p_object == NULL ) return; var_Set( p_object, itemData->psz_var, itemData->val ); - vlc_object_release( p_object );} + vlc_object_release( p_object ); +} +