/*****************************************************************************
* menus.cpp : Qt menus
*****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright ( C ) 2006-2007 the VideoLAN team
* $Id$
*
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <QMenu>
-#include <QMenuBar>
-#include <QAction>
-#include <QActionGroup>
-#include <QSignalMapper>
-
-#ifndef WIN32
-# include <signal.h>
-#endif
-
#include <vlc_intf_strings.h>
#include "main_interface.hpp"
#include "dialogs_provider.hpp"
#include "input_manager.hpp"
+#include <QMenu>
+#include <QMenuBar>
+#include <QAction>
+#include <QActionGroup>
+#include <QSignalMapper>
+#include <QSystemTrayIcon>
+
enum
{
ITEM_NORMAL,
static QActionGroup *currentGroup;
// Add static entries to menus
-#define DP_SADD( text, help, icon, slot, shortcut ) \
- { \
- if( strlen(icon) > 0 ) \
+#define DP_SADD( menu, text, help, icon, slot, shortcut ) \
+{ \
+ if( strlen( icon ) > 0 ) \
{ \
- if( strlen(shortcut) > 0 ) \
+ if( strlen( shortcut ) > 0 ) \
{ \
- menu->addAction( QIcon(icon), text, THEDP, SLOT( slot ), \
- tr(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 \
{ \
menu->addAction( text, THEDP, SLOT( slot ) ); \
} \
} \
- }
-#define MIM_SADD( text, help, icon, slot ) \
- { \
- if( strlen(icon) > 0 ) \
+}
+#define MIM_SADD( menu, text, help, icon, slot ) \
+{ \
+ if( strlen( icon ) > 0 ) \
{ \
QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); \
- action->setIcon(QIcon(icon)); \
+ action->setIcon( QIcon( icon ) ); \
} \
else \
{ \
menu->addAction( text, THEMIM, SLOT( slot ) ); \
} \
- }
+}
#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->i_object_id )
#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
- objects.push_back( 0 ); varnames.push_back( "" ); \
- i_last_separator = objects.size(); }
+ objects.push_back( 0 ); varnames.push_back( "" ); \
+ i_last_separator = objects.size(); }
static int InputAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
- vector<const char *> &varnames )
+ vector<int> &objects,
+ vector<const char *> &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" );
}
static int VideoAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
- vector<const char *> &varnames )
+ vector<int> &objects,
+ vector<const char *> &varnames )
{
PUSH_VAR( "fullscreen" );
PUSH_VAR( "zoom" );
PUSH_VAR( "directx-wallpaper" );
PUSH_VAR( "video-snapshot" );
- vlc_object_t *p_dec_obj = (vlc_object_t *)vlc_object_find( p_object,
- VLC_OBJECT_DECODER,
- FIND_PARENT );
+ vlc_object_t *p_dec_obj = ( vlc_object_t * )vlc_object_find( p_object,
+ VLC_OBJECT_DECODER,
+ FIND_PARENT );
if( p_dec_obj != NULL )
{
vlc_object_t *p_object = p_dec_obj;
}
static int AudioAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &objects,
- vector<const char *> &varnames )
+ vector<int> &objects,
+ vector<const char *> &varnames )
{
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
/*****************************************************************************
* 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 ); }
+/**
+ * Main Menu Bar Creation
+ **/
void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
- bool playlist, bool adv_controls_enabled,
- bool visual_selector_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 )
- {
- 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, 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(), qtr( "&Help" ) );
}
+
+/**
+ * Media ( File ) Menu
+ * Opening, streaming and quit
+ **/
QMenu *QVLCMenu::FileMenu()
{
QMenu *menu = new QMenu();
- DP_SADD( qtr("Open &File..." ), "", "", openFileDialog(), "Ctrl+O" );
- DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" );
- DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog(), "Ctrl+N" );
- DP_SADD( qtr("Open &Capture Device..." ), "", "", openCaptureDialog(),
+
+ DP_SADD( menu, qtr( "&Open File..." ), "",
+ ":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" );
+ DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
+ ":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
+ DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/disc_16px.png",
+ openDiscDialog(), "Ctrl+D" );
+ DP_SADD( menu, qtr( "Open &Network..." ), "",
+ ":/pixmaps/network_16px.png", openNetDialog(), "Ctrl+N" );
+ DP_SADD( menu, qtr( "Open &Capture Device..." ), "",
+ ":/pixmaps/capture-card_16px.png", openCaptureDialog(),
"Ctrl+C" );
menu->addSeparator();
- DP_SADD( qtr("&Streaming..."), "", "", openThenStreamingDialogs(),
- "Ctrl+S" );
+
+ DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/menus_stream_16px.png",
+ openThenStreamingDialogs(), "Ctrl+S" );
+ DP_SADD( menu, qtr( "Conve&rt / Save..." ), "", "",
+ openThenTranscodingDialogs(), "Ctrl+R" );
+
menu->addSeparator();
- DP_SADD( qtr("&Quit") , "", "", quit(), "Ctrl+Q");
+ DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", quit(),
+ "Ctrl+Q" );
return menu;
}
-QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
+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( qtr(I_PL_LOAD), "", "", openPlaylist(), "Ctrl+L" );
- DP_SADD( 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") );
+ 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 )
+ bool visual_selector_enabled,
+ bool with_intf )
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu;
+ if( mi )
+ {
+ menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+ qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
+ qtr( "Ctrl+L" ) );
+ }
+ DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/menus_settings_16px.png",
+ extendedDialog() , "Ctrl+E" );
+
+ menu->addSeparator();
+
if( with_intf )
{
QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
- intfmenu->setTitle( qtr("Interfaces" ) );
+ intfmenu->setTitle( qtr( "Add Interfaces" ) );
menu->addMenu( intfmenu );
menu->addSeparator();
}
- DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog(), "Ctrl+M" );
- DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog(), "Ctrl+J" );
- DP_SADD( qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog(), "Ctrl+I" );
- 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" ),
- mi, SLOT( visual() ) );
+ /* Minimal View */
+ QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
+ SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
+ //FIXME: remove useless thing. But keep it until the release, pls.
+ action->setCheckable( true );
+ if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE )
+ action->setChecked( true );
+
+ /* 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
}
- DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog(), "Ctrl+E" );
- DP_SADD( qtr(I_MENU_GOTOTIME), "","",gotoTimeDialog(), "Ctrl+T" );
+
+ menu->addSeparator();
+
+
+ DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/menus_messages_16px.png",
+ messagesDialog(), "Ctrl+M" );
+ DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" );
+ DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/menus_info_16px.png",
+ mediaCodecDialog(), "Ctrl+J" );
+
+#if 0 /* Not Implemented yet */
+ DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" );
+#endif
+ DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" );
+
+
menu->addSeparator();
- DP_SADD( qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" );
+ DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/menus_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<int> objects;
if( !p_intf->pf_show_dialog )
{
menu->addSeparator();
- menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()),
- qtr("Ctrl+Z") );
+ menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
+ QString( "Ctrl+Z" ) );
}
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
return menu;
}
+/**
+ * Main Audio Menu
+ */
QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
{
vector<int> objects;
vector<const char *> varnames;
- vlc_object_t *p_object = (vlc_object_t *)vlc_object_find( p_intf,
- VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_find( p_intf,
+ VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_object != NULL )
{
PUSH_VAR( "audio-es" );
vlc_object_release( p_object );
}
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
if( p_object )
{
AudioAutoMenuBuilder( p_object, objects, varnames );
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<int> objects;
vector<const char *> varnames;
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
+ p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
if( p_object != NULL )
{
PUSH_VAR( "video-es" );
vlc_object_release( p_object );
}
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
if( p_object != NULL )
{
VideoAutoMenuBuilder( p_object, objects, varnames );
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 *navMenu )
{
vlc_object_t *p_object;
vector<int> objects;
vector<const char *> varnames;
/* FIXME */
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
+ 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" );
+ 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 );
+ navMenu = new QMenu();
+ DP_SADD( navMenu, qtr( I_MENU_GOTOTIME ), "","", 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 );
+ 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;
}
-
+/**
+ * Help/About Menu
+**/
QMenu *QVLCMenu::HelpMenu()
{
QMenu *menu = new QMenu();
- DP_SADD( qtr("Help") , "", "", helpDialog(), "F1" );
+ DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png",
+ helpDialog(), "F1" );
+ DP_SADD( menu, qtr( "Update" ) , "", "", updateDialog(), "");
menu->addSeparator();
- DP_SADD( qtr(I_MENU_ABOUT), "", "", aboutDialog(), "Ctrl+Shift+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; \
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_STATIC_ENTRIES \
- vlc_value_t val; \
+#define POPUP_PLAY_ENTRIES( menu )\
if( p_input ) \
{ \
+ vlc_value_t val; \
var_Get( p_input, "state", &val ); \
- if( val.i_int == PAUSE_S ) \
- MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \
+ if( val.i_int == PLAYING_S ) \
+ MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/pause_16px.png", \
+ togglePlayPause() ) \
else \
- MIM_SADD( qtr("Pause"), "", "", togglePlayPause() ) \
+ MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
+ togglePlayPause() ) \
} \
else if( THEPL->items.i_size && THEPL->i_enabled ) \
- MIM_SADD( qtr("Play"), "", "", togglePlayPause() );\
+ MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
+ togglePlayPause() ); \
+ \
+ MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", stop() ); \
+ MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/previous_16px.png", \
+ prev() ); \
+ MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", next() );
+
+#define POPUP_STATIC_ENTRIES( menu ) \
+ QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); \
+ 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 ); \
\
- MIM_SADD( qtr("Stop"), "", "", stop() ); \
- MIM_SADD( qtr("Previous"), "", "", prev() ); \
- MIM_SADD( qtr("Next"), "", "", next() ); \
menu->addSeparator(); \
- QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \
- intfmenu->setTitle( qtr("Interfaces" ) ); \
- menu->addMenu( intfmenu ); \
+ QMenu *helpmenu = HelpMenu(); \
+ helpmenu->setTitle( qtr( "Help" ) ); \
+ menu->addMenu( helpmenu ); \
\
- QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \
- toolsmenu->setTitle( qtr("Tools" ) ); \
- menu->addMenu( toolsmenu ); \
- DP_SADD( qtr("Quit"), "", "", quit() , "Ctrl+Q" );
+ DP_SADD( menu, qtr( "Quit" ), "", "", quit() , "Ctrl+Q" );
+/* Video Tracks and Subtitles tracks */
void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
objects.push_back( p_input->i_object_id );
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 );
+ 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_input );
}
+ QMenu *menu = new QMenu();
CREATE_POPUP;
}
+/* Audio Tracks */
void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
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,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ 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_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();
- POPUP_STATIC_ENTRIES;
+ POPUP_PLAY_ENTRIES( menu );
+
+ menu->addSeparator();
+ 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 )
{
- // create a popup if there is none
+ // create a popup if there is none
if( ! p_intf->p_sys->p_popup_menu )
- {
- POPUP_BOILERPLATE;
- if( p_input )
- {
- vlc_object_yield( p_input );
- InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames );
-
- /* Video menu */
- PUSH_SEPARATOR;
- varnames.push_back( "video-es" );
- objects.push_back( p_input->i_object_id );
- 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 );
- 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 );
- }
- }
-
- QMenu *menu = new QMenu();
- Populate( p_intf, menu, varnames, objects );
- menu->addSeparator();
- POPUP_STATIC_ENTRIES;
-
- p_intf->p_sys->p_popup_menu = menu;
- }
- p_intf->p_sys->p_popup_menu->popup( QCursor::pos() );
+ {
+ POPUP_BOILERPLATE;
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
+
+ /* 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 );
+ }
+
+ /* Video menu */
+ PUSH_SEPARATOR;
+ varnames.push_back( "video-es" );
+ objects.push_back( p_input->i_object_id );
+ 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 );
+ if( p_vout )
+ {
+ VideoAutoMenuBuilder( p_vout, objects, varnames );
+ vlc_object_release( p_vout );
+ }
+ }
+
+ QMenu *menu = new QMenu();
+ Populate( p_intf, menu, varnames, objects );
+ menu->addSeparator();
+ POPUP_PLAY_ENTRIES( menu );
+ menu->addSeparator();
+ POPUP_STATIC_ENTRIES( 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;
+ }
+}
+
+/************************************************************************
+ * Systray Menu *
+ ************************************************************************/
+
+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( QIcon( ":/vlc16.png" ),
+ qtr( "Hide VLC media player in taskbar" ), mi,
+ SLOT( toggleUpdateSystrayMenu() ) );
}
else
- {
- // destroy popup if there is one
- delete p_intf->p_sys->p_popup_menu;
- p_intf->p_sys->p_popup_menu = NULL;
+ {
+ 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" ), "",
+ ":/pixmaps/file-wide_16px.png", openFileDialog(), "" );
+ DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png",
+ quit(), "" );
+
+ /* Set the menu */
+ mi->getSysTray()->setContextMenu( sysMenu );
}
#undef PUSH_VAR
#undef PUSH_SEPARATOR
+
/*************************************************************************
* Builders for automenus
*************************************************************************/
QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current,
- vector< const char *> & varnames,
- vector<int> & objects, bool append )
+ vector< const char *> & varnames,
+ vector<int> & objects, bool append )
{
QMenu *menu = current;
if( !menu )
vlc_bool_t b_section_empty = VLC_FALSE;
int i;
-#define APPEND_EMPTY { QAction *action = menu->addAction( qtr("Empty" ) ); \
- action->setEnabled( false ); }
+#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] )
{
continue;
}
- if( objects[i] == 0 )
+ if( objects[i] == 0 )
{
/// \bug What is this ?
// Append( menu, varnames[i], NULL );
continue;
}
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- objects[i] );
+ p_object = ( vlc_object_t * )vlc_object_get( p_intf,
+ objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_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 );
*****************************************************************************/
static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object,
- bool b_root = TRUE )
+ bool b_root = TRUE )
{
vlc_value_t val, val_list;
int i_type, i_result, i;
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( (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;
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;
break;
}
void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var,
- vlc_object_t *p_object, bool b_submenu )
+ vlc_object_t *p_object, bool b_submenu )
{
vlc_value_t val, text;
int i_type;
switch( i_type & VLC_VAR_TYPE )
{
- case VLC_VAR_VOID:
- case VLC_VAR_BOOL:
- case VLC_VAR_VARIABLE:
- case VLC_VAR_STRING:
- case VLC_VAR_INTEGER:
- case VLC_VAR_FLOAT:
- break;
- default:
- /* Variable doesn't exist or isn't handled */
- return;
+ case VLC_VAR_VOID:
+ case VLC_VAR_BOOL:
+ case VLC_VAR_VARIABLE:
+ case VLC_VAR_STRING:
+ case VLC_VAR_INTEGER:
+ case VLC_VAR_FLOAT:
+ break;
+ default:
+ /* Variable doesn't exist or isn't handled */
+ return;
}
/* Make sure we want to display the variable */
{
QMenu *submenu = new QMenu();
submenu->setTitle( qfu( text.psz_string ?
- text.psz_string : psz_var ) );
- if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0)
+ text.psz_string : psz_var ) );
+ if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 )
menu->addMenu( submenu );
}
else
switch( i_type & VLC_VAR_TYPE )
{
- 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 );
- 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 );
- break;
+ 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 );
+ 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 );
+ break;
}
FREENULL( text.psz_string );
}
int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
- vlc_object_t *p_object, bool b_root )
+ vlc_object_t *p_object, bool b_root )
{
vlc_value_t val, val_list, text_list;
int i_type, i;
switch( i_type & VLC_VAR_TYPE )
{
- case VLC_VAR_VOID:
- case VLC_VAR_BOOL:
- case VLC_VAR_VARIABLE:
- case VLC_VAR_STRING:
- case VLC_VAR_INTEGER:
- case VLC_VAR_FLOAT:
- break;
- default:
- /* Variable doesn't exist or isn't handled */
- return VLC_EGENERIC;
+ case VLC_VAR_VOID:
+ case VLC_VAR_BOOL:
+ case VLC_VAR_VARIABLE:
+ case VLC_VAR_STRING:
+ case VLC_VAR_INTEGER:
+ case VLC_VAR_FLOAT:
+ break;
+ default:
+ /* Variable doesn't exist or isn't handled */
+ return VLC_EGENERIC;
}
if( var_Change( p_object, psz_var, VLC_VAR_GETLIST,
- &val_list, &text_list ) < 0 )
+ &val_list, &text_list ) < 0 )
{
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
switch( i_type & VLC_VAR_TYPE )
{
- case VLC_VAR_VARIABLE:
- CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false );
- subsubmenu->setTitle( qfu( CURTEXT ? CURTEXT :CURVAL.psz_string ) );
- submenu->addMenu( subsubmenu );
- break;
-
- case VLC_VAR_STRING:
- var_Get( p_object, psz_var, &val );
- another_val.psz_string = strdup( CURVAL.psz_string );
- menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
- CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, another_val, i_type,
- NOTCOMMAND && val.psz_string &&
- !strcmp( val.psz_string, CURVAL.psz_string ) );
-
- if( 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);
- CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, CURVAL, i_type,
- NOTCOMMAND && CURVAL.i_int == val.i_int );
- break;
-
- case VLC_VAR_FLOAT:
- var_Get( p_object, psz_var, &val );
- 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,
- NOTCOMMAND && CURVAL.f_float == val.f_float );
- break;
-
- default:
- break;
+ case VLC_VAR_VARIABLE:
+ CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false );
+ subsubmenu->setTitle( qfu( CURTEXT ? CURTEXT :CURVAL.psz_string ) );
+ submenu->addMenu( subsubmenu );
+ break;
+
+ case VLC_VAR_STRING:
+ var_Get( p_object, psz_var, &val );
+ another_val.psz_string = strdup( CURVAL.psz_string );
+ menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
+ CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
+ p_object->i_object_id, another_val, i_type,
+ NOTCOMMAND && val.psz_string &&
+ !strcmp( val.psz_string, CURVAL.psz_string ) );
+
+ if( 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 );
+ CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
+ p_object->i_object_id, CURVAL, i_type,
+ NOTCOMMAND && CURVAL.i_int == val.i_int );
+ break;
+
+ case VLC_VAR_FLOAT:
+ var_Get( p_object, psz_var, &val );
+ 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,
+ NOTCOMMAND && CURVAL.f_float == val.f_float );
+ break;
+
+ default:
+ break;
}
}
currentGroup = NULL;
}
void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
- QString text, QString help,
- int i_item_type, int i_object_id,
- vlc_value_t val, int i_val_type,
- bool checked )
+ QString text, QString help,
+ int i_item_type, int i_object_id,
+ vlc_value_t val, int i_val_type,
+ bool checked )
{
QAction *action = new QAction( text, menu );
action->setText( text );
{
action->setCheckable( true );
if( !currentGroup )
- currentGroup = new QActionGroup(menu);
+ currentGroup = new QActionGroup( menu );
currentGroup->addAction( action );
}
action->setChecked( true );
}
MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
- val, psz_var );
+ val, psz_var );
CONNECT( action, triggered(), THEDP->menusMapper, map() );
THEDP->menusMapper->setMapping( action, itemData );
menu->addAction( action );
void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data )
{
- MenuItemData *itemData = qobject_cast<MenuItemData *>(data);
- vlc_object_t *p_object = (vlc_object_t *)vlc_object_get( p_intf,
- itemData->i_object_id );
+ MenuItemData *itemData = qobject_cast<MenuItemData *>( data );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( p_intf,
+ itemData->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, itemData->psz_var, itemData->val );
vlc_object_release( p_object );
}
+
projects / vlc / blobdiff