Merge module_release and module_Put

[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 0ae3b2500e6d184abf9186468519671f3e3c9e68..22337fa3f8fe5729678e00de2fd6ab8a40ac65ba 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -97,6 +97,9 @@ 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 )
@@ -299,9 +302,9 @@ 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 );
+    text->setText( toNativeSeparators( file ) );
 }
 
 void FileConfigControl::finish()
@@ -330,11 +333,11 @@ void DirectoryConfigControl::updateField()
     QString dir = QFileDialog::getExistingDirectory( NULL,
                       qtr( "Select Directory" ),
                       text->text().isEmpty() ?
-                        qfu( p_this->p_libvlc->psz_homedir ) : text->text(),
-                      QFileDialog::ShowDirsOnly |
-                        QFileDialog::DontResolveSymlinks );
+                        qfu( config_GetHomeDir() ) : text->text(),
+                  QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+
     if( dir.isNull() ) return;
-    text->setText( dir );
+    text->setText( toNativeSepNoSlash( dir ) );
 }
 
 #if 0
@@ -381,10 +384,10 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
 
        p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
 
-       // assume in any case that dirty was set to VLC_TRUE
+       // 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 = VLC_FALSE;
+       p_module_config->b_dirty = false;
 
        free( val.psz_string );
     }
@@ -439,7 +442,7 @@ void StringListConfigControl::actionRequested( int i_action )
     {
         combo->clear();
         finish( p_module_config, true );
-        p_module_config->b_dirty = VLC_FALSE;
+        p_module_config->b_dirty = false;
     }
 }
 StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
@@ -493,10 +496,10 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
             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 VLC_TRUE
+            // 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 = VLC_FALSE;
+            p_config->b_dirty = false;
         }
 
         for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
@@ -606,8 +609,12 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
         QGridLayout *l, int &line) :
     VStringConfigControl( _p_this, _p_item, _parent )
 {
+    groupBox = NULL;
+    /* Special Hack */
+    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 );
@@ -642,7 +649,6 @@ ModuleListConfigControl::~ModuleListConfigControl()
         delete *it;
     }
     delete groupBox;
-    delete text;
 }
 
 #define CHECKBOX_LISTS \
@@ -699,13 +705,14 @@ void ModuleListConfigControl::finish( bool bycat )
     }
     vlc_list_release( p_list );
     text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
-    if( groupBox )
-        groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+    assert( groupBox );
+    groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
 }
 #undef CHECKBOX_LISTS
 
 QString ModuleListConfigControl::getValue()
 {
+    assert( text );
     return text->text();
 }
 
@@ -871,10 +878,10 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
 
        p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL);
 
-       // assume in any case that dirty was set to VLC_TRUE
+       // 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 = VLC_FALSE;
+       p_module_config->b_dirty = false;
     }
 
 
@@ -958,7 +965,7 @@ void IntegerListConfigControl::actionRequested( int i_action )
     {
         combo->clear();
         finish( p_module_config, true );
-        p_module_config->b_dirty = VLC_FALSE;
+        p_module_config->b_dirty = false;
     }
 }
 
@@ -1001,14 +1008,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;
 }
 
 /**************************************************************************
@@ -1140,6 +1147,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() );
 }
 
@@ -1188,20 +1196,22 @@ void KeySelectorControl::finish()
         }
     }
     module_PutConfig (p_config);
-    module_Put (p_main);
+    module_release (p_main);
 
     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() );
 }