* 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 <QLineEdit>
+#include <vlc_keys.h>
+
#include <QString>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
#include <QVariant>
-#include <QComboBox>
#include <QGridLayout>
-#include <QPushButton>
#include <QSlider>
#include <QFileDialog>
+#include <QFontDialog>
+#include <QGroupBox>
+#include <QTreeWidgetItem>
-#include <vlc_keys.h>
+QString formatTooltip(const QString & tooltip)
+{
+ QString formatted =
+ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">"
+ " p, li { white-space: pre-wrap; } </style></head><body style=\" font-family:'Sans Serif';"
+ " font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;\">"
+ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; "
+ "-qt-block-indent:0; text-indent:0px;\">" +
+ tooltip +
+ "</p></body></html>";
+ return formatted;
+}
ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
module_config_t *p_item,
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 )
{
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,
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;
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) );
+ if( pwd ) text->setEchoMode( QLineEdit::Password );
finish();
if( !l )
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)) );
+ connect( text, SIGNAL(textChanged( const QString & )), this,
+ SIGNAL(Updated()) );
}
/*********** File **************/
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() );
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 );
}
}
FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
- QLabel *_label, QLineEdit *_text,
+ QLabel *_label, QLineEdit *_text,
QPushButton *_button, bool pwd ):
VStringConfigControl( _p_this, _p_item )
{
void FileConfigControl::updateField()
{
- text->setText( QFileDialog::getOpenFileName( NULL,
- qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ) ) );
+ 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( 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)) );
+ connect( text, SIGNAL(textChanged( const QString & )), this,
+ SIGNAL(Updated()) );
}
/********* 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_label, _p_line, _p_button, _pwd)
{}
-
void DirectoryConfigControl::updateField()
{
- text->setText( QFileDialog::getOpenFileName( NULL,
- qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ),
- NULL, 0, QFileDialog::ShowDirsOnly ) );
+ 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 **********/
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 )
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)) );
+ connect( combo, SIGNAL(currentIndexChanged( int )), this,
+ SIGNAL(Updated()) );
}
QString StringListConfigControl::getValue()
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 )
if( bycat )
{
- if( !strcmp( p_parser->psz_object_name, "main" ) ) continue;
+ if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
for (size_t i = 0; i < p_parser->confsize; 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( qfu(p_parser->psz_longname),
- QVariant( 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,
- p_parser->psz_object_name) )
+ module_GetObjName( p_parser ) ) )
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),
- QVariant( 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,
- p_parser->psz_object_name) )
+ 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)) );
+ connect( combo, SIGNAL(currentIndexChanged( int )), this,
+ SIGNAL(Updated()) );
}
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();
+ connect( text, SIGNAL(textChanged( const QString & )), this,
+ SIGNAL(Updated()) );
+ QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
+
finish( bycat );
- bool pom = false;
+ int boxline = 0;
+ for( QVector<checkBoxListItem*>::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<QCheckBox*>::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;
ModuleListConfigControl::~ModuleListConfigControl()
{
- for( QVector<QCheckBox*>::iterator it = modules.begin();
- it != modules.end(); it++ )
+ for( QVector<checkBoxListItem*>::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;
if( bycat )
{
- if( !strcmp( p_parser->psz_object_name, "main" ) ) continue;
+ if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
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->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()
{
void ModuleListConfigControl::hide()
{
- for( QVector<QCheckBox*>::iterator it = modules.begin();
+ for( QVector<checkBoxListItem*>::iterator it = modules.begin();
it != modules.end(); it++ )
{
- (*it)->hide();
+ (*it)->checkBox->hide();
}
- text->hide();
- label->hide();
+ groupBox->hide();
}
void ModuleListConfigControl::show()
{
- for( QVector<QCheckBox*>::iterator it = modules.begin();
+ for( QVector<checkBoxListItem*>::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<QCheckBox*>::iterator it = modules.begin();
+ bool first = true;
+
+ for( QVector<checkBoxListItem*>::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 );
+ }
+ }
}
+ emit Updated();
}
/**************************************************************************
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();
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)) );
+ connect( spin, SIGNAL(valueChanged( int )), this,
+ SIGNAL(Updated()) );
}
int IntegerConfigControl::getValue()
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()
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 )
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)) );
+ connect( combo, SIGNAL(currentIndexChanged( int )), this,
+ SIGNAL(Updated()) );
}
int IntegerListConfigControl::getValue()
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 )
{
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)) );
+ connect( checkbox, SIGNAL(stateChanged( int )), this,
+ SIGNAL(Updated()) );
}
int BoolConfigControl::getValue()
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 )
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)) );
+ connect( spin, SIGNAL(valueChanged( double )), this,
+ SIGNAL(Updated()) );
}
float FloatConfigControl::getValue()
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 );
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 ) );
QTreeWidgetItem *it = table->topLevelItem(i);
module_config_t *p_item = static_cast<module_config_t*>
(it->data( 0, Qt::UserRole ).value<void*>());
+ if( p_keyItem != p_item && p_item->value.i == d->keyValue )
+ p_item->value.i = 0;
it->setText( 1, VLCKeyToString( p_item->value.i ) );
}
}
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;
conflicts = true;
break;
}
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;
}
projects / vlc / blobdiff