X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=8959a6a995fc420c1f210ba7919d45addaf7f775;hb=fd7e3ccc211703d018d454625a37a1ca662b7b15;hp=1d2ce89bdbf168a9f6c5be263b526c76109df7cd;hpb=51ae198224bef9648582542cc518743ee0c5e930;p=vlc

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 1d2ce89bdb..8959a6a995 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -36,23 +36,26 @@
 
 #include <vlc_common.h>
 #include <vlc_intf_strings.h>
-#include <vlc_vout.h>              /* vout_thread_t */
+#include <vlc_vout.h>                             /* vout_thread_t */
+#include <vlc_aout.h>                             /* audio_output_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"     /* Actions Management: play+volume */
-#include "extensions_manager.hpp"  /* Extensions menu*/
+#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 "util/qmenuview.hpp"                     /* Simple Playlist menu */
+#include "components/playlist/playlist_model.hpp" /* PLModel getter */
 
 #include <QMenu>
 #include <QMenuBar>
 #include <QAction>
 #include <QActionGroup>
 #include <QSignalMapper>
-#include <QSystemTrayIcon>
+#include <QStatusBar>
 
 /*
   This file defines the main menus and the pop-up menu (right-click menu)
@@ -68,9 +71,6 @@
   Just before one of those menus are aboutToShow(), they are rebuild.
   */
 
-#define STATIC_ENTRY "__static__"
-#define ENTRY_ALWAYS_ENABLED "__ignore__"
-
 enum
 {
     ITEM_NORMAL, /* not a checkbox, nor a radio */
@@ -80,7 +80,7 @@ enum
 
 static QActionGroup *currentGroup;
 
-QMenu *QVLCMenu::recentsMenu = NULL;
+QMenu *VLCMenuBar::recentsMenu = NULL;
 
 /**
  * @brief Add static entries to DP in menus
@@ -111,7 +111,8 @@ QAction *addDPStaticEntry( QMenu *menu,
         else
             action = menu->addAction( text, THEDP, member );
     }
-    action->setData( STATIC_ENTRY );
+    action->setData( VLCMenuBar::ACTION_STATIC );
+    return action;
 }
 
 /**
@@ -136,7 +137,10 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf,
     {
         action = menu->addAction( text, THEMIM, member );
     }
-    action->setData( bStatic ? STATIC_ENTRY : ENTRY_ALWAYS_ENABLED );
+    action->setData( VLCMenuBar::ACTION_STATIC |
+                     ( bStatic ) ? VLCMenuBar::ACTION_ALWAYS_ENABLED
+                                 : VLCMenuBar::ACTION_NONE
+                   );
     return action;
 }
 
@@ -145,17 +149,20 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf,
  * @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 )
+void VLCMenuBar::EnableStaticEntries( QMenu *menu, bool enable = true )
 {
     if( !menu ) return;
 
     QList< QAction* > actions = menu->actions();
-    for( int i = 0; i < actions.size(); ++i )
+    for( int i = 0; i < actions.count(); ++i )
     {
-        actions[i]->setEnabled( actions[i]->data().toString()
-                                == ENTRY_ALWAYS_ENABLED ||
-            /* Be careful here, because data("string").toBool is true */
-            ( enable && (actions[i]->data().toString() == STATIC_ENTRY ) ) );
+        int actionflags = actions[i]->data().toInt();
+        if ( actionflags & ACTION_MANAGED )
+            actions[i]->setEnabled(
+                ( actionflags & ACTION_ALWAYS_ENABLED )
+                ||
+                enable
+            );
     }
 }
 
@@ -169,12 +176,12 @@ inline int DeleteNonStaticEntries( QMenu *menu )
     int i_ret = 0;
 
     QList< QAction* > actions = menu->actions();
-    for( int i = 0; i < actions.size(); ++i )
+    for( int i = 0; i < actions.count(); ++i )
     {
-        if( actions[i]->data().toString() != STATIC_ENTRY )
-            delete actions[i];
-        else
+        if( actions[i]->data().toInt() & VLCMenuBar::ACTION_NO_CLEANUP )
             i_ret++;
+        else
+            delete actions[i];
     }
     return i_ret;
 }
@@ -185,7 +192,7 @@ inline int DeleteNonStaticEntries( QMenu *menu )
 static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
 {
     QList< QAction* > actions = menu->actions();
-    for( int i = 0; i < actions.size(); ++i )
+    for( int i = 0; i < actions.count(); ++i )
     {
         if( actions[i]->data().toString() == psz_var )
             return actions[i];
@@ -196,19 +203,15 @@ static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
 /*****************************************************************************
  * Definitions of variables for the dynamic menus
  *****************************************************************************/
-#define PUSH_VAR( var ) varnames.push_back( var ); \
-    objects.push_back( VLC_OBJECT(p_object) )
+#define PUSH_VAR( var ) varnames.append( var ); \
+    objects.append( VLC_OBJECT(p_object) )
 
-#define PUSH_INPUTVAR( var ) varnames.push_back( var ); \
-    objects.push_back( VLC_OBJECT(p_input) );
-
-#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
-    objects.push_back( 0 ); varnames.push_back( "" ); \
-    i_last_separator = objects.size(); }
+#define PUSH_INPUTVAR( var ) varnames.append( var ); \
+    objects.append( VLC_OBJECT(p_input) );
 
 static int InputAutoMenuBuilder( input_thread_t *p_object,
-        vector<vlc_object_t *> &objects,
-        vector<const char *> &varnames )
+        QVector<vlc_object_t *> &objects,
+        QVector<const char *> &varnames )
 {
     PUSH_VAR( "bookmark" );
     PUSH_VAR( "title" );
@@ -220,17 +223,14 @@ static int InputAutoMenuBuilder( input_thread_t *p_object,
 
 static int VideoAutoMenuBuilder( vout_thread_t *p_object,
         input_thread_t *p_input,
-        vector<vlc_object_t *> &objects,
-        vector<const char *> &varnames )
+        QVector<vlc_object_t *> &objects,
+        QVector<const char *> &varnames )
 {
     PUSH_INPUTVAR( "video-es" );
     PUSH_INPUTVAR( "spu-es" );
     PUSH_VAR( "fullscreen" );
     PUSH_VAR( "video-on-top" );
     PUSH_VAR( "video-wallpaper" );
-#ifdef WIN32
-    PUSH_VAR( "direct3d-desktop" );
-#endif
     PUSH_VAR( "video-snapshot" );
     PUSH_VAR( "zoom" );
     PUSH_VAR( "autoscale" );
@@ -243,10 +243,10 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object,
     return VLC_SUCCESS;
 }
 
-static int AudioAutoMenuBuilder( aout_instance_t *p_object,
+static int AudioAutoMenuBuilder( audio_output_t *p_object,
         input_thread_t *p_input,
-        vector<vlc_object_t *> &objects,
-        vector<const char *> &varnames )
+        QVector<vlc_object_t *> &objects,
+        QVector<const char *> &varnames )
 {
     PUSH_INPUTVAR( "audio-es" );
     PUSH_VAR( "audio-channels" );
@@ -281,11 +281,13 @@ static inline void addAction( QMenu *_menu, QVariant val, QString title ) {
 }
 
 // Add an action with a submenu
-static inline void addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
+static inline QMenu *addActionWithSubmenu( QMenu *_menu, QVariant val, QString title ) {
     QAction *_action = new QAction( title, _menu );
+    QMenu *_submenu = new QMenu( _menu );
     _action->setData( val );
-    _action->setMenu( new QMenu( _menu ) );
+    _action->setMenu( _submenu );
     _menu->addAction( _action );
+    return _submenu;
 }
 
 // Add an action that is a checkbox
@@ -299,7 +301,7 @@ static inline void addActionWithCheckbox( QMenu *_menu, QVariant val, QString ti
 /**
  * Main Menu Bar Creation
  **/
-void QVLCMenu::createMenuBar( MainInterface *mi,
+void VLCMenuBar::createMenuBar( MainInterface *mi,
                               intf_thread_t *p_intf )
 {
     /* QMainWindows->menuBar()
@@ -307,7 +309,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
        setDesktopAware set to false */
     QMenuBar *bar = mi->menuBar();
 
-    addMenuToMainbar( FileMenu( p_intf, bar ), qtr( "&Media" ), bar );
+    addMenuToMainbar( FileMenu( p_intf, bar, mi ), qtr( "&Media" ), bar );
 
     /* Dynamic menus, rebuilt before being showed */
     BAR_DADD( NavigMenu( p_intf, bar ), qtr( "P&layback" ), 3 );
@@ -317,7 +319,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
     addMenuToMainbar( ToolsMenu( bar ), qtr( "&Tools" ), bar );
 
     /* View menu, a bit different */
-    BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+    BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
 
     addMenuToMainbar( HelpMenu( bar ), qtr( "&Help" ), bar );
 
@@ -327,14 +329,11 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
  * Media ( File ) Menu
  * Opening, streaming and quit
  **/
-QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
+QMenu *VLCMenuBar::FileMenu( intf_thread_t *p_intf, QWidget *parent, MainInterface *mi )
 {
     QMenu *menu = new QMenu( parent );
     QAction *action;
 
-    addDPStaticEntry( menu, qtr( "&Open (advanced)..." ),
-        ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
-    menu->addSeparator();
     addDPStaticEntry( menu, qtr( "Open &File..." ),
         ":/type/file-asym", SLOT( simpleOpenDialog() ), "Ctrl+O" );
     addDPStaticEntry( menu, qtr( I_OP_OPDIR ),
@@ -347,6 +346,11 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
         ":/type/capture-card", SLOT( openCaptureDialog() ), "Ctrl+C" );
 
     menu->addSeparator();
+
+    addDPStaticEntry( menu, qtr( "&Open (advanced)..." ),
+        ":/type/file-asym", SLOT( openFileDialog() ), "Ctrl+Shift+O" );
+    menu->addSeparator();
+
     addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ),
                       NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
 
@@ -375,6 +379,12 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
     action->setCheckable( true );
     action->setChecked( THEMIM->getPlayExitState() );
 
+    if( mi->getSysTray() )
+    {
+        action = menu->addAction( qtr( "Close to systray"), mi,
+                                 SLOT( toggleUpdateSystrayMenu() ) );
+    }
+
     addDPStaticEntry( menu, qtr( "&Quit" ) ,
         ":/menu/quit", SLOT( quit() ), "Ctrl+Q" );
     return menu;
@@ -383,7 +393,7 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
 /**
  * Tools, like Media Information, Preferences or Messages
  **/
-QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
+QMenu *VLCMenuBar::ToolsMenu( QMenu *menu )
 {
     addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/menu/settings",
             SLOT( extendedDialog() ), "Ctrl+E" );
@@ -423,8 +433,9 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
 /**
  * View Menu
  * Interface modification, load other interfaces, activate Extensions
+ * \param current, set to NULL for menu creation, else for menu update
  **/
-QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi )
+QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface *_mi )
 {
     QAction *action;
     QMenu *menu;
@@ -490,6 +501,10 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface
     action->setChecked( mi->isPlDocked() );
     CONNECT( action, triggered( bool ), mi, dockPlaylist( bool ) );
 
+    action = menu->addAction( qtr( "Status Bar" ) );
+    action->setCheckable( true );
+    action->setChecked( mi->statusBar()->isVisible() );
+    CONNECT( action, triggered( bool ), mi, setStatusBarVisibility( bool) );
 #if 0 /* For Visualisations. Not yet working */
     adv = menu->addAction( qtr( "Visualizations selector" ), mi,
                            SLOT( visual() ) );
@@ -511,12 +526,12 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface
 /**
  * Interface Sub-Menu, to list extras interface and skins
  **/
-QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *VLCMenuBar::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
 {
-    vector<vlc_object_t *> objects;
-    vector<const char *> varnames;
-    varnames.push_back( "intf-add" );
-    objects.push_back( VLC_OBJECT(p_intf) );
+    QVector<vlc_object_t *> objects;
+    QVector<const char *> varnames;
+    varnames.append( "intf-add" );
+    objects.append( VLC_OBJECT(p_intf) );
 
     return Populate( p_intf, current, varnames, objects );
 }
@@ -524,7 +539,7 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
 /**
  * Extensions menu: populate the current menu with extensions
  **/
-void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu )
+void VLCMenuBar::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu )
 {
     /* Get ExtensionsManager and load extensions if needed */
     ExtensionsManager *extMgr = ExtensionsManager::getInstance( p_intf );
@@ -545,14 +560,29 @@ void QVLCMenu::ExtensionsMenu( intf_thread_t *p_intf, QMenu *extMenu )
     extMgr->menu( extMenu );
 }
 
+static inline void VolumeEntries( intf_thread_t *p_intf, QMenu *current )
+{
+    current->addSeparator();
+
+    QAction *action = current->addAction( qtr( "&Increase Volume" ),
+                ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
+    action->setData( VLCMenuBar::ACTION_STATIC );
+    action = current->addAction( qtr( "&Decrease Volume" ),
+                ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
+    action->setData( VLCMenuBar::ACTION_STATIC );
+    action = current->addAction( qtr( "&Mute" ),
+                ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
+    action->setData( VLCMenuBar::ACTION_STATIC );
+}
+
 /**
  * Main Audio Menu
  **/
-QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
+QMenu *VLCMenuBar::AudioMenu( intf_thread_t *p_intf, QMenu * current )
 {
-    vector<vlc_object_t *> objects;
-    vector<const char *> varnames;
-    aout_instance_t *p_aout;
+    QVector<vlc_object_t *> objects;
+    QVector<const char *> varnames;
+    audio_output_t *p_aout;
     input_thread_t *p_input;
 
     if( current->isEmpty() )
@@ -563,17 +593,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
         current->addSeparator();
 
         addActionWithSubmenu( current, "visual", qtr( "&Visualizations" ) );
-        current->addSeparator();
-
-        QAction *action = current->addAction( qtr( "Increase Volume" ),
-                ActionsManager::getInstance( p_intf ), SLOT( AudioUp() ) );
-        action->setData( STATIC_ENTRY );
-        action = current->addAction( qtr( "Decrease Volume" ),
-                ActionsManager::getInstance( p_intf ), SLOT( AudioDown() ) );
-        action->setData( STATIC_ENTRY );
-        action = current->addAction( qtr( "Mute" ),
-                ActionsManager::getInstance( p_intf ), SLOT( toggleMuteAudio() ) );
-        action->setData( STATIC_ENTRY );
+        VolumeEntries( p_intf, current );
     }
 
     p_input = THEMIM->getInput();
@@ -589,7 +609,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
 }
 
 /* Subtitles */
-QMenu *QVLCMenu::SubMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *VLCMenuBar::SubtitleMenu( QMenu *current )
 {
     QAction *action;
     QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
@@ -605,39 +625,41 @@ QMenu *QVLCMenu::SubMenu( intf_thread_t *p_intf, QMenu *current )
  * Main Video Menu
  * Subtitles are part of Video.
  **/
-QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle )
+QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtitle )
 {
     vout_thread_t *p_vout;
     input_thread_t *p_input;
-    vector<vlc_object_t *> objects;
-    vector<const char *> varnames;
+    QVector<vlc_object_t *> objects;
+    QVector<const char *> varnames;
 
     if( current->isEmpty() )
     {
         addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
         if( b_subtitle)
-            SubMenu( p_intf, current );
+            SubtitleMenu( current );
 
         current->addSeparator();
-
+        /* Surface modifiers */
         addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) );
         addActionWithCheckbox( current, "autoscale", qtr( "Always Fit &Window" ) );
         addActionWithCheckbox( current, "video-on-top", qtr( "Always &on Top" ) );
-#ifdef WIN32
-        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
-        current->addSeparator();
 
+        current->addSeparator();
+        /* Size modifiers */
         addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) );
         addActionWithSubmenu( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
         addActionWithSubmenu( current, "crop", qtr( "&Crop" ) );
+
+        current->addSeparator();
+        /* Rendering modifiers */
         addActionWithSubmenu( current, "deinterlace", qtr( "&Deinterlace" ) );
         addActionWithSubmenu( current, "deinterlace-mode", qtr( "&Deinterlace mode" ) );
         addActionWithSubmenu( current, "postprocess", qtr( "&Post processing" ) );
+
+        current->addSeparator();
+        /* Other actions */
+        addAction( current, "video-snapshot", qtr( "Take &Snapshot" ) );
     }
 
     p_input = THEMIM->getInput();
@@ -655,17 +677,20 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
  * Navigation Menu
  * For DVD, MP4, MOV and other chapter based format
  **/
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
+QMenu *VLCMenuBar::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
 {
     QAction *action;
+    QMenu *submenu;
 
     addActionWithSubmenu( menu, "title", qtr( "T&itle" ) );
     addActionWithSubmenu( menu, "chapter", qtr( "&Chapter" ) );
-    addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+    submenu = addActionWithSubmenu( menu, "navigation", qtr( "&Navigation" ) );
+    submenu->setTearOffEnabled( true );
     addActionWithSubmenu( menu, "program", qtr( "&Program" ) );
 
     /* FixMe: sync I_MENU_BOOKMARK string */
-    QMenu *submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+    submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu );
+    submenu->setTearOffEnabled( true );
     addDPStaticEntry( submenu, qtr( "&Manage" ), "",
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
     submenu->addSeparator();
@@ -673,41 +698,53 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
     action->setData( "bookmark" );
 
     menu->addSeparator();
-    PopupMenuPlaylistControlEntries( menu, p_intf );
+
     PopupMenuControlEntries( menu, p_intf );
 
     EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) );
-    return RebuildNavigMenu( p_intf, menu );
+    return RebuildNavigMenu( p_intf, menu, true );
 }
 
-QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu )
+QMenu *VLCMenuBar::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu, bool b_keep )
 {
     /* */
     input_thread_t *p_object;
-    vector<vlc_object_t *> objects;
-    vector<const char *> varnames;
+    QVector<vlc_object_t *> objects;
+    QVector<const char *> varnames;
 
     /* Get the input and hold it */
     p_object = THEMIM->getInput();
 
     InputAutoMenuBuilder( p_object, objects, varnames );
 
-    menu->addSeparator();
-
     /* Title and so on */
     PUSH_VAR( "prev-title" );
     PUSH_VAR( "next-title" );
     PUSH_VAR( "prev-chapter" );
     PUSH_VAR( "next-chapter" );
 
+    /* */
     EnableStaticEntries( menu, (p_object != NULL ) );
-    return Populate( p_intf, menu, varnames, objects );
+    Populate( p_intf, menu, varnames, objects );
+
+    /* Remove playback actions to recreate them */
+    if( !b_keep )
+    {
+        QList< QAction* > actions = menu->actions();
+        for( int i = 0; i < actions.count(); i++ )
+            if( actions[i]->data().toInt() & ACTION_DELETE_ON_REBUILD )
+                delete actions[i];
+    }
+
+    PopupMenuPlaylistEntries( menu, p_intf, p_object );
+
+    return menu;
 }
 
 /**
  * Help/About Menu
 **/
-QMenu *QVLCMenu::HelpMenu( QWidget *parent )
+QMenu *VLCMenuBar::HelpMenu( QWidget *parent )
 {
     QMenu *menu = new QMenu( parent );
     addDPStaticEntry( menu, qtr( "&Help..." ) ,
@@ -730,18 +767,16 @@ QMenu *QVLCMenu::HelpMenu( QWidget *parent )
     delete menu; menu = NULL; \
     if( !show ) \
         return; \
-    unsigned int i_last_separator = 0; \
-    vector<vlc_object_t *> objects; \
-    vector<const char *> varnames; \
+    QVector<vlc_object_t *> objects; \
+    QVector<const char *> varnames; \
     input_thread_t *p_input = THEMIM->getInput();
 
 #define CREATE_POPUP \
     menu = new QMenu(); \
     Populate( p_intf, menu, varnames, objects ); \
     menu->popup( QCursor::pos() ); \
-    i_last_separator = 0;
 
-void QVLCMenu::PopupPlayEntries( QMenu *menu,
+void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
                                         intf_thread_t *p_intf,
                                         input_thread_t *p_input )
 {
@@ -750,7 +785,7 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu,
     /* Play or Pause action and icon */
     if( !p_input || var_GetInteger( p_input, "state" ) != PLAYING_S )
     {
-        action = menu->addAction( qtr( "Play" ),
+        action = menu->addAction( qtr( "&Play" ),
                 ActionsManager::getInstance( p_intf ), SLOT( play() ) );
 #ifndef __APPLE__ /* No icons in menus in Mac */
         action->setIcon( QIcon( ":/menu/play" ) );
@@ -758,86 +793,103 @@ void QVLCMenu::PopupPlayEntries( QMenu *menu,
     }
     else
     {
-         addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
-                    ":/menu/pause", SLOT( togglePlayPause() ) );
+        action = addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
+                ":/menu/pause", SLOT( togglePlayPause() ) );
     }
+    action->setData( ACTION_DELETE_ON_REBUILD );
+
+    /* Stop */
+    action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
+            ":/menu/stop", SLOT( stop() ), true );
+    if( !p_input )
+        action->setEnabled( false );
+    action->setData( ACTION_DELETE_ON_REBUILD );
+
+    /* Next / Previous */
+    bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
+    action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
+            ":/menu/previous", SLOT( prev() ), true );
+    action->setEnabled( !bPlaylistEmpty );
+    action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
+    CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+
+    action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
+            ":/menu/next", SLOT( next() ), true );
+    action->setEnabled( !bPlaylistEmpty );
+    action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
+    CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+
+    menu->addSeparator();
 }
 
-void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf )
+void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
+                                        bool b_normal )
 {
     QAction *action;
+    QMenu *rateMenu = new QMenu( qtr( "Sp&eed" ), menu );
+    rateMenu->setTearOffEnabled( true );
 
-    /* Faster/Slower */
-    action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
-                              SLOT( faster() ) );
+    if( b_normal )
+    {
+        /* Faster/Slower */
+        action = rateMenu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
+                                  SLOT( faster() ) );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-    action->setIcon( QIcon( ":/toolbar/faster") );
+        action->setIcon( QIcon( ":/toolbar/faster2") );
 #endif
-    action->setData( STATIC_ENTRY );
+        action->setData( ACTION_STATIC );
+    }
 
-    action = menu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
+    action = rateMenu->addAction( qtr( "Faster (fine)" ), THEMIM->getIM(),
                               SLOT( littlefaster() ) );
-    action->setData( STATIC_ENTRY );
+    action->setData( ACTION_STATIC );
 
-    action = menu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(),
+    action = rateMenu->addAction( qtr( "N&ormal Speed" ), THEMIM->getIM(),
                               SLOT( normalRate() ) );
-    action->setData( STATIC_ENTRY );
+    action->setData( ACTION_STATIC );
 
-    action = menu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
+    action = rateMenu->addAction( qtr( "Slower (fine)" ), THEMIM->getIM(),
                               SLOT( littleslower() ) );
-    action->setData( STATIC_ENTRY );
+    action->setData( ACTION_STATIC );
 
-    action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
-                              SLOT( slower() ) );
+    if( b_normal )
+    {
+        action = rateMenu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
+                                  SLOT( slower() ) );
 #ifndef __APPLE__ /* No icons in menus in Mac */
-    action->setIcon( QIcon( ":/toolbar/slower") );
+        action->setIcon( QIcon( ":/toolbar/slower2") );
 #endif
-    action->setData( STATIC_ENTRY );
+        action->setData( ACTION_STATIC );
+    }
+
+    action = menu->addMenu( rateMenu );
+    action->setData( ACTION_STATIC );
 
     menu->addSeparator();
 
+    if( !b_normal ) return;
+
     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->setData( ACTION_STATIC );
 
     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 );
+    action->setData( ACTION_STATIC );
     addDPStaticEntry( menu, qtr( I_MENU_GOTOTIME ),"",
                       SLOT( gotoTimeDialog() ), "Ctrl+T" );
     menu->addSeparator();
 }
 
-
-void QVLCMenu::PopupMenuPlaylistControlEntries( QMenu *menu,
-                                                intf_thread_t *p_intf )
-{
-    bool bEnable = THEMIM->getInput() != NULL;
-    QAction *action =
-            addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ), ":/menu/stop",
-                               SLOT( stop() ), true );
-    /* Disable Stop in the right-click popup menu */
-    if( !bEnable )
-        action->setEnabled( false );
-
-    /* Next / Previous */
-    addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
-        ":/menu/previous", SLOT( prev() ) );
-    addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
-        ":/menu/next", SLOT( next() ) );
-
-    menu->addSeparator();
-}
-
-void QVLCMenu::PopupMenuStaticEntries( QMenu *menu )
+void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
 {
-    QMenu *openmenu = new QMenu( qtr( "Open a Media" ), menu );
+    QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
     addDPStaticEntry( openmenu, qtr( "&Open File..." ),
         ":/type/file-asym", SLOT( openFileDialog() ) );
     addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ),
@@ -862,7 +914,7 @@ void QVLCMenu::PopupMenuStaticEntries( QMenu *menu )
 }
 
 /* Video Tracks and Subtitles tracks */
-void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show )
+void VLCMenuBar::VideoPopupMenu( intf_thread_t *p_intf, bool show )
 {
     POPUP_BOILERPLATE
     if( p_input )
@@ -878,12 +930,12 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, bool show )
 }
 
 /* Audio Tracks */
-void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show )
+void VLCMenuBar::AudioPopupMenu( intf_thread_t *p_intf, bool show )
 {
     POPUP_BOILERPLATE
     if( p_input )
     {
-        aout_instance_t *p_aout = THEMIM->getAout();
+        audio_output_t *p_aout = THEMIM->getAout();
         AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
         if( p_aout )
             vlc_object_release( p_aout );
@@ -892,23 +944,22 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, bool show )
 }
 
 /* Navigation stuff, and general menus ( open ), used only for skins */
-void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show )
+void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
 {
     POPUP_BOILERPLATE
 
     if( p_input )
     {
-        varnames.push_back( "audio-es" );
+        varnames.append( "audio-es" );
         InputAutoMenuBuilder( p_input, objects, varnames );
-        PUSH_SEPARATOR;
+        menu->addSeparator();
     }
 
     menu = new QMenu();
     Populate( p_intf, menu, varnames, objects );
 
     menu->addSeparator();
-    PopupPlayEntries( menu, p_intf, p_input );
-    PopupMenuPlaylistControlEntries( menu, p_intf);
+    PopupMenuPlaylistEntries( menu, p_intf, p_input );
 
     menu->addSeparator();
     PopupMenuControlEntries( menu, p_intf );
@@ -920,18 +971,17 @@ void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf, bool show )
 }
 
 /* Main Menu that sticks everything together  */
-void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
+void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
 {
     POPUP_BOILERPLATE
 
     /* */
-    menu = new QMenu( );
+    menu = new QMenu();
     QAction *action;
     bool b_isFullscreen = false;
     MainInterface *mi = p_intf->p_sys->p_mi;
 
-    PopupPlayEntries( menu, p_intf, p_input );
-    PopupMenuPlaylistControlEntries( menu, p_intf );
+    PopupMenuPlaylistEntries( menu, p_intf, p_input );
     menu->addSeparator();
 
     if( p_input )
@@ -974,7 +1024,9 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
         if( action->menu()->isEmpty() )
             action->setEnabled( false );
 
-        SubMenu( p_intf, menu )->setTitle( qtr( "Subti&tle") );
+        submenu = SubtitleMenu( menu );
+        submenu->setTitle( qtr( "Subti&tle") );
+        UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
 
         /* Playback menu for chapters */
         submenu = new QMenu( menu );
@@ -1002,13 +1054,13 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
                 vlc_object_t* p_object = p_intf->p_parent;
 
                 objects.clear(); varnames.clear();
-                objects.push_back( p_object );
-                varnames.push_back( "intf-skins" );
+                objects.append( p_object );
+                varnames.append( "intf-skins" );
                 Populate( p_intf, submenu, varnames, objects );
 
                 objects.clear(); varnames.clear();
-                objects.push_back( p_object );
-                varnames.push_back( "intf-skins-interactive" );
+                objects.append( p_object );
+                varnames.append( "intf-skins-interactive" );
                 Populate( p_intf, submenu, varnames, objects );
             }
             else
@@ -1017,12 +1069,21 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
         else
         {
             QMenu *bar = menu; // Needed for next macro
-            BAR_DADD( ViewMenu( p_intf, _menu, mi ), qtr( "V&iew" ), 4 );
+            BAR_DADD( ViewMenu( p_intf, NULL, mi ), qtr( "V&iew" ), 4 );
         }
 
         menu->addMenu( submenu );
     }
 
+    /* */
+    QMenuView *plMenu = new QMenuView( menu, 25 );
+    plMenu->setTitle( qtr("Playlist") );
+    PLModel *model = PLModel::getPLModel( p_intf );
+    plMenu->setModel( model );
+    CONNECT( plMenu, activated(const QModelIndex&),
+             model, activateItem(const QModelIndex&));
+    menu->addMenu( plMenu );
+
     /* Static entries for ending, like open */
     PopupMenuStaticEntries( menu );
 
@@ -1033,12 +1094,11 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
 #undef POPUP_BOILERPLATE
 #undef BAR_DADD
 
-#ifndef HAVE_MAEMO
 /************************************************************************
  * Systray Menu                                                         *
  ************************************************************************/
 
-void QVLCMenu::updateSystrayMenu( MainInterface *mi,
+void VLCMenuBar::updateSystrayMenu( MainInterface *mi,
                                   intf_thread_t *p_intf,
                                   bool b_force_visible )
 {
@@ -1053,23 +1113,24 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
     if( mi->isVisible() || b_force_visible )
     {
         sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
-                            qtr( "Hide VLC media player in taskbar" ), mi,
+                            qtr( "&Hide VLC media player in taskbar" ), mi,
                             SLOT( hideUpdateSystrayMenu() ) );
     }
     else
     {
         sysMenu->addAction( QIcon( ":/logo/vlc16.png" ),
-                            qtr( "Show VLC media player" ), mi,
+                            qtr( "Sho&w VLC media player" ), mi,
                             SLOT( showUpdateSystrayMenu() ) );
     }
     sysMenu->addSeparator();
 #endif
 
-    PopupPlayEntries( sysMenu, p_intf, p_input );
-    PopupMenuPlaylistControlEntries( sysMenu, p_intf);
-    PopupMenuControlEntries( sysMenu, p_intf);
+    PopupMenuPlaylistEntries( sysMenu, p_intf, p_input );
+    PopupMenuControlEntries( sysMenu, p_intf, false );
 
-    addDPStaticEntry( sysMenu, qtr( "&Open a Media" ),
+    VolumeEntries( p_intf, sysMenu );
+    sysMenu->addSeparator();
+    addDPStaticEntry( sysMenu, qtr( "&Open Media" ),
             ":/type/file-wide", SLOT( openFileDialog() ) );
     addDPStaticEntry( sysMenu, qtr( "&Quit" ) ,
             ":/menu/quit", SLOT( quit() ) );
@@ -1077,26 +1138,24 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
     /* Set the menu */
     mi->getSysTray()->setContextMenu( sysMenu );
 }
-#endif
 
 
 #undef PUSH_VAR
-#undef PUSH_SEPARATOR
 
 /*************************************************************************
  * Builders for automenus
  *************************************************************************/
-QMenu * QVLCMenu::Populate( intf_thread_t *p_intf,
+QMenu * VLCMenuBar::Populate( intf_thread_t *p_intf,
                             QMenu *current,
-                            vector< const char *> & varnames,
-                            vector<vlc_object_t *> & objects )
+                            QVector< const char *> & varnames,
+                            QVector<vlc_object_t *> & objects )
 {
     QMenu *menu = current;
     assert( menu );
 
     currentGroup = NULL;
 
-    for( int i = 0; i < (int)objects.size() ; i++ )
+    for( int i = 0; i < (int)objects.count() ; i++ )
     {
         if( !varnames[i] || !*varnames[i] )
         {
@@ -1159,7 +1218,7 @@ static bool IsMenuEmpty( const char *psz_var,
 
 #define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
 
-void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
+void VLCMenuBar::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
         const char *psz_var, vlc_object_t *p_object, bool b_submenu )
 {
     vlc_value_t val, text;
@@ -1294,7 +1353,7 @@ static bool CheckTitle( vlc_object_t *p_object, const char *psz_var )
 }
 
 
-int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
+int VLCMenuBar::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
         vlc_object_t *p_object, bool b_root )
 {
     vlc_value_t val, val_list, text_list;
@@ -1329,7 +1388,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
 
 #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
+#define RADIO_OR_COMMAND  ( i_type & ( VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE ) ) ? ITEM_RADIO : ITEM_NORMAL
 
     for( i = 0; i < val_list.p_list->i_count; i++ )
     {
@@ -1359,7 +1418,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
             case VLC_VAR_INTEGER:
                 var_Get( p_object, psz_var, &val );
                 if( CURTEXT ) menutext = qfu( CURTEXT );
-                else menutext.sprintf( "%"PRId64, CURVAL.i_int );
+                else menutext = QString::number( CURVAL.i_int );
                 CreateAndConnect( submenu, psz_var, menutext, "", RADIO_OR_COMMAND,
                         p_object, CURVAL, i_type,
                         ( CURVAL.i_int == val.i_int )
@@ -1390,7 +1449,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
     return submenu->isEmpty() ? VLC_EGENERIC : VLC_SUCCESS;
 }
 
-void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
+void VLCMenuBar::CreateAndConnect( QMenu *menu, const char *psz_var,
         const QString& text, const QString& help,
         int i_item_type, vlc_object_t *p_obj,
         vlc_value_t val, int i_val_type,
@@ -1437,7 +1496,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
         menu->addAction( action );
 }
 
-void QVLCMenu::DoAction( QObject *data )
+void VLCMenuBar::DoAction( QObject *data )
 {
     MenuItemData *itemData = qobject_cast<MenuItemData *>( data );
     vlc_object_t *p_object = itemData->p_obj;
@@ -1451,7 +1510,7 @@ void QVLCMenu::DoAction( QObject *data )
     var_Set( p_object, itemData->psz_var, itemData->val );
 }
 
-void QVLCMenu::updateRecents( intf_thread_t *p_intf )
+void VLCMenuBar::updateRecents( intf_thread_t *p_intf )
 {
     if( recentsMenu )
     {
@@ -1461,24 +1520,31 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf )
 
         recentsMenu->clear();
 
-        if( !l.size() )
+        if( !l.count() )
         {
-            action = recentsMenu->addAction( qtr(" - Empty - ") );
-            action->setEnabled( false );
+            recentsMenu->setEnabled( false );
         }
         else
         {
-            for( int i = 0; i < l.size(); ++i )
+            for( int i = 0; i < l.count(); ++i )
             {
+                QString mrl = l.at( i );
+                char *psz = decode_URI_duplicate( qtu( mrl ) );
+                QString text = qfu( psz );
+
+                free( psz );
                 action = recentsMenu->addAction(
-                        QString( "&%1: " ).arg( i + 1 ) + l.at( i ),
+                        QString( i < 9 ? "&%1: ": "%1: " ).arg( i + 1 ) +
+                            QApplication::fontMetrics().elidedText( text,
+                                                          Qt::ElideLeft, 400 ),
                         rmrl->signalMapper, SLOT( map() ),
-                        i <= 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" );
+                        i < 9 ? QString( "Ctrl+%1" ).arg( i + 1 ) : "" );
                 rmrl->signalMapper->setMapping( action, l.at( i ) );
             }
 
             recentsMenu->addSeparator();
             recentsMenu->addAction( qtr("&Clear"), rmrl, SLOT( clear() ) );
+            recentsMenu->setEnabled( true );
         }
     }
 }