-Au/*****************************************************************************
+/*****************************************************************************
* open.cpp : Panels for the open dialogs
****************************************************************************
* Copyright (C) 2006-2007 the VideoLAN team
dialogBox->setSizeGripEnabled( false );
/* Add a tooltip */
- dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ) );
+ dialogBox->setToolTip( qtr( "Select one or multiple files" ) );
// But hide the two OK/Cancel buttons. Enable them for debug.
QDialogButtonBox *fileDialogAcceptBox =
/* DVD */
if( ui.dvdRadioButton->isChecked() ) {
if( !ui.dvdsimple->isChecked() )
- mrl = "dvd://";
+ mrl = "\"dvd://";
else
- mrl = "dvdsimple://";
+ mrl = "\"dvdsimple://";
mrl += ui.deviceCombo->currentText();
emit methodChanged( "dvdnav-caching" );
/* VCD */
} else if ( ui.vcdRadioButton->isChecked() ) {
- mrl = "vcd://" + ui.deviceCombo->currentText();
+ mrl = "\"vcd://" + ui.deviceCombo->currentText();
emit methodChanged( "vcd-caching" );
if( ui.titleSpin->value() > 0 ) {
/* CDDA */
} else {
- mrl = "cdda://" + ui.deviceCombo->currentText();
+ mrl = "\"cdda://" + ui.deviceCombo->currentText();
if( ui.titleSpin->value() > 0 ) {
QString("@%1").arg( ui.titleSpin->value() );
}
}
+ mrl += "\"";
+
if ( ui.dvdRadioButton->isChecked() || ui.vcdRadioButton->isChecked() )
{
if ( ui.audioSpin->value() >= 0 ) {
void NetOpenPanel::updateMRL() {
QString mrl = "";
QString addr = ui.addressText->text();
+ addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" );
int proto = ui.protocolCombo->currentIndex();
- if( addr.contains( "://") && proto != 5 ) {
+ if( addr.contains( "://") && ( proto != 5 || proto != 6 ) )
+ {
mrl = addr;
- } else {
+ }
+ else
+ {
switch( proto ) {
case 0:
mrl = "http://" + addr;
break;
case 5:
mrl = "udp://@";
- if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() ) {
+ if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
+ {
mrl += "[::]";
}
mrl += QString(":%1").arg( ui.portSpin->value() );
case 6: /* UDP multicast */
mrl = "udp://@";
/* Add [] to IPv6 */
- if ( addr.contains(':') && !addr.contains('[') ) {
+ if ( addr.contains(':') && !addr.contains('[') )
+ {
mrl += "[" + addr + "]";
- } else mrl += addr;
+ }
+ else mrl += addr;
mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching");
}
}
// Encode the boring stuffs
- mrl = QUrl( mrl ).toEncoded();
+
if( ui.timeShift->isEnabled() && ui.timeShift->isChecked() ) {
mrl += " :access-filter=timeshift";
}
/* Jack Main panel */
/* Channels */
- QLabel *jackChannelsLabel = new QLabel( qtr( "Channels :" ) );
+ QLabel *jackChannelsLabel = new QLabel( qtr( "Channels:" ) );
jackDevLayout->addWidget( jackChannelsLabel, 1, 0 );
jackChannels = new QSpinBox;
/* Jack Props panel */
/* Selected ports */
- QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports :" ) );
+ QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports:" ) );
jackPropLayout->addWidget( jackPortsLabel, 0 , 0 );
jackPortsSelected = new QLineEdit( qtr( ".*") );
jackPropLayout->addWidget( jackPortsSelected, 0, 1 );
/* Caching */
- QLabel *jackCachingLabel = new QLabel( qtr( "Input caching :" ) );
+ QLabel *jackCachingLabel = new QLabel( qtr( "Input caching:" ) );
jackPropLayout->addWidget( jackCachingLabel, 1 , 0 );
jackCaching = new QSpinBox;
setSpinBoxFreq( jackCaching );
/* Get the current Device Number */
int i_devicetype = ui.deviceCombo->itemData(
ui.deviceCombo->currentIndex() ).toInt();
- msg_Dbg( p_intf, "Capture Type: %i", i_devicetype );
switch( i_devicetype )
{
#ifdef WIN32