X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=2df114a4c0c9792701eff1a58051dbe797118b24;hb=e7859061b0370d2dd22961792a23324270362fdb;hp=aea238411db1f92e06f2448ae40fe6e0e65fc1fa;hpb=cdda8bc8c3985e8fa0cf27a1e22651b7e0cdcbb6;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index aea238411d..2df114a4c0 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -36,18 +36,29 @@ #include "util/customwidgets.hpp" #include "qt4.hpp" -#include +#include + #include -#include -#include #include -#include #include -#include #include #include +#include +#include +#include -#include +QString formatTooltip(const QString & tooltip) +{ + QString formatted = + "" + "

" + + tooltip + + "

"; + return formatted; +} ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, module_config_t *p_item, @@ -110,6 +121,10 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new DirectoryConfigControl( p_this, p_item, parent, l, line, false ); break; + case CONFIG_ITEM_FONT: + p_control = new FontConfigControl( p_this, p_item, parent, l, + line, false ); + break; case CONFIG_ITEM_KEY: p_control = new KeySelectorControl( p_this, p_item, parent, l, line ); break; @@ -177,7 +192,7 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, int &line, bool pwd ) : VStringConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); text = new QLineEdit( qfu(p_item->value.psz) ); finish(); @@ -206,9 +221,9 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, void StringConfigControl::finish() { text->setText( qfu(p_item->value.psz) ); - text->setToolTip( qfu(p_item->psz_longtext) ); + text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } /*********** File **************/ @@ -218,9 +233,13 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, int &line, bool pwd ) : VStringConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); text = new QLineEdit( qfu(p_item->value.psz) ); - browse = new QPushButton( qtr( "Browse" ) ); + browse = new QPushButton( qtr( "Browse..." ) ); + QHBoxLayout *textAndButton = new QHBoxLayout(); + textAndButton->setMargin( 0 ); + textAndButton->addWidget( text, 2 ); + textAndButton->addWidget( browse, 0 ); BUTTONACT( browse, updateField() ); @@ -229,14 +248,14 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, if( !l ) { QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( label, 0 ); layout->addWidget( text, 1 ); - layout->addWidget( browse, 2 ); + layout->addWidget( label, 0 ); + layout->addLayout( textAndButton, 1 ); widget->setLayout( layout ); } else { - l->addWidget( label, line, 0 ); l->addWidget( text, line, 1 ); - l->addWidget( browse, line, 2 ); + l->addWidget( label, line, 0 ); + l->addLayout( textAndButton, line, 1 ); } } @@ -267,13 +286,12 @@ void FileConfigControl::updateField() void FileConfigControl::finish() { text->setText( qfu(p_item->value.psz) ); - text->setToolTip( qfu(p_item->psz_longtext) ); + text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } /********* String / Directory **********/ - DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_p_widget, QGridLayout *_p_layout, int& _int, bool _pwd ) : @@ -286,24 +304,46 @@ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this, FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button, _pwd) {} - void DirectoryConfigControl::updateField() { QString dir = QFileDialog::getExistingDirectory( NULL, qtr( "Select Directory" ), - qfu( p_this->p_libvlc->psz_homedir ), - QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); + text->text().isEmpty() ? + qfu( p_this->p_libvlc->psz_homedir ) : text->text(), + QFileDialog::ShowDirsOnly | + QFileDialog::DontResolveSymlinks ); if( dir.isNull() ) return; text->setText( 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) +{} + +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() +{ + bool ok; + QFont font = QFontDialog::getFont( &ok, QFont( text->text() ), NULL ); + if( !ok ) return; + text->setText( font.family() ); +} + /********* 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) ); + label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); finish( bycat ); if( !l ) @@ -341,9 +381,9 @@ void StringListConfigControl::finish( bool bycat ) p_item->ppsz_list[i_index] ) ) combo->setCurrentIndex( combo->count() - 1 ); } - combo->setToolTip( qfu(p_item->psz_longtext) ); + combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } QString StringListConfigControl::getValue() @@ -357,7 +397,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, QGridLayout *l, int &line) : VStringConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); finish( bycat ); if( !l ) @@ -405,16 +445,16 @@ void ModuleConfigControl::finish( bool bycat ) /* 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( qfu(p_parser->psz_longname), + combo->addItem( qtr(p_parser->psz_longname), QVariant( p_parser->psz_object_name ) ); if( p_item->value.psz && !strcmp( p_item->value.psz, p_parser->psz_object_name) ) combo->setCurrentIndex( combo->count() - 1 ); } } - else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) ) + else if( module_IsCapable( p_parser, p_item->psz_type ) ) { - combo->addItem( qfu(p_parser->psz_longname), + combo->addItem( qtr(p_parser->psz_longname), QVariant( p_parser->psz_object_name ) ); if( p_item->value.psz && !strcmp( p_item->value.psz, p_parser->psz_object_name) ) @@ -422,9 +462,9 @@ void ModuleConfigControl::finish( bool bycat ) } } vlc_list_release( p_list ); - combo->setToolTip( qfu(p_item->psz_longtext) ); + combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } QString ModuleConfigControl::getValue() @@ -434,35 +474,41 @@ QString ModuleConfigControl::getValue() /********* 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 ) + 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) ); + groupBox = new QGroupBox ( qtr(p_item->psz_text) ); text = new QLineEdit(); + QGridLayout *layoutGroupBox = new QGridLayout( groupBox ); + finish( bycat ); - bool pom = false; + int boxline = 0; + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) + { + layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 ); + } + layoutGroupBox->addWidget( text, boxline, 0 ); + if( !l ) { - l = new QGridLayout(); - line = 0; - pom = true; + QVBoxLayout *layout = new QVBoxLayout(); + layout->addWidget( groupBox, line, 0 ); + widget->setLayout( layout ); } - for( QVector::iterator it = modules.begin(); - it != modules.end(); it++ ) + else { - l->addWidget( *it, line++, 1 ); + l->addWidget( groupBox, line, 0, 1, -1 ); } - l->addWidget( label, line, 0 ); - l->addWidget( text, line, 1 ); - if( pom ) - widget->setLayout( l ); + + 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 ) + module_config_t *_p_item, QLabel *_label, QComboBox *_combo, + bool bycat ) : VStringConfigControl( _p_this, _p_item ) { combo = _combo; label = _label; @@ -472,15 +518,34 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, ModuleListConfigControl::~ModuleListConfigControl() { - for( QVector::iterator it = modules.begin(); - it != modules.end(); it++ ) + for( QVector::iterator it = modules.begin(); + it != modules.end(); it++ ) { delete *it; } - delete label; + delete groupBox; delete text; } +#define CHECKBOX_LISTS \ +{ \ + QCheckBox *cb = new QCheckBox( qtr( p_parser->psz_longname ) );\ + checkBoxListItem *cbl = new checkBoxListItem; \ +\ + CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\ + cb->setToolTip( formatTooltip( qtr(p_parser->psz_longname)) );\ + 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 ); \ + modules.push_back( cbl ); \ +} + + void ModuleListConfigControl::finish( bool bycat ) { vlc_list_t *p_list; @@ -501,28 +566,23 @@ void ModuleListConfigControl::finish( bool bycat ) 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 ) + p_config->value.i == p_item->min.i ) { - QCheckBox *cb = - new QCheckBox( qfu( p_parser->psz_object_name ) ); - cb->setToolTip( qfu(p_parser->psz_longname) ); - modules.push_back( cb ); + CHECKBOX_LISTS; } } } - else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) ) + else if( module_IsCapable( p_parser, 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 ); + CHECKBOX_LISTS; } } vlc_list_release( p_list ); - text->setToolTip( qfu(p_item->psz_longtext) ); - if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + if( groupBox ) + groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } +#undef CHECKBOX_LISTS QString ModuleListConfigControl::getValue() { @@ -531,33 +591,45 @@ QString ModuleListConfigControl::getValue() void ModuleListConfigControl::hide() { - for( QVector::iterator it = modules.begin(); + for( QVector::iterator it = modules.begin(); it != modules.end(); it++ ) { - (*it)->hide(); + (*it)->checkBox->hide(); } - text->hide(); - label->hide(); + groupBox->hide(); } void ModuleListConfigControl::show() { - for( QVector::iterator it = modules.begin(); + for( QVector::iterator it = modules.begin(); it != modules.end(); it++ ) { - (*it)->show(); + (*it)->checkBox->show(); } - text->show(); - label->show(); + groupBox->show(); } -void ModuleListConfigControl::wakeUp_TheUserJustClickedOnSomething( int value ) +void ModuleListConfigControl::onUpdate( int value ) { text->clear(); - for( QVector::iterator it = modules.begin(); + bool first = true; + + for( QVector::iterator it = modules.begin(); it != modules.end(); it++ ) { + if( (*it)->checkBox->isChecked() ) + { + if( first ) + { + text->setText( text->text() + (*it)->psz_module ); + first = false; + } + else + { + text->setText( text->text() + ":" + (*it)->psz_module ); + } + } } } @@ -572,8 +644,9 @@ IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this, int &line ) : VIntConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); spin = new QSpinBox; spin->setMinimumWidth( 80 ); + spin->setAlignment( Qt::AlignRight ); spin->setMaximumWidth( 90 ); finish(); @@ -604,9 +677,9 @@ void IntegerConfigControl::finish() spin->setMaximum( 2000000000 ); spin->setMinimum( -2000000000 ); spin->setValue( p_item->value.i ); - spin->setToolTip( qfu(p_item->psz_longtext) ); + spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int IntegerConfigControl::getValue() @@ -649,9 +722,9 @@ IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl( slider->setMaximum( p_item->max.i ); slider->setMinimum( p_item->min.i ); slider->setValue( p_item->value.i ); - slider->setToolTip( qfu(p_item->psz_longtext) ); + slider->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int IntegerRangeSliderConfigControl::getValue() @@ -666,7 +739,7 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, QGridLayout *l, int &line) : VIntConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); finish( bycat ); if( !l ) @@ -696,14 +769,14 @@ void IntegerListConfigControl::finish( bool bycat ) for( int i_index = 0; i_index < p_item->i_list; i_index++ ) { - combo->addItem( qfu(p_item->ppsz_list_text[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->setCurrentIndex( combo->count() - 1 ); } - combo->setToolTip( qfu(p_item->psz_longtext) ); + combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int IntegerListConfigControl::getValue() @@ -718,7 +791,7 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, int &line ) : VIntConfigControl( _p_this, _p_item, _parent ) { - checkbox = new QCheckBox( qfu(p_item->psz_text) ); + checkbox = new QCheckBox( qtr(p_item->psz_text) ); finish(); if( !l ) @@ -747,7 +820,7 @@ void BoolConfigControl::finish() { checkbox->setCheckState( p_item->value.i == VLC_TRUE ? Qt::Checked : Qt::Unchecked ); - checkbox->setToolTip( qfu(p_item->psz_longtext) ); + checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int BoolConfigControl::getValue() @@ -766,9 +839,10 @@ FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this, int &line ) : VFloatConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 ); spin->setMaximumWidth( 90 ); + spin->setAlignment( Qt::AlignRight ); finish(); if( !l ) @@ -801,9 +875,9 @@ void FloatConfigControl::finish() spin->setMinimum( -2000000000. ); spin->setSingleStep( 0.1 ); spin->setValue( (double)p_item->value.f ); - spin->setToolTip( qfu(p_item->psz_longtext) ); + spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } float FloatConfigControl::getValue() @@ -867,7 +941,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, void KeySelectorControl::finish() { if( label ) - label->setToolTip( qfu(p_item->psz_longtext) ); + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); /* Fill the table */ table->setColumnCount( 2 ); @@ -884,7 +958,7 @@ void KeySelectorControl::finish() strstr( p_item->psz_name , "key-" ) ) { QTreeWidgetItem *treeItem = new QTreeWidgetItem(); - treeItem->setText( 0, qfu( p_item->psz_text ) ); + 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 ) ); @@ -960,16 +1034,13 @@ KeyInputDialog::KeyInputDialog( QList& _values, l->addLayout( l2 ); } -void KeyInputDialog::keyPressEvent( QKeyEvent *e ) +void KeyInputDialog::checkForConflicts( int i_vlckey ) { - if( e->key() == Qt::Key_Tab ) return; - int i_vlck = qtEventToVLCKey( e ); - selected->setText( VLCKeyToString( i_vlck ) ); conflicts = false; module_config_t *p_current = NULL; foreach( p_current, values ) { - if( p_current->value.i == i_vlck && strcmp( p_current->psz_text, + if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text, keyToChange ) ) { p_current->value.i = 0; @@ -984,5 +1055,21 @@ void KeyInputDialog::keyPressEvent( QKeyEvent *e ) QString( p_current->psz_text ) + "\"" ); } else warning->setText( "" ); +} + +void KeyInputDialog::keyPressEvent( QKeyEvent *e ) +{ + if( e->key() == Qt::Key_Tab ) return; + int i_vlck = qtEventToVLCKey( e ); + selected->setText( VLCKeyToString( i_vlck ) ); + checkForConflicts( i_vlck ); + keyValue = i_vlck; +} + +void KeyInputDialog::wheelEvent( QWheelEvent *e ) +{ + int i_vlck = qtWheelEventToVLCKey( e ); + selected->setText( VLCKeyToString( i_vlck ) ); + checkForConflicts( i_vlck ); keyValue = i_vlck; }