[Qt] Rewrite of the controller and ToolBar edition.

[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 76db95125c8ee7fbed97452e902322ff3fe8b713..5d8e3b849e4d3dec06b89ee63c7e7a19dc332dd7 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -304,7 +304,7 @@ void FileConfigControl::updateField()
     QString file = QFileDialog::getOpenFileName( NULL,
                   qtr( "Select File" ), qfu( config_GetHomeDir() ) );
     if( file.isNull() ) return;
-    text->setText( file );
+    text->setText( toNativeSeparators( file ) );
 }
 
 void FileConfigControl::finish()
@@ -334,10 +334,10 @@ void DirectoryConfigControl::updateField()
                       qtr( "Select Directory" ),
                       text->text().isEmpty() ?
                         qfu( config_GetHomeDir() ) : text->text(),
-                      QFileDialog::ShowDirsOnly |
-                        QFileDialog::DontResolveSymlinks );
+                  QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+
     if( dir.isNull() ) return;
-    text->setText( dir );
+    text->setText( toNativeSepNoSlash( dir ) );
 }
 
 #if 0
@@ -549,26 +549,23 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
 
 void ModuleConfigControl::finish( bool bycat )
 {
-    vlc_list_t *p_list;
     module_t *p_parser;
 
     combo->setEditable( false );
 
     /* build a list of available modules */
-    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+    module_t **p_list = module_list_get( NULL );
     combo->addItem( qtr("Default") );
-    for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+    for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
     {
-        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
         if( bycat )
         {
-            if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
+            if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
 
             unsigned confsize;
             module_config_t *p_config;
 
-            p_config = module_GetConfig (p_parser, &confsize);
+            p_config = module_config_get (p_parser, &confsize);
              for (size_t i = 0; i < confsize; i++)
             {
                 /* Hack: required subcategory is stored in i_min */
@@ -576,23 +573,23 @@ void ModuleConfigControl::finish( bool bycat )
                 if( p_cfg->i_type == CONFIG_SUBCATEGORY &&
                     p_cfg->value.i == p_item->min.i )
                     combo->addItem( qtr( module_GetLongName( p_parser )),
-                                    QVariant( module_GetObjName( p_parser ) ) );
+                                    QVariant( module_get_object( p_parser ) ) );
                 if( p_item->value.psz && !strcmp( p_item->value.psz,
-                                                  module_GetObjName( p_parser ) ) )
+                                                  module_get_object( p_parser ) ) )
                     combo->setCurrentIndex( combo->count() - 1 );
             }
-            module_PutConfig (p_config);
+            module_config_free (p_config);
         }
-        else if( module_IsCapable( p_parser, p_item->psz_type ) )
+        else if( module_provides( p_parser, p_item->psz_type ) )
         {
             combo->addItem( qtr(module_GetLongName( p_parser ) ),
-                            QVariant( module_GetObjName( p_parser ) ) );
+                            QVariant( module_get_object( p_parser ) ) );
             if( p_item->value.psz && !strcmp( p_item->value.psz,
-                                              module_GetObjName( p_parser ) ) )
+                                              module_get_object( p_parser ) ) )
                 combo->setCurrentIndex( combo->count() - 1 );
         }
     }
-    vlc_list_release( p_list );
+    module_list_free( p_list );
     combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     if( label )
         label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
@@ -613,7 +610,7 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
     /* Special Hack */
     if( !p_item->psz_text ) return;
 
-    groupBox = new QGroupBox ( qtr(p_item->psz_text) );
+    groupBox = new QGroupBox ( qtr(p_item->psz_text), _parent );
     text = new QLineEdit;
     QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
 
@@ -657,10 +654,10 @@ ModuleListConfigControl::~ModuleListConfigControl()
        checkBoxListItem *cbl = new checkBoxListItem; \
 \
        CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\
-       cb->setToolTip( formatTooltip( qtr( module_GetHelp( p_parser ))));\
+       cb->setToolTip( formatTooltip( qtr( module_get_help( p_parser ))));\
        cbl->checkBox = cb; \
 \
-       cbl->psz_module = strdup( module_GetObjName( p_parser ) ); \
+       cbl->psz_module = strdup( module_get_object( p_parser ) ); \
        modules.push_back( cbl ); \
 \
        if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \
@@ -670,21 +667,18 @@ ModuleListConfigControl::~ModuleListConfigControl()
 
 void ModuleListConfigControl::finish( bool bycat )
 {
-    vlc_list_t *p_list;
     module_t *p_parser;
 
     /* build a list of available modules */
-    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-    for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+    module_t **p_list = module_list_get( NULL );
+    for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
     {
-        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
         if( bycat )
         {
-            if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
+            if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
 
             unsigned confsize;
-            module_config_t *p_config = module_GetConfig (p_parser, &confsize);
+            module_config_t *p_config = module_config_get (p_parser, &confsize);
 
             for (size_t i = 0; i < confsize; i++)
             {
@@ -696,14 +690,14 @@ void ModuleListConfigControl::finish( bool bycat )
                     CHECKBOX_LISTS;
                 }
             }
-            module_PutConfig (p_config);
+            module_config_free (p_config);
         }
-        else if( module_IsCapable( p_parser, p_item->psz_type ) )
+        else if( module_provides( p_parser, p_item->psz_type ) )
         {
             CHECKBOX_LISTS;
         }
     }
-    vlc_list_release( p_list );
+    module_list_free( p_list );
     text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
     assert( groupBox );
     groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
@@ -1161,14 +1155,14 @@ void KeySelectorControl::finish()
     table->setAlternatingRowColors( true );
 
     /* Get the main Module */
-    module_t *p_main = module_Find( p_this, "main" );
+    module_t *p_main = module_get_main();
     assert( p_main );
 
     /* Access to the module_config_t */
     unsigned confsize;
     module_config_t *p_config;
 
-    p_config = module_GetConfig (p_main, &confsize);
+    p_config = module_config_get (p_main, &confsize);
 
     for (size_t i = 0; i < confsize; i++)
     {
@@ -1195,8 +1189,8 @@ void KeySelectorControl::finish()
             table->addTopLevelItem( treeItem );
         }
     }
-    module_PutConfig (p_config);
-    module_Put (p_main);
+    module_config_free (p_config);
+    module_release (p_main);
 
     table->resizeColumnToContents( 0 );