X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=0595ff559d2a84b7d00ae8f742a00ca0cb30a040;hb=6ff86dc483c3d3fabe7ab33278ad59a33f15a72a;hp=81fd6a02251f431a0818f8bb52e9d0750eb15d8c;hpb=a3576a2716c6ea17349b9dbeea4757d2198b40e6;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 81fd6a0225..0595ff559d 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -47,14 +47,18 @@ #include #include +#define MINWIDTH_BOX 90 +#define LAST_COLUMN 10 + QString formatTooltip(const QString & tooltip) { QString formatted = - "" - "

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

" + tooltip + "

"; return formatted; @@ -64,7 +68,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 +78,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, QGridLayout *l, int &line ) { ConfigControl *p_control = NULL; - if( p_item->psz_current || p_item->b_unsaveable ) return NULL; switch( p_item->i_type ) { @@ -157,14 +160,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); @@ -172,7 +176,7 @@ 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); @@ -180,7 +184,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) ); break; } - case 4: + case CONFIG_ITEM_KEY: { KeySelectorControl *ksc = qobject_cast(this); assert( ksc ); @@ -208,12 +212,15 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, 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 ); } } @@ -258,13 +265,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 ); } } @@ -354,18 +363,19 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); - combo->setMinimumWidth( 80 ); + combo->setMinimumWidth( MINWIDTH_BOX ); + combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); finish( 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 ) @@ -379,7 +389,8 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, new QPushButton( qfu( p_item->ppsz_action_text[i] )); CONNECT( button, clicked(), signalMapper, map() ); signalMapper->setMapping( button, i ); - l->addWidget( button, line, 2 + i, Qt::AlignRight ); + l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i, + Qt::AlignRight ); } CONNECT( signalMapper, mapped( int ), this, actionRequested( int ) ); @@ -465,18 +476,18 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); - combo->setMinimumWidth( 80 ); + 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 ); } } @@ -596,7 +607,7 @@ 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 ) ); \ @@ -707,21 +718,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, @@ -803,18 +814,18 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, { label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); - combo->setMinimumWidth( 80 ); + 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 ); } } IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, @@ -903,22 +914,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 ); } } @@ -1005,6 +1016,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 ); @@ -1025,15 +1037,17 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, 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; @@ -1043,20 +1057,29 @@ 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 ); } } module_PutConfig (p_config); - module_Put (p_module); + module_Put (p_main); table->resizeColumnToContents( 0 ); @@ -1067,9 +1090,11 @@ void KeySelectorControl::finish() CONNECT( shortcutValue, pressed(), this, selectKey() ); } +/* Show the key selected from the table in the keySelector */ void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem ) { shortcutValue->setText( keyItem->text( 1 ) ); + shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() ); } void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) @@ -1081,28 +1106,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; } @@ -1110,30 +1139,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; @@ -1141,6 +1175,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(); @@ -1151,36 +1186,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; } @@ -1188,7 +1220,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; } @@ -1197,3 +1229,4 @@ void KeyShortcutEdit::mousePressEvent( QMouseEvent *) { emit pressed(); } +