* - Improvements over WX
* - Validator for modulelist
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "components/preferences_widgets.hpp"
#include "util/customwidgets.hpp"
#include <QGridLayout>
#include <QSlider>
#include <QFileDialog>
-#include <QFontDialog>
#include <QGroupBox>
#include <QTreeWidgetItem>
#include <QSignalMapper>
#include <QDialogButtonBox>
+#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;\">" +
+ "<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;
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 || p_item->b_unsaveable ) return NULL;
switch( p_item->i_type )
{
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);
config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) );
break;
}
- case 4:
+ case CONFIG_ITEM_KEY:
{
KeySelectorControl *ksc = qobject_cast<KeySelectorControl *>(this);
assert( ksc );
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 );
}
}
{
QHBoxLayout *layout = new QHBoxLayout();
layout->addWidget( label, 0 );
- layout->addLayout( textAndButton, 1 );
+ layout->insertSpacing( 1, 10 );
+ layout->addLayout( textAndButton, LAST_COLUMN );
widget->setLayout( layout );
}
else
{
l->addWidget( label, line, 0 );
- l->addLayout( textAndButton, line, 1 );
+ l->setColumnMinimumWidth( 1, 10 );
+ l->addLayout( textAndButton, line, LAST_COLUMN );
}
}
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,
{
label = new QLabel( qtr(p_item->psz_text) );
combo = new QComboBox();
- combo->setMinimumWidth( 80 );
+ combo->setMinimumWidth( MINWIDTH_BOX );
+ combo->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
finish( 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 )
new QPushButton( qfu( p_item->ppsz_action_text[i] ));
CONNECT( button, clicked(), signalMapper, map() );
signalMapper->setMapping( button, i );
- l->addWidget( button, line, 2 + i, Qt::AlignRight );
+ l->addWidget( button, line, LAST_COLUMN - p_item->i_action + i,
+ Qt::AlignRight );
}
CONNECT( signalMapper, mapped( int ),
this, actionRequested( int ) );
{
label = new QLabel( qtr(p_item->psz_text) );
combo = new QComboBox();
- combo->setMinimumWidth( 80 );
+ 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 );
}
}
checkBoxListItem *cbl = new checkBoxListItem; \
\
CONNECT( cb, stateChanged( int ), this, onUpdate( int ) );\
- cb->setToolTip( formatTooltip( qtr( module_GetLongName( p_parser ))));\
+ 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 ); \
}
VIntConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
- spin = new QSpinBox; spin->setMinimumWidth( 80 );
+ spin = new QSpinBox; spin->setMinimumWidth( MINWIDTH_BOX );
spin->setAlignment( Qt::AlignRight );
- spin->setMaximumWidth( 90 );
+ 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,
{
label = new QLabel( qtr(p_item->psz_text) );
combo = new QComboBox();
- combo->setMinimumWidth( 80 );
+ 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 );
}
}
IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
VFloatConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
- spin = new QDoubleSpinBox;
- spin->setMinimumWidth( 80 );
- spin->setMaximumWidth( 90 );
+ 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 );
}
}
QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
QPushButton *setButton = new QPushButton( qtr( "Set" ) );
+ setButton->setDefault( true );
finish();
gLayout->addWidget( label, 0, 0, 1, 4 );
void KeySelectorControl::finish()
{
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ label->setToolTip( formatTooltip( qtr( p_item->psz_longtext ) ) );
/* Fill the table */
table->setColumnCount( 2 );
table->setAlternatingRowColors( true );
+ /* Get the main Module */
module_t *p_main = module_Find( p_this, "main" );
assert( p_main );
+ /* Access to the module_config_t */
unsigned confsize;
module_config_t *p_config;
{
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-" ) && !EMPTY_STR( p_item->psz_text ) )
+ /* 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, qtr( p_item->psz_text ) );
- treeItem->setText( 1, VLCKeyToString( p_item->value.i ) );
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 );
}
}
CONNECT( shortcutValue, pressed(), this, selectKey() );
}
+/* Show the key selected from the table in the keySelector */
void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem )
{
shortcutValue->setText( keyItem->text( 1 ) );
+ shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() );
}
void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
and the shortcutValue is clicked */
if( !keyItem ) return;
- module_config_t *p_keyItem = static_cast<module_config_t*>
- (keyItem->data( 0, Qt::UserRole ).value<void*>());
-
- KeyInputDialog *d = new KeyInputDialog( values, p_keyItem->psz_text, widget );
+ /* 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*>());
- if( p_keyItem != p_item && p_item->value.i == d->keyValue )
- p_item->value.i = 0;
- shortcutValue->setText( 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
- shortcutValue->setText( 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,
+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) );
+ table = _table;
+ setWindowTitle( qtr( "Hotkey for " ) + keyToChange );
vLayout = new QVBoxLayout( this );
- selected = new QLabel( qtr("Press the new keys for ") + qfu( keyToChange ) );
+ selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange );
vLayout->addWidget( selected , Qt::AlignCenter );
buttonBox = new QDialogButtonBox;
QPushButton *cancel = new QPushButton( qtr("Cancel") );
buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );
+ ok->setDefault( true );
vLayout->addWidget( buttonBox );
buttonBox->hide();
void KeyInputDialog::checkForConflicts( int i_vlckey )
{
- conflicts = false;
- module_config_t *p_current = NULL;
- /* Search for conflicts */
- foreach( p_current, values )
- {
- if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
- keyToChange ) )
- {
- conflicts = true;
- break;
- }
- }
+ QList<QTreeWidgetItem *> conflictList =
+ table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 );
- if( conflicts )
+ if( conflictList.size() )
{
QLabel *warning = new QLabel(
- qtr("Warning: the key is already assigned to \"") +
- qfu( p_current->psz_text ) + "\"" );
- warning->setWordWrap( true );
+ qtr("Warning: the key is already assigned to \"") +
+ conflictList[0]->text( 0 ) + "\"" );
vLayout->insertWidget( 1, warning );
buttonBox->show();
+
+ conflicts = true;
}
else accept();
}
void KeyInputDialog::keyPressEvent( QKeyEvent *e )
{
- if( e->key() == Qt::Key_Tab ) return;
+ 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( VLCKeyToString( i_vlck ) );
+ 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( VLCKeyToString( i_vlck ) );
+ selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
checkForConflicts( i_vlck );
keyValue = i_vlck;
}
{
emit pressed();
}
+
projects / vlc / blobdiff