Changeset 5ec2ab65b9da97c218818273f7a8e62cd7eaee09

Timestamp:

17/06/08 04:58:33 (6 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1213671513 -0700

git-parent:

[514a804f231641c2ca86d96281939df2a3843721]

git-author:

Jean-Philippe Andre <jpeg@via.ecp.fr> 1213623610 +0200

Message:

Qt4 menus: start fixing ticket 1602

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Files:

• modules/gui/qt4/menus.cpp (modified) (25 diffs)
• modules/gui/qt4/menus.hpp (modified) (2 diffs)

modules/gui/qt4/menus.cpp

@@ -23 +23 @@
- *****************************************************************************/
-
+/** \todo
+ * - Remove static currentGroup
+ */
+
-#ifdef HAVE_CONFIG_H
-# include "config.h"
@@ -98 +102 @@
- *****************************************************************************/
-#define PUSH_VAR( var ) varnames.push_back( var ); \
-
+
+
+
+
-
-#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
@@ -118 +125 @@
-
-static int VideoAutoMenuBuilder( vlc_object_t *p_object,
+        input_thread_t *p_input,
-        vector<int> &objects,
-        vector<const char *> &varnames )
-{
+    PUSH_INPUTVAR( "video-es" );
+    PUSH_INPUTVAR( "spu-es" );
-    PUSH_VAR( "fullscreen" );
-    PUSH_VAR( "zoom" );
@@ -130 +140 @@
-    PUSH_VAR( "video-snapshot" );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;
@@ -143 +156 @@
-
-static int AudioAutoMenuBuilder( vlc_object_t *p_object,
+        input_thread_t *p_input,
-        vector<int> &objects,
-        vector<const char *> &varnames )
-{
+    PUSH_INPUTVAR( "audio-es" );
-    PUSH_VAR( "audio-device" );
-    PUSH_VAR( "audio-channels" );
@@ -153 +168 @@
-}
-
+static QAction * FindActionWithVar( QMenu *menu, const char *psz_var )
+{
+    QAction *action;
+    Q_FOREACH( action, menu->actions() )
+    {
+        if( action->data().toString() == psz_var )
+            return action;
+    }
+    return NULL;
+}
+
+static QAction * FindActionWithText( QMenu *menu, QString &text )
+{
+    QAction *action;
+    Q_FOREACH( action, menu->actions() )
+    {
+        if( action->text() == text )
+            return action;
+    }
+    return NULL;
+}
+
-/*****************************************************************************
- * All normal menus
@@ -159 +196 @@
-
-#define BAR_ADD( func, title ) { \
-menu = func; menu->setTitle( title ); bar->addMenu( 
+_menu = func; _menu->setTitle( title ); bar->addMenu( _
-
-#define BAR_DADD( func, title, id ) { \
-
-
-
-
+
+
+
+
+
+
+
+
-
-/**
@@ -182 +223 @@
-    BAR_ADD( ToolsMenu( p_intf, NULL, mi, visual_selector_enabled, true ),
-             qtr( "&Tools" ) );
-2
-1
+1
+2
-    BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
-
-    BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
-}
@@ -350 +390 @@
-    vector<int> objects;
-    vector<const char *> varnames;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        vlc_object_release( p_object );
-
-
-
-
-
-
-
-
-
+
+
+
-    return Populate( p_intf, current, varnames, objects );
-}
@@ -376 +429 @@
-{
-    vlc_object_t *p_object;
+    input_thread_t *p_input;
-    vector<int> objects;
-    vector<const char *> varnames;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-            FIND_ANYWHERE );
-
-
-
+
+
+
+
-        vlc_object_release( p_object );
-
+
+
+
-    return Populate( p_intf, current, varnames, objects );
-}
@@ -410 +478 @@
-    p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-            FIND_ANYWHERE );
-
-
-
-
-
+
+
+
+
+
+
-        vlc_object_release( p_object );
-    }
-    QMenu *navMenu = new QMenu( menu );
-    addDPStaticEntry( navMenu, qtr( I_MENU_GOTOTIME ), "","",
@@ -479 +547 @@
-}
-
+#undef ACT_ADD
-
-/*****************************************************************************
@@ -555 +624 @@
-    {
-        vlc_object_yield( p_input );
-        varnames.push_back( "video-es" );
-        objects.push_back( p_input->i_object_id );
-        varnames.push_back( "spu-es" );
-        objects.push_back( p_input->i_object_id );
-        vlc_object_t *p_vout = ( vlc_object_t * )vlc_object_find( p_input,
-                VLC_OBJECT_VOUT, FIND_CHILD );
-        if( p_vout )
-        {
-
+p_input, 
-            vlc_object_release( p_vout );
-        }
@@ -579 +644 @@
-    {
-        vlc_object_yield( p_input );
-        varnames.push_back( "audio-es" );
-        objects.push_back( p_input->i_object_id );
-        vlc_object_t *p_aout = ( vlc_object_t * )vlc_object_find( p_input,
-                VLC_OBJECT_AOUT, FIND_ANYWHERE );
+        AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
-        if( p_aout )
-        {
-            AudioAutoMenuBuilder( p_aout, objects, varnames );
-            vlc_object_release( p_aout );
-        }
-        vlc_object_release( p_input );
-    }
@@ -638 +699 @@
-                /* Audio menu */
-                PUSH_SEPARATOR;
-                varnames.push_back( "audio-es" );
-                objects.push_back( p_input->i_object_id );
-                vlc_object_t *p_aout = ( vlc_object_t * )
-                    vlc_object_find( p_input, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+                AudioAutoMenuBuilder( p_aout, p_input, objects, varnames );
-                if( p_aout )
-                {
-                    AudioAutoMenuBuilder( p_aout, objects, varnames );
-                    vlc_object_release( p_aout );
-                }
-
-                /* Video menu */
-                PUSH_SEPARATOR;
-                varnames.push_back( "video-es" );
-                objects.push_back( p_input->i_object_id );
-                varnames.push_back( "spu-es" );
-                objects.push_back( p_input->i_object_id );
-                vlc_object_t *p_vout = ( vlc_object_t * )
-                    vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+                    VideoAutoMenuBuilder( p_vout, p_input, objects, varnames );
-                if( p_vout )
-                {
-                    VideoAutoMenuBuilder( p_vout, objects, varnames );
-                    vlc_object_release( p_vout );
-                }
-
-                vlc_object_release( p_input );
@@ -727 +778 @@
-#undef PUSH_VAR
-#undef PUSH_SEPARATOR
-
-
-/*************************************************************************
@@ -741 +791 @@
-    if( !menu )
-        menu = new QMenu();
-
-
+
+
+
+
+
+
-
-    currentGroup = NULL;
-
-    vlc_object_t *p_object;
-    bool b_section_empty = false;
-    int i;
-
-#define APPEND_EMPTY { QAction *action = menu->addAction( qtr( "Empty" ) ); \
-    action->setEnabled( false ); }
-
-    for( i = 0; i < ( int )objects.size() ; i++ )
@@ -757 +807 @@
-        if( !varnames[i] || !*varnames[i] )
-        {
-            if( b_section_empty )
-                APPEND_EMPTY;
-            menu->addSeparator();
-            b_section_empty = true;
-            continue;
-        }
@@ -766 +813 @@
-        if( objects[i] == 0 )
-        {
-            /// \bug What is this ?
-            // Append( menu, varnames[i], NULL );
-            b_section_empty = false;
-            continue;
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        /* Ugly specific stuff */
-        if( strstr( varnames[i], "intf-add" ) )
-CreateItem(
+UpdateItem( p_intf,
-        else
-
-
-
-
-
-
-
-
+
+
+
+
-    return menu;
-}
-#undef APPEND_EMPTY
-
-/*****************************************************************************
@@ -840 +884 @@
-}
-
-
-
+
+
+
+
-{
-    vlc_value_t val, text;
-    int i_type;
-
+    if( !p_object )
+    {
+        /* Nothing to do */
+        return;
+    }
+
+    if( !strcmp( psz_var, "spu-es" ) )
+    {
+        /* TODO: add a static entry "Load File..." */
+        return;
+    }
+
-    /* Check the type of the object variable */
-
+
+
+
+
+
-
-    switch( i_type & VLC_VAR_TYPE )
@@ -867 +929 @@
-
-    /* Get the descriptive name of the variable */
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( i_type & VLC_VAR_HASCHOICE )
@@ -874 +947 @@
-        if( b_submenu )
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
-            if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0 )
-                menu->addMenu( submenu );
@@ -885 +965 @@
-        return;
-    }
-
-#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
-
-    switch( i_type & VLC_VAR_TYPE )
@@ -1010 +1088 @@
-        bool checked )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
-    action->setText( text );
-    action->setToolTip( help );
+
+    action->setEnabled( i_object_id != 0 );
-
-    if( i_item_type == ITEM_CHECK )
@@ -1026 +1117 @@
-    }
-
-
-
-
-
+
+
-    MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
-            val, psz_var );

modules/gui/qt4/menus.hpp

@@ -108 +108 @@
-    static void CreateAndConnect( QMenu *, const char *, QString, QString,
-                                  int, int, vlc_value_t, int, bool c = false );
-
+
+
-    static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
-};
@@ -122 +123 @@
-        switch( id )
-        {
-Vide
-Audi
+Audi
+Vide
-        case 3: QVLCMenu::NavigMenu( p_intf, menu ); break;
-        case 4: QVLCMenu::InterfacesMenu( p_intf, menu ); break;