PUSH_VAR( "aspect-ratio" );
PUSH_VAR( "crop" );
PUSH_VAR( "video-on-top" );
+#ifdef WIN32
PUSH_VAR( "directx-wallpaper" );
+#endif
PUSH_VAR( "video-snapshot" );
if( p_object )
return NULL;
}
-static QAction * FindActionWithText( QMenu *menu, QString &text )
-{
- QAction *action;
- foreach( action, menu->actions() )
- {
- if( action->text() == text )
- return action;
- }
- return NULL;
-}
-
/*****************************************************************************
* All normal menus
* Simple Code
setDesktopAware set to false */
QMenuBar *bar = mi->menuBar();
BAR_ADD( FileMenu(), qtr( "&Media" ) );
+
+ BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 1 );
+ BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 );
+ BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "P&layback" ), 3 );
+
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" ), 1 );
- BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 );
- BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
+
BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
}
#undef BAR_ADD
addDPStaticEntry( menu, qtr( "&Open File..." ), "",
":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
- ":/folder-grey", SLOT( PLAppendDir() ), "Ctrl+F" );
+ ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
addDPStaticEntry( menu, qtr( "Open &Network..." ), "",
"Ctrl+C" );
menu->addSeparator();
+ addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "",
+ SLOT( openThenTranscodingDialogs() ), "Ctrl+R" );
addDPStaticEntry( menu, qtr( "&Streaming..." ), "",
":/stream", SLOT( openThenStreamingDialogs() ),
"Ctrl+S" );
- addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "",
- SLOT( openThenTranscodingDialogs() ), "Ctrl+R" );
menu->addSeparator();
addDPStaticEntry( menu, qtr( "&Quit" ) , "",
QMenu *menu = new QMenu();
menu->addMenu( SDMenu( p_intf ) );
menu->addAction( QIcon( ":/playlist_menu" ),
- qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+ qtr( "Show P&laylist" ), mi, SLOT( togglePlaylist() ) );
menu->addSeparator();
addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ),
if( mi )
{
QAction *act=
- menu->addAction( QIcon( ":/playlist_menu" ),
- qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
- qtr( "Ctrl+L" ) );
+ menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ),
+ mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
act->setData( "_static_" );
}
- addDPStaticEntry( menu, qtr( I_MENU_EXT ), "",
- ":/settings", SLOT( extendedDialog() ),
- "Ctrl+E" );
+ addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", ":/settings",
+ SLOT( extendedDialog() ), "Ctrl+E" );
menu->addSeparator();
if( mi )
{
/* Minimal View */
- QAction *action = menu->addAction( qtr( "Minimal View..." ), mi,
+ QAction *action = menu->addAction( qtr( "Mi&nimal View..." ), mi,
SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
action->setCheckable( true );
action->setData( "_static_" );
minimalViewAction = action; /* HACK for minimalView */
/* FullScreen View */
- action = menu->addAction( qtr( "Fullscreen Interface" ), mi,
+ action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
SLOT( toggleFullScreen() ), QString( "F11" ) );
action->setCheckable( true );
action->setData( "_static_" );
/* Advanced Controls */
- action = menu->addAction( qtr( "Advanced Controls" ), mi,
+ action = menu->addAction( qtr( "&Advanced Controls" ), mi,
SLOT( toggleAdvanced() ) );
action->setCheckable( true );
action->setData( "_static_" );
#endif
menu->addSeparator();
- addDPStaticEntry( menu, qtr( "Preferences..." ), "",
+ addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
return menu;
}
SLOT( loadSubtitlesFile() ) );
submenu->addSeparator();
- ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) );
+ ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) );
ACT_ADD( current, "zoom", qtr( "&Zoom" ) );
ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) );
ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
ACT_ADD( current, "crop", qtr( "&Crop" ) );
ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) );
- /* ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); */
- ACT_ADD( current, "video-snapshot", qtr( "Snapshot" ) );
+#ifdef WIN32
+ ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) );
+#endif
+ ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
/* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
}
menu->addSeparator();
ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) );
- ACT_ADD( menu, "title", qtr( "&Title" ) );
+ ACT_ADD( menu, "title", qtr( "T&itle" ) );
ACT_ADD( menu, "chapter", qtr( "&Chapter" ) );
ACT_ADD( menu, "program", qtr( "&Program" ) );
ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
QMenu *QVLCMenu::HelpMenu( QMenu *current )
{
QMenu *menu = new QMenu( current );
- addDPStaticEntry( menu, qtr( "Help..." ) , "",
+ addDPStaticEntry( menu, qtr( "&Help..." ) , "",
":/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
- addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "",
+ addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", "",
SLOT( updateDialog() ), "");
#endif
menu->addSeparator();
addDPStaticEntry( openmenu, qtr( "&Open File..." ), "",
":/file-asym", SLOT( openFileDialog() ) );
addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "",
- ":/folder-grey", SLOT( PLAppendDir() ) );
+ ":/folder-grey", SLOT( PLOpenDir() ) );
addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "",
":/disc", SLOT( openDiscDialog() ) );
addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "",
if( !b_isFullscreen )
{
submenu = new QMenu( qtr( "Interface" ), menu );
- submenu->addAction( QIcon( ":/playlist" ),
- qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+ if( mi )
+ {
+ submenu->addAction( QIcon( ":/playlist" ),
+ qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+ }
addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
":/settings", SLOT( extendedDialog() ) );
- action = submenu->addAction( QIcon( "" ),
- qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) );
- action->setCheckable( true );
- action->setChecked( !( mi->getControlsVisibilityStatus() &
- CONTROLS_VISIBLE ) );
- action = submenu->addAction( QIcon( "" ),
- qtr( "Toggle Fullscreen Interface" ),
- mi, SLOT( toggleFullScreen() ) );
- action->setCheckable( true );
- action->setChecked( mi->isFullScreen() );
+ if( mi )
+ {
+ action = submenu->addAction( QIcon( "" ),
+ qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) );
+ action->setCheckable( true );
+ action->setChecked( !( mi->getControlsVisibilityStatus() &
+ CONTROLS_VISIBLE ) );
+ action = submenu->addAction( QIcon( "" ),
+ qtr( "Toggle Fullscreen Interface" ),
+ mi, SLOT( toggleFullScreen() ) );
+ action->setCheckable( true );
+ action->setChecked( mi->isFullScreen() );
+ }
+ else /* We are using the skins interface.
+ If not, this entry will not show. */
+ {
+ objects.clear();
+ varnames.clear();
+ vlc_object_t *p_object = ( vlc_object_t* )
+ vlc_object_find( p_intf, VLC_OBJECT_INTF, FIND_PARENT );
+ if( p_object )
+ {
+ objects.push_back( p_object->i_object_id );
+ varnames.push_back( "intf-skins" );
+ Populate( p_intf, submenu, varnames, objects );
+ vlc_object_release( p_object );
+ }
+ else
+ {
+ msg_Dbg( p_intf, "could not find parent interface" );
+ }
+ }
menu->addMenu( submenu );
}
p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
if( !p_object )
{
- msg_Dbg( p_intf, "object %d not found !", objects[i] );
+ msg_Warn( p_intf, "object %d not found !", objects[i] );
continue;
}
}
}
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 CURVAL val_list.p_list->p_values[i]
#define CURTEXT text_list.p_list->p_values[i].psz_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,
+ CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
p_object->i_object_id, another_val, i_type,
NOTCOMMAND && val.psz_string &&
!strcmp( val.psz_string, CURVAL.psz_string ) );
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,
+ CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
p_object->i_object_id, CURVAL, i_type,
NOTCOMMAND && CURVAL.i_int == val.i_int );
break;
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,
+ CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
p_object->i_object_id, CURVAL, i_type,
NOTCOMMAND && CURVAL.f_float == val.f_float );
break;
/* clean up everything */
var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, &text_list );
-#undef NORMAL_OR_RADIO
#undef NOTCOMMAND
#undef CURVAL
#undef CURTEXT
QAction *action = FindActionWithVar( menu, psz_var );
if( !action )
{
- /* This is a value */
- action = FindActionWithText( menu, text );
- if( !action )
- {
- action = new QAction( text, menu );
- menu->addAction( action );
- }
+ action = new QAction( text, menu );
+ menu->addAction( action );
}
- action->setText( text );
action->setToolTip( help );
-
action->setEnabled( i_object_id != 0 );
if( i_item_type == ITEM_CHECK )