* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "qt4.hpp"
#include "components/open_panels.hpp"
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 =
listLabel[2]->setText( qtr( "Filter:" ) );
dialogBox->layout()->setMargin( 0 );
- dialogBox->layout()->setSizeConstraint( QLayout::SetMinimumSize );
+ dialogBox->layout()->setSizeConstraint( QLayout::SetNoConstraint );
/** END of QFileDialog tweaking **/
}
if( ui.subCheckBox->isChecked() ) {
- mrl.append( " :sub-file=" + ui.subInput->text() );
+ mrl.append( " :sub-file=\"" + ui.subInput->text() + "\"" );
int align = ui.alignSubComboBox->itemData(
ui.alignSubComboBox->currentIndex() ).toInt();
mrl.append( " :subsdec-align=" + QString().setNum( align ) );
BUTTONACT( ui.audioCDRadioButton, updateButtons() );
BUTTONACT( ui.dvdsimple, updateButtons() );
BUTTONACT( ui.browseDiscButton, browseDevice() );
+ BUTTONACT( ui.ejectButton, eject() );
CONNECT( ui.deviceCombo, editTextChanged( QString ), this, updateMRL());
CONNECT( ui.titleSpin, valueChanged( int ), this, updateMRL());
ui.chapterLabel->show();
ui.chapterSpin->show();
ui.diskOptionBox_2->show();
+ ui.dvdsimple->setEnabled( true );
}
else if ( ui.vcdRadioButton->isChecked() )
{
ui.chapterLabel->hide();
ui.chapterSpin->hide();
ui.diskOptionBox_2->show();
+ ui.dvdsimple->setEnabled( false );
}
else /* CDDA */
{
ui.chapterLabel->hide();
ui.chapterSpin->hide();
ui.diskOptionBox_2->hide();
+ ui.dvdsimple->setEnabled( false );
}
updateMRL();
/* 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 ) {
updateMRL();
}
+void DiscOpenPanel::eject()
+{
+ intf_Eject( p_intf, qtu( ui.deviceCombo->currentText() ) );
+}
+
void DiscOpenPanel::accept()
{}
ui.setupUi( this );
/* CONNECTs */
- CONNECT( ui.protocolCombo, currentIndexChanged( int ),
+ CONNECT( ui.protocolCombo, activated( int ),
this, updateProtocol( int ) );
CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
CONNECT( ui.addressText, textChanged( QString ), this, updateMRL());
CONNECT( ui.timeShift, clicked(), this, updateMRL());
CONNECT( ui.ipv6, clicked(), this, updateMRL());
+ ui.protocolCombo->addItem( "" );
ui.protocolCombo->addItem("HTTP", QVariant("http"));
ui.protocolCombo->addItem("HTTPS", QVariant("https"));
ui.protocolCombo->addItem("FTP", QVariant("ftp"));
ui.protocolCombo->addItem("RTSP", QVariant("rtsp"));
ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
+ ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
}
NetOpenPanel::~NetOpenPanel()
{}
/* update the widgets according the type of protocol */
-void NetOpenPanel::updateProtocol( int idx ) {
+void NetOpenPanel::updateProtocol( int idx_proto ) {
QString addr = ui.addressText->text();
- QString proto = ui.protocolCombo->itemData( idx ).toString();
+ QString proto = ui.protocolCombo->itemData( idx_proto ).toString();
+
+ ui.timeShift->setEnabled( idx_proto == UDP_PROTO ||
+ idx_proto == UDPM_PROTO );
+ ui.ipv6->setEnabled( idx_proto == UDP_PROTO );
+ ui.addressText->setEnabled( idx_proto != UDP_PROTO );
+ ui.portSpin->setEnabled( idx_proto == UDP_PROTO ||
+ idx_proto == UDPM_PROTO );
- ui.timeShift->setEnabled( idx >= 5 );
- ui.ipv6->setEnabled( idx == 5 );
- ui.addressText->setEnabled( idx != 5 );
- ui.portSpin->setEnabled( idx >= 5 );
+ if( idx_proto == NO_PROTO ) return;
/* If we already have a protocol in the address, replace it */
- if( addr.contains( "://")) {
- msg_Err( p_intf, "replace");
- addr.replace( QRegExp("^.*://"), proto + "://");
+ if( addr.contains( "://"))
+ {
+ if( idx_proto != UDPM_PROTO )
+ addr.replace( QRegExp("^.*://@*"), proto + "://");
+ else
+ addr.replace( QRegExp("^.*://"), proto + "://@");
ui.addressText->setText( addr );
}
updateMRL();
void NetOpenPanel::updateMRL() {
QString mrl = "";
QString addr = ui.addressText->text();
- int proto = ui.protocolCombo->currentIndex();
+ addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" );
+ int idx_proto = ui.protocolCombo->currentIndex();
- if( addr.contains( "://") && proto != 5 ) {
- mrl = addr;
- } else {
- switch( proto ) {
- case 0:
+ if( addr.contains( "://"))
+ {
+ /* Match the correct item in the comboBox */
+ ui.protocolCombo->setCurrentIndex(
+ ui.protocolCombo->findData( addr.section( ':', 0, 0 ) ) );
+
+ if( idx_proto != UDP_PROTO || idx_proto != UDPM_PROTO )
+ mrl = addr;
+ }
+ else
+ {
+ switch( idx_proto ) {
+ case HTTP_PROTO:
mrl = "http://" + addr;
emit methodChanged("http-caching");
break;
- case 1:
+ case HTTPS_PROTO:
mrl = "https://" + addr;
emit methodChanged("http-caching");
break;
- case 3:
+ case MMS_PROTO:
mrl = "mms://" + addr;
emit methodChanged("mms-caching");
break;
- case 2:
+ case FTP_PROTO:
mrl = "ftp://" + addr;
emit methodChanged("ftp-caching");
break;
- case 4: /* RTSP */
+ case RTSP_PROTO:
mrl = "rtsp://" + addr;
emit methodChanged("rtsp-caching");
break;
- case 5:
+ case UDP_PROTO:
mrl = "udp://@";
- if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() ) {
+ if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
+ {
mrl += "[::]";
}
mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching");
break;
- case 6: /* UDP multicast */
+ case UDPM_PROTO: /* 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");
+ break;
+ case RTMP_PROTO:
+ mrl = "rtmp://" + addr;
+ emit methodChanged("rtmp-caching");
+ break;
}
}
// Encode the boring stuffs
- mrl = QUrl( mrl ).toEncoded();
+
if( ui.timeShift->isEnabled() && ui.timeShift->isChecked() ) {
mrl += " :access-filter=timeshift";
}
#define CuMRL( widget, slot ) CONNECT( widget , slot , this, updateMRL() );
-#ifndef WIN32
- /*******
- * V4L *
- *******/
- if( module_Exists( p_intf, "v4l" ) ){
- addModuleAndLayouts( V4L_DEVICE, v4l, "Video for Linux" );
+#ifdef WIN32
+ /*********************
+ * DirectShow Stuffs *
+ *********************/
+ if( module_Exists( p_intf, "dshow" ) ){
+ addModuleAndLayouts( DSHOW_DEVICE, dshow, "DirectShow" );
- /* V4l Main panel */
- QLabel *v4lVideoDeviceLabel = new QLabel( qtr( "Video device name" ) );
- v4lDevLayout->addWidget( v4lVideoDeviceLabel, 0, 0 );
+ /* dshow Main */
+ int line = 0;
+ module_config_t *p_config =
+ config_FindConfig( VLC_OBJECT(p_intf), "dshow-vdev" );
+ vdevDshowW = new StringListConfigControl(
+ VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line );
+ line++;
- v4lVideoDevice = new QLineEdit;
- v4lDevLayout->addWidget( v4lVideoDevice, 0, 1 );
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "dshow-adev" );
+ adevDshowW = new StringListConfigControl(
+ VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line );
+ line++;
- QLabel *v4lAudioDeviceLabel = new QLabel( qtr( "Audio device name" ) );
- v4lDevLayout->addWidget( v4lAudioDeviceLabel, 1, 0 );
+ /* dshow Properties */
+ QLabel *dshowVSizeLabel = new QLabel( qtr( "Video size" ) );
+ dshowPropLayout->addWidget( dshowVSizeLabel, 0, 0 );
- v4lAudioDevice = new QLineEdit;
- v4lDevLayout->addWidget( v4lAudioDevice, 1, 1 );
+ dshowVSizeLine = new QLineEdit;
+ dshowPropLayout->addWidget( dshowVSizeLine, 0, 1);
+ dshowPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
+ 1, 0, 3, 1 );
- /* V4l Props panel */
- QLabel *v4lNormLabel = new QLabel( qtr( "Norm" ) );
- v4lPropLayout->addWidget( v4lNormLabel, 0 , 0 );
+ /* dshow CONNECTs */
+ CuMRL( vdevDshowW->combo, currentIndexChanged ( int ) );
+ CuMRL( adevDshowW->combo, currentIndexChanged ( int ) );
+ CuMRL( dshowVSizeLine, textChanged( QString ) );
+ }
- v4lNormBox = new QComboBox;
- setfillVLCConfigCombo( "v4l-norm", p_intf, v4lNormBox );
- v4lPropLayout->addWidget( v4lNormBox, 0 , 1 );
+ /**************
+ * BDA Stuffs *
+ **************/
+ if( module_Exists( p_intf, "bda" ) ){
+ addModuleAndLayouts( BDA_DEVICE, bda, "DVB DirectShow" );
- QLabel *v4lFreqLabel = new QLabel( qtr( "Frequency" ) );
- v4lPropLayout->addWidget( v4lFreqLabel, 1 , 0 );
+ /* bda Main */
+ QLabel *bdaTypeLabel = new QLabel( qtr( "DVB Type:" ) );
- v4lFreq = new QSpinBox;
- v4lFreq->setAlignment( Qt::AlignRight );
- v4lFreq->setSuffix(" kHz");
- setSpinBoxFreq( v4lFreq );
- v4lPropLayout->addWidget( v4lFreq, 1 , 1 );
- v4lPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
+ bdas = new QRadioButton( "DVB-S" );
+ bdas->setChecked( true );
+ bdac = new QRadioButton( "DVB-C" );
+ bdat = new QRadioButton( "DVB-T" );
+
+ bdaDevLayout->addWidget( bdaTypeLabel, 0, 0 );
+ bdaDevLayout->addWidget( bdas, 0, 1 );
+ bdaDevLayout->addWidget( bdac, 0, 2 );
+ bdaDevLayout->addWidget( bdat, 0, 3 );
+
+ /* bda Props */
+ QLabel *bdaFreqLabel =
+ new QLabel( qtr( "Transponder/multiplex frequency" ) );
+ bdaPropLayout->addWidget( bdaFreqLabel, 0, 0 );
+
+ bdaFreq = new QSpinBox;
+ bdaFreq->setAlignment( Qt::AlignRight );
+ bdaFreq->setSuffix(" kHz");
+ bdaFreq->setSingleStep( 1000 );
+ setSpinBoxFreq( bdaFreq )
+ bdaPropLayout->addWidget( bdaFreq, 0, 1 );
+
+ bdaSrateLabel = new QLabel( qtr( "Transponder symbol rate" ) );
+ bdaPropLayout->addWidget( bdaSrateLabel, 1, 0 );
+
+ bdaSrate = new QSpinBox;
+ bdaSrate->setAlignment( Qt::AlignRight );
+ bdaSrate->setSuffix(" kHz");
+ setSpinBoxFreq( bdaSrate );
+ bdaPropLayout->addWidget( bdaSrate, 1, 1 );
+
+ bdaBandLabel = new QLabel( qtr( "Bandwidth" ) );
+ bdaPropLayout->addWidget( bdaBandLabel, 2, 0 );
+
+ bdaBandBox = new QComboBox;
+ setfillVLCConfigCombo( "dvb-bandwidth", p_intf, bdaBandBox );
+ bdaPropLayout->addWidget( bdaBandBox, 2, 1 );
+
+ bdaBandLabel->hide();
+ bdaBandBox->hide();
+ bdaPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
2, 0, 2, 1 );
- /* v4l CONNECTs */
- CuMRL( v4lVideoDevice, textChanged( QString ) );
- CuMRL( v4lAudioDevice, textChanged( QString ) );
- CuMRL( v4lFreq, valueChanged ( int ) );
- CuMRL( v4lNormBox, currentIndexChanged ( int ) );
+ /* bda CONNECTs */
+ CuMRL( bdaFreq, valueChanged ( int ) );
+ CuMRL( bdaSrate, valueChanged ( int ) );
+ CuMRL( bdaBandBox, currentIndexChanged ( int ) );
+ BUTTONACT( bdas, updateButtons() );
+ BUTTONACT( bdat, updateButtons() );
+ BUTTONACT( bdac, updateButtons() );
+ BUTTONACT( bdas, updateMRL() );
+ BUTTONACT( bdat, updateMRL() );
+ BUTTONACT( bdac, updateMRL() );
}
+#else /* WIN32 */
/*******
* V4L2*
*******/
CuMRL( v4l2StdBox, currentIndexChanged ( int ) );
}
+ /*******
+ * V4L *
+ *******/
+ if( module_Exists( p_intf, "v4l" ) ){
+ addModuleAndLayouts( V4L_DEVICE, v4l, "Video for Linux" );
+
+ /* V4l Main panel */
+ QLabel *v4lVideoDeviceLabel = new QLabel( qtr( "Video device name" ) );
+ v4lDevLayout->addWidget( v4lVideoDeviceLabel, 0, 0 );
+
+ v4lVideoDevice = new QLineEdit;
+ v4lDevLayout->addWidget( v4lVideoDevice, 0, 1 );
+
+ QLabel *v4lAudioDeviceLabel = new QLabel( qtr( "Audio device name" ) );
+ v4lDevLayout->addWidget( v4lAudioDeviceLabel, 1, 0 );
+
+ v4lAudioDevice = new QLineEdit;
+ v4lDevLayout->addWidget( v4lAudioDevice, 1, 1 );
+
+ /* V4l Props panel */
+ QLabel *v4lNormLabel = new QLabel( qtr( "Norm" ) );
+ v4lPropLayout->addWidget( v4lNormLabel, 0 , 0 );
+
+ v4lNormBox = new QComboBox;
+ setfillVLCConfigCombo( "v4l-norm", p_intf, v4lNormBox );
+ v4lPropLayout->addWidget( v4lNormBox, 0 , 1 );
+
+ QLabel *v4lFreqLabel = new QLabel( qtr( "Frequency" ) );
+ v4lPropLayout->addWidget( v4lFreqLabel, 1 , 0 );
+
+ v4lFreq = new QSpinBox;
+ v4lFreq->setAlignment( Qt::AlignRight );
+ v4lFreq->setSuffix(" kHz");
+ setSpinBoxFreq( v4lFreq );
+ v4lPropLayout->addWidget( v4lFreq, 1 , 1 );
+ v4lPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
+ 2, 0, 2, 1 );
+
+ /* v4l CONNECTs */
+ CuMRL( v4lVideoDevice, textChanged( QString ) );
+ CuMRL( v4lAudioDevice, textChanged( QString ) );
+ CuMRL( v4lFreq, valueChanged ( int ) );
+ CuMRL( v4lNormBox, currentIndexChanged ( int ) );
+ }
+
/*******
* JACK *
*******/
/* 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 );
BUTTONACT( dvbc, updateButtons() );
}
-#else /*!WIN32 */
-
- /*********************
- * DirectShow Stuffs *
- *********************/
- if( module_Exists( p_intf, "dshow" ) ){
- addModuleAndLayouts( DSHOW_DEVICE, dshow, "DirectShow" );
-
- /* dshow Main */
- int line = 0;
- module_config_t *p_config =
- config_FindConfig( VLC_OBJECT(p_intf), "dshow-vdev" );
- vdevDshowW = new StringListConfigControl(
- VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line );
- line++;
-
- p_config = config_FindConfig( VLC_OBJECT(p_intf), "dshow-adev" );
- adevDshowW = new StringListConfigControl(
- VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line );
- line++;
-
- /* dshow Properties */
- QLabel *dshowVSizeLabel = new QLabel( qtr( "Video size" ) );
- dshowPropLayout->addWidget( dshowVSizeLabel, 0, 0 );
-
- dshowVSizeLine = new QLineEdit;
- dshowPropLayout->addWidget( dshowVSizeLine, 0, 1);
- dshowPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
- 1, 0, 3, 1 );
-
- /* dshow CONNECTs */
- CuMRL( vdevDshowW->combo, currentIndexChanged ( int ) );
- CuMRL( adevDshowW->combo, currentIndexChanged ( int ) );
- CuMRL( dshowVSizeLine, textChanged( QString ) );
- }
-
- /**************
- * BDA Stuffs *
- **************/
- if( module_Exists( p_intf, "bda" ) ){
- addModuleAndLayouts( BDA_DEVICE, bda, "DVB DirectShow" );
-
- /* bda Main */
- QLabel *bdaTypeLabel = new QLabel( qtr( "DVB Type:" ) );
-
- bdas = new QRadioButton( "DVB-S" );
- bdas->setChecked( true );
- bdac = new QRadioButton( "DVB-C" );
- bdat = new QRadioButton( "DVB-T" );
-
- bdaDevLayout->addWidget( bdaTypeLabel, 0, 0 );
- bdaDevLayout->addWidget( bdas, 0, 1 );
- bdaDevLayout->addWidget( bdac, 0, 2 );
- bdaDevLayout->addWidget( bdat, 0, 3 );
-
- /* bda Props */
- QLabel *bdaFreqLabel =
- new QLabel( qtr( "Transponder/multiplex frequency" ) );
- bdaPropLayout->addWidget( bdaFreqLabel, 0, 0 );
-
- bdaFreq = new QSpinBox;
- bdaFreq->setAlignment( Qt::AlignRight );
- bdaFreq->setSuffix(" kHz");
- bdaFreq->setSingleStep( 1000 );
- setSpinBoxFreq( bdaFreq )
- bdaPropLayout->addWidget( bdaFreq, 0, 1 );
-
- bdaSrateLabel = new QLabel( qtr( "Transponder symbol rate" ) );
- bdaPropLayout->addWidget( bdaSrateLabel, 1, 0 );
-
- bdaSrate = new QSpinBox;
- bdaSrate->setAlignment( Qt::AlignRight );
- bdaSrate->setSuffix(" kHz");
- setSpinBoxFreq( bdaSrate );
- bdaPropLayout->addWidget( bdaSrate, 1, 1 );
-
- bdaBandLabel = new QLabel( qtr( "Bandwidth" ) );
- bdaPropLayout->addWidget( bdaBandLabel, 2, 0 );
-
- bdaBandBox = new QComboBox;
- setfillVLCConfigCombo( "dvb-bandwidth", p_intf, bdaBandBox );
- bdaPropLayout->addWidget( bdaBandBox, 2, 1 );
-
- bdaBandLabel->hide();
- bdaBandBox->hide();
- bdaPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
- 2, 0, 2, 1 );
-
- /* bda CONNECTs */
- CuMRL( bdaFreq, valueChanged ( int ) );
- CuMRL( bdaSrate, valueChanged ( int ) );
- CuMRL( bdaBandBox, currentIndexChanged ( int ) );
- BUTTONACT( bdas, updateButtons() );
- BUTTONACT( bdat, updateButtons() );
- BUTTONACT( bdac, updateButtons() );
- BUTTONACT( bdas, updateMRL() );
- BUTTONACT( bdat, updateMRL() );
- BUTTONACT( bdac, updateMRL() );
- }
#endif
screenDevLayout->addWidget( screenLabel, 0, 0 );
/* General connects */
- connect( ui.deviceCombo, SIGNAL( activated( int ) ),
- stackedDevLayout, SLOT( setCurrentIndex( int ) ) );
- connect( ui.deviceCombo, SIGNAL( activated( int ) ),
- stackedPropLayout, SLOT( setCurrentIndex( int ) ) );
+ CONNECT( ui.deviceCombo, activated( int ) ,
+ stackedDevLayout, setCurrentIndex( int ) );
+ CONNECT( ui.deviceCombo, activated( int ),
+ stackedPropLayout, setCurrentIndex( int ) );
CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() );
CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
ui.deviceCombo->currentIndex() ).toInt();
switch( i_devicetype )
{
-#ifndef WIN32
+#ifdef WIN32
+ case BDA_DEVICE:
+ if( bdas->isChecked() ) mrl = "dvb-s://";
+ else if( bdat->isChecked() ) mrl = "dvb-t://";
+ else if( bdac->isChecked() ) mrl = "dvb-c://";
+ else return;
+ mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() );
+ if( bdas->isChecked() || bdac->isChecked() )
+ mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() );
+ else
+ mrl += " :dvb-bandwidth=" +
+ QString("%1").arg( bdaBandBox->itemData(
+ bdaBandBox->currentIndex() ).toInt() );
+ break;
+ case DSHOW_DEVICE:
+ mrl = "dshow://";
+ mrl+= " :dshow-vdev=" + QString("\"%1\"").arg( vdevDshowW->getValue() );
+ mrl+= " :dshow-adev=" + QString("\"%1\"").arg( adevDshowW->getValue() );
+ if( dshowVSizeLine->isModified() )
+ mrl += " :dshow-size=" + dshowVSizeLine->text();
+ break;
+#else
case V4L_DEVICE:
mrl = "v4l://";
mrl += " :v4l-vdev=" + v4lVideoDevice->text();
mrl += " :dvb-frequency=" + QString("%1").arg( dvbFreq->value() );
mrl += " :dvb-srate=" + QString("%1").arg( dvbSrate->value() );
break;
-#else
- case BDA_DEVICE:
- if( bdas->isChecked() ) mrl = "dvb-s://";
- else if( bdat->isChecked() ) mrl = "dvb-t://";
- else if( bdac->isChecked() ) mrl = "dvb-c://";
- else return;
- mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() );
- if( bdas->isChecked() || bdac->isChecked() )
- mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() );
- else
- mrl += " :dvb-bandwidth=" +
- QString("%1").arg( bdaBandBox->itemData(
- bdaBandBox->currentIndex() ).toInt() );
- break;
- case DSHOW_DEVICE:
- mrl = "dshow://";
- mrl += " :dshow-vdev=" + QString("%1").arg( vdevDshowW->getValue() );
- mrl += " :dshow-adev=" + QString("%1").arg( adevDshowW->getValue() );
- if( dshowVSizeLine->isModified() )
- mrl += " :dshow-size=" + dshowVSizeLine->text();
- break;
#endif
case SCREEN_DEVICE:
mrl = "screen://";
/* 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 )
{
-#ifndef WIN32
- case DVB_DEVICE:
- if( dvbs->isChecked() ) dvbFreq->setSuffix(" kHz");
- if( dvbc->isChecked() || dvbt->isChecked() ) dvbFreq->setSuffix(" Hz");
- break;
-#else
+#ifdef WIN32
case BDA_DEVICE:
if( bdas->isChecked() || bdac->isChecked() )
{
bdaBandLabel->show();
}
break;
+#else
+ case DVB_DEVICE:
+ if( dvbs->isChecked() ) dvbFreq->setSuffix(" kHz");
+ if( dvbc->isChecked() || dvbt->isChecked() ) dvbFreq->setSuffix(" Hz");
+ break;
#endif
case SCREEN_DEVICE:
ui.optionsBox->hide();
/* A main Layout with a Frame */
QVBoxLayout *mainLayout = new QVBoxLayout( adv );
- //TODO QScrollArea
QFrame *advFrame = new QFrame;
- mainLayout->addWidget( advFrame );
+ QScrollArea *scroll = new QScrollArea;
+ mainLayout->addWidget( scroll );
/* GridLayout inside the Frame */
QGridLayout *gLayout = new QGridLayout( advFrame );
+ gLayout->setSizeConstraint( QLayout::SetFixedSize );
+
+ scroll->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ scroll->setWidgetResizable( true );
+ scroll->setWidget( advFrame );
/* Create the options inside the FrameLayout */
for( int n = 0; n < i_confsize; n++ )
advButtonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
advButtonBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
- gLayout->addWidget( advButtonBox, i_confsize + 1, 0, 1, -1 );
+ mainLayout->addWidget( advButtonBox );
/* Creation of the MRL */
if( adv->exec() )