Qt: SoutInputBox: show decoded mrl (fix #8436 part1)

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

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index f0fd337f51936dc415c02a050a12147b49400943..969a7cb94e30e1ba4b7be9b7b8cd731b4bfc9a4f 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -28,9 +28,8 @@
 #include "qt4.hpp"
 
 #include <QObject>
-#include <QAction>
 #include <QMenu>
-#include <vector>
+#include <QVector>
 
 using namespace std;
 
@@ -69,7 +68,7 @@ private:
     int i_val_type;
 };
 
-class QVLCMenu : public QObject
+class VLCMenuBar : public QObject
 {
     Q_OBJECT
     friend class MenuFunc;
@@ -90,10 +89,19 @@ public:
 
     /* Actions */
     static void DoAction( QObject * );
+    enum actionflag {
+        ACTION_NONE = 0x0,
+        ACTION_ALWAYS_ENABLED = 0x1,
+        ACTION_MANAGED = 0x2, /* managed using EnableStatic(bool)? */
+        ACTION_NO_CLEANUP = 0x4,
+        ACTION_STATIC = 0x6, /* legacy shortcut */
+        ACTION_DELETE_ON_REBUILD = 0x8
+    };
+    Q_DECLARE_FLAGS(actionflags, actionflag)
 
 private:
     /* All main Menus */
-    static QMenu *FileMenu( intf_thread_t *, QWidget * );
+    static QMenu *FileMenu( intf_thread_t *, QWidget *, MainInterface * mi = NULL );
 
     static QMenu *ToolsMenu( QMenu * );
     static QMenu *ToolsMenu( QWidget *parent ) { return ToolsMenu( new QMenu( parent ) ); }
@@ -107,13 +115,16 @@ private:
     static QMenu *NavigMenu( intf_thread_t *p_intf, QWidget *parent ) {
         return NavigMenu( p_intf, new QMenu( parent ) );
     }
-    static QMenu *RebuildNavigMenu( intf_thread_t *, QMenu *);
+    static QMenu *RebuildNavigMenu( intf_thread_t *, QMenu *, bool b_keep = false );
 
-    static QMenu *VideoMenu( intf_thread_t *, QMenu *, bool b_subtitle = true );
+    static QMenu *VideoMenu( intf_thread_t *, QMenu *, bool b_subtitle = false );
     static QMenu *VideoMenu( intf_thread_t *p_intf, QWidget *parent ) {
         return VideoMenu( p_intf, new QMenu( parent ) );
     }
-    static void SubMenu(intf_thread_t *p_intf, QMenu *current);
+    static QMenu *SubtitleMenu( intf_thread_t *, QMenu *current);
+    static QMenu *SubtitleMenu( intf_thread_t *p_intf, QWidget *parent) {
+        return SubtitleMenu( p_intf, new QMenu( parent ) );
+    }
 
     static QMenu *AudioMenu( intf_thread_t *, QMenu * );
     static QMenu *AudioMenu( intf_thread_t *p_intf, QWidget *parent ) {
@@ -124,14 +135,14 @@ private:
 
     /* Popups Menus */
     static void PopupMenuStaticEntries( QMenu *menu );
-    static void PopupPlayEntries( QMenu *menu, intf_thread_t *p_intf,
-                                         input_thread_t *p_input );
-    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf );
+    static void PopupMenuPlaylistEntries( QMenu *menu, intf_thread_t *p_intf,
+                                          input_thread_t *p_input );
     static void PopupMenuPlaylistControlEntries( QMenu *menu, intf_thread_t *p_intf );
+    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, bool b = true );
 
     /* Generic automenu methods */
     static QMenu * Populate( intf_thread_t *, QMenu *current,
-                             vector<const char*>&, vector<vlc_object_t *>& );
+                             QVector<const char*>&, QVector<vlc_object_t *>& );
 
     static void CreateAndConnect( QMenu *, const char *, const QString&,
                                   const QString&, int, vlc_object_t *,
@@ -139,6 +150,7 @@ private:
     static void UpdateItem( intf_thread_t *, QMenu *, const char *,
                             vlc_object_t *, bool );
     static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
+    static void EnableStaticEntries( QMenu *, bool );
 
     /* recentMRL menu */
     static QMenu *recentsMenu;
@@ -146,6 +158,7 @@ private:
 public slots:
     static void updateRecents( intf_thread_t * );
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(VLCMenuBar::actionflags)
 
 class MenuFunc : public QObject
 {
@@ -159,10 +172,11 @@ public:
     {
         switch( id )
         {
-            case 1: QVLCMenu::AudioMenu( p_intf, menu ); break;
-            case 2: QVLCMenu::VideoMenu( p_intf, menu ); break;
-            case 3: QVLCMenu::RebuildNavigMenu( p_intf, menu ); break;
-            case 4: QVLCMenu::ViewMenu( p_intf, menu ); break;
+            case 1: VLCMenuBar::AudioMenu( p_intf, menu ); break;
+            case 2: VLCMenuBar::VideoMenu( p_intf, menu ); break;
+            case 3: VLCMenuBar::RebuildNavigMenu( p_intf, menu ); break;
+            case 4: VLCMenuBar::ViewMenu( p_intf, menu ); break;
+            case 5: VLCMenuBar::SubtitleMenu( p_intf, menu ); break;
         }
     }
 private: