X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=67f1cf8b7b5369c28d146e1f8b05f668cd6e359b;hb=36f0edc98752f8afa17a50cb8de086b30ba54c2e;hp=d918c5e98d4443e423f5f2f78a601a99e6d58c96;hpb=db4506a7ce6cd2c2c33131b1fad725d16807bcdc;p=vlc

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index d918c5e98d..67f1cf8b7b 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -30,10 +30,12 @@
  *  - Improvements over WX
  *      - Validator for modulelist
  */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "components/preferences_widgets.hpp"
 #include "util/customwidgets.hpp"
-
 #include <vlc_keys.h>
 
 #include <QString>
@@ -41,7 +43,6 @@
 #include <QGridLayout>
 #include <QSlider>
 #include <QFileDialog>
-#include <QFontDialog>
 #include <QGroupBox>
 #include <QTreeWidgetItem>
 #include <QSignalMapper>
@@ -132,10 +133,12 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
         p_control = new DirectoryConfigControl( p_this, p_item, parent, l,
                                                 line, false );
         break;
+#if 0
     case CONFIG_ITEM_FONT:
         p_control = new FontConfigControl( p_this, p_item, parent, l,
                                            line, false );
         break;
+#endif
     case CONFIG_ITEM_KEY:
         p_control = new KeySelectorControl( p_this, p_item, parent, l, line );
         break;
@@ -181,7 +184,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf )
             VStringConfigControl *vscc =
                             qobject_cast<VStringConfigControl *>(this);
             assert( vscc );
-            config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) );
+            config_PutPsz( p_intf, vscc->getName(), qtu( vscc->getValue() ) );
             break;
         }
         case CONFIG_ITEM_KEY:
@@ -296,7 +299,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
 void FileConfigControl::updateField()
 {
     QString file = QFileDialog::getOpenFileName( NULL,
-                  qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ) );
+                  qtr( "Select File" ), qfu( config_GetHomeDir() ) );
     if( file.isNull() ) return;
     text->setText( file );
 }
@@ -327,13 +330,16 @@ void DirectoryConfigControl::updateField()
     QString dir = QFileDialog::getExistingDirectory( NULL,
                       qtr( "Select Directory" ),
                       text->text().isEmpty() ?
-                        qfu( p_this->p_libvlc->psz_homedir ) : text->text(),
+                        qfu( config_GetHomeDir() ) : text->text(),
                       QFileDialog::ShowDirsOnly |
                         QFileDialog::DontResolveSymlinks );
     if( dir.isNull() ) return;
     text->setText( dir );
 }
 
+#if 0
+#include <QFontDialog>
+
 /********* String / Font **********/
 FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
                         module_config_t *_p_item, QWidget *_p_widget,
@@ -354,6 +360,7 @@ void FontConfigControl::updateField()
     if( !ok ) return;
     text->setText( font.family() );
 }
+#endif
 
 /********* String / choice list **********/
 StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
@@ -365,7 +372,24 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
     combo = new QComboBox();
     combo->setMinimumWidth( MINWIDTH_BOX );
     combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
-    finish( bycat );
+
+    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 )
     {
         l = new QGridLayout();
@@ -402,17 +426,20 @@ void StringListConfigControl::actionRequested( int i_action )
     /* Supplementary check for boundaries */
     if( i_action < 0 || i_action >= p_item->i_action ) return;
 
+    module_config_t *p_module_config = config_FindConfig( p_this, getName() );
+    if(!p_module_config) return;
+
     vlc_value_t val;
     val.psz_string =
         qtu( (combo->itemData( combo->currentIndex() ).toString() ) );
 
-    p_item->ppf_action[i_action]( p_this, getName(), val, val, 0 );
+    p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 );
 
-    if( p_item->b_dirty )
+    if( p_module_config->b_dirty )
     {
         combo->clear();
-        finish( true );
-        p_item->b_dirty = VLC_FALSE;
+        finish( p_module_config, true );
+        p_module_config->b_dirty = false;
     }
 }
 StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
@@ -421,26 +448,32 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
 {
     combo = _combo;
     label = _label;
-    finish( bycat );
+
+    module_config_t *p_module_config = config_FindConfig( p_this, getName() );
+
+    finish( p_module_config, bycat );
 }
 
-void StringListConfigControl::finish( bool bycat )
+void StringListConfigControl::finish(module_config_t *p_module_config, bool bycat )
 {
     combo->setEditable( false );
 
-    for( int i_index = 0; i_index < p_item->i_list; i_index++ )
+    if(!p_module_config) return;
+
+    for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
-        combo->addItem( qfu(p_item->ppsz_list_text ?
-                            p_item->ppsz_list_text[i_index] :
-                            p_item->ppsz_list[i_index] ),
-                        QVariant( p_item->ppsz_list[i_index] ) );
-        if( p_item->value.psz && !strcmp( p_item->value.psz,
-                                          p_item->ppsz_list[i_index] ) )
+        combo->addItem( qfu((p_module_config->ppsz_list_text &&
+                            p_module_config->ppsz_list_text[i_index])?
+                            p_module_config->ppsz_list_text[i_index] :
+                            p_module_config->ppsz_list[i_index] ),
+                   QVariant( qfu(p_module_config->ppsz_list[i_index] )) );
+        if( p_item->value.psz && !strcmp( p_module_config->value.psz,
+                                          p_module_config->ppsz_list[i_index] ) )
             combo->setCurrentIndex( combo->count() - 1 );
     }
-    combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+    combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
 }
 
 QString StringListConfigControl::getValue()
@@ -455,6 +488,17 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
                       config_FindConfig( VLC_OBJECT(p_intf), configname );
     if( p_config )
     {
+       if(p_config->pf_update_list)
+        {
+            vlc_value_t val;
+            val.i_int = p_config->value.i;
+            p_config->pf_update_list(VLC_OBJECT(p_intf), configname, 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_config->b_dirty = false;
+        }
+
         for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
         {
             combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
@@ -562,8 +606,11 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
         QGridLayout *l, int &line) :
     VStringConfigControl( _p_this, _p_item, _parent )
 {
+    groupBox = NULL;
+    if( !p_item->psz_text ) return;
+
     groupBox = new QGroupBox ( qtr(p_item->psz_text) );
-    text = new QLineEdit();
+    text = new QLineEdit;
     QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
 
     finish( bycat );
@@ -597,8 +644,7 @@ ModuleListConfigControl::~ModuleListConfigControl()
     {
         delete *it;
     }
-    delete groupBox;
-    delete text;
+    if( groupBox ) delete groupBox;
 }
 
 #define CHECKBOX_LISTS \
@@ -818,7 +864,23 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
     label = new QLabel( qtr(p_item->psz_text) );
     combo = new QComboBox();
     combo->setMinimumWidth( MINWIDTH_BOX );
-    finish( bycat );
+
+    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 )
     {
         QHBoxLayout *layout = new QHBoxLayout();
@@ -830,6 +892,25 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
         l->addWidget( label, line, 0 );
         l->addWidget( combo, line, LAST_COLUMN, Qt::AlignRight );
     }
+
+    if( p_item->i_action )
+    {
+        QSignalMapper *signalMapper = new QSignalMapper(this);
+
+        /* Some stringLists like Capture listings have action associated */
+        for( int i = 0; i < p_item->i_action; i++ )
+        {
+            QPushButton *button =
+                new QPushButton( qfu( p_item->ppsz_action_text[i] ));
+            CONNECT( button, clicked(), signalMapper, map() );
+            signalMapper->setMapping( button, i );
+            l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i,
+                    Qt::AlignRight );
+        }
+        CONNECT( signalMapper, mapped( int ),
+                this, actionRequested( int ) );
+    }
+
 }
 IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
                 module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
@@ -837,23 +918,50 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
 {
     combo = _combo;
     label = _label;
-    finish( bycat );
+
+    module_config_t *p_module_config = config_FindConfig( p_this, getName() );
+
+    finish( p_module_config, bycat );
 }
 
-void IntegerListConfigControl::finish( bool bycat )
+void IntegerListConfigControl::finish(module_config_t *p_module_config, bool bycat )
 {
     combo->setEditable( false );
 
-    for( int i_index = 0; i_index < p_item->i_list; i_index++ )
+    if(!p_module_config) return;
+
+    for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
     {
-        combo->addItem( qtr(p_item->ppsz_list_text[i_index] ),
-                        QVariant( p_item->pi_list[i_index] ) );
-        if( p_item->value.i == p_item->pi_list[i_index] )
+        combo->addItem( qtr(p_module_config->ppsz_list_text[i_index] ),
+                        QVariant( p_module_config->pi_list[i_index] ) );
+        if( p_module_config->value.i == p_module_config->pi_list[i_index] )
             combo->setCurrentIndex( combo->count() - 1 );
     }
-    combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+    combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
     if( label )
-        label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+        label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
+}
+
+void IntegerListConfigControl::actionRequested( int i_action )
+{
+    /* Supplementary check for boundaries */
+    if( i_action < 0 || i_action >= p_item->i_action ) return;
+
+    module_config_t *p_module_config = config_FindConfig( p_this, getName() );
+    if(!p_module_config) return;
+
+
+    vlc_value_t val;
+    val.i_int = combo->itemData( combo->currentIndex() ).toInt();
+
+    p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 );
+
+    if( p_module_config->b_dirty )
+    {
+        combo->clear();
+        finish( p_module_config, true );
+        p_module_config->b_dirty = false;
+    }
 }
 
 int IntegerListConfigControl::getValue()
@@ -895,14 +1003,14 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
 
 void BoolConfigControl::finish()
 {
-    checkbox->setCheckState( p_item->value.i == VLC_TRUE ? Qt::Checked
+    checkbox->setCheckState( p_item->value.i == true ? Qt::Checked
                                                         : Qt::Unchecked );
     checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 
 int BoolConfigControl::getValue()
 {
-    return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE;
+    return checkbox->checkState() == Qt::Checked ? true : false;
 }
 
 /**************************************************************************
@@ -1034,6 +1142,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
     l->addWidget( keyContainer, line, 0, 1, 2 );
 
     CONNECT( clearButton, clicked(), shortcutValue, clear() );
+    CONNECT( clearButton, clicked(), this, setTheKey() );
     BUTTONACT( setButton, setTheKey() );
 }
 
@@ -1086,16 +1195,18 @@ void KeySelectorControl::finish()
 
     table->resizeColumnToContents( 0 );
 
-    CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
-             this, select1Key( QTreeWidgetItem * ) );
     CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
              this, selectKey( QTreeWidgetItem * ) );
+    CONNECT( table, itemSelectionChanged (),
+             this, select1Key() );
+
     CONNECT( shortcutValue, pressed(), this, selectKey() );
 }
 
 /* Show the key selected from the table in the keySelector */
-void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem )
+void KeySelectorControl::select1Key()
 {
+    QTreeWidgetItem *keyItem = table->currentItem();
     shortcutValue->setText( keyItem->text( 1 ) );
     shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() );
 }