X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.hpp;h=d1f8f5d366e9ad5e3d735dc7f8b93b437347aff0;hb=4abc8cd606b30fe0f8f30486ef424b93808a9c23;hp=d06457dee2fd97f2725ec96e7a5767fb0275391d;hpb=099d9779be982f4204911c16f7ef14fcad8d3165;p=vlc

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index d06457dee2..d1f8f5d366 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -28,13 +28,14 @@
 #include "qt4.hpp"
 
 #include <QObject>
+#include <QAction>
 #include <vector>
 
 /* Folder vs. Directory */
-#ifdef WIN32
-#define I_OPEN_FOLDER "Open &Folder..."
+#if defined( WIN32 ) || defined(__APPLE__)
+#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;
@@ -58,9 +59,9 @@ public:
     }
     virtual ~MenuItemData()
     {
-        if( psz_var ) free( psz_var );
-        if( ((i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING)
-            && val.psz_string ) free( val.psz_string );
+        free( psz_var );
+        if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
+            free( val.psz_string );
     }
     int i_object_id;
     int i_val_type;
@@ -78,12 +79,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 * );
@@ -91,7 +93,7 @@ public:
     static void MiscPopupMenu( intf_thread_t * );
     static void PopupMenu( intf_thread_t *, bool );
     static void PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu );
-    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, 
+    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
                                          input_thread_t *p_input );
     /* Systray */
     static void updateSystrayMenu( MainInterface *,intf_thread_t  *,
@@ -99,6 +101,9 @@ public:
 
     /* Actions */
     static void DoAction( intf_thread_t *, QObject * );
+
+    /* HACK for minimalView */
+    static QAction *minimalViewAction;
 private:
     /* Generic automenu methods */
     static QMenu * Populate( intf_thread_t *, QMenu *current,
@@ -107,13 +112,14 @@ private:
 
     static void CreateAndConnect( QMenu *, const char *, QString, QString,
                                   int, int, vlc_value_t, int, bool c = false );
-    static void CreateItem( QMenu *, const char *, vlc_object_t *, bool );
+    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; };
@@ -121,13 +127,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