* - Improvements over WX
* - Validator for modulelist
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "components/preferences_widgets.hpp"
#include "util/customwidgets.hpp"
-
+#include "util/qt_dirs.hpp"
#include <vlc_keys.h>
#include <QString>
#include <QGridLayout>
#include <QSlider>
#include <QFileDialog>
-#include <QFontDialog>
#include <QGroupBox>
#include <QTreeWidgetItem>
#include <QSignalMapper>
case CONFIG_ITEM_MODULE_LIST_CAT:
p_control = new ModuleListConfigControl( p_this, p_item, parent, true,
l, line );
+ /* Special Hack for a bug in video-filter */
+ if( qobject_cast<ModuleListConfigControl *>( p_control )->groupBox == NULL )
+ return NULL;
break;
case CONFIG_ITEM_STRING:
if( !p_item->i_list )
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;
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 CONFIG_ITEM_KEY:
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 );
+ text->setText( toNativeSeparators( file ) );
}
void FileConfigControl::finish()
QString dir = QFileDialog::getExistingDirectory( NULL,
qtr( "Select Directory" ),
text->text().isEmpty() ?
- qfu( p_this->p_libvlc->psz_homedir ) : text->text(),
- QFileDialog::ShowDirsOnly |
- QFileDialog::DontResolveSymlinks );
+ qfu( config_GetHomeDir() ) : text->text(),
+ QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+
if( dir.isNull() ) return;
- text->setText( dir );
+ text->setText( toNativeSepNoSlash( 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,
combo = new QComboBox();
combo->setMinimumWidth( MINWIDTH_BOX );
combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
- finish( bycat );
+
+ 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 )
{
l = new QGridLayout();
/* 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_item->ppf_action[i_action]( p_this, getName(), val, val, 0 );
+ p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 );
- if( p_item->b_dirty )
+ if( p_module_config->b_dirty )
{
combo->clear();
- finish( true );
- p_item->b_dirty = VLC_FALSE;
+ 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( formatTooltip(qtr(p_item->psz_longtext)) );
+ combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
}
QString StringListConfigControl::getValue()
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] ),
void ModuleConfigControl::finish( bool bycat )
{
- vlc_list_t *p_list;
module_t *p_parser;
combo->setEditable( false );
/* build a list of available modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ module_t **p_list = module_list_get( NULL );
combo->addItem( qtr("Default") );
- for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
if( bycat )
{
- if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
+ if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
unsigned confsize;
module_config_t *p_config;
- p_config = module_GetConfig (p_parser, &confsize);
+ p_config = module_config_get (p_parser, &confsize);
for (size_t i = 0; i < confsize; i++)
{
/* Hack: required subcategory is stored in i_min */
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 ) ) );
+ QVariant( module_get_object( p_parser ) ) );
if( p_item->value.psz && !strcmp( p_item->value.psz,
- module_GetObjName( p_parser ) ) )
+ module_get_object( p_parser ) ) )
combo->setCurrentIndex( combo->count() - 1 );
}
- module_PutConfig (p_config);
+ module_config_free (p_config);
}
- else if( module_IsCapable( p_parser, p_item->psz_type ) )
+ else if( module_provides( p_parser, p_item->psz_type ) )
{
combo->addItem( qtr(module_GetLongName( p_parser ) ),
- QVariant( module_GetObjName( p_parser ) ) );
+ QVariant( module_get_object( p_parser ) ) );
if( p_item->value.psz && !strcmp( p_item->value.psz,
- module_GetObjName( p_parser ) ) )
+ module_get_object( p_parser ) ) )
combo->setCurrentIndex( combo->count() - 1 );
}
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
if( label )
label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
QGridLayout *l, int &line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
- groupBox = new QGroupBox ( qtr(p_item->psz_text) );
- text = new QLineEdit();
+ groupBox = NULL;
+ /* Special Hack */
+ if( !p_item->psz_text ) return;
+
+ groupBox = new QGroupBox ( qtr(p_item->psz_text), _parent );
+ text = new QLineEdit;
QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
finish( bycat );
delete *it;
}
delete groupBox;
- delete text;
}
#define CHECKBOX_LISTS \
checkBoxListItem *cbl = new checkBoxListItem; \
\
CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\
- cb->setToolTip( formatTooltip( qtr( module_GetHelp( p_parser ))));\
+ cb->setToolTip( formatTooltip( qtr( module_get_help( p_parser ))));\
cbl->checkBox = cb; \
\
- cbl->psz_module = strdup( module_GetObjName( p_parser ) ); \
+ cbl->psz_module = strdup( module_get_object( p_parser ) ); \
modules.push_back( cbl ); \
\
if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \
void ModuleListConfigControl::finish( bool bycat )
{
- vlc_list_t *p_list;
module_t *p_parser;
/* build a list of available modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+ module_t **p_list = module_list_get( NULL );
+ for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
if( bycat )
{
- if( !strcmp( module_GetObjName( p_parser ), "main" ) ) continue;
+ if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
unsigned confsize;
- module_config_t *p_config = module_GetConfig (p_parser, &confsize);
+ module_config_t *p_config = module_config_get (p_parser, &confsize);
for (size_t i = 0; i < confsize; i++)
{
CHECKBOX_LISTS;
}
}
- module_PutConfig (p_config);
+ module_config_free (p_config);
}
- else if( module_IsCapable( p_parser, p_item->psz_type ) )
+ else if( module_provides( p_parser, p_item->psz_type ) )
{
CHECKBOX_LISTS;
}
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( groupBox )
- groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ assert( groupBox );
+ groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
}
#undef CHECKBOX_LISTS
QString ModuleListConfigControl::getValue()
{
+ assert( text );
return text->text();
}
label = new QLabel( qtr(p_item->psz_text) );
combo = new QComboBox();
combo->setMinimumWidth( MINWIDTH_BOX );
- finish( bycat );
+
+ 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();
l->addWidget( label, line, 0 );
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( 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->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( formatTooltip(qtr(p_item->psz_longtext)) );
+ combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
if( label )
- label->setToolTip( formatTooltip(qtr(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()
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( 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;
}
/**************************************************************************
l->addWidget( keyContainer, line, 0, 1, 2 );
CONNECT( clearButton, clicked(), shortcutValue, clear() );
+ CONNECT( clearButton, clicked(), this, setTheKey() );
BUTTONACT( setButton, setTheKey() );
}
table->setAlternatingRowColors( true );
/* Get the main Module */
- module_t *p_main = module_Find( p_this, "main" );
+ module_t *p_main = module_get_main();
assert( p_main );
/* Access to the module_config_t */
unsigned confsize;
module_config_t *p_config;
- p_config = module_GetConfig (p_main, &confsize);
+ p_config = module_config_get (p_main, &confsize);
for (size_t i = 0; i < confsize; i++)
{
table->addTopLevelItem( treeItem );
}
}
- module_PutConfig (p_config);
- module_Put (p_main);
+ module_config_free (p_config);
+ module_release (p_main);
table->resizeColumnToContents( 0 );
- CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
- this, select1Key( QTreeWidgetItem * ) );
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 )
+void KeySelectorControl::select1Key()
{
+ QTreeWidgetItem *keyItem = table->currentItem();
shortcutValue->setText( keyItem->text( 1 ) );
shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() );
}