]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/preferences.cpp
Some cleanup here and there
[vlc] / modules / gui / qt4 / components / preferences.cpp
index 6dce6de05d371938158fbc65aac7fccd37fe83b3..aeba7bb91e3991187cb72b34e70780866d85ec18 100644 (file)
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * preferences_tree.cpp : Tree of modules for preferences
+ * preferences.cpp : "Normal preferences"
  ****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
- * $Id: wxwidgets.cpp 15731 2006-05-25 14:43:53Z zorglub $
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
  *
  * Authors: ClĂ©ment Stenac <zorglub@videolan.org>
  *
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QApplication>
+#include <QLabel>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QVariant>
+#include <QString>
+#include <QFont>
+#include <QGroupBox>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QPalette>
+#include <QColor>
+
 #include "components/preferences.hpp"
 #include "components/preferences_widgets.hpp"
+#include "qt4.hpp"
+
 #include <vlc_config_cat.h>
+#include <vlc_intf_strings.h>
 #include <assert.h>
 
 #include "pixmaps/audio.xpm"
 #include "pixmaps/codec.xpm"
 #include "pixmaps/intf.xpm"
 
-#include <QLabel>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QVariant>
-#include <QString>
-#include <QFont>
-#include <QGroupBox>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
 #define ITEM_HEIGHT 25
 
 /*********************************************************************
@@ -61,10 +69,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
     setColumnCount( 1 );
     setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
     setAlternatingRowColors( true );
-
-    QFont f = font();
-    f.setPointSize( f.pointSize() + 1 );
-    setFont( f );
+    header()->hide();
 
 #define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b##_xpm ))
     BI( audio, audio );
@@ -98,11 +103,11 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
             case CONFIG_CATEGORY:
                 if( p_item->i_value == -1 ) break;
                 data = new PrefsItemData();
-                data->name = QString( config_CategoryNameGet
-                                               ( p_item->i_value ) );
+                data->name = QString( qfu( config_CategoryNameGet
+                                               ( p_item->i_value ) ) );
                 psz_help = config_CategoryHelpGet( p_item->i_value );
                 if( psz_help )
-                    data->help = QString( psz_help );
+                    data->help = QString( qfu(psz_help) );
                 else
                     data->help.clear();
                 data->i_type = TYPE_CATEGORY;
@@ -127,7 +132,6 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
                 current_item->setData( 0, Qt::UserRole,
                                        qVariantFromValue( data ) );
                 addTopLevelItem( current_item );
-                //fprintf( stderr, "Adding %s\n", current_item->text(0).toLatin1().data() );
                 break;
             case CONFIG_SUBCATEGORY:
                 if( p_item->i_value == -1 ) break;
@@ -143,11 +147,11 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
                     // Data still contains the correct thing
                     data->i_type = TYPE_CATSUBCAT;
                     data->i_subcat_id = p_item->i_value;
-                    data->name = QString( config_CategoryNameGet(
-                                                p_item->i_value ) );
+                    data->name = QString( qfu( config_CategoryNameGet(
+                                                p_item->i_value )) );
                     psz_help = config_CategoryHelpGet( p_item->i_value );
                     if( psz_help )
-                        data->help = QString( psz_help );
+                        data->help = QString( qfu(psz_help) );
                     else
                         data->help.clear();
                     current_item->setData( 0, Qt::UserRole,
@@ -155,10 +159,11 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
                     continue;
                 }
                 data = new PrefsItemData();
-                data->name = QString( config_CategoryNameGet( p_item->i_value));
+                data->name = QString( qfu( config_CategoryNameGet( 
+                                                            p_item->i_value)) );
                 psz_help = config_CategoryHelpGet( p_item->i_value );
                 if( psz_help )
-                    data->help = QString( psz_help );
+                    data->help = QString( qfu(psz_help) );
                 else
                     data->help.clear();
                 data->i_type = TYPE_SUBCATEGORY;
@@ -252,8 +257,8 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
         module_data->help.clear();
         // TODO image
         QTreeWidgetItem *module_item = new QTreeWidgetItem();
-        module_item->setText( 0, p_module->psz_shortname ?
-                      p_module->psz_shortname : p_module->psz_object_name );
+        module_item->setText( 0, qfu( p_module->psz_shortname ?
+                      p_module->psz_shortname : p_module->psz_object_name) );
         //item->setIcon( 0 , XXX );
         module_item->setData( 0, Qt::UserRole,
                               QVariant::fromValue( module_data) );
@@ -269,43 +274,62 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
 
 PrefsTree::~PrefsTree() {}
 
-void PrefsTree::ApplyAll()
+void PrefsTree::applyAll()
 {
-    DoAll( false );
+    doAll( false );
 }
 
-void PrefsTree::CleanAll()
+void PrefsTree::cleanAll()
 {
-    DoAll( true );
+    doAll( true );
 }
 
 /// \todo When cleaning, we should remove the panel ?
-void PrefsTree::DoAll( bool doclean )
+void PrefsTree::doAll( bool doclean )
 {
     for( int i_cat_index = 0 ; i_cat_index < topLevelItemCount();
              i_cat_index++ )
     {
         QTreeWidgetItem *cat_item = topLevelItem( i_cat_index );
-        for( int i_sc_index = 0; i_sc_index <= cat_item->childCount();
+        for( int i_sc_index = 0; i_sc_index < cat_item->childCount();
                  i_sc_index++ )
         {
             QTreeWidgetItem *sc_item = cat_item->child( i_sc_index );
-            for( int i_module = 0 ; i_module <= sc_item->childCount();
+            for( int i_module = 0 ; i_module < sc_item->childCount();
                      i_module++ )
             {
-                PrefsItemData *data = sc_item->child( i_sc_index )->
-                                                 data( 0, Qt::UserRole ).
-                                                 value<PrefsItemData *>();
+                PrefsItemData *data = sc_item->child( i_module )->
+                               data( 0, Qt::UserRole).value<PrefsItemData *>();
                 if( data->panel && doclean )
-                    data->panel->Clean();
+                {
+                    delete data->panel;
+                    data->panel = NULL;
+                }
                 else if( data->panel )
-                    data->panel->Apply();
+                    data->panel->apply();
             }
+            PrefsItemData *data = sc_item->data( 0, Qt::UserRole).
+                                            value<PrefsItemData *>();
+            if( data->panel && doclean )
+            {
+                delete data->panel;
+                data->panel = NULL;
+            }
+            else if( data->panel )
+                data->panel->apply();
         }
+        PrefsItemData *data = cat_item->data( 0, Qt::UserRole).
+                                            value<PrefsItemData *>();
+        if( data->panel && doclean )
+        {
+            delete data->panel;
+            data->panel = NULL;
+        }
+        else if( data->panel )
+            data->panel->apply();
     }
 }
 
-
 /*********************************************************************
  * The Panel
  *********************************************************************/
@@ -317,25 +341,20 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                         QWidget( _parent ), p_intf( _p_intf )
 {
     module_config_t *p_item;
-    module_t *p_module;
-    vlc_list_t *p_list = NULL;
-    global_layout = new QVBoxLayout();
 
+    /* Find our module */
+    module_t *p_module = NULL;
     if( data->i_type == TYPE_CATEGORY )
-    {
-        /* TODO */
-            return;
-    }
+        return;
     else if( data->i_type == TYPE_MODULE )
-    {
         p_module = (module_t *) vlc_object_get( p_intf, data->i_object_id );
-    }
     else
     {
         /* List the plugins */
         int i_index;
         vlc_bool_t b_found = VLC_FALSE;
-        p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+        vlc_list_t *p_list = vlc_list_find( p_intf,
+                                            VLC_OBJECT_MODULE, FIND_ANYWHERE );
         if( !p_list ) return;
 
         for( i_index = 0; i_index < p_list->i_count; i_index++ )
@@ -352,6 +371,7 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             msg_Warn( p_intf, "unable to create preferences (main not found)");
             return;
         }
+        if( p_module ) vlc_object_yield( p_module );
         vlc_list_release( p_list );
     }
 
@@ -369,13 +389,12 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                               p_item->i_value == data->i_object_id ) ||
                             ( data->i_type == TYPE_CATSUBCAT &&
                               p_item->i_value == data->i_subcat_id ) )
-            {
                 break;
-            }
             if( p_item->i_type == CONFIG_HINT_END ) break;
         } while( p_item++ );
     }
 
+    global_layout = new QVBoxLayout();
     QString head;
     if( data->i_type == TYPE_SUBCATEGORY || data->i_type ==  TYPE_CATSUBCAT )
     {
@@ -383,25 +402,35 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         p_item++; // Why that ?
     }
     else
-        head = QString( p_module->psz_longname );
+    {
+        head = QString( qfu(p_module->psz_longname) );
+        if( p_module->psz_help )
+        {
+            head.append( "\n" );
+            head.append( qfu( p_module->psz_help ) );
+        }
+    }
 
-    QLabel *label = new QLabel( head, this );
-    QFont font = label->font();
-    font.setPointSize( font.pointSize() + 2 ); font.setBold( true );
-    label->setFont( font );
+    QLabel *label = new QLabel( head );
+    global_layout->addWidget( label );
+    QFont myFont = QApplication::font(0);
+    myFont.setPointSize( myFont.pointSize() + 3 ); myFont.setBold( true );
+
+    label->setFont( myFont );
     QLabel *help = new QLabel( data->help, this );
     help->setWordWrap( true );
 
-    global_layout->addWidget( label );
     global_layout->addWidget( help );
 
     QGroupBox *box = NULL;
-    QVBoxLayout *boxlayout = NULL;
+    QGridLayout *boxlayout = NULL;
 
     QScrollArea *scroller= new QScrollArea;
+    scroller->setFrameStyle( QFrame::NoFrame );
     QWidget *scrolled_area = new QWidget;
 
-    QVBoxLayout *layout = new QVBoxLayout();
+    QGridLayout *layout = new QGridLayout();
+    int i_line = 0, i_boxline = 0;
 
     if( p_item ) do
     {
@@ -419,24 +448,25 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             if( box )
             {
                 box->setLayout( boxlayout );
-                layout->addWidget( box, 1 );
+                layout->addWidget( box, i_line, 0, 1, 2 );
+                i_line++;
             }
-            box = new QGroupBox( p_item->psz_text );
-            boxlayout = new QVBoxLayout();
+            box = new QGroupBox( qfu(p_item->psz_text) );
+            boxlayout = new QGridLayout();
         }
 
-        ConfigControl *control = ConfigControl::createControl(
-                                    VLC_OBJECT( p_intf ), p_item,
-                                    NULL );
+        ConfigControl *control;
+        if( ! box )
+            control = ConfigControl::createControl( VLC_OBJECT( p_intf ),
+                                        p_item, NULL, layout, i_line );
+        else
+            control = ConfigControl::createControl( VLC_OBJECT( p_intf ),
+                                    p_item, NULL, boxlayout, i_boxline );
         if( !control )
-        {
             continue;
-        }
-        if( !box )
-            layout->addWidget( control );
-        else
-            boxlayout->addWidget( control );
 
+        if( box ) i_boxline++;
+        else i_line++;
         controls.append( control );
     }
     while( !(p_item->i_type == CONFIG_HINT_END ||
@@ -448,78 +478,27 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     if( box )
     {
         box->setLayout( boxlayout );
-        layout->addWidget( box, 1 );
+        layout->addWidget( box, i_line, 0, 1, 2 );
     }
 
+    vlc_object_release( p_module );
+
     scrolled_area->setSizePolicy( QSizePolicy::Preferred,QSizePolicy::Fixed );
     scrolled_area->setLayout( layout );
     scroller->setWidget( scrolled_area );
     scroller->setWidgetResizable( true );
     global_layout->addWidget( scroller );
-
-    some_hidden_text = new QLabel( "Some options are available but hidden. "\
-                                  "Check \"Advanced options\" to see them." );
-    some_hidden_text->setWordWrap( true );
-
     setLayout( global_layout );
-    setAdvanced( false );
 }
 
-void PrefsPanel::Apply()
+void PrefsPanel::apply()
 {
-    /* todo */
     QList<ConfigControl *>::Iterator i;
     for( i = controls.begin() ; i != controls.end() ; i++ )
     {
-        VIntConfigControl *vicc = qobject_cast<VIntConfigControl *>(*i);
-        if( !vicc )
-        {
-            VFloatConfigControl *vfcc = qobject_cast<VFloatConfigControl *>(*i);
-            if( !vfcc)
-            {
-                VStringConfigControl *vscc =
-                               qobject_cast<VStringConfigControl *>(*i);
-                assert( vscc );
-                config_PutPsz( p_intf, vscc->getName().toAscii().data(),
-                                       vscc->getValue().toAscii().data() );
-                continue;
-            }
-            config_PutFloat( p_intf, vfcc->getName().toAscii().data(),
-                                     vfcc->getValue() );
-            continue;
-        }
-        config_PutInt( p_intf, vicc->getName().toAscii().data(),
-                               vicc->getValue() );
+        ConfigControl *c = qobject_cast<ConfigControl *>(*i);
+        c->doApply( p_intf );
     }
 }
-
-void PrefsPanel::Clean()
+void PrefsPanel::clean()
 {}
-
-void PrefsPanel::setAdvanced( bool adv )
-{
-    bool some_hidden = false;
-    if( adv == advanced ) return;
-
-    advanced = adv;
-    QList<ConfigControl *>::Iterator i;
-    for( i = controls.begin() ; i != controls.end() ; i++ )
-    {
-        if( (*i)->isAdvanced() )
-        {
-            fprintf( stderr, "Showing \n" );
-            if( !advanced ) some_hidden = true;
-            (*i)->setVisible( advanced );
-        }
-    }
-    if( some_hidden_text )
-    {
-        global_layout->removeWidget( some_hidden_text );
-        some_hidden_text->hide();
-    }
-    if( some_hidden )
-    {
-        global_layout->addWidget( some_hidden_text );
-        some_hidden_text->show();
-    }
-}