X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fpreferences_widgets.cpp;h=6260c81a9c5048a4190a50ace0bd474eb9e038b7;hb=9896506ee513bcd89afcd1bc48bc238fa5ef1cf2;hp=4c36ce5db6b974cf7c7f2d056ccc82ff774a89e8;hpb=124c9480615cfde6664ed526b47e79bece077628;p=vlc diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 4c36ce5db6..6260c81a9c 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -38,6 +38,8 @@ #include "util/customwidgets.hpp" #include "util/qt_dirs.hpp" #include +#include +#include #include #include @@ -48,6 +50,7 @@ #include #include #include +#include #define MINWIDTH_BOX 90 #define LAST_COLUMN 10 @@ -98,9 +101,6 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, case CONFIG_ITEM_MODULE_LIST_CAT: p_control = new ModuleListConfigControl( p_this, p_item, parent, true, l, line ); - /* Special Hack for a bug in video-filter */ - if( qobject_cast( p_control )->groupBox == NULL ) - return NULL; break; case CONFIG_ITEM_STRING: if( !p_item->i_list ) @@ -206,16 +206,31 @@ InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( par setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); } -void InterfacePreviewWidget::setPreview( int comboid ) +void InterfacePreviewWidget::setNormalPreview( bool b_minimal ) { - /* Need to move resources references as soon as qt4.cpp - local defines has been moved somewhere else - */ - static const char pixmaps[][28] = { ":/prefsmenu/sample_classic", - ":/prefsmenu/sample_complete", - ":/prefsmenu/sample_minimal", - ":/prefsmenu/sample_skins" }; - setPixmap( QPixmap( pixmaps[ comboid ] ) ); + 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(); } @@ -326,7 +341,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *_p_this, void FileConfigControl::updateField() { - QString file = QFileDialog::getOpenFileName( NULL, + QString file = QFileDialog::getSaveFileName( NULL, qtr( "Select File" ), QVLCUserDir( VLC_HOME_DIR ) ); if( file.isNull() ) return; text->setText( toNativeSeparators( file ) ); @@ -359,7 +374,7 @@ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this, void DirectoryConfigControl::updateField() { QString dir = QFileDialog::getExistingDirectory( NULL, - qtr( "Select Directory" ), + qtr( I_OP_SEL_DIR ), text->text().isEmpty() ? QVLCUserDir( VLC_HOME_DIR ) : text->text(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); @@ -413,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 ) @@ -449,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, @@ -499,11 +500,33 @@ 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] : + _(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, @@ -543,7 +566,7 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf, 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] ) { @@ -913,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 ) @@ -977,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] ), @@ -1040,6 +1063,7 @@ 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, @@ -1175,12 +1199,13 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this, 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(); @@ -1233,14 +1258,14 @@ 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; } @@ -1255,7 +1280,7 @@ void KeySelectorControl::finish() { list[0]->setText( 2, VLCKeyToString( p_item->value.i ) ); list[0]->setData( 2, Qt::UserRole, - QVariant( p_item->value.i ) ); + QVariant( qlonglong( p_item->value.i ) ) ); } if( list.count() >= 2 ) msg_Dbg( p_this, "This is probably wrong, %s", p_item->psz_text ); @@ -1268,6 +1293,8 @@ void KeySelectorControl::finish() CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ), this, selectKey( QTreeWidgetItem *, int ) ); + CONNECT( table, itemClicked( QTreeWidgetItem *, int ), + this, select( QTreeWidgetItem *, int) ); CONNECT( table, itemSelectionChanged(), this, select1Key() ); @@ -1285,6 +1312,11 @@ void KeySelectorControl::filter( const QString &qs_search ) } } +void KeySelectorControl::select( QTreeWidgetItem *keyItem, int column ) +{ + shortcutValue->setGlobal( column == 2 ); +} + /* Show the key selected from the table in the keySelector */ void KeySelectorControl::select1Key() {