Qt4 - Windows. Put the file extensions in a tree and in categories. Various checks...

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

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 75110cdf87753765f6260bb81b447da0a9563b50..b59948ec89372573700d39b1d006e8412aabd119 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -22,6 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+
 #include <vlc_intf_strings.h>
 
 #include "main_interface.hpp"
@@ -170,7 +176,8 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
     QMenuBar *bar = mi->menuBar();
     BAR_ADD( FileMenu(), qtr( "&Media" ) );
     BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
-    BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), qtr( "&Tools" ) );
+    BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ),
+             qtr( "&Tools" ) );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 );
     BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
@@ -259,7 +266,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
     if( with_intf )
     {
         QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
-        intfmenu->setTitle( qtr( "Add Interfaces" ) );
+        intfmenu->setTitle( qtr( "Interfaces" ) );
         menu->addMenu( intfmenu );
         menu->addSeparator();
     }
@@ -268,11 +275,14 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
         /* Minimal View */
         QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
                 SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
-        //FIXME: remove useless thing. But keep it until the release, pls.
         action->setCheckable( true );
         if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE )
             action->setChecked( true );
 
+        /* FullScreen View */
+        action = menu->addAction( qtr( "Toggle Fullscreen Interface" ), mi,
+                SLOT( toggleFullScreen() ), qtr( "F11" ) );
+
         /* Advanced Controls */
         action = menu->addAction( qtr( "Advanced controls" ), mi,
                 SLOT( toggleAdvanced() ) );
@@ -296,12 +306,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
         SLOT( mediaInfoDialog() ), "Ctrl+I" );
     addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
         ":/pixmaps/menus_info_16px.png", SLOT( mediaCodecDialog() ), "Ctrl+J" );
-
-#if 0 /* Not Implemented yet */
-    addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","", "bookmarksDialog()", "Ctrl+B" );
-#endif
+    addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
+                      SLOT( bookmarksDialog() ), "Ctrl+B" );
+#ifdef ENABLE_VLM
     addDPStaticEntry( menu, qtr( I_MENU_VLM ), "", "", SLOT( vlmDialog() ),
         "Ctrl+V" );
+#endif
 
     menu->addSeparator();
     addDPStaticEntry( menu, qtr( "Preferences..." ), "",
@@ -325,8 +335,15 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
     if( !p_intf->pf_show_dialog )
     {
         menu->addSeparator();
-        menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
-                QString( "Ctrl+Z" ) );
+        menu->addAction( qtr( "Switch to skins" ), THEDP,
+                SLOT( switchToSkins() ), QString( "Ctrl+Z" ) );
+#ifdef HAVE_WX
+        if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
+        {
+            menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
+                    SLOT( switchToWx() ) );
+        }
+#endif
     }
 
     CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
@@ -399,12 +416,11 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu )
     vector<int> objects;
     vector<const char *> varnames;
 
-    /* FIXME */
     p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
             FIND_ANYWHERE );
     if( p_object != NULL )
     {
-        InputAutoMenuBuilder( p_object, objects, varnames );
+        InputAutoMenuBuilder(  p_object, objects, varnames );
         PUSH_VAR( "prev-title" ); PUSH_VAR ( "next-title" );
         PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" );
         vlc_object_release( p_object );
@@ -459,7 +475,9 @@ QMenu *QVLCMenu::HelpMenu()
     QMenu *menu = new QMenu();
     addDPStaticEntry( menu, qtr( "Help..." ) , "",
         ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
+#ifdef UPDATE_CHECK
     addDPStaticEntry( menu, qtr( "Update" ) , "", "", SLOT( updateDialog() ), "");
+#endif
     menu->addSeparator();
     addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
         "Ctrl+F1" );
@@ -948,7 +966,8 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
             case VLC_VAR_STRING:
                 var_Get( p_object, psz_var, &val );
                 another_val.psz_string = strdup( CURVAL.psz_string );
-                menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
+                menutext = qfu( "Add " ) /* If this function is more used, FIX*/
+                         + qfu( CURTEXT ? CURTEXT : another_val.psz_string );
                 CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
                         p_object->i_object_id, another_val, i_type,
                         NOTCOMMAND && val.psz_string &&