X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=477c7ddd788c6b993e1ecde51dc78d50f3dbb431;hb=bfffe8bfbce5ec499f4ab04f89c18b4b3752df93;hp=49039f1d066527075fff0e2b10f52c68979aab03;hpb=2fe13ef6f75e31db2542f8433d53a5c319da7c5b;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 49039f1d06..477c7ddd78 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -5,6 +5,7 @@ * $Id$ * * Authors: Clément Stenac + * Antoine Cellerier * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,10 +39,20 @@ #include #include #include +#include ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, module_config_t *p_item, QWidget *parent ) +{ + int i=0; + return createControl( p_this, p_item, parent, NULL, i ); +} + +ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, + module_config_t *p_item, + QWidget *parent, + QGridLayout *l, int &line ) { ConfigControl *p_control = NULL; if( p_item->psz_current ) return NULL; @@ -49,24 +60,59 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, switch( p_item->i_type ) { case CONFIG_ITEM_MODULE: - p_control = new ModuleConfigControl( p_this, p_item, parent, false ); + p_control = new ModuleConfigControl( p_this, p_item, parent, false, + l, line ); break; case CONFIG_ITEM_MODULE_CAT: - p_control = new ModuleConfigControl( p_this, p_item, parent, true ); + p_control = new ModuleConfigControl( p_this, p_item, parent, true, + l, line ); + break; + case CONFIG_ITEM_MODULE_LIST: + p_control = new ModuleListConfigControl( p_this, p_item, parent, false, + l, line ); + break; + case CONFIG_ITEM_MODULE_LIST_CAT: + p_control = new ModuleListConfigControl( p_this, p_item, parent, true, + l, line ); break; case CONFIG_ITEM_STRING: if( !p_item->i_list ) - p_control = new StringConfigControl( p_this, p_item, parent,false ); + p_control = new StringConfigControl( p_this, p_item, parent, + l, line, false ); else - fprintf(stderr, "TODO\n" ); + p_control = new StringListConfigControl( p_this, p_item, + parent, false, l, line ); break; case CONFIG_ITEM_INTEGER: if( p_item->i_list ) - fprintf( stderr, "Todo\n" ); + p_control = new IntegerListConfigControl( p_this, p_item, + parent, false, l, line ); else if( p_item->i_min || p_item->i_max ) - fprintf( stderr, "Todo\n" ); + p_control = new IntegerRangeConfigControl( p_this, p_item, parent, + l, line ); else - p_control = new IntegerConfigControl( p_this, p_item, parent ); + p_control = new IntegerConfigControl( p_this, p_item, parent, + l, line ); + break; + case CONFIG_ITEM_FILE: + fprintf( stderr, "Todo (CONFIG_ITEM_FILE)\n" ); + break; + case CONFIG_ITEM_DIRECTORY: + fprintf( stderr, "Todo (CONFIG_ITEM_DIRECTORY)\n" ); + break; + case CONFIG_ITEM_KEY: + p_control = new KeySelectorControl( p_this, p_item, parent, l, line ); + break; + case CONFIG_ITEM_BOOL: + p_control = new BoolConfigControl( p_this, p_item, parent, l, line ); + break; + case CONFIG_ITEM_FLOAT: + if( p_item->f_min || p_item->f_max ) + p_control = new FloatRangeConfigControl( p_this, p_item, parent, + l, line ); + else + p_control = new FloatConfigControl( p_this, p_item, parent, + l, line ); break; default: break; @@ -74,6 +120,37 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, return p_control; } +void ConfigControl::doApply( intf_thread_t *p_intf ) +{ + switch( getType() ) + { + case 1: + { + VIntConfigControl *vicc = qobject_cast(this); + config_PutInt( p_intf, vicc->getName(), vicc->getValue() ); + break; + } + case 2: + { + VFloatConfigControl *vfcc = + qobject_cast(this); + config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() ); + break; + } + case 3: + { + VStringConfigControl *vscc = + qobject_cast(this); + config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) ); + } + case 4: + { + KeySelectorControl *ksc = qobject_cast(this); + ksc->doApply(); + } + } +} + /************************************************************************** * String-based controls *************************************************************************/ @@ -81,55 +158,129 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, /*********** String **************/ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, - QWidget *_parent, bool pwd ) : + QWidget *_parent, QGridLayout *l, + int &line, bool pwd ) : VStringConfigControl( _p_this, _p_item, _parent ) { - QLabel *label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qfu(p_item->psz_text) ); text = new QLineEdit( qfu(p_item->psz_value) ); - finish(label); + finish(); - QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( text, 1 ); - widget->setLayout( layout ); + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label, 0 ); layout->addWidget( text, 1 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); l->addWidget( text, line, 1 ); + } } StringConfigControl::StringConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, - QLabel *label, QLineEdit *_text, bool pwd ): + QLabel *_label, QLineEdit *_text, bool pwd ): VStringConfigControl( _p_this, _p_item ) { text = _text; - finish( label ); + label = _label; + finish( ); } -void StringConfigControl::finish( QLabel *label ) +void StringConfigControl::finish() { text->setText( qfu(p_item->psz_value) ); text->setToolTip( qfu(p_item->psz_longtext) ); - label->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); +} + +/********* String / choice list **********/ +StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QWidget *_parent, bool bycat, + QGridLayout *l, int &line) : + VStringConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qfu(p_item->psz_text) ); + combo = new QComboBox(); + finish( bycat ); + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label ); layout->addWidget( combo ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addWidget( combo, line, 1, Qt::AlignRight ); + } +} +StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QLabel *_label, QComboBox *_combo, + bool bycat ) : VStringConfigControl( _p_this, _p_item ) +{ + combo = _combo; + label = _label; + finish( bycat ); +} + +void StringListConfigControl::finish( bool bycat ) +{ + combo->setEditable( false ); + + for( int i_index = 0; i_index < p_item->i_list; i_index++ ) + { + combo->addItem( qfu(p_item->ppsz_list_text ? + p_item->ppsz_list_text[i_index] : + p_item->ppsz_list[i_index] ), + QVariant( p_item->ppsz_list[i_index] ) ); + if( p_item->psz_value && !strcmp( p_item->psz_value, + p_item->ppsz_list[i_index] ) ) + combo->setCurrentIndex( combo->count() - 1 ); + } + combo->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); +} + +QString StringListConfigControl::getValue() +{ + return combo->itemData( combo->currentIndex() ).toString(); } /********* Module **********/ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, - module_config_t *_p_item, QWidget *_parent, - bool bycat ) : VStringConfigControl( _p_this, _p_item, _parent ) + module_config_t *_p_item, QWidget *_parent, bool bycat, + QGridLayout *l, int &line) : + VStringConfigControl( _p_this, _p_item, _parent ) { - QLabel *label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qfu(p_item->psz_text) ); combo = new QComboBox(); - finish( label, bycat ); - QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label ); layout->addWidget( combo ); - widget->setLayout( layout ); + finish( bycat ); + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label ); layout->addWidget( combo ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addWidget( combo, line, 1, Qt::AlignRight ); + } } ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, - module_config_t *_p_item, QLabel *label, QComboBox *_combo, + module_config_t *_p_item, QLabel *_label, QComboBox *_combo, bool bycat ) : VStringConfigControl( _p_this, _p_item ) { combo = _combo; - finish( label, bycat ); + label = _label; + finish( bycat ); } -void ModuleConfigControl::finish( QLabel *label, bool bycat ) +void ModuleConfigControl::finish( bool bycat ) { vlc_list_t *p_list; module_t *p_parser; @@ -171,7 +322,8 @@ void ModuleConfigControl::finish( QLabel *label, bool bycat ) } vlc_list_release( p_list ); combo->setToolTip( qfu(p_item->psz_longtext) ); - label->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); } QString ModuleConfigControl::getValue() @@ -179,6 +331,135 @@ QString ModuleConfigControl::getValue() return combo->itemData( combo->currentIndex() ).toString(); } +/********* Module list **********/ +ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QWidget *_parent, bool bycat, + QGridLayout *l, int &line) : + VStringConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qfu(p_item->psz_text) ); + text = new QLineEdit(); + finish( bycat ); + + bool pom = false; + if( !l ) + { + l = new QGridLayout(); + line = 0; + pom = true; + } + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + l->addWidget( *it, line++, 1 ); + } + l->addWidget( label, line, 0 ); + l->addWidget( text, line, 1 ); + if( pom ) + widget->setLayout( l ); +} +#if 0 +ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QLabel *_label, QComboBox *_combo, + bool bycat ) : VStringConfigControl( _p_this, _p_item ) +{ + combo = _combo; + label = _label; + finish( bycat ); +} +#endif + +ModuleListConfigControl::~ModuleListConfigControl() +{ + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + delete *it; + } + delete label; + delete text; +} + +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++ ) + { + p_parser = (module_t *)p_list->p_values[i_index].p_object ; + + if( bycat ) + { + if( !strcmp( p_parser->psz_object_name, "main" ) ) continue; + + module_config_t *p_config = p_parser->p_config; + if( p_config ) do + { + /* Hack: required subcategory is stored in i_min */ + if( p_config->i_type == CONFIG_SUBCATEGORY && + p_config->i_value == p_item->i_min ) + { + QCheckBox *cb = + new QCheckBox( qfu( p_parser->psz_object_name ) ); + cb->setToolTip( qfu(p_parser->psz_longname) ); + modules.push_back( cb ); + } + } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } + else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) ) + { + QCheckBox *cb = + new QCheckBox( qfu( p_parser->psz_object_name ) ); + cb->setToolTip( qfu(p_parser->psz_longname) ); + modules.push_back( cb ); + } + } + vlc_list_release( p_list ); + text->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); +} + +QString ModuleListConfigControl::getValue() +{ + return text->text(); +} + +void ModuleListConfigControl::hide() +{ + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + (*it)->hide(); + } + text->hide(); + label->hide(); +} + +void ModuleListConfigControl::show() +{ + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + (*it)->show(); + } + text->show(); + label->show(); +} + + +void ModuleListConfigControl::wakeUp_TheUserJustClickedOnSomething( int value ) +{ + text->clear(); + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + } +} + /************************************************************************** * Integer-based controls *************************************************************************/ @@ -186,34 +467,308 @@ QString ModuleConfigControl::getValue() /*********** Integer **************/ IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, - QWidget *_parent ) : + QWidget *_parent, QGridLayout *l, + int &line ) : VIntConfigControl( _p_this, _p_item, _parent ) { - QLabel *label = new QLabel( qfu(p_item->psz_text) ); - spin = new QSpinBox; - finish( label ); + label = new QLabel( qfu(p_item->psz_text) ); + spin = new QSpinBox; spin->setMinimumWidth( 80 ); + spin->setMaximumWidth( 90 ); + finish(); - QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( spin, 1 ); - widget->setLayout( layout ); + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label, 0 ); layout->addWidget( spin, 1 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addWidget( spin, line, 1, Qt::AlignRight ); + } } IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, - QLabel *label, QSpinBox *_spin ) : + QLabel *_label, QSpinBox *_spin ) : VIntConfigControl( _p_this, _p_item ) { spin = _spin; - finish(label); + label = _label; + finish(); } -void IntegerConfigControl::finish( QLabel *label ) +void IntegerConfigControl::finish() { + spin->setMaximum( 2000000000 ); + spin->setMinimum( -2000000000 ); spin->setValue( p_item->i_value ); spin->setToolTip( qfu(p_item->psz_longtext) ); - label->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); } int IntegerConfigControl::getValue() { return spin->value(); } + +/********* Integer range **********/ +IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line ) : + IntegerConfigControl( _p_this, _p_item, _parent, l, line ) +{ + finish(); +} + +IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, QSpinBox *_spin ) : + IntegerConfigControl( _p_this, _p_item, _label, _spin ) +{ + finish(); +} + +void IntegerRangeConfigControl::finish() +{ + spin->setMaximum( p_item->i_max ); + spin->setMinimum( p_item->i_min ); +} + +/********* Integer / choice list **********/ +IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QWidget *_parent, bool bycat, + QGridLayout *l, int &line) : + VIntConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qfu(p_item->psz_text) ); + combo = new QComboBox(); + finish( bycat ); + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label ); layout->addWidget( combo ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addWidget( combo, line, 1, Qt::AlignRight ); + } +} +IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, QLabel *_label, QComboBox *_combo, + bool bycat ) : VIntConfigControl( _p_this, _p_item ) +{ + combo = _combo; + label = _label; + finish( bycat ); +} + +void IntegerListConfigControl::finish( bool bycat ) +{ + combo->setEditable( false ); + + for( int i_index = 0; i_index < p_item->i_list; i_index++ ) + { + combo->addItem( qfu(p_item->ppsz_list_text[i_index] ), + QVariant( p_item->pi_list[i_index] ) ); + if( p_item->i_value == p_item->pi_list[i_index] ) + combo->setCurrentIndex( combo->count() - 1 ); + } + combo->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); +} + +int IntegerListConfigControl::getValue() +{ + return combo->itemData( combo->currentIndex() ).toInt(); +} + +/*********** Boolean **************/ +BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line ) : + VIntConfigControl( _p_this, _p_item, _parent ) +{ + checkbox = new QCheckBox( qfu(p_item->psz_text) ); + finish(); + + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( checkbox, 0 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( checkbox, line, 0 ); + } +} +BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, + QCheckBox *_checkbox, + bool bycat ) : + VIntConfigControl( _p_this, _p_item ) +{ + checkbox = _checkbox; + finish(); +} + +void BoolConfigControl::finish() +{ + checkbox->setCheckState( p_item->i_value == VLC_TRUE ? Qt::Checked + : Qt::Unchecked ); + checkbox->setToolTip( qfu(p_item->psz_longtext) ); +} + +int BoolConfigControl::getValue() +{ + return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE; +} + +/************************************************************************** + * Float-based controls + *************************************************************************/ + +/*********** Float **************/ +FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line ) : + VFloatConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qfu(p_item->psz_text) ); + spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 ); + spin->setMaximumWidth( 90 ); + finish(); + + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label, 0 ); layout->addWidget( spin, 1 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addWidget( spin, line, 1, Qt::AlignRight ); + } +} + +FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, + QDoubleSpinBox *_spin ) : + VFloatConfigControl( _p_this, _p_item ) +{ + spin = _spin; + label = _label; + finish(); +} + +void FloatConfigControl::finish() +{ + spin->setMaximum( 2000000000. ); + spin->setMinimum( -2000000000. ); + spin->setSingleStep( 0.1 ); + spin->setValue( (double)p_item->f_value ); + spin->setToolTip( qfu(p_item->psz_longtext) ); + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); +} + +float FloatConfigControl::getValue() +{ + return (float)spin->value(); +} + +/*********** Float with range **************/ +FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line ) : + FloatConfigControl( _p_this, _p_item, _parent, l, line ) +{ + finish(); +} + +FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, + QDoubleSpinBox *_spin ) : + FloatConfigControl( _p_this, _p_item, _label, _spin ) +{ + finish(); +} + +void FloatRangeConfigControl::finish() +{ + spin->setMaximum( (double)p_item->f_max ); + spin->setMinimum( (double)p_item->f_min ); +} + + +/********************************************************************** + * Key selector widget + **********************************************************************/ +KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line ) : + ConfigControl( _p_this, _p_item, _parent ) + +{ + label = new QLabel( qtr("Select an action to change the associated hotkey") ); + table = new QTreeWidget( 0 ); + finish(); + + if( !l ) + { + QVBoxLayout *layout = new QVBoxLayout(); + layout->addWidget( label, 0 ); layout->addWidget( table, 1 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0, 1, 2 ); + l->addWidget( table, line+1, 0, 1,2 ); + } +} + +void KeySelectorControl::finish() +{ + if( label ) + label->setToolTip( qfu(p_item->psz_longtext) ); + + /* Fill the table */ + table->setColumnCount( 2 ); + table->setAlternatingRowColors( true ); + + module_t *p_main = config_FindModule( p_this, "main" ); + assert( p_main ); + module_config_t *p_item = p_main->p_config; + + if( p_item ) do + { + if( p_item->i_type & CONFIG_ITEM && p_item->psz_name && + strstr( p_item->psz_name , "key-" ) ) + { + QTreeWidgetItem *treeItem = new QTreeWidgetItem(); + treeItem->setText( 0, qfu( p_item->psz_text ) ); + treeItem->setText( 1, p_item->psz_value ); + treeItem->setData( 0, Qt::UserRole, QVariant( p_item->psz_name ) ); + table->addTopLevelItem( treeItem ); + } + } while( p_item->i_type != CONFIG_HINT_END && p_item++ ); +} + +void KeySelectorControl::doApply() +{ + +}