Advanced controls bar

[vlc] / modules / gui / qt4 / menus.cpp

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f6424d75db8ebbc4f96a414e96b835cc1c8e3777..f00454417e118061ee7be7c5c61502bb2a871aba 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -27,6 +27,8 @@
 #include <QActionGroup>
 #include <QSignalMapper>
 
+#include "main_interface.hpp"
+
 #include "menus.hpp"
 #include "dialogs_provider.hpp"
 #include "input_manager.hpp"
@@ -117,10 +119,16 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object,
     CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \
     THEDP->menusUpdateMapper->setMapping( menu, f ); }
 
-void QVLCMenu::createMenuBar( QMenuBar *bar, intf_thread_t *p_intf )
+void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
+                              bool playlist, bool adv_controls_enabled )
 {
-    BAR_ADD( FileMenu(), qtr("File") );
-    BAR_ADD( ToolsMenu( p_intf ), qtr("Tools") );
+    QMenuBar *bar = mi->menuBar();
+    BAR_ADD( FileMenu(), qtr("Media") );
+    if( playlist )
+    {
+        BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("Playlist" ) );
+    }
+    BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled ), qtr("Tools") );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr("Video"), 1 );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr("Audio"), 2 );
     BAR_DADD( NavigMenu( p_intf, NULL ), qtr("Navigation"), 3 );
@@ -139,7 +147,22 @@ QMenu *QVLCMenu::FileMenu()
     return menu;
 }
 
-QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, bool with_intf )
+QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
+{
+    QMenu *menu = new QMenu();
+    menu->addMenu( SDMenu( p_intf ) );
+    menu->addSeparator();
+
+    DP_SADD( qtr( "Open playlist file"), "", "", openPlaylist() );
+//    DP_SADD( qtr( "Save playlist to file" ), "", "", savePlaylist() );
+    menu->addSeparator();
+    menu->addAction( qtr("Undock from interface"), mi,
+                     SLOT( undockPlaylist() ) );
+    return menu;
+}
+
+QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
+                            bool adv_controls_enabled, bool with_intf )
 {
     QMenu *menu = new QMenu();
     if( with_intf )
@@ -147,15 +170,22 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, bool with_intf )
         QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
         intfmenu->setTitle( qtr("Interfaces" ) );
         menu->addMenu( intfmenu );
-        /** \todo ADD EXT GUI HERE */
         menu->addSeparator();
     }
     DP_SADD( qtr("Messages" ), "", "", messagesDialog() );
     DP_SADD( qtr("Information") , "", "", streaminfoDialog() );
     DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() );
+    DP_SADD( qtr("Extended settings"), "","",extendedDialog() );
+    if( mi )
+    {
+        menu->addSeparator();
+        QAction *adv = menu->addAction( qtr("Advanced controls" ),
+                                        mi, SLOT( advanced() ) );
+        adv->setCheckable( true );
+        if( adv_controls_enabled ) adv->setChecked( true );
+    }
     menu->addSeparator();
     DP_SADD( qtr("Preferences"), "", "", prefsDialog() );
-    DP_SADD( qtr("Extended"), "","",extendedDialog() );
     return menu;
 }
 
@@ -242,6 +272,44 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
     return Populate( p_intf, current, varnames, objects );
 }
 
+QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
+{
+    QMenu *menu = new QMenu();
+    menu->setTitle( qtr( "Additional sources" ) );
+    vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
+                                        FIND_ANYWHERE );
+    int i_num = 0;
+    for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
+    {
+        module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+        if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
+            i_num++;
+    }
+    for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
+    {
+        module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object;
+        if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
+        {
+            QAction *a = new QAction( qfu( p_parser->psz_longname ), menu );
+            a->setCheckable( true );
+            /* hack to handle submodules properly */
+            int i = -1;
+            while( p_parser->pp_shortcuts[++i] != NULL );
+            i--;
+            if( playlist_IsServicesDiscoveryLoaded( THEPL,
+                 i>=0?p_parser->pp_shortcuts[i] : p_parser->psz_object_name ) )
+            {
+                a->setChecked( true );
+            }
+            CONNECT( a , triggered(), THEDP->SDMapper, map() );
+            THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
+                                                  p_parser->psz_object_name );
+            menu->addAction( a );
+        }
+    }
+    vlc_list_release( p_list );
+    return menu;
+}
 
 /*****************************************************************************
  * Popup menus
@@ -280,7 +348,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
     intfmenu->setTitle( qtr("Interfaces" ) ); \
     menu->addMenu( intfmenu ); \
     \
-    QMenu *toolsmenu = ToolsMenu( p_intf, false ); \
+    QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \
     toolsmenu->setTitle( qtr("Tools" ) ); \
     menu->addMenu( toolsmenu ); \