Qt: unify item activation among PL views, change title when browsing in iconView

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

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 396da64011dfcc9bdf35b2a9f54df96f1e134da9..6b626b1b6d2ad63e7ad5be52c26096b03ffaa3da 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -48,6 +48,7 @@
 #include <QTreeWidgetItem>
 #include <QSignalMapper>
 #include <QDialogButtonBox>
+#include <QKeyEvent>
 
 #define MINWIDTH_BOX 90
 #define LAST_COLUMN 10
@@ -98,9 +99,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
     case CONFIG_ITEM_MODULE_LIST_CAT:
         p_control = new ModuleListConfigControl( p_this, p_item, parent, true,
                                              l, line );
-        /* Special Hack for a bug in video-filter */
-        if( qobject_cast<ModuleListConfigControl *>( p_control )->groupBox == NULL )
-            return NULL;
         break;
     case CONFIG_ITEM_STRING:
         if( !p_item->i_list )
@@ -211,10 +209,10 @@ void InterfacePreviewWidget::setPreview( int comboid )
     /* Need to move resources references as soon as qt4.cpp
        local defines has been moved somewhere else
     */
-    const char * pixmaps[] = { ":/prefsmenu/sample_classic",
-                               ":/prefsmenu/sample_complete",
-                               ":/prefsmenu/sample_minimal",
-                                ":/prefsmenu/sample_skins" };
+    static const char pixmaps[][28] = { ":/prefsmenu/sample_classic",
+                                        ":/prefsmenu/sample_complete",
+                                        ":/prefsmenu/sample_minimal",
+                                        ":/prefsmenu/sample_skins" };
     setPixmap( QPixmap( pixmaps[ comboid ] ) );
 }
 
@@ -413,20 +411,6 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
     combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
 
     module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
-    if(p_module_config && p_module_config->pf_update_list)
-    {
-       vlc_value_t val;
-       val.psz_string = strdup(p_module_config->value.psz);
-
-       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
-
-       // assume in any case that dirty was set to true
-       // because lazy programmes will use the same callback for
-       // this, like the one behind the refresh push button?
-       p_module_config->b_dirty = false;
-
-       free( val.psz_string );
-    }
 
     finish( p_module_config, bycat );
     if( !l )
@@ -499,6 +483,21 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca
 
     if(!p_module_config) return;
 
+    if( p_module_config->pf_update_list )
+    {
+       vlc_value_t val;
+       val.psz_string = strdup(p_module_config->value.psz);
+
+       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
+
+       // assume in any case that dirty was set to true
+       // because lazy programmes will use the same callback for
+       // this, like the one behind the refresh push button?
+       p_module_config->b_dirty = false;
+
+       free( val.psz_string );
+    }
+
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
         combo->addItem( qfu((p_module_config->ppsz_list_text &&
@@ -913,19 +912,6 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
     combo->setMinimumWidth( MINWIDTH_BOX );
 
     module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
-    if(p_module_config && p_module_config->pf_update_list)
-    {
-       vlc_value_t val;
-       val.i_int = p_module_config->value.i;
-
-       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
-
-       // assume in any case that dirty was set to true
-       // because lazy programmes will use the same callback for
-       // this, like the one behind the refresh push button?
-       p_module_config->b_dirty = false;
-    }
-
 
     finish( p_module_config, bycat );
     if( !l )
@@ -977,6 +963,19 @@ void IntegerListConfigControl::finish(module_config_t *p_module_config, bool byc
 
     if(!p_module_config) return;
 
+    if( p_module_config->pf_update_list )
+    {
+       vlc_value_t val;
+       val.i_int = p_module_config->value.i;
+
+       p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
+
+       // assume in any case that dirty was set to true
+       // because lazy programmes will use the same callback for
+       // this, like the one behind the refresh push button?
+       p_module_config->b_dirty = false;
+    }
+
     for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
         combo->addItem( qtr(p_module_config->ppsz_list_text[i_index] ),