Qt4 - Popup Menu: Add open and help. Correct the tool menu behaviour. Other small fix.

modules/gui/qt4/menus.cpp

@@ -440,9 +440,23 @@ QMenu *QVLCMenu::HelpMenu()
     intfmenu->setTitle( qtr("Interfaces" ) ); \
     menu->addMenu( intfmenu ); \
     \
-    QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \
+    QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false, false ); \
     toolsmenu->setTitle( qtr("Tools" ) ); \
     menu->addMenu( toolsmenu ); \
+    \
+    QMenu *openmenu = new QMenu( qtr("Open") ); \
+    openmenu->addAction( qtr("Open &File..." ), THEDP, SLOT( openFileDialog() ) ); \
+    openmenu->addAction( qtr("Open &Disc..." ), THEDP, SLOT( openDiscDialog() ) ); \
+    openmenu->addAction( qtr("Open &Network..." ), THEDP, SLOT( openNetDialog() ) ); \
+    openmenu->addAction( qtr("Open &Capture Device..." ), THEDP, \
+            SLOT( openCaptureDialog() ) ); \
+    menu->addMenu( openmenu ); \
+    \
+    menu->addSeparator(); \
+    QMenu *helpmenu = HelpMenu(); \
+    helpmenu->setTitle( qtr("Help") ); \
+    menu->addMenu( helpmenu ); \
+    \
     DP_SADD( qtr("Quit"), "", "", quit() , "Ctrl+Q" );
 
 void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )