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 c6642837343cde16256d26d36909da41a8011da2..b59948ec89372573700d39b1d006e8412aabd119 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -22,6 +22,10 @@
  * 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>
@@ -172,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 );
@@ -261,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();
     }
@@ -330,13 +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() );
@@ -959,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 &&