[PATCH] Move 'Playlist' menu into 'File' menu.

[Pauline Castets]

- Move "Load Playlist" and "Save playlist" to File menu,
- Move "Additional sources" to File menu too,
- Delete "Playlist" menu.
   (its "Show Playlist" item is not moved since it is
    already in tools menu, with CTRL+L hotkey)
---
 modules/gui/qt4/menus.cpp |   32 ++++++++++----------------------
 modules/gui/qt4/menus.hpp |    3 +--
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 677119e..370a586 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -263,13 +263,12 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
        gives the QProcess::destroyed timeout issue on Cleanlooks style with
        setDesktopAware set to false */
     QMenuBar *bar = mi->menuBar();
-    BAR_ADD( FileMenu(), qtr( "&File" ) );
+    BAR_ADD( FileMenu( p_intf ), qtr( "&File" ) );
 
     BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "P&layback" ), 3 );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 1 );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 );
 
-    BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
     BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ),
              qtr( "&Tools" ) );
 
@@ -282,7 +281,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
  * Media ( File ) Menu
  * Opening, streaming and quit
  **/
-QMenu *QVLCMenu::FileMenu()
+QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf )
 {
     QMenu *menu = new QMenu();
 
@@ -299,6 +298,14 @@ QMenu *QVLCMenu::FileMenu()
         "Ctrl+C" );
     menu->addSeparator();
 
+    addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ),
+        "Ctrl+X" );
+    addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ),
+        "Ctrl+Y" );
+    /* Additional sources submenu */
+    menu->addMenu( SDMenu( p_intf ) );
+    menu->addSeparator();
+
     addDPStaticEntry( menu, qtr( I_MENU_PROPERTIES ) , "", ":/info",
     SLOT( mediaInfoDialog() ), "Ctrl+I" );
     menu->addSeparator();
@@ -315,25 +322,6 @@ QMenu *QVLCMenu::FileMenu()
     return menu;
 }
 
-/* Playlist/MediaLibrary Control */
-QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
-{
-    QMenu *menu = new QMenu();
-    menu->addMenu( SDMenu( p_intf ) );
-    menu->addAction( QIcon( ":/playlist_menu" ),
-                     qtr( "Show P&laylist" ), mi, SLOT( togglePlaylist() ) );
-    menu->addSeparator();
-
-    addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ),
-        "Ctrl+X" );
-    addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ),
-        "Ctrl+Y" );
-    /*menu->addSeparator();
-    menu->addAction( qtr( "Undock from Interface" ), mi,
-                     SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/
-    return menu;
-}
-
 /**
  * Tools/View Menu
  * This is kept in the same menu for now, but could change if it gets much
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index d1f8f5d..308b19e 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -76,9 +76,8 @@ public:
     static void createMenuBar( MainInterface *mi, intf_thread_t *, bool );
 
     /* Menus */
-    static QMenu *FileMenu();
+    static QMenu *FileMenu( intf_thread_t *p_intf );
     static QMenu *SDMenu( intf_thread_t * );
-    static QMenu *PlaylistMenu( intf_thread_t *, MainInterface * );
     static QMenu *ToolsMenu( intf_thread_t *, QMenu *, MainInterface *,
                              bool, bool with = true );
     static QMenu *NavigMenu( intf_thread_t *, QMenu * );
-- 
1.5.4.3


--=-9dq+iTtTHFqjMy5lRrRc
Content-Disposition: attachment; filename=0004-Move-Video-menu-to-the-left-of-Audio-menu.patch
Content-Type: application/mbox; name=0004-Move-Video-menu-to-the-left-of-Audio-menu.patch
Content-Transfer-Encoding: 7bit