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 );
}
QString dir = QFileDialog::getExistingDirectory( NULL,
qtr( "Select Directory" ),
text->text().isEmpty() ?
- qfu( p_this->p_libvlc->psz_homedir ) : text->text(),
+ qfu( config_GetHomeDir() ) : text->text(),
QFileDialog::ShowDirsOnly |
QFileDialog::DontResolveSymlinks );
if( dir.isNull() ) return;
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)
+ 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 a×y case that dirty was set to VLC_TRUE
+ // 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 = VLC_FALSE;
+ p_module_config->b_dirty = false;
- if(val.psz_string) free(val.psz_string);
+ free( val.psz_string );
}
finish( p_module_config, bycat );
{
combo->clear();
finish( p_module_config, true );
- p_module_config->b_dirty = VLC_FALSE;
+ p_module_config->b_dirty = false;
}
}
StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
{
- combo->addItem( qfu(p_module_config->ppsz_list_text ?
+ 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( 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 );
config_FindConfig( VLC_OBJECT(p_intf), configname );
if( p_config )
{
- if(p_config->pf_update_list)
+ 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 VLC_TRUE
+ // 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 = VLC_FALSE;
+ p_config->b_dirty = false;
}
for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
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)
+ 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 VLC_TRUE
+ // 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 = VLC_FALSE;
+ p_module_config->b_dirty = false;
}
{
combo->clear();
finish( p_module_config, true );
- p_module_config->b_dirty = VLC_FALSE;
+ p_module_config->b_dirty = false;
}
}
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->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() );
}