Include vlc_services_discovery.h only where needed

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

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 1d2d01a08b7b019a3c85b342b60873adc351f133..32fda56655a902a54978fe8b037a0aeb7adbc934 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -31,15 +31,15 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #include <vlc_intf_strings.h>
+#include <vlc_services_discovery.h>
 
-#include "main_interface.hpp"
 #include "menus.hpp"
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "recents.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 <QMenu>
 #include <QMenuBar>
@@ -137,6 +137,7 @@ int DeleteNonStaticEntries( QMenu *menu )
         else
             i_ret++;
     }
+    return i_ret;
 }
 
 /***
@@ -323,7 +324,9 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf )
         ":/capture-card", SLOT( openCaptureDialog() ),
         "Ctrl+C" );
 
-    recentsMenu = new QMenu( qtr( "Recently played" ), menu );
+    menu->addSeparator();
+
+    recentsMenu = new QMenu( qtr( "Recently &Played" ), menu );
     updateRecents( p_intf );
     menu->addMenu( recentsMenu );
     menu->addSeparator();
@@ -350,6 +353,9 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf )
     addDPStaticEntry( menu, qtr( I_MENU_MSG ), "",
         ":/messages", SLOT( messagesDialog() ),
         "Ctrl+M" );
+    addDPStaticEntry( menu, qtr( "Plugins and extensions" ), "",
+        "", SLOT( pluginDialog() ),
+        "" );
     addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", ":/info",
         SLOT( mediaInfoDialog() ), "Ctrl+I" );
     addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
@@ -362,6 +368,8 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf )
 #endif
     menu->addSeparator();
 
+    addDPStaticEntry( menu, qtr( "Customi&ze Interface..." ), "",
+        ":/preferences", SLOT( toolbarDialog() ), "" );
     addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
         ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
 
@@ -1322,19 +1330,15 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf )
         {
             for( int i = 0; i < l.size(); ++i )
             {
-                action = recentsMenu->addAction( l.at( i ),
+                action = recentsMenu->addAction(
+                        QString( "&%1: " ).arg( i + 1 ) + l.at( i ),
                         rmrl->signalMapper,
                         SLOT( map() ) );
                 rmrl->signalMapper->setMapping( action, l.at( i ) );
             }
 
-            CONNECT( rmrl->signalMapper,
-                     mapped(const QString & ),
-                     DialogsProvider::getInstance( p_intf ),
-                     playMRL( const QString & ) );
-
             recentsMenu->addSeparator();
-            recentsMenu->addAction( "Clear", rmrl, SLOT( clear() ) );
+            recentsMenu->addAction( "&Clear", rmrl, SLOT( clear() ) );
         }
     }
 }