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

diff --git a/modules/gui/kde/pluginsbox.cpp b/modules/gui/kde/pluginsbox.cpp
index 7c4f6662da32c1e98a133bcbc6000a1431d84d38..93b24d8191f46fbaedf1ef33fbf6e06c398a78be 100644 (file)
--- a/modules/gui/kde/pluginsbox.cpp
+++ b/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)));
 }

diff --git a/modules/gui/kde/pluginsbox.h b/modules/gui/kde/pluginsbox.h
index 6d51380be1c619a32f969c9a43149cc866a44b40..f8548bdca30dfa3e9c5ba3a756a068748ebd3153 100644 (file)
--- a/modules/gui/kde/pluginsbox.h
+++ b/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;

diff --git a/modules/gui/kde/preferences.cpp b/modules/gui/kde/preferences.cpp
index 0f83b70a7d95cfaefcf1e17852046fcd42e247d5..e378f20b8757ea295de5216cbb4845c9c4a187e6 100644 (file)
--- a/modules/gui/kde/preferences.cpp
+++ b/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,192 +64,186 @@ 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;
-    }
-
-    p_item = p_parser->p_config;
-    if( p_item ) do
-    {
-        switch( p_item->i_type )
+        msg_Dbg( p_intf,"adding module: %s", p_parser->psz_object_name );
+        p_item = p_parser->p_config;
+        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 )
+            {
 
-        case CONFIG_HINT_CATEGORY:
-        case CONFIG_HINT_END:
+            case CONFIG_HINT_CATEGORY:
+            case CONFIG_HINT_END:
 
-            /*
-             * Now we can start taking care of the new category
-             */
-            if( p_item->i_type == CONFIG_HINT_CATEGORY )
-            {
-                category_label = new QString( p_item->psz_text );
-                QFrame *page = addPage( *category_label );
-                QVBoxLayout *toplayout = new QVBoxLayout( page);
-                QScrollView *sv = new QScrollView(page);
-                sv->setResizePolicy(QScrollView::AutoOneFit);
-                sv->setFrameStyle(QScrollView::NoFrame);
-                toplayout->addWidget(sv);
-                category_table = new QVBox(sv->viewport());
-                sv->addChild(category_table);
-                toplayout->addStretch(10);
-                category_table->setSpacing(spacingHint());
-            }
+                /*
+                 * Now we can start taking care of the new category
+                 */
+                if( p_item->i_type == CONFIG_HINT_CATEGORY )
+                {
+                    category_label = new QString( p_item->psz_text );
+                    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);
+                    sv->setFrameStyle(QScrollView::NoFrame);
+                    toplayout->addWidget(sv);
+                    category_table = new QVBox(sv->viewport());
+                    sv->addChild(category_table);
+                    category_table->setSpacing(spacingHint());
+                }
 
-            break;
+                break;
 
-        case CONFIG_ITEM_MODULE:
+            case CONFIG_ITEM_MODULE:
 
-        {
-            vlc_mutex_lock( p_item->p_lock );
-            KPluginsBox *item_frame =
-                new KPluginsBox( p_intf, p_item->psz_text,
-                                 p_item->psz_value ? p_item->psz_value :"",
-                                 category_table,
-                                 spacingHint(),
-                                 this );
-            QConfigItem *ci = new QConfigItem(this,
-                                              p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->psz_value);
-            connect(item_frame, SIGNAL(selectionChanged(const QString &)),
-                    ci, SLOT(setValue(const QString &)));
-
-
-            /* build a list of available plugins */
-            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( !strcmp( p_parser->psz_capability,
-                             p_item->psz_type ) )
+                vlc_mutex_lock( p_item->p_lock );
+                KPluginsBox *item_frame =
+                    new KPluginsBox( p_intf, p_item->psz_text,
+                                     p_item->psz_value ? p_item->psz_value :"",
+                                     category_table,
+                                     spacingHint(),
+                                     this );
+                QConfigItem *ci = new QConfigItem(this,
+                                                  p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->psz_value);
+                connect(item_frame, SIGNAL(selectionChanged(const QString &)),
+                        ci, SLOT(setValue(const QString &)));
+
+
+                /* build a list of available plugins */
+                for( int i_index = 0; i_index < p_list->i_count; i_index++ )
                 {
-                    new QListViewItem(item_frame->getListView(),
-                                      p_parser->psz_object_name,
-                                      p_parser->psz_longname);
+                    module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+                    if( !strcmp( p_parser->psz_capability,
+                                 p_item->psz_type ) )
+                    {
+                        new QListViewItem(item_frame->getListView(),
+                                          p_parser->psz_object_name,
+                                          p_parser->psz_longname);
+                    }
                 }
-            }
 
-            vlc_mutex_unlock( p_item->p_lock );
-        }
-        break;
+                vlc_mutex_unlock( p_item->p_lock );
+            }
+            break;
 
-        case CONFIG_ITEM_STRING:
-        {
-            QHBox *hb = new QHBox(category_table);
-            hb->setSpacing(spacingHint());
-            new QLabel(p_item->psz_text, hb);
-            /* add input box with default value */
-            vlc_mutex_lock( p_item->p_lock );
-
-            KLineEdit *kl = new KLineEdit( p_item->psz_value ?
-                                           p_item->psz_value : "", hb);
-            QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->psz_value ?
-                                              p_item->psz_value : "");
-            connect(kl, SIGNAL(textChanged ( const QString & )),
-                    ci, SLOT(setValue( const QString &)));
-            QToolTip::add(kl, p_item->psz_longtext);
-            kl->setMaxLength(40);
-
-            vlc_mutex_unlock( p_item->p_lock );
-        }
-        break;
+            case CONFIG_ITEM_STRING:
+            {
+                QHBox *hb = new QHBox(category_table);
+                hb->setSpacing(spacingHint());
+                new QLabel(p_item->psz_text, hb);
+                /* add input box with default value */
+                vlc_mutex_lock( p_item->p_lock );
+
+                KLineEdit *kl = new KLineEdit( p_item->psz_value ?
+                                               p_item->psz_value : "", hb);
+                QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->psz_value ?
+                                                  p_item->psz_value : "");
+                connect(kl, SIGNAL(textChanged ( const QString & )),
+                        ci, SLOT(setValue( const QString &)));
+                QToolTip::add(kl, p_item->psz_longtext);
+                kl->setMaxLength(40);
+
+                vlc_mutex_unlock( p_item->p_lock );
+            }
+            break;
 
-        case CONFIG_ITEM_FILE:
-        {
-            QHBox *hb = new QHBox(category_table);
-            hb->setSpacing(spacingHint());
-            new QLabel(p_item->psz_text, hb);
-            /* add input box with default value */
-            vlc_mutex_lock( p_item->p_lock );
+            case CONFIG_ITEM_FILE:
+            {
+                QHBox *hb = new QHBox(category_table);
+                hb->setSpacing(spacingHint());
+                new QLabel(p_item->psz_text, hb);
+                /* add input box with default value */
+                vlc_mutex_lock( p_item->p_lock );
 
 //            KLineEdit *kl = new KLineEdit( p_item->psz_value ?
 //                                           p_item->psz_value : "", hb);
-            QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->psz_value ?
-                                              p_item->psz_value : "");
+                QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->psz_value ?
+                                                  p_item->psz_value : "");
 //            QPushButton *bbrowse = new QPushButton( _("Browse"), hb );
-            KURLRequester *kfile = new KURLRequester( p_item->psz_value ?
-                                                      p_item->psz_value : "",
-                                                      hb );
-            connect(kfile, SIGNAL(textChanged ( const QString & )),
-                    ci, SLOT(setValue( const QString &)));
-            QToolTip::add(kfile, p_item->psz_longtext);
-            vlc_mutex_unlock( p_item->p_lock );
-        }
-        break;
+                KURLRequester *kfile = new KURLRequester( p_item->psz_value ?
+                                                          p_item->psz_value : "",
+                                                          hb );
+                connect(kfile, SIGNAL(textChanged ( const QString & )),
+                        ci, SLOT(setValue( const QString &)));
+                QToolTip::add(kfile, p_item->psz_longtext);
+                vlc_mutex_unlock( p_item->p_lock );
+            }
+            break;
 
-        case CONFIG_ITEM_INTEGER:
-            /* add input box with default value */
-        {
-            QHBox *hb = new QHBox(category_table);
-            hb->setSpacing(spacingHint());
-            new QLabel(p_item->psz_text, hb);
-            QSpinBox *item_adj = new QSpinBox(-1, 99999, 1, hb);
-            QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->i_value);
-            item_adj->setValue( p_item->i_value );
-            connect(item_adj, SIGNAL(valueChanged( int)),
-                    ci, SLOT(setValue(int)));
-            QToolTip::add(item_adj, p_item->psz_longtext);
-        }
-        break;
+            case CONFIG_ITEM_INTEGER:
+                /* add input box with default value */
+            {
+                QHBox *hb = new QHBox(category_table);
+                hb->setSpacing(spacingHint());
+                new QLabel(p_item->psz_text, hb);
+                QSpinBox *item_adj = new QSpinBox(-1, 99999, 1, hb);
+                QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->i_value);
+                item_adj->setValue( p_item->i_value );
+                connect(item_adj, SIGNAL(valueChanged( int)),
+                        ci, SLOT(setValue(int)));
+                QToolTip::add(item_adj, p_item->psz_longtext);
+            }
+            break;
 
-        case CONFIG_ITEM_FLOAT:
-        {
-            QHBox *hb = new QHBox(category_table);
-            hb->setSpacing(spacingHint());
-            new QLabel(p_item->psz_text, hb);
-            KDoubleNumInput *kdi= new KDoubleNumInput(p_item->f_value, hb);
-            kdi->setRange(-1, 99999, 0.01, false);
-            QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->f_value);
-            connect(kdi, SIGNAL(valueChanged(double)),
-                    ci, SLOT(setValue(double)));
-            QToolTip::add(kdi, p_item->psz_longtext);
-        }
-        break;
+            case CONFIG_ITEM_FLOAT:
+            {
+                QHBox *hb = new QHBox(category_table);
+                hb->setSpacing(spacingHint());
+                new QLabel(p_item->psz_text, hb);
+                KDoubleNumInput *kdi= new KDoubleNumInput(p_item->f_value, hb);
+                kdi->setRange(-1, 99999, 0.01, false);
+                QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->f_value);
+                connect(kdi, SIGNAL(valueChanged(double)),
+                        ci, SLOT(setValue(double)));
+                QToolTip::add(kdi, p_item->psz_longtext);
+            }
+            break;
 
-        case CONFIG_ITEM_BOOL:
+            case CONFIG_ITEM_BOOL:
 
-            /* add check button */
-        {
-            QCheckBox *bool_checkbutton =
-                new QCheckBox(QString(p_item->psz_text), category_table);
-            QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
-                                              p_item->i_type,
-                                              p_item->i_value);
-            bool_checkbutton->setChecked(p_item->i_value);
-            connect(bool_checkbutton, SIGNAL(stateChanged( int)),
-                    ci, SLOT(setValue(int)));
-            QToolTip::add(bool_checkbutton, p_item->psz_longtext);
+                /* add check button */
+            {
+                QCheckBox *bool_checkbutton =
+                    new QCheckBox(QString(p_item->psz_text), category_table);
+                QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
+                                                  p_item->i_type,
+                                                  p_item->i_value);
+                bool_checkbutton->setChecked(p_item->i_value);
+                connect(bool_checkbutton, SIGNAL(stateChanged( int)),
+                        ci, SLOT(setValue(int)));
+                QToolTip::add(bool_checkbutton, p_item->psz_longtext);
 
-        }
-        break;
+            }
+            break;
 
-        }
+            }
 
-        p_item++;
+            p_item++;
+        }
     }
-    while( p_item->i_type != CONFIG_HINT_END );
 
     vlc_list_release( p_list );