class MenuItemData : public QObject
{
-
-Q_OBJECT
+ Q_OBJECT
public:
- MenuItemData( QObject* parent, int i_id, int _i_type, vlc_value_t _val, const char *_var ) : QObject( parent )
+ MenuItemData( QObject* parent, vlc_object_t *_p_obj, int _i_type,
+ vlc_value_t _val, const char *_var ) : QObject( parent )
{
- i_object_id = i_id;
+ p_obj = _p_obj;
i_val_type = _i_type;
val = _val;
psz_var = strdup( _var );
if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( val.psz_string );
}
- int i_object_id;
- int i_val_type;
+
+ vlc_object_t *p_obj;
vlc_value_t val;
char *psz_var;
+
+private:
+ int i_val_type;
};
class QVLCMenu : public QObject
{
Q_OBJECT;
+ friend class MenuFunc;
+
public:
+ /* Main bar creation */
static void createMenuBar( MainInterface *mi, intf_thread_t *, bool );
- /* Menus */
- static QMenu *FileMenu();
- static QMenu *SDMenu( intf_thread_t * );
- static QMenu *PlaylistMenu( intf_thread_t *, MainInterface * );
- 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( QMenu * );
-
/* Popups Menus */
+ static void PopupMenu( intf_thread_t *, bool );
static void AudioPopupMenu( intf_thread_t * );
static void VideoPopupMenu( intf_thread_t * );
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,
- input_thread_t *p_input );
+
/* Systray */
static void updateSystrayMenu( MainInterface *,intf_thread_t *,
bool b_force_visible = false);
/* HACK for minimalView */
static QAction *minimalViewAction;
+
private:
+ /* All main Menus */
+ static QMenu *FileMenu( intf_thread_t * );
+ static QMenu *SDMenu( intf_thread_t * );
+ static QMenu *ToolsMenu( intf_thread_t * );
+ static QMenu *ViewMenu( 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( QMenu * );
+
+ /* Popups Menus */
+ static void PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu );
+ static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
+ input_thread_t *p_input );
/* Generic automenu methods */
static QMenu * Populate( intf_thread_t *, QMenu *current,
- vector<const char*>&, vector<int>&,
+ vector<const char*>&, vector<vlc_object_t *>&,
bool append = false );
static void CreateAndConnect( QMenu *, const char *, QString, QString,
- int, int, vlc_value_t, int, bool c = false );
+ int, vlc_object_t *, 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 );
+
+ /* recentMRL menu */
+ static QMenu *recentsMenu;
+
+public slots:
+ static void updateRecents( intf_thread_t * );
};
class MenuFunc : public QObject
{
switch( id )
{
- 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;
+ 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;
}
};
+private:
int id;
QMenu *menu;
};