/*****************************************************************************
* menus.cpp : Qt menus
*****************************************************************************
- * Copyright © 2006-2009 the VideoLAN team
+ * Copyright © 2006-2011 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* - Remove static currentGroup
*/
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <vlc_common.h>
#include <vlc_intf_strings.h>
-#include <vlc_services_discovery.h>
-#include <vlc_aout.h>
-#include <vlc_vout.h>
+#include <vlc_vout.h> /* vout_thread_t */
#include "menus.hpp"
-#include "main_interface.hpp" /* View modifications */
-#include "dialogs_provider.hpp" /* Dialogs display */
-#include "input_manager.hpp" /* Input Management */
-#include "recents.hpp" /* Recent Items */
-#include "actions_manager.hpp"
-#include "extensions_manager.hpp"
+#include "main_interface.hpp" /* View modifications */
+#include "dialogs_provider.hpp" /* Dialogs display */
+#include "input_manager.hpp" /* Input Management */
+#include "recents.hpp" /* Recent Items */
+#include "actions_manager.hpp" /* Actions Management: play+volume */
+#include "extensions_manager.hpp" /* Extensions menu*/
#include <QMenu>
#include <QMenuBar>
#include <QActionGroup>
#include <QSignalMapper>
#include <QSystemTrayIcon>
-#include <QList>
/*
This file defines the main menus and the pop-up menu (right-click menu)
and the systray menu (in that order in the file)
- There are 3 menus that have to be rebuilt everytime there are called:
- Audio, Video, Navigation
- 3 functions are building those menus: AudioMenu, VideoMenu, NavigMenu
+ There are 4 menus that have to be rebuilt everytime there are called:
+ Audio, Video, Navigation, view
+ 4 functions are building those menus: AudioMenu, VideoMenu, NavigMenu, View
and 3 functions associated are collecting the objects :
InputAutoMenuBuilder, AudioAutoMenuBuilder, VideoAutoMenuBuilder.
enum
{
- ITEM_NORMAL,
- ITEM_CHECK,
- ITEM_RADIO
+ ITEM_NORMAL, /* not a checkbox, nor a radio */
+ ITEM_CHECK, /* Checkbox */
+ ITEM_RADIO /* Radiobox */
};
static QActionGroup *currentGroup;
QMenu *QVLCMenu::recentsMenu = NULL;
-/****************************************************************************
- * Menu code helpers:
- ****************************************************************************
- * Add static entries to DP in menus
- ***************************************************************************/
+/**
+ * @brief Add static entries to DP in menus
+ **/
void addDPStaticEntry( QMenu *menu,
const QString& text,
const char *icon,
const char *member,
- const char *shortcut = NULL )
+ const char *shortcut = NULL,
+ QAction::MenuRole = QAction::NoRole
+ )
{
QAction *action = NULL;
+#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
if( !EMPTY_STR( icon ) )
{
if( !EMPTY_STR( shortcut ) )
action = menu->addAction( QIcon( icon ), text, THEDP, member );
}
else
+#endif
{
if( !EMPTY_STR( shortcut ) )
action = menu->addAction( text, THEDP, member, qtr( shortcut ) );
action->setData( STATIC_ENTRY );
}
-/***
- * Same for MIM
- ***/
+/**
+ * @brief Add static entries to MIM in menus
+ **/
QAction* addMIMStaticEntry( intf_thread_t *p_intf,
QMenu *menu,
const QString& text,
bool bStatic = false )
{
QAction *action;
- if( strlen( icon ) > 0 )
+#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
+ if( !EMPTY_STR( icon ) )
{
action = menu->addAction( text, THEMIM, member );
action->setIcon( QIcon( icon ) );
}
else
+#endif
{
action = menu->addAction( text, THEMIM, member );
}
}
/**
- * @brief Enable all static entries, disable the others
+ * @brief Enable all static entries of a menu, disable the others
+ * @param menu the menu in which the entries will be disabled
* @param enable if false, disable all entries
- */
+ **/
void EnableStaticEntries( QMenu *menu, bool enable = true )
{
if( !menu ) return;
/**
* \return Number of static entries
- */
-int DeleteNonStaticEntries( QMenu *menu )
+ **/
+inline int DeleteNonStaticEntries( QMenu *menu )
{
if( !menu ) return VLC_EGENERIC;
* Simple Code
*****************************************************************************/
-#define BAR_ADD( func, title ) { \
- QMenu *_menu = func; _menu->setTitle( title ); bar->addMenu( _menu ); }
+// Static menu
+static inline void addMenuToMainbar( QMenu *func, QString title, QMenuBar *bar ) {
+ func->setTitle( title );
+ bar->addMenu( func);
+}
+// Dynamic menu
#define BAR_DADD( func, title, id ) { \
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 ); }
-#define ACT_ADD( _menu, val, title ) { \
- QAction *_action = new QAction( title, _menu ); _action->setData( val ); \
- _menu->addAction( _action ); }
+// Add a simple action
+static inline void addAction( QMenu *_menu, QVariant val, QString title ) {
+ 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 ); }
+// Add an action with a submenu
+static inline void addActionWithSubmenu( QMenu *_menu, QVariant val, QString 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 ); }
+// Add an action that is a checkbox
+static inline void addActionWithCheckbox( QMenu *_menu, QVariant val, QString title ) {
+ QAction *_action = new QAction( title, _menu );
+ _action->setData( val );
+ _action->setCheckable( true );
+ _menu->addAction( _action );
+}
/**
* Main Menu Bar Creation
setDesktopAware set to false */
QMenuBar *bar = mi->menuBar();
- BAR_ADD( FileMenu( p_intf, bar ), qtr( "&Media" ) );
+ addMenuToMainbar( FileMenu( p_intf, bar ), qtr( "&Media" ), bar );
/* 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( ToolsMenu( bar ), qtr( "&Tools" ) );
- BAR_ADD( ViewMenu( p_intf, bar ), qtr( "V&iew" ) );
- BAR_ADD( HelpMenu( bar ), qtr( "&Help" ) );
+ addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar );
+
+ /* View menu, a bit different */
+ BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+
+ addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar );
+
}
-#undef BAR_ADD
-#undef BAR_DADD
/**
* Media ( File ) Menu
":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( "Advanced Open File..." ),
":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
- addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ),
+ addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
":/type/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ),
":/type/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
addDPStaticEntry( menu, qtr( "Open &Network Stream..." ),
":/type/network", SLOT( openNetDialog() ), "Ctrl+N" );
addDPStaticEntry( menu, qtr( "Open &Capture Device..." ),
- ":/type/capture-card", SLOT( openCaptureDialog() ),
- "Ctrl+C" );
+ ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" );
menu->addSeparator();
addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ),
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
SLOT( openAndTranscodingDialogs() ), "Ctrl+R" );
addDPStaticEntry( menu, qtr( "&Streaming..." ),
- ":/menu/stream", SLOT( openAndStreamingDialogs() ),
- "Ctrl+S" );
+ ":/menu/stream", SLOT( openAndStreamingDialogs() ), "Ctrl+S" );
menu->addSeparator();
#endif
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
":/menu/info", 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" );
"" );
addDPStaticEntry( menu, qtr( I_MENU_MSG ),
- ":/menu/messages", SLOT( messagesDialog() ),
- "Ctrl+M" );
+ ":/menu/messages", SLOT( messagesDialog() ), "Ctrl+M" );
addDPStaticEntry( menu, qtr( "Plu&gins and extensions" ),
"", SLOT( pluginDialog() ) );
menu->addSeparator();
+ addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ),
+ ":/menu/preferences", SLOT( toolbarDialog() ) );
+
addDPStaticEntry( menu, qtr( "&Preferences" ),
- ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
+ ":/menu/preferences", SLOT( prefsDialog() ), "Ctrl+P", QAction::PreferencesRole );
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
* Interface modification, load other interfaces, activate Extensions
**/
-QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
- QMenu *current,
- bool with_intf )
+QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi )
{
QAction *action;
-
QMenu *menu;
- if( !with_intf )
- menu = new QMenu( qtr( "&View" ), current );
+
+ MainInterface *mi = _mi ? _mi : p_intf->p_sys->p_mi;
+ assert( mi );
+
+ if( !current )
+ {
+ menu = new QMenu( qtr( "&View" ), mi );
+ }
else
{
menu = current;
- menu->clear();
+ //menu->clear();
+ //HACK menu->clear() does not delete submenus
+ QList<QAction*> actions = menu->actions();
+ foreach( QAction *a, actions )
+ {
+ QMenu *m = a->menu();
+ if( a->parent() == menu ) delete a;
+ else menu->removeAction( a );
+ if( m && m->parent() == menu ) delete m;
+ }
}
- MainInterface *mi = p_intf->p_sys->p_mi;
- assert( mi );
-
- menu->addAction( QIcon( ":/menu/playlist_menu" ),
+ menu->addAction(
+#ifndef __APPLE__
+ QIcon( ":/menu/playlist_menu" ),
+#endif
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 );
- menu->addSeparator();
- }
+ InterfacesMenu( p_intf, menu );
+ menu->addSeparator();
/* 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 ) );
+ action->setChecked( (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" ) );
+ SLOT( toggleInterfaceFullScreen() ), QString( "F11" ) );
action->setCheckable( true );
- action->setChecked( mi->isFullScreen() );
+ action->setChecked( mi->isInterfaceFullScreen() );
CONNECT( mi, fullscreenInterfaceToggled( bool ),
action, setChecked( bool ) );
/* Advanced Controls */
action = menu->addAction( qtr( "&Advanced Controls" ), mi,
- SLOT( toggleAdvanced() ) );
+ SLOT( toggleAdvancedButtons() ) );
action->setCheckable( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
action->setChecked( true );
- if( with_intf )
- // I don't want to manage consistency between menus, so no popup-menu
- {
- action = menu->addAction( qtr( "Quit after Playback" ) );
- action->setCheckable( true );
- CONNECT( action, triggered( bool ), THEMIM, activatePlayQuit( bool ) );
- }
+ /* Docked Playlist */
+ action = menu->addAction( qtr( "Docked Playlist" ) );
+ action->setCheckable( true );
+ action->setChecked( mi->isPlDocked() );
+ CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) );
#if 0 /* For Visualisations. Not yet working */
- adv = menu->addAction( qtr( "Visualizations selector" ),
- mi, SLOT( visual() ) );
+ 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..." ),
- ":/menu/preferences", SLOT( toolbarDialog() ) );
-
/* Extensions */
ExtensionsMenu( p_intf, menu );
if( current->isEmpty() )
{
- ACT_ADDMENU( current, "audio-es", qtr( "Audio &Track" ) );
- ACT_ADDMENU( current, "audio-channels", qtr( "Audio &Channels" ) );
- ACT_ADDMENU( current, "audio-device", qtr( "Audio &Device" ) );
+ addActionWithSubmenu( current, "audio-es", qtr( "Audio &Track" ) );
+ addActionWithSubmenu( current, "audio-channels", qtr( "Audio &Channels" ) );
+ addActionWithSubmenu( current, "audio-device", qtr( "Audio &Device" ) );
current->addSeparator();
- ACT_ADDMENU( current, "visual", qtr( "&Visualizations" ) );
+ addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) );
current->addSeparator();
QAction *action = current->addAction( qtr( "Increase Volume" ),
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.
if( current->isEmpty() )
{
- ACT_ADDMENU( current, "video-es", qtr( "Video &Track" ) );
+ addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
submenu->addSeparator();
current->addSeparator();
- ACT_ADDCHECK( current, "fullscreen", qtr( "&Fullscreen" ) );
- ACT_ADDCHECK( current, "video-on-top", qtr( "Always &On Top" ) );
- ACT_ADDCHECK( current, "video-wallpaper", qtr( "DirectX Wallpaper" ) );
+ addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) );
+ addActionWithCheckbox( current, "autoscale", qtr( "Always Fit &Window" ) );
+ addActionWithCheckbox( current, "video-on-top", qtr( "Always &on Top" ) );
#ifdef WIN32
- ACT_ADDCHECK( current, "direct3d-desktop", qtr( "Direct3D Desktop mode" ) );
+ addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) );
+#endif
+ addAction( current, "video-snapshot", qtr( "Take &Snapshot" ) );
+#ifdef WIN32
+ addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) );
#endif
- ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
-
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" ) );
+ addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) );
+ addActionWithSubmenu( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
+ addActionWithSubmenu( current, "crop", qtr( "&Crop" ) );
+ addActionWithSubmenu( current, "deinterlace", qtr( "&Deinterlace" ) );
+ addActionWithSubmenu( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) );
+ addActionWithSubmenu( current, "postprocess", qtr( "&Post processing" ) );
}
p_input = THEMIM->getInput();
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
{
QAction *action;
- QMenu *submenu = new QMenu( qtr( "&Bookmarks" ), menu );
- addDPStaticEntry( submenu, qtr( "Manage &bookmarks" ), "",
- SLOT( bookmarksDialog() ) );
+ addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
+ addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
+ addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+ addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
+
+ /* FixMe: sync I_MENU_BOOKMARK string */
+ QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+ addDPStaticEntry( submenu, qtr( "&Manage" ), "",
+ SLOT( bookmarksDialog() ), "Ctrl+B" );
submenu->addSeparator();
action = menu->addMenu( submenu );
action->setData( "bookmark" );
- 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 );
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, QWidget *parent )
-{
- QMenu *menu = new QMenu( parent );
- menu->setTitle( qtr( I_PL_SD ) );
-
- char **ppsz_longnames;
- char **ppsz_names = vlc_sd_GetNames( p_intf, &ppsz_longnames, NULL );
- if( !ppsz_names )
- return menu;
-
- char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
- for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
- {
- if( !strcmp( *ppsz_name, "podcast" ) )
- {
- QAction *b = new QAction( qtr( "Configure podcasts..." ), menu );
- //b->setEnabled( a->isChecked() );
- menu->addAction( b );
- CONNECT( b, triggered(), THEDP, podcastConfigureDialog() );
- }
- free( *ppsz_name );
- free( *ppsz_longname );
- }
- free( ppsz_names );
- free( ppsz_longnames );
- return menu;
-}
-
/**
* Help/About Menu
**/
#endif
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), ":/menu/info",
- SLOT( aboutDialog() ), "Shift+F1" );
+ SLOT( aboutDialog() ), "Shift+F1", QAction::AboutRole );
return menu;
}
* Popup menus - Right Click menus *
*****************************************************************************/
#define POPUP_BOILERPLATE \
+ static QMenu* menu = NULL; \
+ delete menu; menu = NULL; \
+ if( !show ) \
+ return; \
unsigned int i_last_separator = 0; \
vector<vlc_object_t *> objects; \
vector<const char *> varnames; \
input_thread_t *p_input = THEMIM->getInput();
#define CREATE_POPUP \
+ menu = new QMenu(); \
Populate( p_intf, menu, varnames, objects ); \
- p_intf->p_sys->p_popup_menu = menu; \
menu->popup( QCursor::pos() ); \
- p_intf->p_sys->p_popup_menu = NULL; \
i_last_separator = 0;
void QVLCMenu::PopupPlayEntries( QMenu *menu,
{
action = menu->addAction( qtr( "Play" ),
ActionsManager::getInstance( p_intf ), SLOT( play() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/menu/play" ) );
+#endif
}
else
{
/* Faster/Slower */
action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
SLOT( faster() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/faster") );
+#endif
action->setData( STATIC_ENTRY );
action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
SLOT( slower() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/slower") );
+#endif
action->setData( STATIC_ENTRY );
menu->addSeparator();
action = menu->addAction( qtr( "&Jump Forward" ), THEMIM->getIM(),
SLOT( jumpFwd() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/skip_fw") );
+#endif
action->setData( STATIC_ENTRY );
action = menu->addAction( qtr( "Jump Bac&kward" ), THEMIM->getIM(),
SLOT( jumpBwd() ) );
+#ifndef __APPLE__ /* No icons in menus in Mac */
action->setIcon( QIcon( ":/toolbar/skip_back") );
+#endif
action->setData( STATIC_ENTRY );
addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"",
SLOT( gotoTimeDialog() ), "Ctrl+T" );
":/menu/previous", SLOT( prev() ) );
addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
":/menu/next", SLOT( next() ) );
+
+ action = addMIMStaticEntry( p_intf, menu, qtr( "Quit after Playback" ), "",
+ SLOT( activatePlayQuit( bool ) ) );
+ action->setCheckable( true );
+ action->setChecked( THEMIM->getPlayExitState() );
+
menu->addSeparator();
}
QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
addDPStaticEntry( openmenu, qtr( "&Open File..." ),
":/type/file-asym", SLOT( openFileDialog() ) );
- addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ),
+ addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
":/type/folder-grey", SLOT( PLOpenDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ),
":/type/disc", SLOT( openDiscDialog() ) );
#endif
addDPStaticEntry( menu, qtr( "Quit" ), ":/menu/quit",
- SLOT( quit() ), "Ctrl+Q" );
+ SLOT( quit() ), "Ctrl+Q", QAction::QuitRole );
}
/* Video Tracks and Subtitles tracks */
-void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
+void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
vout_thread_t *p_vout = THEMIM->getVout();
vlc_object_release( p_vout );
}
}
- QMenu *menu = new QMenu();
- CREATE_POPUP;
+ CREATE_POPUP
}
/* Audio Tracks */
-void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf )
+void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
aout_instance_t *p_aout = THEMIM->getAout();
if( p_aout )
vlc_object_release( p_aout );
}
- QMenu *menu = new QMenu();
- CREATE_POPUP;
+ CREATE_POPUP
}
/* Navigation stuff, and general menus ( open ), used only for skins */
-void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf )
+void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show )
{
- POPUP_BOILERPLATE;
+ POPUP_BOILERPLATE
if( p_input )
{
PUSH_SEPARATOR;
}
- QMenu *menu = new QMenu();
+ menu = new QMenu();
Populate( p_intf, menu, varnames, objects );
menu->addSeparator();
menu->addSeparator();
PopupMenuStaticEntries( menu );
- p_intf->p_sys->p_popup_menu = menu;
menu->popup( QCursor::pos() );
- p_intf->p_sys->p_popup_menu = NULL;
}
/* Main Menu that sticks everything together */
void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
{
- /* Delete old popup if there is one */
- delete p_intf->p_sys->p_popup_menu;
-
- if( !show )
- {
- p_intf->p_sys->p_popup_menu = NULL;
- return;
- }
+ POPUP_BOILERPLATE
/* */
- QMenu *menu = new QMenu();
+ menu = new QMenu( );
QAction *action;
bool b_isFullscreen = false;
MainInterface *mi = p_intf->p_sys->p_mi;
- POPUP_BOILERPLATE;
-
PopupPlayEntries( menu, p_intf, p_input );
PopupMenuPlaylistControlEntries( menu, p_intf );
menu->addSeparator();
b_isFullscreen = !( !val.b_bool );
if( b_isFullscreen )
+ {
+ val.b_bool = false;
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();
msg_Warn( p_intf, "could not find parent interface" );
}
else
- menu->addMenu( ViewMenu( p_intf, menu, false ));
+ {
+ QMenu *bar = menu; // Needed for next macro
+ BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+ }
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() );
+ menu->popup( QCursor::pos() );
}
-#undef ACT_ADD
-#undef ACT_ADDMENU
-#undef ACT_ADDCHECK
+#undef CREATE_POPUP
+#undef POPUP_BOILERPLATE
+#undef BAR_DADD
#ifndef HAVE_MAEMO
/************************************************************************
intf_thread_t *p_intf,
bool b_force_visible )
{
- POPUP_BOILERPLATE;
+ input_thread_t *p_input = THEMIM->getInput();
/* Get the systray menu and clean it */
QMenu *sysMenu = mi->getSysTrayMenu();
sysMenu->clear();
+#ifndef Q_WS_MAC
/* Hide / Show VLC and cone */
if( mi->isVisible() || b_force_visible )
{
sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
qtr( "Hide VLC media player in taskbar" ), mi,
- SLOT( toggleUpdateSystrayMenu() ) );
+ SLOT( hideUpdateSystrayMenu() ) );
}
else
{
sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
qtr( "Show VLC media player" ), mi,
- SLOT( toggleUpdateSystrayMenu() ) );
+ SLOT( showUpdateSystrayMenu() ) );
}
-
sysMenu->addSeparator();
+#endif
+
PopupPlayEntries( sysMenu, p_intf, p_input );
PopupMenuPlaylistControlEntries( sysMenu, p_intf);
PopupMenuControlEntries( sysMenu, p_intf);
- sysMenu->addSeparator();
addDPStaticEntry( sysMenu, qtr( "&Open Media" ),
":/type/file-wide", SLOT( openFileDialog() ) );
addDPStaticEntry( sysMenu, qtr( "&Quit" ) ,
}
#endif
-#undef CREATE_POPUP
-#undef POPUP_BOILERPLATE
#undef PUSH_VAR
#undef PUSH_SEPARATOR
currentGroup = NULL;
- vlc_object_t *p_object;
-
- for( int i = 0; i < ( int )objects.size() ; i++ )
+ for( int i = 0; i < (int)objects.size() ; i++ )
{
if( !varnames[i] || !*varnames[i] )
{
menu->addSeparator();
continue;
}
- p_object = objects[i];
- UpdateItem( p_intf, menu, varnames[i], p_object, true );
+ UpdateItem( p_intf, menu, varnames[i], objects[i], true );
}
return menu;
}
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_VOID:
- var_Get( p_object, psz_var, &val );
+ val.i_int = 0; // Prevent the copy of an uninitialized value
CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_NORMAL,
p_object, val, i_type );
break;
#define CURVAL val_list.p_list->p_values[i]
#define CURTEXT text_list.p_list->p_values[i].psz_string
+#define RADIO_OR_COMMAND ( i_type & VLC_VAR_ISCOMMAND ) ? ITEM_NORMAL : ITEM_RADIO
for( i = 0; i < val_list.p_list->i_count; i++ )
{
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, "", ITEM_RADIO,
+ CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, another_val, i_type,
val.psz_string && !strcmp( val.psz_string, CURVAL.psz_string ) );
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, "", ITEM_RADIO,
+ else menutext.sprintf( "%"PRId64, CURVAL.i_int );
+ CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
( CURVAL.i_int == val.i_int )
&& CheckTitle( p_object, psz_var ) );
var_Get( p_object, psz_var, &val );
if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%.2f", CURVAL.f_float );
- CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
+ CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
p_object, CURVAL, i_type,
CURVAL.f_float == val.f_float );
break;
/* clean up everything */
var_FreeList( &val_list, &text_list );
+#undef RADIO_OR_COMMAND
#undef CURVAL
#undef CURTEXT
return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS;
action->setChecked( checked );
- MenuItemData *itemData = new MenuItemData( THEDP->menusMapper, p_obj, i_val_type,
- val, psz_var );
+ MenuItemData *itemData = qFindChild<MenuItemData*>( action, QString() );
+ delete itemData;
+ itemData = new MenuItemData( action, p_obj, i_val_type, val, psz_var );
/* remove previous signal-slot connection(s) if any */
action->disconnect( );
vlc_object_t *p_object = itemData->p_obj;
if( p_object == NULL ) return;
+ /* Preserve settings across vouts via the playlist object: */
+ if( !strcmp( itemData->psz_var, "fullscreen" )
+ || !strcmp( itemData->psz_var, "video-on-top" ) )
+ var_Set( pl_Get( p_object ), itemData->psz_var, itemData->val );
+
var_Set( p_object, itemData->psz_var, itemData->val );
}
projects / vlc / blobdiff