/**
* Todo:
- * - Finish implementation (see WX)
+ * - Finish implementation (see WX, there might be missing a
+ * i_action handler for IntegerLists, but I don't see any module using it...
* - Improvements over WX
- * - Password field implementation (through "pwd" bool param
* - Validator for modulelist
- * - Implement update stuff using a general Updated signal
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "components/preferences_widgets.hpp"
#include "util/customwidgets.hpp"
-#include "qt4.hpp"
+#include <vlc_keys.h>
-#include <QLineEdit>
#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 <QSignalMapper>
+#include <QDialogButtonBox>
-#include <vlc_keys.h>
+#define MINWIDTH_BOX 90
+#define LAST_COLUMN 10
+
+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,
QWidget *parent )
{
- int i=0;
+ int i = 0;
return createControl( p_this, p_item, parent, NULL, i );
}
QGridLayout *l, int &line )
{
ConfigControl *p_control = NULL;
- if( p_item->psz_current ) 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;
+#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;
{
switch( getType() )
{
- case 1:
+ case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
{
VIntConfigControl *vicc = qobject_cast<VIntConfigControl *>(this);
assert( vicc );
config_PutInt( p_intf, vicc->getName(), vicc->getValue() );
break;
}
- case 2:
+ case CONFIG_ITEM_FLOAT:
{
VFloatConfigControl *vfcc =
qobject_cast<VFloatConfigControl *>(this);
config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() );
break;
}
- case 3:
+ case CONFIG_ITEM_STRING:
{
VStringConfigControl *vscc =
qobject_cast<VStringConfigControl *>(this);
assert( vscc );
- config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) );
+ config_PutPsz( p_intf, vscc->getName(), qtu( vscc->getValue() ) );
break;
}
- case 4:
+ case CONFIG_ITEM_KEY:
{
KeySelectorControl *ksc = qobject_cast<KeySelectorControl *>(this);
assert( ksc );
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 )
{
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 );
}
}
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 **************/
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->insertSpacing( 1, 10 );
+ layout->addLayout( textAndButton, LAST_COLUMN );
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->setColumnMinimumWidth( 1, 10 );
+ l->addLayout( textAndButton, line, LAST_COLUMN );
}
}
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 );
}
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 **********/
{
QString dir = QFileDialog::getExistingDirectory( NULL,
qtr( "Select Directory" ),
- qfu( p_this->p_libvlc->psz_homedir ),
- QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+ text->text().isEmpty() ?
+ qfu( config_GetHomeDir() ) : text->text(),
+ QFileDialog::ShowDirsOnly |
+ QFileDialog::DontResolveSymlinks );
if( dir.isNull() ) return;
text->setText( dir );
}
+#if 0
+#include <QFontDialog>
+
/********* String / Font **********/
FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_p_widget,
if( !ok ) return;
text->setText( font.family() );
}
+#endif
/********* String / choice list **********/
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 );
+ combo->setMinimumWidth( MINWIDTH_BOX );
+ combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
+
+ 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 )
{
- 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 )
+ {
+ 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 ) );
+ }
+}
+
+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_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;
}
}
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( qfu(p_item->psz_longtext) );
+ combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
if( label )
- label->setToolTip( qfu(p_item->psz_longtext) );
+ label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
}
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 )
+ {
+ 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] ),
+ 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();
+ 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 );
}
}
+
ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
bool bycat ) : VStringConfigControl( _p_this, _p_item )
if( bycat )
{
- if( !strcmp( p_parser->psz_object_name, "main" ) ) continue;
+ if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
+
+ unsigned confsize;
+ module_config_t *p_config;
- for (size_t i = 0; i < p_parser->confsize; i++)
+ p_config = module_GetConfig (p_parser, &confsize);
+ for (size_t i = 0; i < 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 )
- combo->addItem( qfu(p_parser->psz_longname),
- QVariant( p_parser->psz_object_name ) );
+ const module_config_t *p_cfg = p_config + i;
+ if( p_cfg->i_type == CONFIG_SUBCATEGORY &&
+ p_cfg->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,
- p_parser->psz_object_name) )
+ module_GetObjName( p_parser ) ) )
combo->setCurrentIndex( combo->count() - 1 );
}
+ module_PutConfig (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 ) );
+ 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)) );
}
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) );
- text = new QLineEdit();
+ groupBox = NULL;
+ if( !p_item->psz_text ) return;
+
+ 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<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 );
-}
-#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<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 text;
+ delete groupBox;
+}
+
+#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_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 ); \
}
+
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;
+
+ unsigned confsize;
+ module_config_t *p_config = module_GetConfig (p_parser, &confsize);
- for (size_t i = 0; i < p_parser->confsize; i++)
+ for (size_t i = 0; i < confsize; i++)
{
- module_config_t *p_config = p_parser->p_config + i;
+ module_config_t *p_cfg = 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 )
+ if( p_cfg->i_type == CONFIG_SUBCATEGORY &&
+ p_cfg->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;
}
}
+ module_PutConfig (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()
{
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 );
+ }
+ }
}
}
int &line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
- label = new QLabel( qfu(p_item->psz_text) );
- spin = new QSpinBox; spin->setMinimumWidth( 80 );
- spin->setMaximumWidth( 90 );
+ label = new QLabel( qtr(p_item->psz_text) );
+ spin = new QSpinBox; spin->setMinimumWidth( MINWIDTH_BOX );
+ spin->setAlignment( Qt::AlignRight );
+ 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,
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()
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 );
+ combo->setMinimumWidth( MINWIDTH_BOX );
+
+ 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();
- 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 );
+ }
+
+ 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,
{
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( qfu(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( qfu(p_item->psz_longtext) );
+ combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
if( label )
- label->setToolTip( qfu(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()
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 )
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( qfu(p_item->psz_longtext) );
+ 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;
}
/**************************************************************************
int &line ) :
VFloatConfigControl( _p_this, _p_item, _parent )
{
- label = new QLabel( qfu(p_item->psz_text) );
- spin = new QDoubleSpinBox; spin->setMinimumWidth( 80 );
- spin->setMaximumWidth( 90 );
+ label = new QLabel( qtr(p_item->psz_text) );
+ 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 );
}
}
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()
ConfigControl( _p_this, _p_item, _parent )
{
- label = new QLabel( qtr("Select an action to change the associated hotkey") );
- table = new QTreeWidget( 0 );
+ QWidget *keyContainer = new QWidget;
+ QGridLayout *gLayout = new QGridLayout( keyContainer );
+
+ label = new QLabel(
+ qtr( "Select an action to change the associated hotkey") );
+
+ /* Deactivated for now
+ QLabel *searchLabel = new QLabel( qtr( "Search" ) );
+ QLineEdit *actionSearch = new QLineEdit;*/
+
+ table = new QTreeWidget;
+ table->setColumnCount(2);
+ table->headerItem()->setText( 0, qtr( "Action" ) );
+ table->headerItem()->setText( 1, qtr( "Shortcut" ) );
+
+ shortcutValue = new KeyShortcutEdit;
+ shortcutValue->setReadOnly(true);
+
+ QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
+ QPushButton *setButton = new QPushButton( qtr( "Set" ) );
+ setButton->setDefault( true );
finish();
- if( !l )
- {
- QVBoxLayout *layout = new QVBoxLayout();
- layout->addWidget( label, 0 ); layout->addWidget( table, 1 );
- widget->setLayout( layout );
- }
- else
- {
- l->addWidget( label, line, 0, 1, 2 );
- l->addWidget( table, line+1, 0, 1,2 );
- }
+ gLayout->addWidget( label, 0, 0, 1, 4 );
+ /* deactivated for now
+ gLayout->addWidget( searchLabel, 1, 0, 1, 2 );
+ gLayout->addWidget( actionSearch, 1, 2, 1, 2 ); */
+ gLayout->addWidget( table, 2, 0, 1, 4 );
+ gLayout->addWidget( clearButton, 3, 0, 1, 1 );
+ gLayout->addWidget( shortcutValue, 3, 1, 1, 2 );
+ gLayout->addWidget( setButton, 3, 3, 1, 1 );
+
+ 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( qfu(p_item->psz_longtext) );
+ label->setToolTip( formatTooltip( qtr( p_item->psz_longtext ) ) );
/* Fill the table */
table->setColumnCount( 2 );
table->setAlternatingRowColors( true );
- module_t *p_main = config_FindModule( p_this, "main" );
+ /* Get the main Module */
+ module_t *p_main = module_Find( p_this, "main" );
assert( p_main );
- for (size_t i = 0; i < p_main->confsize; i++)
+ /* Access to the module_config_t */
+ unsigned confsize;
+ module_config_t *p_config;
+
+ p_config = module_GetConfig (p_main, &confsize);
+
+ for (size_t i = 0; i < confsize; i++)
{
- module_config_t *p_item = p_main->p_config + i;
+ 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-" ) )
+ /* 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, qfu( p_item->psz_text ) );
- treeItem->setText( 1, VLCKeyToString( p_item->value.i ) );
+ treeItem->setText( 0, qtr( p_item->psz_text ) );
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_main);
+
table->resizeColumnToContents( 0 );
CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
this, selectKey( QTreeWidgetItem * ) );
+ CONNECT( table, itemSelectionChanged (),
+ this, select1Key() );
+
+ CONNECT( shortcutValue, pressed(), this, selectKey() );
+}
+
+/* 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 )
{
- module_config_t *p_keyItem = static_cast<module_config_t*>
- (keyItem->data( 0, Qt::UserRole ).value<void*>());
+ /* This happens when triggered by ClickEater */
+ if( keyItem == NULL ) keyItem = table->currentItem();
+
+ /* This can happen when nothing is selected on the treeView
+ and the shortcutValue is clicked */
+ if( !keyItem ) return;
- KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text );
+ /* 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<module_config_t*>
- (it->data( 0, Qt::UserRole ).value<void*>());
- it->setText( 1, 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
- keyItem->setText( 1, VLCKeyToString( p_keyItem->value.i ) );
}
delete d;
}
+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<module_config_t*>& _values,
- const char * _keyToChange ) :
- QDialog(0), keyValue(0)
+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) );
- QVBoxLayout *l = new QVBoxLayout( this );
- selected = new QLabel( qtr("Press the new keys for ") + qfu(keyToChange) );
- warning = new QLabel();
- l->addWidget( selected , Qt::AlignCenter );
- l->addWidget( warning, Qt::AlignCenter );
+ table = _table;
+ setWindowTitle( qtr( "Hotkey for " ) + keyToChange );
+
+ vLayout = new QVBoxLayout( this );
+ selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange );
+ vLayout->addWidget( selected , Qt::AlignCenter );
- QHBoxLayout *l2 = new QHBoxLayout();
+ buttonBox = new QDialogButtonBox;
QPushButton *ok = new QPushButton( qtr("OK") );
- l2->addWidget( ok );
QPushButton *cancel = new QPushButton( qtr("Cancel") );
- l2->addWidget( cancel );
+ buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
+ buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );
+ ok->setDefault( true );
- BUTTONACT( ok, accept() );
- BUTTONACT( cancel, reject() );
+ vLayout->addWidget( buttonBox );
+ buttonBox->hide();
- l->addLayout( l2 );
+ CONNECT( buttonBox, accepted(), this, accept() );
+ CONNECT( buttonBox, rejected(), this, reject() );
}
-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,
- keyToChange ) )
- {
- p_current->value.i = 0;
- conflicts = true;
- break;
- }
- }
- if( conflicts )
+ QList<QTreeWidgetItem *> conflictList =
+ table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 );
+
+ if( conflictList.size() )
{
- warning->setText(
- qtr("Warning: the key is already assigned to \"") +
- QString( p_current->psz_text ) + "\"" );
+ QLabel *warning = new QLabel(
+ qtr("Warning: the key is already assigned to \"") +
+ conflictList[0]->text( 0 ) + "\"" );
+ vLayout->insertWidget( 1, warning );
+ buttonBox->show();
+
+ conflicts = true;
}
- else warning->setText( "" );
+ else accept();
+}
+
+void KeyInputDialog::keyPressEvent( QKeyEvent *e )
+{
+ 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( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
+ checkForConflicts( i_vlck );
keyValue = i_vlck;
}
+
+void KeyInputDialog::wheelEvent( QWheelEvent *e )
+{
+ int i_vlck = qtWheelEventToVLCKey( e );
+ selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
+ checkForConflicts( i_vlck );
+ keyValue = i_vlck;
+}
+
+void KeyShortcutEdit::mousePressEvent( QMouseEvent *)
+{
+ emit pressed();
+}
+
projects / vlc / blobdiff