* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_intf_strings.h>
// Add static entries to menus
void addDPStaticEntry( QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member,
- char *shortcut )
+ const char *shortcut )
{
if( !EMPTY_STR( icon ) > 0 )
{
void addMIMStaticEntry( intf_thread_t *p_intf,
QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member )
{
if( strlen( icon ) > 0 )
QMenuBar *bar = mi->menuBar();
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_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 );
if( with_intf )
{
QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
- intfmenu->setTitle( qtr( "Add Interfaces" ) );
+ intfmenu->setTitle( qtr( "Interfaces" ) );
menu->addMenu( intfmenu );
menu->addSeparator();
}
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() ) );
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 ), "","",
+ addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
SLOT( bookmarksDialog() ), "Ctrl+B" );
+#ifdef ENABLE_VLM
addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
- "Ctrl+V" );
+ "Ctrl+W" );
+#endif
menu->addSeparator();
addDPStaticEntry( menu, qtr( "Preferences..." ), "",
QMenu *menu = Populate( p_intf, current, varnames, objects );
- if( !p_intf->pf_show_dialog )
- {
- menu->addSeparator();
- menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
- QString( "Ctrl+Z" ) );
- }
-
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
THEDP->menusUpdateMapper->setMapping( menu, 4 );
return menu;
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++ )
{
addDPStaticEntry( menu, qtr( "Help..." ) , "",
":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
- addDPStaticEntry( menu, qtr( "Update" ) , "", "", SLOT( updateDialog() ), "");
+ addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "", SLOT( updateDialog() ), "");
#endif
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
continue;
}
- p_object = ( vlc_object_t * )vlc_object_get( p_intf, objects[i] );
+ p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
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;
}
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 );
+ menutext = qfu( "Add " ) /* If this function is more used, FIX*/
+ + 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 &&
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 );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( itemData->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, itemData->psz_var, itemData->val );