qt: i18n fix

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

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 9de11632610f9e71eb43a595339a5b101a7bbbc7..0120dedff8ccaf7acb6a74a651422e1473e544e0 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -32,9 +32,9 @@
 
 /* Folder vs. Directory */
 #if defined( WIN32 ) || defined(__APPLE__)
-#define I_OPEN_FOLDER "Open &Folder..."
+#define I_OPEN_FOLDER N_("Open &Folder...")
 #else
-#define I_OPEN_FOLDER "Open D&irectory..."
+#define I_OPEN_FOLDER N_("Open D&irectory...")
 #endif //WIN32
 
 using namespace std;
@@ -49,10 +49,9 @@ class MenuItemData : public QObject
 Q_OBJECT
 
 public:
-    MenuItemData( vlc_object_t *_obj, int _i_type, vlc_value_t _val,
-                  const char *_var )
+    MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
     {
-        obj = _obj;
+        i_object_id = i_id;
         i_val_type = _i_type;
         val = _val;
         psz_var = strdup( _var );
@@ -63,7 +62,7 @@ public:
         if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
             free( val.psz_string );
     }
-    vlc_object_t *obj;
+    int i_object_id;
     int i_val_type;
     vlc_value_t val;
     char *psz_var;
@@ -79,12 +78,13 @@ public:
     static QMenu *FileMenu();
     static QMenu *SDMenu( intf_thread_t * );
     static QMenu *PlaylistMenu( intf_thread_t *, MainInterface * );
-    static QMenu *ToolsMenu( intf_thread_t *, MainInterface *, bool, bool with = true );
-    static QMenu *NavigMenu( intf_thread_t * , QMenu * );
-    static QMenu *VideoMenu( intf_thread_t * , QMenu * );
-    static QMenu *AudioMenu( intf_thread_t * , QMenu * );
+    static QMenu *ToolsMenu( intf_thread_t *, QMenu *, MainInterface *,
+                             bool, bool with = true );
+    static QMenu *NavigMenu( intf_thread_t *, QMenu * );
+    static QMenu *VideoMenu( intf_thread_t *, QMenu * );
+    static QMenu *AudioMenu( intf_thread_t *, QMenu * );
     static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
-    static QMenu *HelpMenu();
+    static QMenu *HelpMenu( QMenu * );
 
     /* Popups Menus */
     static void AudioPopupMenu( intf_thread_t * );
@@ -103,19 +103,19 @@ public:
 private:
     /* Generic automenu methods */
     static QMenu * Populate( intf_thread_t *, QMenu *current,
-                             vector<const char*>&, vector<vlc_object_t *>&,
+                             vector<const char*>&, vector<int>&,
                              bool append = false );
 
     static void CreateAndConnect( QMenu *, const char *, QString, QString,
-                                  int, vlc_object_t *, vlc_value_t, int,
-                                  bool c = false );
-    static void CreateItem( QMenu *, const char *, vlc_object_t *, bool );
+                                  int, int, vlc_value_t, int, bool c = false );
+    static void UpdateItem( intf_thread_t *, QMenu *, const char *,
+                            vlc_object_t *, bool );
     static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
 };
 
 class MenuFunc : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
@@ -123,13 +123,14 @@ public:
     {
         switch( id )
         {
-        case 1: QVLCMenu::VideoMenu( p_intf, menu ); break;
-        case 2: QVLCMenu::AudioMenu( p_intf, menu ); break;
+        case 1: QVLCMenu::AudioMenu( p_intf, menu ); break;
+        case 2: QVLCMenu::VideoMenu( p_intf, menu ); break;
         case 3: QVLCMenu::NavigMenu( p_intf, menu ); break;
         case 4: QVLCMenu::InterfacesMenu( p_intf, menu ); break;
         }
     };
-    int id; QMenu *menu;
+    int id;
+    QMenu *menu;
 };
 
 #endif