#include "components/preferences_widgets.hpp"
#include "util/customwidgets.hpp"
+#include "util/searchlineedit.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_keys.h>
#include <vlc_intf_strings.h>
return formatted;
}
-ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
- module_config_t *p_item,
- QWidget *parent )
-{
- int i = 0;
- return createControl( p_this, p_item, parent, NULL, i );
-}
-
ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
module_config_t *p_item,
QWidget *parent,
- QGridLayout *l, int &line )
+ QGridLayout *l, int line )
{
ConfigControl *p_control = NULL;
l, line, false );
else
p_control = new StringListConfigControl( p_this, p_item,
- parent, false, l, line );
+ parent, l, line );
break;
case CONFIG_ITEM_PASSWORD:
if( !p_item->i_list )
l, line, true );
else
p_control = new StringListConfigControl( p_this, p_item,
- parent, true, l, line );
+ parent, l, line );
break;
case CONFIG_ITEM_INTEGER:
if( p_item->i_list )
p_control = new IntegerConfigControl( p_this, p_item, parent,
l, line );
break;
- case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_LOADFILE:
+ case CONFIG_ITEM_SAVEFILE:
p_control = new FileConfigControl( p_this, p_item, parent, l, line);
break;
case CONFIG_ITEM_DIRECTORY:
return p_control;
}
-void ConfigControl::doApply( intf_thread_t *p_intf )
-{
- switch( getType() )
- {
- 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 CONFIG_ITEM_FLOAT:
- {
- VFloatConfigControl *vfcc =
- qobject_cast<VFloatConfigControl *>(this);
- assert( vfcc );
- config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() );
- break;
- }
- case CONFIG_ITEM_STRING:
- {
- VStringConfigControl *vscc =
- qobject_cast<VStringConfigControl *>(this);
- assert( vscc );
- config_PutPsz( p_intf, vscc->getName(), qtu( vscc->getValue() ) );
- break;
- }
- case CONFIG_ITEM_KEY:
- {
- KeySelectorControl *ksc = qobject_cast<KeySelectorControl *>(this);
- assert( ksc );
- ksc->doApply();
- }
- }
-}
-
/*******************************************************
* Simple widgets
*******************************************************/
* String-based controls
*************************************************************************/
+void
+VStringConfigControl::doApply()
+{
+ config_PutPsz( p_this, getName(), qtu( getValue() ) );
+}
+
/*********** String **************/
StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line, bool pwd ) :
+ int line, bool pwd ) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
void StringConfigControl::finish()
{
text->setText( qfu(p_item->value.psz) );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( label )
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( text );
+ QString tipText = qtr(p_item->psz_longtext);
+ text->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( text );
}
/*********** File **************/
FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
void FileConfigControl::updateField()
{
- QString file = QFileDialog::getSaveFileName( NULL,
- qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) );
+ QString file;
+
+ if (p_item->i_type == CONFIG_ITEM_SAVEFILE)
+ file = QFileDialog::getSaveFileName( NULL, qtr( "Save File" ),
+ QVLCUserDir( VLC_HOME_DIR ) );
+ else
+ file = QFileDialog::getOpenFileName( NULL, qtr( "Select File" ),
+ QVLCUserDir( VLC_HOME_DIR ) );
+
if( file.isNull() ) return;
text->setText( toNativeSeparators( file ) );
}
void FileConfigControl::finish()
{
text->setText( qfu(p_item->value.psz) );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( label )
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( text );
+ QString tipText = qtr(p_item->psz_longtext);
+ text->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( text );
}
/********* String / Directory **********/
DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_p_widget,
- QGridLayout *_p_layout, int& _int ) :
+ QGridLayout *_p_layout, int _int ) :
FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int )
{}
/********* String / Font **********/
FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent,
- QGridLayout *_p_layout, int& line) :
+ QGridLayout *_p_layout, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
/********* String / choice list **********/
StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
- module_config_t *_p_item, QWidget *_parent, bool bycat,
- QGridLayout *l, int &line) :
+ module_config_t *_p_item, QWidget *_parent,
+ QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
- finish( p_module_config, bycat );
+ finish( p_module_config );
if( !l )
{
l = new QGridLayout();
if( p_module_config->b_dirty )
{
combo->clear();
- finish( p_module_config, true );
+ finish( p_module_config );
p_module_config->b_dirty = false;
}
}
StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
- bool bycat ) : VStringConfigControl( _p_this, _p_item )
+ bool ) : VStringConfigControl( _p_this, _p_item )
{
combo = _combo;
label = _label;
module_config_t *p_module_config = config_FindConfig( p_this, getName() );
- finish( p_module_config, bycat );
+ finish( p_module_config );
}
-void StringListConfigControl::finish(module_config_t *p_module_config, bool bycat )
+void StringListConfigControl::finish(module_config_t *p_module_config )
{
combo->setEditable( false );
}
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_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_module_config->psz_longtext)) );
- if( label )
+
+ if( p_module_config->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
- label->setBuddy( combo );
+ QString tipText = qtr(p_module_config->psz_longtext);
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( combo );
}
-QString StringListConfigControl::getValue()
+QString StringListConfigControl::getValue() const
{
return combo->itemData( combo->currentIndex() ).toString();
}
for ( int i_index = 0; i_index < p_config->i_list; i_index++ )
{
- combo->addItem( qfu( p_config->ppsz_list_text[i_index] ),
+ combo->addItem( qtr(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 ) );
+
+ if( p_config->psz_longtext )
+ 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) :
+ QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
}
}
module_list_free( p_list );
- combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( label )
+
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( combo );
+ QString tipText = qtr(p_item->psz_longtext);
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( combo );
}
-QString ModuleConfigControl::getValue()
+QString ModuleConfigControl::getValue() const
{
return combo->itemData( combo->currentIndex() ).toString();
}
/********* Module list **********/
ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, bool bycat,
- QGridLayout *l, int &line) :
+ QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
groupBox = NULL;
finish( bycat );
int boxline = 0;
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
- {
- layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 );
- }
+ foreach ( checkBoxListItem *it, modules )
+ layoutGroupBox->addWidget( it->checkBox, boxline++, 0 );
layoutGroupBox->addWidget( text, boxline, 0 );
if( !l )
l->addWidget( groupBox, line, 0, 1, -1 );
}
- text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) );
+ if( p_item->psz_longtext )
+ text->setToolTip( formatTooltip( qtr( p_item->psz_longtext) ) );
}
ModuleListConfigControl::~ModuleListConfigControl()
{
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
- {
- delete *it;
- }
+ qDeleteAll( modules );
+ modules.clear();
delete groupBox;
}
checkBoxListItem *cbl = new checkBoxListItem; \
\
CONNECT( cb, stateChanged( int ), this, onUpdate() );\
- cb->setToolTip( formatTooltip( qtr( module_get_help( p_parser ))));\
+ const char *help = module_get_help( p_parser ); \
+ if( help != NULL ) \
+ cb->setToolTip( formatTooltip( qtr( help ) ) ); \
cbl->checkBox = cb; \
\
cbl->psz_module = strdup( module_get_object( p_parser ) ); \
}
}
module_list_free( p_list );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- assert( groupBox );
- groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+
+ if( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+
+ text->setToolTip( formatTooltip(tipText) );
+ assert( groupBox );
+ groupBox->setToolTip( formatTooltip(tipText) );
+ }
}
#undef CHECKBOX_LISTS
-QString ModuleListConfigControl::getValue()
+QString ModuleListConfigControl::getValue() const
{
assert( text );
return text->text();
void ModuleListConfigControl::hide()
{
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
- {
- (*it)->checkBox->hide();
- }
+ foreach ( checkBoxListItem *it, modules )
+ it->checkBox->hide();
groupBox->hide();
}
void ModuleListConfigControl::show()
{
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
- {
- (*it)->checkBox->show();
- }
+ foreach ( checkBoxListItem *it, modules )
+ it->checkBox->show();
groupBox->show();
}
text->clear();
bool first = true;
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
+ foreach ( checkBoxListItem *it, modules )
{
- if( (*it)->checkBox->isChecked() )
+ if( it->checkBox->isChecked() )
{
if( first )
{
- text->setText( text->text() + (*it)->psz_module );
+ text->setText( text->text() + it->psz_module );
first = false;
}
else
{
- text->setText( text->text() + ":" + (*it)->psz_module );
+ text->setText( text->text() + ":" + it->psz_module );
}
}
}
* Integer-based controls
*************************************************************************/
+void
+VIntConfigControl::doApply()
+{
+ config_PutInt( p_this, getName(), getValue() );
+}
+
/*********** Integer **************/
IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
spin->setMaximum( 2000000000 );
spin->setMinimum( -2000000000 );
spin->setValue( p_item->value.i );
- spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( label )
+
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( spin );
+ QString tipText = qtr(p_item->psz_longtext);
+ spin->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( spin );
}
-int IntegerConfigControl::getValue()
+int IntegerConfigControl::getValue() const
{
return spin->value();
}
IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
IntegerConfigControl( _p_this, _p_item, _parent, l, line )
{
finish();
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 )
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( slider );
+ QString tipText = qtr(p_item->psz_longtext);
+ slider->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( slider );
}
-int IntegerRangeSliderConfigControl::getValue()
+int IntegerRangeSliderConfigControl::getValue() const
{
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) :
+ module_config_t *_p_item, QWidget *_parent, bool,
+ QGridLayout *l, int line) :
VIntConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
module_config_t *p_module_config = config_FindConfig( p_this, p_item->psz_name );
- finish( p_module_config, bycat );
+ finish( p_module_config );
if( !l )
{
QHBoxLayout *layout = new QHBoxLayout();
}
IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QLabel *_label, QComboBox *_combo,
- bool bycat ) : VIntConfigControl( _p_this, _p_item )
+ bool ) : VIntConfigControl( _p_this, _p_item )
{
combo = _combo;
label = _label;
module_config_t *p_module_config = config_FindConfig( p_this, getName() );
- finish( p_module_config, bycat );
+ finish( p_module_config );
}
-void IntegerListConfigControl::finish(module_config_t *p_module_config, bool bycat )
+void IntegerListConfigControl::finish(module_config_t *p_module_config )
{
combo->setEditable( false );
if( p_module_config->value.i == p_module_config->pi_list[i_index] )
combo->setCurrentIndex( combo->count() - 1 );
}
- combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
- if( label )
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
- label->setBuddy( combo );
+ QString tipText = qtr(p_item->psz_longtext );
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( combo );
}
void IntegerListConfigControl::actionRequested( int i_action )
if( p_module_config->b_dirty )
{
combo->clear();
- finish( p_module_config, true );
+ finish( p_module_config );
p_module_config->b_dirty = false;
}
}
-int IntegerListConfigControl::getValue()
+int IntegerListConfigControl::getValue() const
{
return combo->itemData( combo->currentIndex() ).toInt();
}
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
checkbox = new QCheckBox( qtr(p_item->psz_text) );
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QLabel *_label,
- QAbstractButton *_checkbox,
- bool bycat ) :
+ QAbstractButton *_checkbox ) :
VIntConfigControl( _p_this, _p_item )
{
checkbox = _checkbox;
void BoolConfigControl::finish()
{
- checkbox->setChecked( p_item->value.i == true );
- checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ checkbox->setChecked( p_item->value.i );
+ if( p_item->psz_longtext )
+ checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
}
-int BoolConfigControl::getValue()
+int BoolConfigControl::getValue() const
{
return checkbox->isChecked();
}
* Float-based controls
*************************************************************************/
+void
+VFloatConfigControl::doApply()
+{
+ config_PutFloat( p_this, getName(), getValue() );
+}
+
/*********** Float **************/
FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
VFloatConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
spin->setMinimum( -2000000000. );
spin->setSingleStep( 0.1 );
spin->setValue( (double)p_item->value.f );
- spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( label )
+ if( p_item->psz_longtext )
{
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- label->setBuddy( spin );
+ QString tipText = qtr(p_item->psz_longtext);
+ spin->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
}
+ if( label )
+ label->setBuddy( spin );
}
-float FloatConfigControl::getValue()
+float FloatConfigControl::getValue() const
{
return (float)spin->value();
}
FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
FloatConfigControl( _p_this, _p_item, _parent, l, line )
{
finish();
KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line ) :
+ int line ) :
ConfigControl( _p_this, _p_item, _parent )
{
void KeySelectorControl::finish()
{
- if( label )
+ if( label && p_item->psz_longtext )
label->setToolTip( formatTooltip( qtr( p_item->psz_longtext ) ) );
/* Fill the table */
{
module_config_t *p_item = p_config + i;
- /* 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-" )
- && !strstr( p_item->psz_name , "global-key" )
- && !EMPTY_STR( p_item->psz_text ) )
+ /* If we are a (non-global) key option not empty */
+ if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+ && !strncmp( p_item->psz_name , "key-", 4 )
+ && !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 int64_t in column 1
*/
QTreeWidgetItem *treeItem = new QTreeWidgetItem();
treeItem->setText( 0, qtr( p_item->psz_text ) );
treeItem->setData( 0, Qt::UserRole,
QVariant( qfu( p_item->psz_name ) ) );
- treeItem->setText( 1, VLCKeyToString( p_item->value.i ) );
- treeItem->setData( 1, Qt::UserRole, QVariant( qlonglong( p_item->value.i ) ) );
+
+ QString keys = qfu( p_item->value.psz );
+ treeItem->setText( 1, keys );
+ treeItem->setData( 1, Qt::UserRole, QVariant( keys ) );
table->addTopLevelItem( treeItem );
continue;
}
- if( p_item->i_type & CONFIG_ITEM && p_item->psz_name
- && strstr( p_item->psz_name , "global-key" )
- && !EMPTY_STR( p_item->psz_text ) )
+ if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+ && !strncmp( p_item->psz_name , "global-key", 10 )
+ && !EMPTY_STR( p_item->psz_text ) )
{
QList<QTreeWidgetItem *> list =
table->findItems( qtr( p_item->psz_text ), Qt::MatchExactly );
if( list.count() >= 1 )
{
- list[0]->setText( 2, VLCKeyToString( p_item->value.i ) );
- list[0]->setData( 2, Qt::UserRole,
- QVariant( qlonglong( p_item->value.i ) ) );
+ QString keys = qfu( p_item->value.psz );
+ list[0]->setText( 2, keys );
+ list[0]->setData( 2, Qt::UserRole, keys );
}
if( list.count() >= 2 )
msg_Dbg( p_this, "This is probably wrong, %s", p_item->psz_text );
}
}
-void KeySelectorControl::select( QTreeWidgetItem *keyItem, int column )
+void KeySelectorControl::select( QTreeWidgetItem *, int column )
{
shortcutValue->setGlobal( column == 2 );
}
{
QTreeWidgetItem *keyItem = table->currentItem();
shortcutValue->setText( keyItem->text( 1 ) );
- shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() );
+ shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toString() );
shortcutValue->setGlobal( false );
}
if( d->result() == QDialog::Accepted )
{
- int newValue = d->keyValue;
- shortcutValue->setText( VLCKeyToString( newValue ) );
- shortcutValue->setValue( newValue );
+ QString newKey = VLCKeyToString( d->keyValue );
+ shortcutValue->setText( newKey );
+ shortcutValue->setValue( newKey );
shortcutValue->setGlobal( b_global );
if( d->conflicts )
{
it = table->topLevelItem(i);
if( ( keyItem != it ) &&
- ( it->data( b_global ? 2: 1, Qt::UserRole ).toInt() == newValue ) )
+ ( it->data( 1 + b_global, Qt::UserRole ).toString() == newKey ) )
{
- it->setData( b_global ? 2 : 1, Qt::UserRole, QVariant( -1 ) );
- it->setText( b_global ? 2 : 1, qtr( "Unset" ) );
+ it->setData( 1 + b_global, Qt::UserRole,
+ QVariant( qfu( "Unset" ) ) );
+ it->setText( 1 + b_global, qtr( "Unset" ) );
}
}
/* We already made an OK once. */
{
it = table->topLevelItem(i);
if( it->data( 1, Qt::UserRole ).toInt() >= 0 )
- config_PutInt( p_this,
+ config_PutPsz( p_this,
qtu( it->data( 0, Qt::UserRole ).toString() ),
- it->data( 1, Qt::UserRole ).toInt() );
+ qtu( it->data( 1, Qt::UserRole ).toString() ) );
if( it->data( 2, Qt::UserRole ).toInt() >= 0 )
- config_PutInt( p_this,
+ config_PutPsz( p_this,
qtu( "global-" + it->data( 0, Qt::UserRole ).toString() ),
- it->data( 2, Qt::UserRole ).toInt() );
+ qtu( it->data( 2, Qt::UserRole ).toString() ) );
}
}
projects / vlc / blobdiff