preferences.cpp: Changed the preferences dialog to use a tree of categories

and plugins, the way wxwindows do it.
pluginsbox.(cpp|h): removed the "Configure" button from CONFIG_ITEM_MODULE
widgets, as it isn't needed anymore

modules/gui/kde/pluginsbox.cpp

@@ -2,7 +2,7 @@
  * pluginbox.cpp: the pluginbox class
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: pluginsbox.cpp,v 1.2 2002/08/12 17:38:10 sigmunau Exp $
+ * $Id: pluginsbox.cpp,v 1.3 2003/03/29 14:30:55 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
  *
@@ -45,15 +45,12 @@ KPluginsBox::KPluginsBox(intf_thread_t *p_intf,
     listView->addColumn(_("Name"));
     listView->addColumn(_("Description"));
     KButtonBox *item_bbox = new KButtonBox(item_vbox);
-    configure = item_bbox->addButton( _("Configure") );
-    configure->setEnabled(false);
     selectButton = item_bbox->addButton( _("Select") );
     QHBox *item_hbox = new QHBox(item_vbox);
     item_hbox->setSpacing(spacing);
     new QLabel( _("Selected:"), item_hbox );
     line = new KLineEdit( value, item_hbox );
     connect(selectButton, SIGNAL(clicked()), this, SLOT(selectClicked()));
-    connect(configure, SIGNAL(clicked()), this, SLOT(configureClicked()));
     connect(listView, SIGNAL(selectionChanged( QListViewItem *)),
             this, SLOT( selectionChanged( QListViewItem *)));
 }
@@ -76,15 +73,7 @@ void KPluginsBox::selectClicked()
     }
 }
 
-void KPluginsBox::configureClicked()
-{
-    if (listView->selectedItem()) {
-        new KPreferences(p_intf, listView->selectedItem()->text(0), this);
-    }
-}
 void KPluginsBox::selectionChanged( QListViewItem *item )
 {
     selectButton->setEnabled(true);
-    /* look for module 'psz_name' */
-    configure->setEnabled(owner->isConfigureable(item->text(0)));
 }

modules/gui/kde/pluginsbox.h

@@ -2,7 +2,7 @@
  * pluginbox.h: includes for the pluginbox class
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: pluginsbox.h,v 1.2 2002/08/12 17:38:10 sigmunau Exp $
+ * $Id: pluginsbox.h,v 1.3 2003/03/29 14:30:55 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
  *
@@ -39,7 +39,6 @@ class KPluginsBox : public QGroupBox
 
  private slots:
     void selectClicked(void);
-    void configureClicked(void);
     void selectionChanged( QListViewItem * );
 
  signals:
@@ -48,7 +47,6 @@ class KPluginsBox : public QGroupBox
  private:
     intf_thread_t *p_intf;
     KListView *listView;
-    QPushButton *configure;
     QPushButton *selectButton;
     KLineEdit *line;
     KPreferences *owner;

modules/gui/kde/preferences.cpp

@@ -2,7 +2,7 @@
  * preferences.cpp: preferences window for the kde gui
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: preferences.cpp,v 1.12 2003/02/09 12:18:40 sam Exp $
+ * $Id: preferences.cpp,v 1.13 2003/03/29 14:30:55 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
  *
@@ -49,7 +49,7 @@
 */
 KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
                            QWidget *parent, const QString &caption) :
-    KDialogBase ( Tabbed, caption, Ok| Apply|Cancel|User1, Ok, parent,
+    KDialogBase ( TreeList, caption, Ok| Apply|Cancel|User1, Ok, parent,
                   "vlc preferences", true, false, i18n("&Save") )
 {
     module_t *p_parser = NULL;
@@ -64,27 +64,14 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
     /* List all modules */
     p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
 
-    /* Look for the selected module */
     for( i_index = 0; i_index < p_list->i_count; i_index++ )
     {
         p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
-        if( psz_module_name
-            && !strcmp( psz_module_name, p_parser->psz_object_name ) )
-        {
-            break;
-        }
-    }
-
-    if( !p_parser || i_index == p_list->i_count )
-    {
-        vlc_list_release( p_list );
-        return;
-    }
-
+        msg_Dbg( p_intf,"adding module: %s", p_parser->psz_object_name );
         p_item = p_parser->p_config;
-    if( p_item ) do
+        while( p_item && p_item->i_type != CONFIG_HINT_END )
         {
+            msg_Dbg( p_intf, "adding item: %s type: %d", p_item->psz_text,p_item->i_type );
             switch( p_item->i_type )
             {
 
@@ -97,7 +84,15 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
                 if( p_item->i_type == CONFIG_HINT_CATEGORY )
                 {
                     category_label = new QString( p_item->psz_text );
-                QFrame *page = addPage( *category_label );
+                    QStringList path;
+                    if ( strcmp( p_parser->psz_object_name, "main" ) )
+                    {
+                        path += _( "Plugins" );
+                        path += p_parser->psz_capability;
+                        path += p_parser->psz_object_name;
+                    }
+                    path += *category_label;
+                    QFrame *page = addPage( path );
                     QVBoxLayout *toplayout = new QVBoxLayout( page);
                     QScrollView *sv = new QScrollView(page);
                     sv->setResizePolicy(QScrollView::AutoOneFit);
@@ -105,7 +100,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
                     toplayout->addWidget(sv);
                     category_table = new QVBox(sv->viewport());
                     sv->addChild(category_table);
-                toplayout->addStretch(10);
                     category_table->setSpacing(spacingHint());
                 }
 
@@ -130,9 +124,9 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
 
 
                 /* build a list of available plugins */
-            for( i_index = 0; i_index < p_list->i_count; i_index++ )
+                for( int i_index = 0; i_index < p_list->i_count; i_index++ )
                 {
-                p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+                    module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object ;
 
                     if( !strcmp( p_parser->psz_capability,
                                  p_item->psz_type ) )
@@ -249,7 +243,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
 
             p_item++;
         }
-    while( p_item->i_type != CONFIG_HINT_END );
+    }
 
     vlc_list_release( p_list );