X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=56c68f29027b6d0ae4a0c0483c8b8c1e5d783de9;hb=0e3e62f3582ab6ee45462dc7b39fabab935a5e68;hp=7ff6aea51636fcca1883216b42205152ef1d8f0e;hpb=08016364e84b8915cb595ad1455ad0d559e52869;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 7ff6aea516..56c68f2902 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -36,7 +36,10 @@ #include "components/preferences_widgets.hpp" #include "util/customwidgets.hpp" +#include "util/qt_dirs.hpp" #include +#include +#include #include #include @@ -47,6 +50,7 @@ #include #include #include +#include #define MINWIDTH_BOX 90 #define LAST_COLUMN 10 @@ -56,7 +60,7 @@ QString formatTooltip(const QString & tooltip) QString formatted = "" "" - "" "

" + @@ -126,19 +130,16 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, l, line ); break; case CONFIG_ITEM_FILE: - p_control = new FileConfigControl( p_this, p_item, parent, l, - line, false ); + 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; @@ -196,6 +197,44 @@ 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 ) +{ + QString pixmapLocationString(":/prefsmenu/"); + + switch( e_style ) + { + 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 *************************************************************************/ @@ -233,6 +272,7 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this, VStringConfigControl( _p_this, _p_item ) { text = _text; + if( pwd ) text->setEchoMode( QLineEdit::Password ); label = _label; finish( ); } @@ -242,14 +282,17 @@ void StringConfigControl::finish() text->setText( qfu(p_item->value.psz) ); text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); 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) ); @@ -284,7 +327,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, 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; @@ -298,10 +341,10 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, void FileConfigControl::updateField() { - QString file = QFileDialog::getOpenFileName( NULL, - qtr( "Select File" ), qfu( config_GetHomeDir() ) ); + QString file = QFileDialog::getSaveFileName( NULL, + qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) ); if( file.isNull() ) return; - text->setText( file ); + text->setText( toNativeSeparators( file ) ); } void FileConfigControl::finish() @@ -309,58 +352,69 @@ void FileConfigControl::finish() text->setText( qfu(p_item->value.psz) ); text->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); 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( config_GetHomeDir() ) : 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 - /********* 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 ); + } +} 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) ) ); } -#endif /********* String / choice list **********/ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, @@ -374,20 +428,6 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, 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 ); if( !l ) @@ -410,7 +450,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, 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, @@ -430,7 +470,7 @@ void StringListConfigControl::actionRequested( int i_action ) if(!p_module_config) return; vlc_value_t val; - val.psz_string = + val.psz_string = const_cast qtu( (combo->itemData( combo->currentIndex() ).toString() ) ); p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 ); @@ -460,8 +500,30 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca 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] : @@ -473,7 +535,10 @@ void StringListConfigControl::finish(module_config_t *p_module_config, bool byca } combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); + label->setBuddy( combo ); + } } QString StringListConfigControl::getValue() @@ -482,7 +547,7 @@ QString StringListConfigControl::getValue() } 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 ); @@ -546,26 +611,23 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this, 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 */ @@ -573,26 +635,29 @@ void ModuleConfigControl::finish( bool bycat ) 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)) ); + label->setBuddy( combo ); + } } QString ModuleConfigControl::getValue() @@ -606,8 +671,12 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, 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 ); @@ -642,7 +711,6 @@ ModuleListConfigControl::~ModuleListConfigControl() delete *it; } delete groupBox; - delete text; } #define CHECKBOX_LISTS \ @@ -650,11 +718,11 @@ ModuleListConfigControl::~ModuleListConfigControl() 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 ))));\ + CONNECT( cb, stateChanged( int ), this, onUpdate() );\ + 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 ) ) \ @@ -664,21 +732,18 @@ ModuleListConfigControl::~ModuleListConfigControl() 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++) { @@ -690,22 +755,23 @@ void ModuleListConfigControl::finish( bool bycat ) 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(); } @@ -730,7 +796,7 @@ void ModuleListConfigControl::show() } -void ModuleListConfigControl::onUpdate( int value ) +void ModuleListConfigControl::onUpdate() { text->clear(); bool first = true; @@ -799,7 +865,10 @@ void IntegerConfigControl::finish() spin->setValue( p_item->value.i ); spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( spin ); + } } int IntegerConfigControl::getValue() @@ -844,7 +913,10 @@ IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl( slider->setValue( p_item->value.i ); slider->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( slider ); + } } int IntegerRangeSliderConfigControl::getValue() @@ -864,19 +936,6 @@ IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this, 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 ); if( !l ) @@ -928,6 +987,19 @@ void IntegerListConfigControl::finish(module_config_t *p_module_config, bool byc 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] ), @@ -937,7 +1009,10 @@ void IntegerListConfigControl::finish(module_config_t *p_module_config, bool byc } combo->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_module_config->psz_longtext)) ); + label->setBuddy( combo ); + } } void IntegerListConfigControl::actionRequested( int i_action ) @@ -988,27 +1063,28 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, l->addWidget( checkbox, line, 0 ); } } + BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QLabel *_label, - QCheckBox *_checkbox, + QAbstractButton *_checkbox, bool bycat ) : 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->setChecked( p_item->value.i == true ); checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); } int BoolConfigControl::getValue() { - return checkbox->checkState() == Qt::Checked ? true : false; + return checkbox->isChecked(); } /************************************************************************** @@ -1061,7 +1137,10 @@ void FloatConfigControl::finish() spin->setValue( (double)p_item->value.f ); spin->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); if( label ) + { label->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); + label->setBuddy( spin ); + } } float FloatConfigControl::getValue() @@ -1111,37 +1190,40 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, 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() @@ -1150,18 +1232,16 @@ void KeySelectorControl::finish() 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++) { @@ -1170,6 +1250,7 @@ void KeySelectorControl::finish() /* 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 ) ) { /* @@ -1177,39 +1258,75 @@ void KeySelectorControl::finish() - QString text in column 0 - QString name in data of column 0 - KeyValue in String in column 1 - - KeyValue in int 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( p_item->value.i ) ); + treeItem->setData( 1, Qt::UserRole, QVariant( qlonglong( p_item->value.i ) ) ); 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 ) ) + { + QList 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 ) ) ); + } + 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); + module_release (p_main); table->resizeColumnToContents( 0 ); CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ), - this, selectKey( QTreeWidgetItem * ) ); - CONNECT( table, itemSelectionChanged (), - this, select1Key() ); + 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 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 *keyItem, int column ) +{ + shortcutValue->setGlobal( column == 2 ); +} + /* Show the key selected from the table in the keySelector */ void KeySelectorControl::select1Key() { QTreeWidgetItem *keyItem = table->currentItem(); shortcutValue->setText( keyItem->text( 1 ) ); shortcutValue->setValue( keyItem->data( 1, Qt::UserRole ).toInt() ); + 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(); @@ -1218,8 +1335,13 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) 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 ) @@ -1227,6 +1349,7 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) int newValue = d->keyValue; shortcutValue->setText( VLCKeyToString( newValue ) ); shortcutValue->setValue( newValue ); + shortcutValue->setGlobal( b_global ); if( d->conflicts ) { @@ -1234,11 +1357,11 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) 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( b_global ? 2: 1, Qt::UserRole ).toInt() == newValue ) ) { - it->setData( 1, Qt::UserRole, QVariant( -1 ) ); - it->setText( 1, qtr( "Unset" ) ); + it->setData( b_global ? 2 : 1, Qt::UserRole, QVariant( -1 ) ); + it->setText( b_global ? 2 : 1, qtr( "Unset" ) ); } } /* We already made an OK once. */ @@ -1250,8 +1373,11 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem ) 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() @@ -1264,24 +1390,39 @@ void KeySelectorControl::doApply() config_PutInt( p_this, qtu( it->data( 0, Qt::UserRole ).toString() ), it->data( 1, Qt::UserRole ).toInt() ); + if( it->data( 2, Qt::UserRole ).toInt() >= 0 ) + config_PutInt( p_this, + qtu( "global-" + it->data( 0, Qt::UserRole ).toString() ), + it->data( 2, Qt::UserRole ).toInt() ); + } } +/** + * 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") ); @@ -1299,14 +1440,16 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table, void KeyInputDialog::checkForConflicts( int i_vlckey ) { QList conflictList = - table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, 1 ); + table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly, + b_global ? 2 : 1 ); - if( conflictList.size() ) + if( conflictList.size() && + conflictList[0]->data( b_global ? 2 : 1, Qt::UserRole ).toInt() > 1 ) + /* Avoid 0 or -1 that are the "Unset" states */ { - 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;