X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=67f1cf8b7b5369c28d146e1f8b05f668cd6e359b;hb=36f0edc98752f8afa17a50cb8de086b30ba54c2e;hp=81b9283c7e45a643e485e21fb701483b88b78c6b;hpb=56fbf5f7575056764ca1e7a9e2a89c3e156a9d46;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 81b9283c7e..67f1cf8b7b 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -30,10 +30,12 @@ * - Improvements over WX * - Validator for modulelist */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "components/preferences_widgets.hpp" #include "util/customwidgets.hpp" - #include #include @@ -41,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -132,10 +133,12 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new DirectoryConfigControl( p_this, p_item, parent, l, line, false ); break; +#if 0 case CONFIG_ITEM_FONT: p_control = new FontConfigControl( p_this, p_item, parent, l, line, false ); break; +#endif case CONFIG_ITEM_KEY: p_control = new KeySelectorControl( p_this, p_item, parent, l, line ); break; @@ -181,7 +184,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) 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 CONFIG_ITEM_KEY: @@ -296,7 +299,7 @@ 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" ), qfu( config_GetHomeDir() ) ); if( file.isNull() ) return; text->setText( file ); } @@ -327,13 +330,16 @@ void DirectoryConfigControl::updateField() QString dir = QFileDialog::getExistingDirectory( NULL, qtr( "Select Directory" ), text->text().isEmpty() ? - qfu( p_this->p_libvlc->psz_homedir ) : text->text(), + qfu( config_GetHomeDir() ) : text->text(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); if( dir.isNull() ) return; text->setText( dir ); } +#if 0 +#include + /********* String / Font **********/ FontConfigControl::FontConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_p_widget, @@ -354,6 +360,7 @@ void FontConfigControl::updateField() if( !ok ) return; text->setText( font.family() ); } +#endif /********* String / choice list **********/ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, @@ -365,7 +372,24 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, combo = new QComboBox(); combo->setMinimumWidth( MINWIDTH_BOX ); combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); - finish( bycat ); + + module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name ); + if(p_module_config && p_module_config->pf_update_list) + { + 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 ); + } + + finish( p_module_config, bycat ); if( !l ) { l = new QGridLayout(); @@ -402,17 +426,20 @@ 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 = qtu( (combo->itemData( combo->currentIndex() ).toString() ) ); - p_item->ppf_action[i_action]( p_this, getName(), val, val, 0 ); + p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 ); - if( p_item->b_dirty ) + if( p_module_config->b_dirty ) { combo->clear(); - finish( true ); - p_item->b_dirty = VLC_FALSE; + finish( p_module_config, true ); + p_module_config->b_dirty = false; } } StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, @@ -421,26 +448,32 @@ 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; + + for( int i_index = 0; i_index < p_module_config->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->value.psz && !strcmp( p_item->value.psz, - p_item->ppsz_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)) ); } QString StringListConfigControl::getValue() @@ -455,6 +488,17 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf, 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] ), @@ -562,8 +606,11 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, QGridLayout *l, int &line) : VStringConfigControl( _p_this, _p_item, _parent ) { + groupBox = NULL; + if( !p_item->psz_text ) return; + groupBox = new QGroupBox ( qtr(p_item->psz_text) ); - text = new QLineEdit(); + text = new QLineEdit; QGridLayout *layoutGroupBox = new QGridLayout( groupBox ); finish( bycat ); @@ -597,8 +644,7 @@ ModuleListConfigControl::~ModuleListConfigControl() { delete *it; } - delete groupBox; - delete text; + if( groupBox ) delete groupBox; } #define CHECKBOX_LISTS \ @@ -607,11 +653,14 @@ ModuleListConfigControl::~ModuleListConfigControl() checkBoxListItem *cbl = new checkBoxListItem; \ \ CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\ - cb->setToolTip( formatTooltip( qtr( module_GetLongName( p_parser ))));\ + cb->setToolTip( formatTooltip( qtr( module_GetHelp( p_parser ))));\ cbl->checkBox = cb; \ \ cbl->psz_module = strdup( module_GetObjName( p_parser ) ); \ modules.push_back( cbl ); \ +\ + if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \ + cbl->checkBox->setChecked( true ); \ } @@ -815,7 +864,23 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); combo->setMinimumWidth( MINWIDTH_BOX ); - finish( bycat ); + + module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name ); + if(p_module_config && 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; + } + + + finish( p_module_config, bycat ); if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); @@ -827,6 +892,25 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, l->addWidget( label, line, 0 ); 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, @@ -834,23 +918,50 @@ 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; + + 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)) ); +} + +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() @@ -892,14 +1003,14 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, void BoolConfigControl::finish() { - checkbox->setCheckState( p_item->value.i == VLC_TRUE ? Qt::Checked + checkbox->setCheckState( p_item->value.i == true ? Qt::Checked : Qt::Unchecked ); checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int BoolConfigControl::getValue() { - return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE; + return checkbox->checkState() == Qt::Checked ? true : false; } /************************************************************************** @@ -1016,6 +1127,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, QPushButton *clearButton = new QPushButton( qtr( "Clear" ) ); QPushButton *setButton = new QPushButton( qtr( "Set" ) ); + setButton->setDefault( true ); finish(); gLayout->addWidget( label, 0, 0, 1, 4 ); @@ -1030,21 +1142,24 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, l->addWidget( keyContainer, line, 0, 1, 2 ); CONNECT( clearButton, clicked(), shortcutValue, clear() ); + CONNECT( clearButton, clicked(), this, setTheKey() ); BUTTONACT( setButton, setTheKey() ); } 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 ); + /* Get the main Module */ module_t *p_main = module_Find( p_this, "main" ); assert( p_main ); + /* Access to the module_config_t */ unsigned confsize; module_config_t *p_config; @@ -1054,15 +1169,24 @@ void KeySelectorControl::finish() { 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-" ) && !EMPTY_STR( p_item->psz_text ) ) + /* 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-" ) + && !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 ); } } @@ -1071,16 +1195,20 @@ void KeySelectorControl::finish() table->resizeColumnToContents( 0 ); - CONNECT( table, itemClicked( QTreeWidgetItem *, int ), - this, select1Key( QTreeWidgetItem * ) ); CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ), this, selectKey( QTreeWidgetItem * ) ); + CONNECT( table, itemSelectionChanged (), + this, select1Key() ); + CONNECT( shortcutValue, pressed(), this, selectKey() ); } -void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem ) +/* 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() ); } void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) @@ -1092,28 +1220,32 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) and the shortcutValue is clicked */ if( !keyItem ) return; - module_config_t *p_keyItem = static_cast - (keyItem->data( 0, Qt::UserRole ).value()); - - KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text, widget ); + /* Launch a small dialog to ask for a new key */ + KeyInputDialog *d = new KeyInputDialog( table, keyItem->text( 0 ), widget ); d->exec(); + if( d->result() == QDialog::Accepted ) { - p_keyItem->value.i = d->keyValue; + int newValue = d->keyValue; + shortcutValue->setText( VLCKeyToString( newValue ) ); + shortcutValue->setValue( newValue ); + 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()); - if( p_keyItem != p_item && p_item->value.i == d->keyValue ) - p_item->value.i = 0; - shortcutValue->setText( VLCKeyToString( p_item->value.i ) ); + it = table->topLevelItem(i); + if( ( keyItem != it ) + && ( it->data( 1, Qt::UserRole ).toInt() == newValue ) ) + { + it->setData( 1, Qt::UserRole, QVariant( -1 ) ); + it->setText( 1, qtr( "Unset" ) ); + } } + /* We already made an OK once. */ + setTheKey(); } - else - shortcutValue->setText( VLCKeyToString( p_keyItem->value.i ) ); } delete d; } @@ -1121,30 +1253,35 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) void KeySelectorControl::setTheKey() { table->currentItem()->setText( 1, shortcutValue->text() ); + table->currentItem()->setData( 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() ); } } -KeyInputDialog::KeyInputDialog( QList& _values, - const char * _keyToChange, +KeyInputDialog::KeyInputDialog( QTreeWidget *_table, + QString keyToChange, QWidget *_parent ) : QDialog( _parent ), keyValue(0) { setModal( true ); - values = _values; conflicts = false; - keyToChange = _keyToChange; - setWindowTitle( qtr( "Hotkey for " ) + qfu( keyToChange) ); + table = _table; + setWindowTitle( qtr( "Hotkey for " ) + keyToChange ); vLayout = new QVBoxLayout( this ); - selected = new QLabel( qtr("Press the new keys for ") + qfu( keyToChange ) ); + selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange ); vLayout->addWidget( selected , Qt::AlignCenter ); buttonBox = new QDialogButtonBox; @@ -1152,6 +1289,7 @@ KeyInputDialog::KeyInputDialog( QList& _values, QPushButton *cancel = new QPushButton( qtr("Cancel") ); buttonBox->addButton( ok, QDialogButtonBox::AcceptRole ); buttonBox->addButton( cancel, QDialogButtonBox::RejectRole ); + ok->setDefault( true ); vLayout->addWidget( buttonBox ); buttonBox->hide(); @@ -1162,36 +1300,33 @@ KeyInputDialog::KeyInputDialog( QList& _values, void KeyInputDialog::checkForConflicts( int i_vlckey ) { - conflicts = false; - module_config_t *p_current = NULL; - /* Search for conflicts */ - foreach( p_current, values ) - { - if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text, - keyToChange ) ) - { - conflicts = true; - break; - } - } + QList conflictList = + table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 ); - if( conflicts ) + if( conflictList.size() ) { QLabel *warning = new QLabel( - qtr("Warning: the key is already assigned to \"") + - qfu( p_current->psz_text ) + "\"" ); - warning->setWordWrap( true ); + qtr("Warning: the key is already assigned to \"") + + conflictList[0]->text( 0 ) + "\"" ); vLayout->insertWidget( 1, warning ); buttonBox->show(); + + conflicts = true; } 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; } @@ -1199,7 +1334,7 @@ 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; } @@ -1208,3 +1343,4 @@ void KeyShortcutEdit::mousePressEvent( QMouseEvent *) { emit pressed(); } +