X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=0de3250b2eb2f962e7173692f73834f01e4563ee;hb=72a25f190a8028c16c9cfa48b331d0772839fea2;hp=bd17adb1c48900e3c509cd207fe49d2e06b5ab9a;hpb=be4cca987ba9de8ae3dd33243ef863263d7723d7;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index bd17adb1c4..0de3250b2e 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -1,11 +1,12 @@ /***************************************************************************** * preferences_widgets.cpp : Widgets for preferences displays **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright (C) 2006-2007 the VideoLAN team * $Id$ * * Authors: ClÃ©ment Stenac * Antoine Cellerier + * Jean-Baptiste Kempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,25 +27,36 @@ * Todo: * - Finish implementation (see WX) * - Improvements over WX - * - Password field implementation (through "pwd" bool param * - Validator for modulelist - * - Implement update stuff using a general Updated signal */ #include "components/preferences_widgets.hpp" #include "util/customwidgets.hpp" -#include "qt4.hpp" -#include +#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, @@ -60,7 +72,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, QGridLayout *l, int &line ) { ConfigControl *p_control = NULL; - if( p_item->psz_current ) return NULL; + if( p_item->psz_current || p_item->b_unsaveable ) return NULL; switch( p_item->i_type ) { @@ -88,11 +100,19 @@ 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, parent, false, l, line ); - else if( p_item->i_min || p_item->i_max ) + else if( p_item->min.i || p_item->max.i ) p_control = new IntegerRangeConfigControl( p_this, p_item, parent, l, line ); else @@ -100,10 +120,16 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, l, line ); break; case CONFIG_ITEM_FILE: - fprintf( stderr, "Todo (CONFIG_ITEM_FILE)\n" ); + p_control = new FileConfigControl( p_this, p_item, parent, l, + line, false ); break; case CONFIG_ITEM_DIRECTORY: - fprintf( stderr, "Todo (CONFIG_ITEM_DIRECTORY)\n" ); + 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 ); @@ -112,7 +138,7 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new BoolConfigControl( p_this, p_item, parent, l, line ); break; case CONFIG_ITEM_FLOAT: - if( p_item->f_min || p_item->f_max ) + if( p_item->min.f || p_item->max.f ) p_control = new FloatRangeConfigControl( p_this, p_item, parent, l, line ); else @@ -132,6 +158,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) case 1: { VIntConfigControl *vicc = qobject_cast(this); + assert( vicc ); config_PutInt( p_intf, vicc->getName(), vicc->getValue() ); break; } @@ -139,6 +166,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) { VFloatConfigControl *vfcc = qobject_cast(this); + assert( vfcc ); config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() ); break; } @@ -146,11 +174,14 @@ void ConfigControl::doApply( intf_thread_t *p_intf ) { VStringConfigControl *vscc = qobject_cast(this); + assert( vscc ); config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) ); + break; } case 4: { KeySelectorControl *ksc = qobject_cast(this); + assert( ksc ); ksc->doApply(); } } @@ -167,8 +198,9 @@ 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) ); - text = new QLineEdit( qfu(p_item->psz_value) ); + 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 ) @@ -195,10 +227,121 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, void StringConfigControl::finish() { - text->setText( qfu(p_item->psz_value) ); - text->setToolTip( qfu(p_item->psz_longtext) ); + text->setText( qfu(p_item->value.psz) ); + 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 **************/ +FileConfigControl::FileConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QWidget *_parent, QGridLayout *l, + int &line, bool pwd ) : + VStringConfigControl( _p_this, _p_item, _parent ) +{ + label = new QLabel( qtr(p_item->psz_text) ); + text = new QLineEdit( qfu(p_item->value.psz) ); + browse = new QPushButton( qtr( "Browse..." ) ); + QHBoxLayout *textAndButton = new QHBoxLayout(); + textAndButton->setMargin( 0 ); + textAndButton->addWidget( text, 2 ); + textAndButton->addWidget( browse, 0 ); + + BUTTONACT( browse, updateField() ); + + finish(); + + if( !l ) + { + QHBoxLayout *layout = new QHBoxLayout(); + layout->addWidget( label, 0 ); + layout->addLayout( textAndButton, 1 ); + widget->setLayout( layout ); + } + else + { + l->addWidget( label, line, 0 ); + l->addLayout( textAndButton, line, 1 ); + } +} + + +FileConfigControl::FileConfigControl( vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, QLineEdit *_text, + QPushButton *_button, bool pwd ): + VStringConfigControl( _p_this, _p_item ) +{ + browse = _button; + text = _text; + label = _label; + + BUTTONACT( browse, updateField() ); + + finish( ); +} + +void FileConfigControl::updateField() +{ + QString file = QFileDialog::getOpenFileName( NULL, + qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ) ); + if( file.isNull() ) return; + text->setText( file ); +} + +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)) ); +} + +/********* 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) +{} + +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) +{} + +void DirectoryConfigControl::updateField() +{ + QString dir = QFileDialog::getExistingDirectory( NULL, + qtr( "Select Directory" ), + 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 **********/ @@ -207,7 +350,7 @@ StringListConfigControl::StringListConfigControl( 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 ) @@ -221,6 +364,42 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, l->addWidget( label, line, 0 ); l->addWidget( combo, line, 1, 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, 2 + 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; + + 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 ); + + if( p_item->b_dirty ) + { + combo->clear(); + finish( true ); + p_item->b_dirty = VLC_FALSE; + + } } StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, QComboBox *_combo, @@ -241,13 +420,13 @@ void StringListConfigControl::finish( bool bycat ) p_item->ppsz_list_text[i_index] : p_item->ppsz_list[i_index] ), QVariant( p_item->ppsz_list[i_index] ) ); - if( p_item->psz_value && !strcmp( p_item->psz_value, + if( p_item->value.psz && !strcmp( p_item->value.psz, 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() @@ -255,13 +434,33 @@ QString StringListConfigControl::getValue() return combo->itemData( combo->currentIndex() ).toString(); } +void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf, + QComboBox *combo, QWidget *parent ) +{ + module_config_t *p_config = + config_FindConfig( VLC_OBJECT(p_intf), configname ); + if( p_config ) + { + 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, 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 ) @@ -276,6 +475,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, l->addWidget( combo, line, 1, 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 ) @@ -301,34 +501,34 @@ void ModuleConfigControl::finish( bool bycat ) if( bycat ) { - if( !strcmp( p_parser->psz_object_name, "main" ) ) continue; + if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue; - module_config_t *p_config = p_parser->p_config; - if( p_config ) do + for (size_t i = 0; i < p_parser->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->i_value == p_item->i_min ) - combo->addItem( qfu(p_parser->psz_longname), - QVariant( p_parser->psz_object_name ) ); - if( p_item->psz_value && !strcmp( p_item->psz_value, - p_parser->psz_object_name) ) + p_config->value.i == p_item->min.i ) + combo->addItem( qtr( module_GetLongName( p_parser )), + QVariant( module_GetObjName( p_parser ) ) ); + if( p_item->value.psz && !strcmp( p_item->value.psz, + module_GetObjName( p_parser ) ) ) combo->setCurrentIndex( combo->count() - 1 ); - } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } } - 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), - QVariant( p_parser->psz_object_name ) ); - if( p_item->psz_value && !strcmp( p_item->psz_value, - p_parser->psz_object_name) ) + combo->addItem( qtr(module_GetLongName( p_parser ) ), + QVariant( module_GetObjName( p_parser ) ) ); + if( p_item->value.psz && !strcmp( p_item->value.psz, + module_GetObjName( p_parser ) ) ) combo->setCurrentIndex( combo->count() - 1 ); } } 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() @@ -338,53 +538,68 @@ 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 ); -} -#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 ); + + text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) ); } -#endif 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( module_GetLongName( p_parser ) ) );\ + checkBoxListItem *cbl = new checkBoxListItem; \ +\ + CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\ + cb->setToolTip( formatTooltip( qtr( module_GetLongName( 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] \ + : module_GetObjName( p_parser ) ); \ + modules.push_back( cbl ); \ +} + + void ModuleListConfigControl::finish( bool bycat ) { vlc_list_t *p_list; @@ -398,35 +613,30 @@ void ModuleListConfigControl::finish( bool bycat ) if( bycat ) { - if( !strcmp( p_parser->psz_object_name, "main" ) ) continue; + if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue; - module_config_t *p_config = p_parser->p_config; - if( p_config ) do + for (size_t i = 0; i < p_parser->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->i_value == p_item->i_min ) + 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; } - } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } } - 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() { @@ -435,33 +645,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 ); + } + } } } @@ -476,8 +698,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(); @@ -507,10 +730,10 @@ void IntegerConfigControl::finish() { spin->setMaximum( 2000000000 ); spin->setMinimum( -2000000000 ); - spin->setValue( p_item->i_value ); - spin->setToolTip( qfu(p_item->psz_longtext) ); + spin->setValue( p_item->value.i ); + 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() @@ -538,17 +761,39 @@ IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this, void IntegerRangeConfigControl::finish() { - spin->setMaximum( p_item->i_max ); - spin->setMinimum( p_item->i_min ); + spin->setMaximum( p_item->max.i ); + spin->setMinimum( p_item->min.i ); } +IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl( + vlc_object_t *_p_this, + module_config_t *_p_item, + QLabel *_label, QSlider *_slider ): + VIntConfigControl( _p_this, _p_item ) +{ + slider = _slider; + label = _label; + slider->setMaximum( p_item->max.i ); + slider->setMinimum( p_item->min.i ); + slider->setValue( p_item->value.i ); + slider->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + if( label ) + label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); +} + +int IntegerRangeSliderConfigControl::getValue() +{ + return slider->value(); +} + + /********* Integer / choice list **********/ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_parent, bool bycat, QGridLayout *l, int &line) : VIntConfigControl( _p_this, _p_item, _parent ) { - label = new QLabel( qfu(p_item->psz_text) ); + label = new QLabel( qtr(p_item->psz_text) ); combo = new QComboBox(); finish( bycat ); if( !l ) @@ -578,14 +823,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->i_value == 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() @@ -600,7 +845,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 ) @@ -627,9 +872,9 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, void BoolConfigControl::finish() { - checkbox->setCheckState( p_item->i_value == VLC_TRUE ? Qt::Checked + 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() @@ -648,9 +893,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 ) @@ -682,10 +928,10 @@ void FloatConfigControl::finish() spin->setMaximum( 2000000000. ); spin->setMinimum( -2000000000. ); spin->setSingleStep( 0.1 ); - spin->setValue( (double)p_item->f_value ); - spin->setToolTip( qfu(p_item->psz_longtext) ); + spin->setValue( (double)p_item->value.f ); + 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() @@ -714,8 +960,8 @@ FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this, void FloatRangeConfigControl::finish() { - spin->setMaximum( (double)p_item->f_max ); - spin->setMinimum( (double)p_item->f_min ); + spin->setMaximum( (double)p_item->max.f ); + spin->setMinimum( (double)p_item->min.f ); } @@ -749,7 +995,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 ); @@ -757,22 +1003,23 @@ void KeySelectorControl::finish() module_t *p_main = config_FindModule( p_this, "main" ); assert( p_main ); - module_config_t *p_item = p_main->p_config; - if( p_item ) do + for (size_t i = 0; i < p_main->confsize; i++) { + module_config_t *p_item = p_main->p_config + i; + if( p_item->i_type & CONFIG_ITEM && p_item->psz_name && strstr( p_item->psz_name , "key-" ) ) { QTreeWidgetItem *treeItem = new QTreeWidgetItem(); - treeItem->setText( 0, qfu( p_item->psz_text ) ); - treeItem->setText( 1, VLCKeyToString( p_item->i_value ) ); + 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; table->addTopLevelItem( treeItem ); } - } while( p_item->i_type != CONFIG_HINT_END && p_item++ ); + } table->resizeColumnToContents( 0 ); CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ), @@ -788,7 +1035,7 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) d->exec(); if( d->result() == QDialog::Accepted ) { - p_keyItem->i_value = d->keyValue; + p_keyItem->value.i = d->keyValue; if( d->conflicts ) { for( int i = 0; i < table->topLevelItemCount() ; i++ ) @@ -796,21 +1043,27 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) QTreeWidgetItem *it = table->topLevelItem(i); module_config_t *p_item = static_cast (it->data( 0, Qt::UserRole ).value()); - it->setText( 1, VLCKeyToString( p_item->i_value ) ); + if( p_keyItem != p_item && p_item->value.i == d->keyValue ) + p_item->value.i = 0; + it->setText( 1, VLCKeyToString( p_item->value.i ) ); } } else - keyItem->setText( 1, VLCKeyToString( p_keyItem->i_value ) ); + keyItem->setText( 1, VLCKeyToString( p_keyItem->value.i ) ); } delete d; } void KeySelectorControl::doApply() { + foreach( module_config_t *p_current, values ) + { + config_PutInt( p_this, p_current->psz_name, p_current->value.i ); + } } KeyInputDialog::KeyInputDialog( QList& _values, - char * _keyToChange ) : + const char * _keyToChange ) : QDialog(0), keyValue(0) { setModal( true ); @@ -837,19 +1090,15 @@ 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->i_value == i_vlck && strcmp( p_current->psz_text, + if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text, keyToChange ) ) { - p_current->i_value = 0; conflicts = true; break; } @@ -861,5 +1110,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; }