#include "dialogs_provider.hpp" /* Open Subtitle file */
#include "util/qt_dirs.hpp"
#include <vlc_intf_strings.h>
+#include <vlc_modules.h>
#include <QFileDialog>
#include <QDialogButtonBox>
#include <QStringListModel>
#include <QDropEvent>
-
#define I_DEVICE_TOOLTIP \
I_DIR_OR_FOLDER( N_("Select a device or a VIDEO_TS directory"), \
N_("Select a device or a VIDEO_TS folder") )
+/* Populate a combobox with the devices matching a pattern.
+ Combobox will automatically do autocompletion on the edit zone */
+#define POPULATE_WITH_DEVS(ppsz_devlist, targetCombo) \
+ QStringList targetCombo ## StringList = QStringList(); \
+ for ( int i = 0; i< sizeof(ppsz_devlist) / sizeof(*ppsz_devlist); i++ ) \
+ targetCombo ## StringList << QString( ppsz_devlist[ i ] ); \
+ targetCombo->addItems( QDir( "/dev/" )\
+ .entryList( targetCombo ## StringList, QDir::System )\
+ .replaceInStrings( QRegExp("^"), "/dev/" ) \
+ );
+
static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
"dshow", "screen", "jack" };
}
SetErrorMode(oldMode);
}
-#else /* Use a Completer under Linux */
- QCompleter *discCompleter = new QCompleter( this );
- discCompleter->setModel( new QDirModel( discCompleter ) );
- ui.deviceCombo->setCompleter( discCompleter );
+#else /* Linux */
+ char const * const ppsz_discdevices[] = {
+ "sr*",
+ "sg*",
+ "scd*",
+ "dvd*",
+ "cd*"
+ };
+ QComboBox *discCombo = ui.deviceCombo; /* avoid namespacing in macro */
+ POPULATE_WITH_DEVS( ppsz_discdevices, discCombo );
#endif
/* CONNECTs */
#undef setDrive
+#ifndef WIN32
+# define LOCALHOST ""
+#else
+# define LOCALHOST "/"
+#endif
+
/* Update the current MRL */
void DiscOpenPanel::updateMRL()
{
/* DVD */
if( ui.dvdRadioButton->isChecked() ) {
if( !ui.dvdsimple->isChecked() )
- mrl = "dvd://";
+ mrl = "dvd://" LOCALHOST;
else
- mrl = "dvdsimple://";
+ mrl = "dvdsimple://" LOCALHOST;
mrl += ui.deviceCombo->currentText();
if( !ui.dvdsimple->isChecked() )
emit methodChanged( "dvdnav-caching" );
/* VCD */
} else if ( ui.vcdRadioButton->isChecked() ) {
- mrl = "vcd://" + ui.deviceCombo->currentText();
+ mrl = "vcd://" LOCALHOST + ui.deviceCombo->currentText();
emit methodChanged( "vcd-caching" );
if( ui.titleSpin->value() > 0 ) {
/* CDDA */
} else {
- mrl = "cdda://" + ui.deviceCombo->currentText();
+ mrl = "cdda://" LOCALHOST + ui.deviceCombo->currentText();
emit methodChanged( "cdda-caching" );
}
ui.setupUi( this );
/* CONNECTs */
- CONNECT( ui.urlText, textChanged( const QString& ), this, updateMRL());
+ CONNECT( ui.urlComboBox->lineEdit(), textChanged( const QString& ), this, updateMRL());
+ CONNECT( ui.urlComboBox, currentIndexChanged( const QString& ), this, updateMRL());
if( var_InheritBool( p_intf, "qt-recentplay" ) )
{
mrlList = new QStringListModel(
getSettings()->value( "Open/netMRL" ).toStringList() );
- QCompleter *completer = new QCompleter( mrlList, this );
- ui.urlText->setCompleter( completer );
-
- CONNECT( ui.urlText, editingFinished(), this, updateCompleter() );
+ ui.urlComboBox->setModel( mrlList );
+ ui.urlComboBox->clearEditText();
+ CONNECT( ui.urlComboBox->lineEdit(), editingFinished(), this, updateModel() );
}
else
mrlList = NULL;
- ui.urlText->setValidator( new UrlValidator( this ) );
+ ui.urlComboBox->setValidator( new UrlValidator( this ) );
+ ui.urlComboBox->setFocus();
}
NetOpenPanel::~NetOpenPanel()
{ "udp", "udp" },
};
- QString url = ui.urlText->text();
+ QString url = ui.urlComboBox->lineEdit()->text();
if( !url.contains( "://") )
return; /* nothing to do this far */
emit mrlUpdated( qsl, "" );
}
-void NetOpenPanel::updateCompleter()
+void NetOpenPanel::updateModel()
{
assert( mrlList );
QStringList tempL = mrlList->stringList();
- if( !tempL.contains( ui.urlText->text() ) )
- tempL.append( ui.urlText->text() );
+ if( !tempL.contains( ui.urlComboBox->lineEdit()->text() ) )
+ tempL.append( ui.urlComboBox->lineEdit()->text() );
mrlList->setStringList( tempL );
}
if( module_exists( "v4l2" ) ){
addModuleAndLayouts( V4L2_DEVICE, v4l2, "Video for Linux 2", QGridLayout );
+ char const * const ppsz_v4lvdevices[] = {
+ "video*"
+ };
+
+ char const * const ppsz_v4ladevices[] = {
+ "dsp*",
+ "radio*"
+ };
+
/* V4l Main panel */
QLabel *v4l2VideoDeviceLabel = new QLabel( qtr( "Video device name" ) );
v4l2DevLayout->addWidget( v4l2VideoDeviceLabel, 0, 0 );
- v4l2VideoDevice = new QLineEdit;
+ v4l2VideoDevice = new QComboBox( this );
+ v4l2VideoDevice->setEditable( true );
+ POPULATE_WITH_DEVS( ppsz_v4lvdevices, v4l2VideoDevice );
+ v4l2VideoDevice->clearEditText();
v4l2DevLayout->addWidget( v4l2VideoDevice, 0, 1 );
QLabel *v4l2AudioDeviceLabel = new QLabel( qtr( "Audio device name" ) );
v4l2DevLayout->addWidget( v4l2AudioDeviceLabel, 1, 0 );
- v4l2AudioDevice = new QLineEdit;
+ v4l2AudioDevice = new QComboBox( this );
+ v4l2AudioDevice->setEditable( true );
+ POPULATE_WITH_DEVS( ppsz_v4ladevices, v4l2AudioDevice );
+ v4l2AudioDevice->clearEditText();
v4l2DevLayout->addWidget( v4l2AudioDevice, 1, 1 );
/* v4l2 Props panel */
- QLabel *v4l2StdLabel = new QLabel( qtr( "Standard" ) );
+ QLabel *v4l2StdLabel = new QLabel( qtr( "Video standard" ) );
v4l2PropLayout->addWidget( v4l2StdLabel, 0 , 0 );
v4l2StdBox = new QComboBox;
setfillVLCConfigCombo( "v4l2-standard", p_intf, v4l2StdBox );
v4l2PropLayout->addWidget( v4l2StdBox, 0 , 1 );
v4l2PropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
- 1, 0, 3, 1 );
+ 1, 0, 3, 2 );
/* v4l2 CONNECTs */
- CuMRL( v4l2VideoDevice, textChanged( const QString& ) );
- CuMRL( v4l2AudioDevice, textChanged( const QString& ) );
+ CuMRL( v4l2VideoDevice->lineEdit(), textChanged( const QString& ) );
+ CuMRL( v4l2VideoDevice, currentIndexChanged ( int ) );
+ CuMRL( v4l2AudioDevice->lineEdit(), textChanged( const QString& ) );
+ CuMRL( v4l2AudioDevice, currentIndexChanged ( int ) );
CuMRL( v4l2StdBox, currentIndexChanged ( int ) );
}
mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
break;
case V4L2_DEVICE:
- fileList << "v4l2://" + v4l2VideoDevice->text();
- mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
+ fileList << "v4l2://" + v4l2VideoDevice->currentText();
+ mrl += " :input-slave=alsa://" + v4l2AudioDevice->currentText();
mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
break;
case JACK_DEVICE:
switch( control->getType() )
{
case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_LOADFILE:
+ case CONFIG_ITEM_SAVEFILE:
case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE:
tempMRL += colon_escape( QString("=%1").arg( qobject_cast<VStringConfigControl *>(control)->getValue() ) );
projects / vlc / blobdiff