/*****************************************************************************
* preferences_widgets.cpp : Widgets for preferences displays
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2011 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#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>
+#include <vlc_modules.h>
#include <QString>
#include <QVariant>
#include <QTreeWidgetItem>
#include <QSignalMapper>
#include <QDialogButtonBox>
+#include <QKeyEvent>
+#include <QColorDialog>
#define MINWIDTH_BOX 90
#define LAST_COLUMN 10
QString formatTooltip(const QString & tooltip)
{
+ QString text = tooltip;
+ text.replace("\n", "<br/>");
+
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; "
+ "<body style=\" font-family:'Sans Serif'; "
"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>";
+ text + "</p></body></html>";
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_RGB:
+ p_control = new ColorConfigControl( p_this, p_item, 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:
- p_control = new FileConfigControl( p_this, p_item, parent, l,
- line, false );
+ case CONFIG_ITEM_LOADFILE:
+ case CONFIG_ITEM_SAVEFILE:
+ p_control = new FileConfigControl( p_this, p_item, parent, l, line);
break;
case CONFIG_ITEM_DIRECTORY:
p_control = new DirectoryConfigControl( p_this, p_item, parent, l,
- line, false );
+ line );
break;
-#if 0
case CONFIG_ITEM_FONT:
p_control = new FontConfigControl( p_this, p_item, parent, l,
- line, false );
+ line);
break;
-#endif
case CONFIG_ITEM_KEY:
p_control = new KeySelectorControl( p_this, p_item, parent, l, line );
break;
return p_control;
}
-void ConfigControl::doApply( intf_thread_t *p_intf )
+/*******************************************************
+ * Simple widgets
+ *******************************************************/
+InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( parent )
+{
+ setGeometry( 0, 0, 128, 100 );
+ setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+}
+
+void InterfacePreviewWidget::setNormalPreview( bool b_minimal )
+{
+ setPreview( ( b_minimal ) ? MINIMAL : COMPLETE );
+}
+
+void InterfacePreviewWidget::setPreview( enum_style e_style )
{
- switch( getType() )
+ QString pixmapLocationString(":/prefsmenu/");
+
+ switch( e_style )
{
- 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();
- }
+ default:
+ case COMPLETE:
+ pixmapLocationString += "sample_complete";
+ break;
+ case MINIMAL:
+ pixmapLocationString += "sample_minimal";
+ break;
+ case SKINS:
+ pixmapLocationString += "sample_skins";
+ break;
}
+
+ setPixmap( QPixmap( pixmapLocationString ) );
+ update();
}
+
/**************************************************************************
* 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) );
VStringConfigControl( _p_this, _p_item )
{
text = _text;
+ if( pwd ) text->setEchoMode( QLineEdit::Password );
label = _label;
finish( );
}
void StringConfigControl::finish()
{
text->setText( qfu(p_item->value.psz) );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ if( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ text->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ label->setBuddy( text );
}
/*********** File **************/
FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
- int &line, bool pwd ) :
+ int line ) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QLabel *_label, QLineEdit *_text,
- QPushButton *_button, bool pwd ):
+ QPushButton *_button ):
VStringConfigControl( _p_this, _p_item )
{
browse = _button;
void FileConfigControl::updateField()
{
- QString file = QFileDialog::getOpenFileName( NULL,
- qtr( "Select File" ), qfu( p_this->p_libvlc->psz_homedir ) );
+ 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( file );
+ text->setText( toNativeSeparators( file ) );
}
void FileConfigControl::finish()
{
text->setText( qfu(p_item->value.psz) );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ if( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ text->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ 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, bool _pwd ) :
- FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int, _pwd)
+ QGridLayout *_p_layout, int _int ) :
+ FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int )
{}
DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QLabel *_p_label,
- QLineEdit *_p_line, QPushButton *_p_button, bool _pwd ):
- FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button, _pwd)
+ QLineEdit *_p_line, QPushButton *_p_button ):
+ FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button)
{}
void DirectoryConfigControl::updateField()
{
QString dir = QFileDialog::getExistingDirectory( NULL,
- qtr( "Select Directory" ),
+ qtr( I_OP_SEL_DIR ),
text->text().isEmpty() ?
- qfu( p_this->p_libvlc->psz_homedir ) : text->text(),
- QFileDialog::ShowDirsOnly |
- QFileDialog::DontResolveSymlinks );
+ QVLCUserDir( VLC_HOME_DIR ) : 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,
- QGridLayout *_p_layout, int& _int, bool _pwd ) :
- FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int, _pwd)
-{}
+ module_config_t *_p_item, QWidget *_parent,
+ QGridLayout *_p_layout, int line) :
+ VStringConfigControl( _p_this, _p_item, _parent )
+{
+ label = new QLabel( qtr(p_item->psz_text) );
+ font = new QFontComboBox( _parent );
+ font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
+ if( !_p_layout )
+ {
+ QHBoxLayout *layout = new QHBoxLayout();
+ layout->addWidget( label, 0 );
+ layout->addWidget( font, 1 );
+ widget->setLayout( layout );
+ }
+ else
+ {
+ _p_layout->addWidget( label, line, 0 );
+ _p_layout->addWidget( font, line, 1, 1, -1 );
+ }
+
+ if( p_item->psz_longtext )
+ {
+ label->setToolTip( formatTooltip( qtr(p_item->psz_longtext) ) );
+ }
+}
FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QLabel *_p_label,
- QLineEdit *_p_line, QPushButton *_p_button, bool _pwd ):
- FileConfigControl( _p_this, _p_item, _p_label, _p_line, _p_button, _pwd)
-{}
-
-void FontConfigControl::updateField()
+ QFontComboBox *_p_font):
+ VStringConfigControl( _p_this, _p_item)
{
- bool ok;
- QFont font = QFontDialog::getFont( &ok, QFont( text->text() ), NULL );
- if( !ok ) return;
- text->setText( font.family() );
+ label = _p_label;
+ font = _p_font;
+ font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
+
+ if( p_item->psz_longtext )
+ {
+ label->setToolTip( formatTooltip( qtr(p_item->psz_longtext) ) );
+ }
}
-#endif
/********* 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) );
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 );
+ finish( p_module_config );
if( !l )
{
l = new QGridLayout();
for( int i = 0; i < p_item->i_action; i++ )
{
QPushButton *button =
- new QPushButton( qfu( p_item->ppsz_action_text[i] ));
+ new QPushButton( qtr( 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,
if(!p_module_config) return;
vlc_value_t val;
- val.psz_string =
+ val.psz_string = const_cast<char *>
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 );
+ 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 );
if(!p_module_config) return;
+ if( 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 );
+ }
+
for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
{
+ if( !p_module_config->ppsz_list[i_index] )
+ {
+ combo->addItem( "", QVariant(""));
+ if( !p_item->value.psz )
+ combo->setCurrentIndex( combo->count() - 1 );
+ continue;
+ }
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( p_module_config->psz_longtext )
+ {
+ QString tipText = qtr(p_module_config->psz_longtext);
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
+ label->setBuddy( combo );
}
-QString StringListConfigControl::getValue()
+QString StringListConfigControl::getValue() const
{
return combo->itemData( combo->currentIndex() ).toString();
}
void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
- QComboBox *combo, QWidget *parent )
+ QComboBox *combo )
{
module_config_t *p_config =
config_FindConfig( VLC_OBJECT(p_intf), configname );
if( p_config )
{
- if(p_config->pf_update_list)
+ QVariant def;
+ bool string = (p_config->i_type & 0xF0) == CONFIG_ITEM_STRING;
+
+ if( string )
+ def = QVariant( qfu(p_config->value.psz) );
+ else
+ def = QVariant( qlonglong( p_config->value.i ) );
+
+ if(p_config->pf_update_list)
{
vlc_value_t val;
val.i_int = p_config->value.i;
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] )
- {
+ QVariant value;
+
+ if( string )
+ value = QVariant( qfu(p_config->ppsz_list[i_index]) );
+ else
+ value =QVariant( p_config->pi_list[i_index] );
+ combo->addItem( qtr(p_config->ppsz_list_text[i_index]), value );
+ if( def == value )
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) );
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);
- for (size_t i = 0; i < confsize; i++)
+ p_config = module_config_get (p_parser, &confsize);
+ for (size_t i = 0; i < confsize; i++)
{
/* Hack: required subcategory is stored in i_min */
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 ) ) );
+ 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 );
- combo->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ module_list_free( p_list );
+
+ if( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ 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 = 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 );
int boxline = 0;
- for( QVector<checkBoxListItem*>::iterator it = modules.begin();
- it != modules.end(); it++ )
+ foreach ( checkBoxListItem *it, modules )
{
- layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 );
+ layoutGroupBox->addWidget( it->checkBox, boxline / 2, boxline % 2 );
+ boxline++;
}
- layoutGroupBox->addWidget( text, boxline, 0 );
+
+ layoutGroupBox->addWidget( text, boxline, 0, 1, 2 );
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;
- delete text;
}
#define CHECKBOX_LISTS \
{ \
- QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\
- checkBoxListItem *cbl = new checkBoxListItem; \
+ 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; \
+ CONNECT( cb, stateChanged( int ), this, onUpdate() );\
+ const char *help = module_get_help( p_parser ); \
+ if( help != NULL ) \
+ cb->setToolTip( formatTooltip( qtr( help ) ) ); \
+ cbl->checkBox = cb; \
\
- cbl->psz_module = strdup( module_GetObjName( p_parser ) ); \
- modules.push_back( cbl ); \
+ cbl->psz_module = strdup( module_get_object( p_parser ) ); \
+ modules.append( cbl ); \
\
- if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \
+ 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;
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 );
- text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
- if( groupBox )
- groupBox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ module_list_free( p_list );
+
+ 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();
}
-void ModuleListConfigControl::onUpdate( int value )
+void ModuleListConfigControl::onUpdate()
{
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( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ spin->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ 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( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ slider->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ 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) );
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 );
+ 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) return;
+ if( 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;
+ }
+
for( int i_index = 0; i_index < p_module_config->i_list; i_index++ )
{
combo->addItem( qtr(p_module_config->ppsz_list_text[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_module_config->psz_longtext)) );
+ if( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext );
+ combo->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) );
+ 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) );
l->addWidget( checkbox, line, 0 );
}
}
+
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QLabel *_label,
- QCheckBox *_checkbox,
- bool bycat ) :
+ QAbstractButton *_checkbox ) :
VIntConfigControl( _p_this, _p_item )
{
checkbox = _checkbox;
+ VLC_UNUSED( _label );
finish();
}
void BoolConfigControl::finish()
{
- checkbox->setCheckState( p_item->value.i == true ? Qt::Checked
- : Qt::Unchecked );
- 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->checkState() == Qt::Checked ? true : false;
+ return checkbox->isChecked();
}
+/************* Color *************/
+ColorConfigControl::ColorConfigControl( vlc_object_t *_p_this,
+ module_config_t *_p_item,
+ QWidget *_parent, QGridLayout *l,
+ int line ) :
+ VIntConfigControl( _p_this, _p_item, _parent )
+{
+ label = new QLabel;
+ color_but = new QToolButton;
+ finish();
+
+ if( !l )
+ {
+ QHBoxLayout *layout = new QHBoxLayout();
+ layout->addWidget( label, 0 ); layout->addWidget( color_but, LAST_COLUMN );
+ widget->setLayout( layout );
+ }
+ else
+ {
+ l->addWidget( label, line, 0 );
+ l->addWidget( color_but, line, LAST_COLUMN, Qt::AlignRight );
+ }
+}
+
+ColorConfigControl::ColorConfigControl( vlc_object_t *_p_this,
+ module_config_t *_p_item,
+ QLabel *_label, QAbstractButton *_color ):
+ VIntConfigControl( _p_this, _p_item )
+{
+ label = _label;
+ color_but = _color;
+ finish();
+}
+
+void ColorConfigControl::finish()
+{
+ i_color = p_item->value.i;
+
+ color_px = new QPixmap( 34, 20 );
+ color_px->fill( QColor( i_color ) );
+ color_but->setIcon( QIcon( *color_px ) );
+ color_but->setMinimumWidth( 40 );
+
+ label->setText( qtr(p_item->psz_text) );
+ if( p_item->psz_longtext )
+ {
+ label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ color_but->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ }
+
+ BUTTONACT( color_but, selectColor() );
+}
+
+int ColorConfigControl::getValue() const
+{
+ return i_color;
+}
+
+void ColorConfigControl::selectColor()
+{
+ QColor color = QColorDialog::getColor( QColor( i_color ) );
+ i_color = (color.red() << 16) + (color.green() << 8) + color.blue();
+
+ color_px->fill( QColor( i_color ) );
+ color_but->setIcon( QIcon( *color_px ) );
+}
+
+
/**************************************************************************
* 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( p_item->psz_longtext )
+ {
+ QString tipText = qtr(p_item->psz_longtext);
+ spin->setToolTip( formatTooltip(tipText) );
+ if( label )
+ label->setToolTip( formatTooltip(tipText) );
+ }
if( label )
- label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ 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 )
{
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;*/
+ actionSearch = new SearchLineEdit( keyContainer );
table = new QTreeWidget;
- table->setColumnCount(2);
+ table->setColumnCount(3);
table->headerItem()->setText( 0, qtr( "Action" ) );
- table->headerItem()->setText( 1, qtr( "Shortcut" ) );
+ table->headerItem()->setText( 1, qtr( "Hotkey" ) );
+ table->headerItem()->setText( 2, qtr( "Global" ) );
+ table->setAlternatingRowColors( true );
+ table->setSelectionBehavior( QAbstractItemView::SelectItems );
shortcutValue = new KeyShortcutEdit;
shortcutValue->setReadOnly(true);
QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
- QPushButton *setButton = new QPushButton( qtr( "Set" ) );
+ QPushButton *setButton = new QPushButton( qtr( "Apply" ) );
setButton->setDefault( true );
finish();
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( 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 );
+ l->addWidget( keyContainer, line, 0, 1, -1 );
CONNECT( clearButton, clicked(), shortcutValue, clear() );
+ CONNECT( clearButton, clicked(), this, setTheKey() );
BUTTONACT( setButton, setTheKey() );
+ CONNECT( actionSearch, textChanged( const QString& ),
+ this, filter( const QString& ) );
}
void KeySelectorControl::finish()
{
- if( label )
+ if( label && 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" );
+ 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++)
{
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-" )
- && !EMPTY_STR( p_item->psz_text ) )
+ /* If we are a (non-global) key option not empty */
+ if( CONFIG_ITEM(p_item->i_type) && 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 int 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( 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( CONFIG_ITEM(p_item->i_type) && 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 )
+ {
+ 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 );
}
}
- module_PutConfig (p_config);
- module_Put (p_main);
+ module_config_free (p_config);
table->resizeColumnToContents( 0 );
- CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
- this, select1Key( QTreeWidgetItem * ) );
CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
- this, selectKey( QTreeWidgetItem * ) );
+ this, selectKey( QTreeWidgetItem *, int ) );
+ CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
+ this, select( QTreeWidgetItem *, int) );
+ CONNECT( table, itemSelectionChanged(),
+ this, select1Key() );
+
CONNECT( shortcutValue, pressed(), this, selectKey() );
}
+void KeySelectorControl::filter( const QString &qs_search )
+{
+ QList<QTreeWidgetItem *> resultList =
+ table->findItems( qs_search, Qt::MatchContains, 0 );
+ for( int i = 0; i < table->topLevelItemCount(); i++ )
+ {
+ table->topLevelItem( i )->setHidden(
+ !resultList.contains( table->topLevelItem( i ) ) );
+ }
+}
+
+void KeySelectorControl::select( QTreeWidgetItem *, int column )
+{
+ shortcutValue->setGlobal( column == 2 );
+}
+
/* 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() );
+ shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toString() );
+ shortcutValue->setGlobal( false );
}
-void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
+void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column )
{
/* This happens when triggered by ClickEater */
if( keyItem == NULL ) keyItem = table->currentItem();
and the shortcutValue is clicked */
if( !keyItem ) return;
+ /* If clicked on the first column, assuming user wants the normal hotkey */
+ if( column == 0 ) column = 1;
+
+ bool b_global = ( column == 2 );
+
/* Launch a small dialog to ask for a new key */
- KeyInputDialog *d = new KeyInputDialog( table, keyItem->text( 0 ), widget );
+ KeyInputDialog *d = new KeyInputDialog( table, keyItem->text( 0 ), widget, b_global );
d->exec();
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 )
{
for( int i = 0; i < table->topLevelItemCount() ; i++ )
{
it = table->topLevelItem(i);
- if( ( keyItem != it )
- && ( it->data( 1, Qt::UserRole ).toInt() == newValue ) )
+ if( ( keyItem != it ) &&
+ ( it->data( 1 + b_global, Qt::UserRole ).toString() == newKey ) )
{
- it->setData( 1, Qt::UserRole, QVariant( -1 ) );
- it->setText( 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. */
void KeySelectorControl::setTheKey()
{
- table->currentItem()->setText( 1, shortcutValue->text() );
- table->currentItem()->setData( 1, Qt::UserRole, shortcutValue->getValue() );
+ if( !table->currentItem() ) return;
+ table->currentItem()->setText( shortcutValue->getGlobal() ? 2 : 1,
+ shortcutValue->text() );
+ table->currentItem()->setData( shortcutValue->getGlobal() ? 2 : 1,
+ Qt::UserRole, shortcutValue->getValue() );
}
void KeySelectorControl::doApply()
{
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_PutPsz( p_this,
+ qtu( "global-" + it->data( 0, Qt::UserRole ).toString() ),
+ qtu( it->data( 2, Qt::UserRole ).toString() ) );
+
}
}
+/**
+ * Class KeyInputDialog
+ **/
KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
- QString keyToChange,
- QWidget *_parent ) :
- QDialog( _parent ), keyValue(0)
+ const QString& keyToChange,
+ QWidget *_parent,
+ bool _b_global ) :
+ QDialog( _parent ), keyValue(0), b_global( _b_global )
{
setModal( true );
conflicts = false;
table = _table;
- setWindowTitle( qtr( "Hotkey for " ) + keyToChange );
+ setWindowTitle( b_global ? qtr( "Global" ): ""
+ + qtr( "Hotkey for " ) + keyToChange );
+ setWindowRole( "vlc-key-input" );
vLayout = new QVBoxLayout( this );
selected = new QLabel( qtr( "Press the new keys for " ) + keyToChange );
vLayout->addWidget( selected , Qt::AlignCenter );
+ warning = new QLabel;
+ warning->hide();
+ vLayout->insertWidget( 1, warning );
+
buttonBox = new QDialogButtonBox;
QPushButton *ok = new QPushButton( qtr("OK") );
QPushButton *cancel = new QPushButton( qtr("Cancel") );
void KeyInputDialog::checkForConflicts( int i_vlckey )
{
- QList<QTreeWidgetItem *> conflictList =
- table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 );
+ QList<QTreeWidgetItem *> conflictList =
+ table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly,
+ b_global ? 2 : 1 );
- if( conflictList.size() )
+ if( conflictList.count() &&
+ !conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toString().isEmpty() &&
+ conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toString() != "Unset" )
{
- QLabel *warning = new QLabel(
- qtr("Warning: the key is already assigned to \"") +
- conflictList[0]->text( 0 ) + "\"" );
- vLayout->insertWidget( 1, warning );
+ warning->setText( qtr("Warning: the key is already assigned to \"") +
+ conflictList[0]->text( 0 ) + "\"" );
+ warning->show();
buttonBox->show();
conflicts = true;
projects / vlc / blobdiff