X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=fa697f3f5413ad5d541c014a1946b15977f6f666;hb=23dedd4ffd53685e612ffc5ee171eed52a43bb68;hp=5abd99e5b23e8931c94d67897feee57f93f4f8c1;hpb=fa0c3cd517645df1e57cdb0ddecdd4f3b22bfebe;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 5abd99e5b2..fa697f3f54 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -25,36 +25,44 @@ /** * Todo: - * - Finish implementation (see WX) + * - Finish implementation (see WX, there might be missing a + * i_action handler for IntegerLists, but I don't see any module using it... * - Improvements over WX - * - Password field implementation (through "pwd" bool param * - Validator for modulelist - * - Implement update stuff using a general Updated signal */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "components/preferences_widgets.hpp" #include "util/customwidgets.hpp" -#include "qt4.hpp" - +#include "util/qt_dirs.hpp" #include +#include #include #include #include #include #include -#include #include #include +#include +#include +#include + +#define MINWIDTH_BOX 90 +#define LAST_COLUMN 10 QString formatTooltip(const QString & tooltip) { QString formatted = - "" - "

" + + "" + "" + "" + "

" + tooltip + "

"; return formatted; @@ -64,7 +72,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, module_config_t *p_item, QWidget *parent ) { - int i=0; + int i = 0; return createControl( p_this, p_item, parent, NULL, i ); } @@ -74,7 +82,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, QGridLayout *l, int &line ) { ConfigControl *p_control = NULL; - if( p_item->psz_current ) return NULL; switch( p_item->i_type ) { @@ -102,6 +109,14 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new StringListConfigControl( p_this, p_item, parent, false, l, line ); break; + case CONFIG_ITEM_PASSWORD: + if( !p_item->i_list ) + p_control = new StringConfigControl( p_this, p_item, parent, + l, line, true ); + else + p_control = new StringListConfigControl( p_this, p_item, + parent, true, l, line ); + break; case CONFIG_ITEM_INTEGER: if( p_item->i_list ) p_control = new IntegerListConfigControl( p_this, p_item, @@ -114,16 +129,15 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, l, line ); break; case CONFIG_ITEM_FILE: - p_control = new FileConfigControl( p_this, p_item, parent, l, - line, false ); + p_control = new FileConfigControl( p_this, p_item, parent, l, line); break; case CONFIG_ITEM_DIRECTORY: p_control = new DirectoryConfigControl( p_this, p_item, parent, l, - line, false ); + line ); break; case CONFIG_ITEM_FONT: p_control = new FontConfigControl( p_this, p_item, parent, l, - line, false ); + line); break; case CONFIG_ITEM_KEY: p_control = new KeySelectorControl( p_this, p_item, parent, l, line ); @@ -149,14 +163,15 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) { switch( getType() ) { - case 1: + case CONFIG_ITEM_INTEGER: + case CONFIG_ITEM_BOOL: { VIntConfigControl *vicc = qobject_cast(this); assert( vicc ); config_PutInt( p_intf, vicc->getName(), vicc->getValue() ); break; } - case 2: + case CONFIG_ITEM_FLOAT: { VFloatConfigControl *vfcc = qobject_cast(this); @@ -164,15 +179,15 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() ); break; } - case 3: + case CONFIG_ITEM_STRING: { VStringConfigControl *vscc = qobject_cast(this); assert( vscc ); - config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) ); + config_PutPsz( p_intf, vscc->getName(), qtu( vscc->getValue() ) ); break; } - case 4: + case CONFIG_ITEM_KEY: { KeySelectorControl *ksc = qobject_cast(this); assert( ksc ); @@ -181,6 +196,44 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) } } +/******************************************************* + * Simple widgets + *******************************************************/ +InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( parent ) +{ + setGeometry( 0, 0, 128, 100 ); + setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); +} + +void InterfacePreviewWidget::setNormalPreview( bool b_minimal ) +{ + setPreview( ( b_minimal )?MINIMAL:COMPLETE ); +} + +void InterfacePreviewWidget::setPreview( enum_style e_style ) +{ + QString pixmapLocationString(":/prefsmenu/"); + + switch( e_style ) + { + default: + case COMPLETE: + pixmapLocationString += "sample_complete"; + break; + case MINIMAL: + pixmapLocationString += "sample_minimal"; + break; + case SKINS: + pixmapLocationString += "sample_skins"; + break; + } + + setPixmap( QPixmap( pixmapLocationString ) ); + update(); +} + + + /************************************************************************** * String-based controls *************************************************************************/ @@ -194,17 +247,21 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); text = new QLineEdit( qfu(p_item->value.psz) ); + if( pwd ) text->setEchoMode( QLineEdit::Password ); finish(); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( text, 1 ); + layout->addWidget( label, 0 ); layout->insertSpacing( 1, 10 ); + layout->addWidget( text, LAST_COLUMN ); widget->setLayout( layout ); } else { - l->addWidget( label, line, 0 ); l->addWidget( text, line, 1 ); + l->addWidget( label, line, 0 ); + l->setColumnMinimumWidth( 1, 10 ); + l->addWidget( text, line, LAST_COLUMN ); } } @@ -214,6 +271,7 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, VStringConfigControl( _p_this, _p_item ) { text = _text; + if( pwd ) text->setEchoMode( QLineEdit::Password ); label = _label; finish( ); } @@ -223,14 +281,17 @@ void StringConfigControl::finish() text->setText( qfu(p_item->value.psz) ); text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( text ); + } } /*********** File **************/ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_parent, QGridLayout *l, - int &line, bool pwd ) : + int &line ) : VStringConfigControl( _p_this, _p_item, _parent ) { label = new QLabel( qtr(p_item->psz_text) ); @@ -249,13 +310,15 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, { QHBoxLayout *layout = new QHBoxLayout(); layout->addWidget( label, 0 ); - layout->addLayout( textAndButton, 1 ); + layout->insertSpacing( 1, 10 ); + layout->addLayout( textAndButton, LAST_COLUMN ); widget->setLayout( layout ); } else { l->addWidget( label, line, 0 ); - l->addLayout( textAndButton, line, 1 ); + l->setColumnMinimumWidth( 1, 10 ); + l->addLayout( textAndButton, line, LAST_COLUMN ); } } @@ -263,7 +326,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, FileConfigControl::FileConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, QLineEdit *_text, - QPushButton *_button, bool pwd ): + QPushButton *_button ): VStringConfigControl( _p_this, _p_item ) { browse = _button; @@ -278,9 +341,9 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, void FileConfigControl::updateField() { QString file = QFileDialog::getOpenFileName( NULL, - qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ) ); + qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) ); if( file.isNull() ) return; - text->setText( file ); + text->setText( toNativeSeparators( file ) ); } void FileConfigControl::finish() @@ -288,53 +351,68 @@ void FileConfigControl::finish() text->setText( qfu(p_item->value.psz) ); text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( text ); + } } /********* String / Directory **********/ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_p_widget, - QGridLayout *_p_layout, int& _int, bool _pwd ) : - FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int, _pwd) + QGridLayout *_p_layout, int& _int ) : + FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int ) {} DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_p_label, - QLineEdit *_p_line, QPushButton *_p_button, bool _pwd ): - FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button, _pwd) + QLineEdit *_p_line, QPushButton *_p_button ): + FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button) {} void DirectoryConfigControl::updateField() { QString dir = QFileDialog::getExistingDirectory( NULL, - qtr( "Select Directory" ), + qtr( I_OP_SEL_DIR ), text->text().isEmpty() ? - qfu( p_this->p_libvlc->psz_homedir ) : text->text(), - QFileDialog::ShowDirsOnly | - QFileDialog::DontResolveSymlinks ); + QVLCUserDir( VLC_HOME_DIR ) : text->text(), + QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); + if( dir.isNull() ) return; - text->setText( dir ); + text->setText( toNativeSepNoSlash( dir ) ); } /********* String / Font **********/ FontConfigControl::FontConfigControl( vlc_object_t *_p_this, - module_config_t *_p_item, QWidget *_p_widget, - QGridLayout *_p_layout, int& _int, bool _pwd ) : - FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int, _pwd) -{} + module_config_t *_p_item, QWidget *_parent, + QGridLayout *_p_layout, int& line) : + VStringConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qtr(p_item->psz_text) ); + font = new QFontComboBox( _parent ); + font->setCurrentFont( QFont( qfu( p_item->value.psz) ) ); + if( !_p_layout ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label, 0 ); + layout->addWidget( font, 1 ); + widget->setLayout( layout ); + } + else + { + _p_layout->addWidget( label, line, 0 ); + _p_layout->addWidget( font, line, 1, 1, -1 ); + } +} FontConfigControl::FontConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_p_label, - QLineEdit *_p_line, QPushButton *_p_button, bool _pwd ): - FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button, _pwd) -{} - -void FontConfigControl::updateField() + QFontComboBox *_p_font): + VStringConfigControl( _p_this, _p_item) { - bool ok; - QFont font = QFontDialog::getFont( &ok, QFont( text->text() ), NULL ); - if( !ok ) return; - text->setText( font.family() ); + label = _p_label; + font = _p_font; + font->setCurrentFont( QFont( qfu( p_item->value.psz) ) ); } /********* String / choice list **********/ @@ -345,17 +423,62 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); - finish( bycat ); + combo->setMinimumWidth( MINWIDTH_BOX ); + combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); + + module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name ); + + finish( p_module_config, bycat ); if( !l ) { - QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label ); layout->addWidget( combo ); - widget->setLayout( layout ); + l = new QGridLayout(); + l->addWidget( label, 0, 0 ); l->addWidget( combo, 0, LAST_COLUMN ); + widget->setLayout( l ); } else { l->addWidget( label, line, 0 ); - l->addWidget( combo, line, 1, Qt::AlignRight ); + l->addWidget( combo, line, LAST_COLUMN, Qt::AlignRight ); + } + + if( p_item->i_action ) + { + QSignalMapper *signalMapper = new QSignalMapper(this); + + /* Some stringLists like Capture listings have action associated */ + for( int i = 0; i < p_item->i_action; i++ ) + { + QPushButton *button = + new QPushButton( qfu( p_item->ppsz_action_text[i] )); + CONNECT( button, clicked(), signalMapper, map() ); + signalMapper->setMapping( button, i ); + l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i, + Qt::AlignRight ); + } + CONNECT( signalMapper, mapped( int ), + this, actionRequested( int ) ); + } +} + +void StringListConfigControl::actionRequested( int i_action ) +{ + /* Supplementary check for boundaries */ + if( i_action < 0 || i_action >= p_item->i_action ) return; + + module_config_t *p_module_config = config_FindConfig( p_this, getName() ); + if(!p_module_config) return; + + vlc_value_t val; + val.psz_string = const_cast + qtu( (combo->itemData( combo->currentIndex() ).toString() ) ); + + p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 ); + + if( p_module_config->b_dirty ) + { + combo->clear(); + finish( p_module_config, true ); + p_module_config->b_dirty = false; } } StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, @@ -364,26 +487,50 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, { combo = _combo; label = _label; - finish( bycat ); + + module_config_t *p_module_config = config_FindConfig( p_this, getName() ); + + finish( p_module_config, bycat ); } -void StringListConfigControl::finish( bool bycat ) +void StringListConfigControl::finish(module_config_t *p_module_config, bool bycat ) { combo->setEditable( false ); - for( int i_index = 0; i_index < p_item->i_list; i_index++ ) + if(!p_module_config) return; + + if( p_module_config->pf_update_list ) { - 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->value.psz && !strcmp( p_item->value.psz, - p_item->ppsz_list[i_index] ) ) + vlc_value_t val; + val.psz_string = strdup(p_module_config->value.psz); + + p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL); + + // assume in any case that dirty was set to true + // because lazy programmes will use the same callback for + // this, like the one behind the refresh push button? + p_module_config->b_dirty = false; + + free( val.psz_string ); + } + + for( int i_index = 0; i_index < p_module_config->i_list; i_index++ ) + { + combo->addItem( qfu((p_module_config->ppsz_list_text && + p_module_config->ppsz_list_text[i_index])? + p_module_config->ppsz_list_text[i_index] : + p_module_config->ppsz_list[i_index] ), + QVariant( qfu(p_module_config->ppsz_list[i_index] )) ); + if( p_item->value.psz && !strcmp( p_module_config->value.psz, + p_module_config->ppsz_list[i_index] ) ) combo->setCurrentIndex( combo->count() - 1 ); } - combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); if( label ) - label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + { + label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); + label->setBuddy( combo ); + } } QString StringListConfigControl::getValue() @@ -391,6 +538,37 @@ QString StringListConfigControl::getValue() return combo->itemData( combo->currentIndex() ).toString(); } +void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf, + QComboBox *combo ) +{ + module_config_t *p_config = + config_FindConfig( VLC_OBJECT(p_intf), configname ); + if( p_config ) + { + if(p_config->pf_update_list) + { + vlc_value_t val; + val.i_int = p_config->value.i; + p_config->pf_update_list(VLC_OBJECT(p_intf), configname, val, val, NULL); + // assume in any case that dirty was set to true + // because lazy programmes will use the same callback for + // this, like the one behind the refresh push button? + p_config->b_dirty = false; + } + + for ( int i_index = 0; i_index < p_config->i_list; i_index++ ) + { + combo->addItem( qfu( p_config->ppsz_list_text[i_index] ), + QVariant( p_config->pi_list[i_index] ) ); + if( p_config->value.i == p_config->pi_list[i_index] ) + { + combo->setCurrentIndex( i_index ); + } + } + combo->setToolTip( qfu( p_config->psz_longtext ) ); + } +} + /********* Module **********/ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_parent, bool bycat, @@ -399,19 +577,21 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); + combo->setMinimumWidth( MINWIDTH_BOX ); finish( bycat ); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label ); layout->addWidget( combo ); + layout->addWidget( label ); layout->addWidget( combo, LAST_COLUMN ); widget->setLayout( layout ); } else { l->addWidget( label, line, 0 ); - l->addWidget( combo, line, 1, Qt::AlignRight ); + l->addWidget( combo, line, LAST_COLUMN, Qt::AlignRight ); } } + ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, QComboBox *_combo, bool bycat ) : VStringConfigControl( _p_this, _p_item ) @@ -423,48 +603,53 @@ 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( p_parser->psz_object_name, "main" ) ) continue; + if( !strcmp( module_get_object( p_parser ), "main" ) ) continue; + + unsigned confsize; + module_config_t *p_config; - for (size_t i = 0; i < p_parser->confsize; i++) + p_config = module_config_get (p_parser, &confsize); + for (size_t i = 0; i < confsize; i++) { - module_config_t *p_config = p_parser->p_config + i; /* Hack: required subcategory is stored in i_min */ - if( p_config->i_type == CONFIG_SUBCATEGORY && - p_config->value.i == p_item->min.i ) - combo->addItem( qtr(p_parser->psz_longname), - QVariant( p_parser->psz_object_name ) ); + const module_config_t *p_cfg = p_config + i; + if( p_cfg->i_type == CONFIG_SUBCATEGORY && + p_cfg->value.i == p_item->min.i ) + combo->addItem( qtr( module_GetLongName( p_parser )), + QVariant( module_get_object( p_parser ) ) ); if( p_item->value.psz && !strcmp( p_item->value.psz, - p_parser->psz_object_name) ) + module_get_object( p_parser ) ) ) combo->setCurrentIndex( combo->count() - 1 ); } + module_config_free (p_config); } - else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) ) + else if( module_provides( p_parser, p_item->psz_type ) ) { - combo->addItem( qtr(p_parser->psz_longname), - QVariant( p_parser->psz_object_name ) ); + combo->addItem( qtr(module_GetLongName( p_parser ) ), + QVariant( module_get_object( p_parser ) ) ); if( p_item->value.psz && !strcmp( p_item->value.psz, - p_parser->psz_object_name) ) + 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)) ); + label->setBuddy( combo ); + } } QString ModuleConfigControl::getValue() @@ -478,8 +663,12 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, QGridLayout *l, int &line) : VStringConfigControl( _p_this, _p_item, _parent ) { - groupBox = new QGroupBox ( qtr(p_item->psz_text) ); - text = new QLineEdit(); + groupBox = NULL; + /* Special Hack */ + if( !p_item->psz_text ) return; + + groupBox = new QGroupBox ( qtr(p_item->psz_text), _parent ); + text = new QLineEdit; QGridLayout *layoutGroupBox = new QGridLayout( groupBox ); finish( bycat ); @@ -505,16 +694,6 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) ); } -#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() { @@ -524,68 +703,67 @@ ModuleListConfigControl::~ModuleListConfigControl() delete *it; } delete groupBox; - delete text; } #define CHECKBOX_LISTS \ { \ - QCheckBox *cb = new QCheckBox( qtr( p_parser->psz_longname ) );\ + QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\ checkBoxListItem *cbl = new checkBoxListItem; \ \ - CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\ - cb->setToolTip( formatTooltip( qtr(p_parser->psz_longname)) );\ + CONNECT( cb, stateChanged( int ), this, onUpdate() );\ + cb->setToolTip( formatTooltip( qtr( module_get_help( p_parser ))));\ cbl->checkBox = cb; \ \ - int i = -1; \ - while( p_parser->pp_shortcuts[++i] != NULL); \ - i--; \ -\ - cbl->psz_module = strdup( i>=0?p_parser->pp_shortcuts[i] \ - : p_parser->psz_object_name ); \ + 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 ) ) \ + cbl->checkBox->setChecked( true ); \ } 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( p_parser->psz_object_name, "main" ) ) continue; + if( !strcmp( module_get_object( p_parser ), "main" ) ) continue; - for (size_t i = 0; i < p_parser->confsize; i++) + unsigned confsize; + module_config_t *p_config = module_config_get (p_parser, &confsize); + + for (size_t i = 0; i < confsize; i++) { - module_config_t *p_config = p_parser->p_config + i; + module_config_t *p_cfg = p_config + i; /* Hack: required subcategory is stored in i_min */ - if( p_config->i_type == CONFIG_SUBCATEGORY && - p_config->value.i == p_item->min.i ) + if( p_cfg->i_type == CONFIG_SUBCATEGORY && + p_cfg->value.i == p_item->min.i ) { CHECKBOX_LISTS; } } + module_config_free (p_config); } - else if( !strcmp( p_parser->psz_capability, 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)) ); - if( groupBox ) - groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + assert( groupBox ); + groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } #undef CHECKBOX_LISTS QString ModuleListConfigControl::getValue() { + assert( text ); return text->text(); } @@ -610,7 +788,7 @@ void ModuleListConfigControl::show() } -void ModuleListConfigControl::onUpdate( int value ) +void ModuleListConfigControl::onUpdate() { text->clear(); bool first = true; @@ -645,21 +823,21 @@ IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this, VIntConfigControl( _p_this, _p_item, _parent ) { label = new QLabel( qtr(p_item->psz_text) ); - spin = new QSpinBox; spin->setMinimumWidth( 80 ); + spin = new QSpinBox; spin->setMinimumWidth( MINWIDTH_BOX ); spin->setAlignment( Qt::AlignRight ); - spin->setMaximumWidth( 90 ); + spin->setMaximumWidth( MINWIDTH_BOX ); finish(); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( spin, 1 ); + layout->addWidget( label, 0 ); layout->addWidget( spin, LAST_COLUMN ); widget->setLayout( layout ); } else { l->addWidget( label, line, 0 ); - l->addWidget( spin, line, 1, Qt::AlignRight ); + l->addWidget( spin, line, LAST_COLUMN, Qt::AlignRight ); } } IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this, @@ -679,7 +857,10 @@ void IntegerConfigControl::finish() spin->setValue( p_item->value.i ); spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( spin ); + } } int IntegerConfigControl::getValue() @@ -724,7 +905,10 @@ IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl( slider->setValue( p_item->value.i ); slider->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( slider ); + } } int IntegerRangeSliderConfigControl::getValue() @@ -741,18 +925,41 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); - finish( bycat ); + combo->setMinimumWidth( MINWIDTH_BOX ); + + module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name ); + + finish( p_module_config, bycat ); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label ); layout->addWidget( combo ); + layout->addWidget( label ); layout->addWidget( combo, LAST_COLUMN ); widget->setLayout( layout ); } else { l->addWidget( label, line, 0 ); - l->addWidget( combo, line, 1, Qt::AlignRight ); + l->addWidget( combo, line, LAST_COLUMN, Qt::AlignRight ); } + + if( p_item->i_action ) + { + QSignalMapper *signalMapper = new QSignalMapper(this); + + /* Some stringLists like Capture listings have action associated */ + for( int i = 0; i < p_item->i_action; i++ ) + { + QPushButton *button = + new QPushButton( qfu( p_item->ppsz_action_text[i] )); + CONNECT( button, clicked(), signalMapper, map() ); + signalMapper->setMapping( button, i ); + l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i, + Qt::AlignRight ); + } + CONNECT( signalMapper, mapped( int ), + this, actionRequested( int ) ); + } + } IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, QComboBox *_combo, @@ -760,23 +967,66 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, { combo = _combo; label = _label; - finish( bycat ); + + module_config_t *p_module_config = config_FindConfig( p_this, getName() ); + + finish( p_module_config, bycat ); } -void IntegerListConfigControl::finish( bool bycat ) +void IntegerListConfigControl::finish(module_config_t *p_module_config, bool bycat ) { combo->setEditable( false ); - for( int i_index = 0; i_index < p_item->i_list; i_index++ ) + if(!p_module_config) return; + + if( p_module_config->pf_update_list ) + { + vlc_value_t val; + val.i_int = p_module_config->value.i; + + p_module_config->pf_update_list(p_this, p_item->psz_name, val, val, NULL); + + // assume in any case that dirty was set to true + // because lazy programmes will use the same callback for + // this, like the one behind the refresh push button? + p_module_config->b_dirty = false; + } + + for( int i_index = 0; i_index < p_module_config->i_list; i_index++ ) { - combo->addItem( qtr(p_item->ppsz_list_text[i_index] ), - QVariant( p_item->pi_list[i_index] ) ); - if( p_item->value.i == p_item->pi_list[i_index] ) + combo->addItem( qtr(p_module_config->ppsz_list_text[i_index] ), + QVariant( p_module_config->pi_list[i_index] ) ); + if( p_module_config->value.i == p_module_config->pi_list[i_index] ) combo->setCurrentIndex( combo->count() - 1 ); } - combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); if( label ) - label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + { + label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); + label->setBuddy( combo ); + } +} + +void IntegerListConfigControl::actionRequested( int i_action ) +{ + /* Supplementary check for boundaries */ + if( i_action < 0 || i_action >= p_item->i_action ) return; + + module_config_t *p_module_config = config_FindConfig( p_this, getName() ); + if(!p_module_config) return; + + + vlc_value_t val; + val.i_int = combo->itemData( combo->currentIndex() ).toInt(); + + p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 ); + + if( p_module_config->b_dirty ) + { + combo->clear(); + finish( p_module_config, true ); + p_module_config->b_dirty = false; + } } int IntegerListConfigControl::getValue() @@ -805,27 +1055,28 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, l->addWidget( checkbox, line, 0 ); } } + BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, - QCheckBox *_checkbox, + QAbstractButton *_checkbox, bool bycat ) : VIntConfigControl( _p_this, _p_item ) { checkbox = _checkbox; + VLC_UNUSED( _label ); finish(); } void BoolConfigControl::finish() { - checkbox->setCheckState( p_item->value.i == VLC_TRUE ? Qt::Checked - : Qt::Unchecked ); + checkbox->setChecked( p_item->value.i == true ); checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int BoolConfigControl::getValue() { - return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE; + return checkbox->isChecked(); } /************************************************************************** @@ -840,21 +1091,22 @@ FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this, VFloatConfigControl( _p_this, _p_item, _parent ) { label = new QLabel( qtr(p_item->psz_text) ); - spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 ); - spin->setMaximumWidth( 90 ); + spin = new QDoubleSpinBox; + spin->setMinimumWidth( MINWIDTH_BOX ); + spin->setMaximumWidth( MINWIDTH_BOX ); spin->setAlignment( Qt::AlignRight ); finish(); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( spin, 1 ); + layout->addWidget( label, 0 ); layout->addWidget( spin, LAST_COLUMN ); widget->setLayout( layout ); } else { l->addWidget( label, line, 0 ); - l->addWidget( spin, line, 1, Qt::AlignRight ); + l->addWidget( spin, line, LAST_COLUMN, Qt::AlignRight ); } } @@ -877,7 +1129,10 @@ void FloatConfigControl::finish() spin->setValue( (double)p_item->value.f ); spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( spin ); + } } float FloatConfigControl::getValue() @@ -921,147 +1176,282 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, ConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qtr("Select an action to change the associated hotkey") ); - table = new QTreeWidget( 0 ); + QWidget *keyContainer = new QWidget; + QGridLayout *gLayout = new QGridLayout( keyContainer ); + + label = new QLabel( + qtr( "Select an action to change the associated hotkey") ); + + QLabel *searchLabel = new QLabel( qtr( "Search" ) ); + actionSearch = new SearchLineEdit( keyContainer ); + + table = new QTreeWidget; + table->setColumnCount(3); + table->headerItem()->setText( 0, qtr( "Action" ) ); + table->headerItem()->setText( 1, qtr( "Hotkey" ) ); + table->headerItem()->setText( 2, qtr( "Global" ) ); + table->setAlternatingRowColors( true ); + + shortcutValue = new KeyShortcutEdit; + shortcutValue->setReadOnly(true); + + QPushButton *clearButton = new QPushButton( qtr( "Clear" ) ); + QPushButton *setButton = new QPushButton( qtr( "Set" ) ); + setButton->setDefault( true ); 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 ); - } + gLayout->addWidget( label, 0, 0, 1, 4 ); + gLayout->addWidget( searchLabel, 1, 0, 1, 2 ); + gLayout->addWidget( actionSearch, 1, 2, 1, 2 ); + gLayout->addWidget( table, 2, 0, 1, 4 ); + gLayout->addWidget( clearButton, 3, 0, 1, 1 ); + gLayout->addWidget( shortcutValue, 3, 1, 1, 2 ); + gLayout->addWidget( setButton, 3, 3, 1, 1 ); + + l->addWidget( keyContainer, line, 0, 1, -1 ); + + CONNECT( clearButton, clicked(), shortcutValue, clear() ); + CONNECT( clearButton, clicked(), this, setTheKey() ); + BUTTONACT( setButton, setTheKey() ); + CONNECT( actionSearch, textChanged( const QString& ), + this, filter( const QString& ) ); } void KeySelectorControl::finish() { if( label ) - label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setToolTip( formatTooltip( qtr( p_item->psz_longtext ) ) ); /* Fill the table */ - table->setColumnCount( 2 ); - table->setAlternatingRowColors( true ); - module_t *p_main = config_FindModule( p_this, "main" ); + /* Get the main Module */ + module_t *p_main = module_get_main(); assert( p_main ); - for (size_t i = 0; i < p_main->confsize; i++) + /* Access to the module_config_t */ + unsigned confsize; + module_config_t *p_config; + + p_config = module_config_get (p_main, &confsize); + + for (size_t i = 0; i < confsize; i++) { - module_config_t *p_item = p_main->p_config + i; + module_config_t *p_item = p_config + i; - if( p_item->i_type & CONFIG_ITEM && p_item->psz_name && - strstr( p_item->psz_name , "key-" ) ) + /* If we are a key option not empty */ + if( p_item->i_type & CONFIG_ITEM && p_item->psz_name + && strstr( p_item->psz_name , "key-" ) + && !strstr( p_item->psz_name , "global-key" ) + && !EMPTY_STR( p_item->psz_text ) ) { + /* + Each tree item has: + - QString text in column 0 + - QString name in data of column 0 + - KeyValue in String in column 1 + - KeyValue in int in column 1 + */ QTreeWidgetItem *treeItem = new QTreeWidgetItem(); treeItem->setText( 0, qtr( p_item->psz_text ) ); - treeItem->setText( 1, VLCKeyToString( p_item->value.i ) ); treeItem->setData( 0, Qt::UserRole, - QVariant::fromValue( (void*)p_item ) ); - values += p_item; + QVariant( qfu( p_item->psz_name ) ) ); + treeItem->setText( 1, VLCKeyToString( p_item->value.i ) ); + treeItem->setData( 1, Qt::UserRole, QVariant( p_item->value.i ) ); table->addTopLevelItem( treeItem ); + continue; + } + + if( p_item->i_type & CONFIG_ITEM && p_item->psz_name + && strstr( p_item->psz_name , "global-key" ) + && !EMPTY_STR( p_item->psz_text ) ) + { + QList list = + table->findItems( qtr( p_item->psz_text ), Qt::MatchExactly ); + if( list.count() >= 1 ) + { + list[0]->setText( 2, VLCKeyToString( p_item->value.i ) ); + list[0]->setData( 2, Qt::UserRole, + QVariant( p_item->value.i ) ); + } + if( list.count() >= 2 ) + msg_Dbg( p_this, "This is probably wrong, %s", p_item->psz_text ); } } + module_config_free (p_config); + module_release (p_main); + table->resizeColumnToContents( 0 ); CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ), - this, selectKey( QTreeWidgetItem * ) ); + this, selectKey( QTreeWidgetItem *, int ) ); + CONNECT( table, itemSelectionChanged(), + this, select1Key() ); + + CONNECT( shortcutValue, pressed(), this, selectKey() ); } -void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) +void KeySelectorControl::filter( const QString &qs_search ) { - module_config_t *p_keyItem = static_cast - (keyItem->data( 0, Qt::UserRole ).value()); + QList resultList = + table->findItems( qs_search, Qt::MatchContains, 0 ); + for( int i = 0; i < table->topLevelItemCount(); i++ ) + { + table->topLevelItem( i )->setHidden( + !resultList.contains( table->topLevelItem( i ) ) ); + } +} + +/* Show the key selected from the table in the keySelector */ +void KeySelectorControl::select1Key() +{ + QTreeWidgetItem *keyItem = table->currentItem(); + shortcutValue->setText( keyItem->text( 1 ) ); + shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() ); + shortcutValue->setGlobal( false ); +} + +void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column ) +{ + /* This happens when triggered by ClickEater */ + if( keyItem == NULL ) keyItem = table->currentItem(); + + /* This can happen when nothing is selected on the treeView + and the shortcutValue is clicked */ + if( !keyItem ) return; - KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text ); + /* If clicked on the first column, assuming user wants the normal hotkey */ + if( column == 0 ) column = 1; + + bool b_global = ( column == 2 ); + + /* Launch a small dialog to ask for a new key */ + KeyInputDialog *d = new KeyInputDialog( table, keyItem->text( 0 ), widget, b_global ); d->exec(); + if( d->result() == QDialog::Accepted ) { - p_keyItem->value.i = d->keyValue; + int newValue = d->keyValue; + shortcutValue->setText( VLCKeyToString( newValue ) ); + shortcutValue->setValue( newValue ); + shortcutValue->setGlobal( b_global ); + if( d->conflicts ) { + QTreeWidgetItem *it; for( int i = 0; i < table->topLevelItemCount() ; i++ ) { - QTreeWidgetItem *it = table->topLevelItem(i); - module_config_t *p_item = static_cast - (it->data( 0, Qt::UserRole ).value()); - it->setText( 1, VLCKeyToString( p_item->value.i ) ); + it = table->topLevelItem(i); + if( ( keyItem != it ) && + ( it->data( b_global ? 2: 1, Qt::UserRole ).toInt() == newValue ) ) + { + it->setData( b_global ? 2 : 1, Qt::UserRole, QVariant( -1 ) ); + it->setText( b_global ? 2 : 1, qtr( "Unset" ) ); + } } + /* We already made an OK once. */ + setTheKey(); } - else - keyItem->setText( 1, VLCKeyToString( p_keyItem->value.i ) ); } delete d; } +void KeySelectorControl::setTheKey() +{ + if( !table->currentItem() ) return; + table->currentItem()->setText( shortcutValue->getGlobal() ? 2 : 1, + shortcutValue->text() ); + table->currentItem()->setData( shortcutValue->getGlobal() ? 2 : 1, + Qt::UserRole, shortcutValue->getValue() ); +} + void KeySelectorControl::doApply() { - foreach( module_config_t *p_current, values ) + QTreeWidgetItem *it; + for( int i = 0; i < table->topLevelItemCount() ; i++ ) { - config_PutInt( p_this, p_current->psz_name, p_current->value.i ); + it = table->topLevelItem(i); + if( it->data( 1, Qt::UserRole ).toInt() >= 0 ) + config_PutInt( p_this, + qtu( it->data( 0, Qt::UserRole ).toString() ), + it->data( 1, Qt::UserRole ).toInt() ); + if( it->data( 2, Qt::UserRole ).toInt() >= 0 ) + config_PutInt( p_this, + qtu( "global-" + it->data( 0, Qt::UserRole ).toString() ), + it->data( 2, Qt::UserRole ).toInt() ); + } } -KeyInputDialog::KeyInputDialog( QList& _values, - const char * _keyToChange ) : - QDialog(0), keyValue(0) +/** + * Class KeyInputDialog + **/ +KeyInputDialog::KeyInputDialog( QTreeWidget *_table, + const QString& keyToChange, + QWidget *_parent, + bool _b_global ) : + QDialog( _parent ), keyValue(0), b_global( _b_global ) { setModal( true ); - values = _values; conflicts = false; - keyToChange = _keyToChange; - setWindowTitle( qtr( "Hotkey for " ) + qfu( keyToChange) ); - QVBoxLayout *l = new QVBoxLayout( this ); - selected = new QLabel( qtr("Press the new keys for ") + qfu(keyToChange) ); - warning = new QLabel(); - l->addWidget( selected , Qt::AlignCenter ); - l->addWidget( warning, Qt::AlignCenter ); + table = _table; + setWindowTitle( b_global ? qtr( "Global" ): "" + + qtr( "Hotkey for " ) + keyToChange ); + setWindowRole( "vlc-key-input" ); + + vLayout = new QVBoxLayout( this ); + selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange ); + vLayout->addWidget( selected , Qt::AlignCenter ); - QHBoxLayout *l2 = new QHBoxLayout(); + warning = new QLabel; + warning->hide(); + vLayout->insertWidget( 1, warning ); + + buttonBox = new QDialogButtonBox; QPushButton *ok = new QPushButton( qtr("OK") ); - l2->addWidget( ok ); QPushButton *cancel = new QPushButton( qtr("Cancel") ); - l2->addWidget( cancel ); + buttonBox->addButton( ok, QDialogButtonBox::AcceptRole ); + buttonBox->addButton( cancel, QDialogButtonBox::RejectRole ); + ok->setDefault( true ); - BUTTONACT( ok, accept() ); - BUTTONACT( cancel, reject() ); + vLayout->addWidget( buttonBox ); + buttonBox->hide(); - l->addLayout( l2 ); + CONNECT( buttonBox, accepted(), this, accept() ); + CONNECT( buttonBox, rejected(), this, reject() ); } void KeyInputDialog::checkForConflicts( int i_vlckey ) { - conflicts = false; - module_config_t *p_current = NULL; - foreach( p_current, values ) - { - if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text, - keyToChange ) ) - { - p_current->value.i = 0; - conflicts = true; - break; - } - } - if( conflicts ) + QList conflictList = + table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, + b_global ? 2 : 1 ); + + if( conflictList.size() && + conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toInt() > 1 ) + /* Avoid 0 or -1 that are the "Unset" states */ { - warning->setText( - qtr("Warning: the key is already assigned to \"") + - QString( p_current->psz_text ) + "\"" ); + warning->setText( qtr("Warning: the key is already assigned to \"") + + conflictList[0]->text( 0 ) + "\"" ); + warning->show(); + buttonBox->show(); + + conflicts = true; } - else warning->setText( "" ); + else accept(); } void KeyInputDialog::keyPressEvent( QKeyEvent *e ) { - if( e->key() == Qt::Key_Tab ) return; + if( e->key() == Qt::Key_Tab || + e->key() == Qt::Key_Shift || + e->key() == Qt::Key_Control || + e->key() == Qt::Key_Meta || + e->key() == Qt::Key_Alt || + e->key() == Qt::Key_AltGr ) + return; int i_vlck = qtEventToVLCKey( e ); - selected->setText( VLCKeyToString( i_vlck ) ); + selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) ); checkForConflicts( i_vlck ); keyValue = i_vlck; } @@ -1069,7 +1459,13 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e ) void KeyInputDialog::wheelEvent( QWheelEvent *e ) { int i_vlck = qtWheelEventToVLCKey( e ); - selected->setText( VLCKeyToString( i_vlck ) ); + selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) ); checkForConflicts( i_vlck ); keyValue = i_vlck; } + +void KeyShortcutEdit::mousePressEvent( QMouseEvent *) +{ + emit pressed(); +} +