Qt4 : Simple Preferences. Add a slider widget to pref_widget, because it is nicer...

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

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 4d8962d60961a58d7c07234691fed45957995204..8787e821c6d999532ac2573f577ca6d6a664dab8 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -27,8 +27,9 @@
 #include <QActionGroup>
 #include <QSignalMapper>
 
-#include "main_interface.hpp"
+#include <vlc_intf_strings.h>
 
+#include "main_interface.hpp"
 #include "menus.hpp"
 #include "dialogs_provider.hpp"
 #include "input_manager.hpp"
@@ -135,13 +136,15 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr("Audio"), 2 );
     BAR_DADD( NavigMenu( p_intf, NULL ), qtr("Navigation"), 3 );
 
-    //    BAR_ADD( HelpMenu(), qtr("Help" ) );
+    BAR_ADD( HelpMenu(), qtr("Help" ) );
 }
 QMenu *QVLCMenu::FileMenu()
 {
     QMenu *menu = new QMenu();
-    DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );
-    DP_SADD( qtr("&Advanced Open..." ), "", "", openDialog() );
+/*    DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );*/
+    DP_SADD( qtr("Open &File..." ), "", "", openFileDialog() );
+    DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
+    DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
     menu->addSeparator();
     DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
     menu->addSeparator();
@@ -155,8 +158,8 @@ QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
     menu->addMenu( SDMenu( p_intf ) );
     menu->addSeparator();
 
-    DP_SADD( qtr( "Open playlist file"), "", "", openPlaylist() );
-//    DP_SADD( qtr( "Save playlist to file" ), "", "", savePlaylist() );
+    DP_SADD( qtr(I_PL_LOAD), "", "", openPlaylist() );
+    DP_SADD( qtr(I_PL_SAVE), "", "", savePlaylist() );
     menu->addSeparator();
     menu->addAction( qtr("Undock from interface"), mi,
                      SLOT( undockPlaylist() ) );
@@ -175,10 +178,9 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
         menu->addMenu( intfmenu );
         menu->addSeparator();
     }
-    DP_SADD( qtr("Messages" ), "", "", messagesDialog() );
-    DP_SADD( qtr("Information") , "", "", streaminfoDialog() );
-    DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() );
-    DP_SADD( qtr("Extended settings"), "","",extendedDialog() );
+    DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog() );
+    DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog() );
+    DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog() );
     if( mi )
     {
         menu->addSeparator();
@@ -290,7 +292,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
 QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
 {
     QMenu *menu = new QMenu();
-    menu->setTitle( qtr( "Additional sources" ) );
+    menu->setTitle( qtr(I_PL_SD) );
     vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
                                         FIND_ANYWHERE );
     int i_num = 0;
@@ -326,6 +328,16 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
     return menu;
 }
 
+QMenu *QVLCMenu::HelpMenu()
+{
+    QMenu *menu = new QMenu();
+    DP_SADD( qtr("Help") , "", "", helpDialog() );
+                menu->addSeparator();
+    DP_SADD( qtr(I_MENU_ABOUT), "", "", aboutDialog() );
+    return menu;
+}
+
+
 /*****************************************************************************
  * Popup menus
  *****************************************************************************/