Add special case for category labels.

[vlc] / modules / gui / qt4 / components / extended_panels.cpp

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 6adc33390761401128631a440a93a5fa037a1481..bb5d54f961b2c11937104d4e93584132273f980c 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -105,12 +105,12 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QWidget *_parent ) :
         if( p_obj ) \
         { \
             vlc_object_release( p_obj ); \
-            if( checkbox ) checkbox->setCheckState( Qt::Checked ); \
+            if( checkbox ) checkbox->setChecked( true ); \
             else groupbox->setChecked( true ); \
         } \
         else \
         { \
-            if( checkbox ) checkbox->setCheckState( Qt::Unchecked ); \
+            if( checkbox ) checkbox->setChecked( false ); \
             else groupbox->setChecked( false ); \
         } \
     } \
@@ -212,7 +212,7 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, vlc_bool_t b_add )
 
     /* Please leave p_libvlc_global. This is where cached modules are
      * stored. We're not trying to find a module instance. */
-    module_t *p_obj = module_FindName( p_intf, psz_name );
+    module_t *p_obj = module_Find( p_intf, psz_name );
     if( !p_obj )
     {
         msg_Err( p_intf, "Unable to find filter module \"%s\n.", psz_name );
@@ -689,12 +689,20 @@ void ExtV4l2::Refresh( void )
                 }
                 case VLC_VAR_VOID:
                 {
-                    QPushButton *button = new QPushButton( psz_label, box );
-                    button->setObjectName( psz_var );
+                    if( i_type & VLC_VAR_ISCOMMAND )
+                    {
+                        QPushButton *button = new QPushButton( psz_label, box );
+                        button->setObjectName( psz_var );
 
-                    CONNECT( button, clicked( bool ), this,
-                             ValueChange( bool ) );
-                    layout->addWidget( button );
+                        CONNECT( button, clicked( bool ), this,
+                                 ValueChange( bool ) );
+                        layout->addWidget( button );
+                    }
+                    else
+                    {
+                        QLabel *label = new QLabel( psz_label, box );
+                        layout->addWidget( label );
+                    }
                     break;
                 }
                 default: