]> git.sesse.net Git - vlc/commitdiff
Qt: Adding a Fast Playlist access in the right-click menus
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 7 Oct 2011 16:58:09 +0000 (18:58 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 9 Oct 2011 21:34:52 +0000 (23:34 +0200)
As asked by Laurent
Close #4722

modules/gui/qt4/menus.cpp

index 3c2b40329d0fda2b4e2d74613f48dc5e702ce706..197bb88e777ffa0478d8735b97fe042c4d424fed 100644 (file)
 
 #include <vlc_common.h>
 #include <vlc_intf_strings.h>
-#include <vlc_vout.h>              /* vout_thread_t */
-#include <vlc_aout.h>
+#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>
@@ -1062,6 +1064,15 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
         menu->addMenu( submenu );
     }
 
+    /* */
+    QMenuView *plMenu = new QMenuView( menu );
+    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 );