]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/open.cpp
Removes trailing spaces. Removes tabs.
[vlc] / modules / gui / qt4 / components / open.cpp
index d75bd4f69363936c47ab81f212c486ef45d66cd9..f91ff544706038fdd9e08f54deea4650783eb1a9 100644 (file)
@@ -2,10 +2,13 @@
  * open.cpp : Panels for the open dialogs
  ****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2007 Société des arts technologiques
+ * Copyright (C) 2007 Savoir-faire Linux
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <QDialogButtonBox>
 #include <QLineEdit>
 #include <QStackedLayout>
+#include <QListView>
 
 /**************************************************************************
- * File open
+ * Open Files and subtitles                                               *
  **************************************************************************/
 FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
@@ -59,33 +63,40 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     // Make this QFileDialog a child of tempWidget from the ui.
     dialogBox = new FileOpenBox( ui.tempWidget, NULL,
             qfu( p_intf->p_libvlc->psz_homedir ), fileTypes );
-/*    dialogBox->setFileMode( QFileDialog::ExistingFiles );*/
+
+    dialogBox->setFileMode( QFileDialog::ExistingFiles );
     dialogBox->setAcceptMode( QFileDialog::AcceptOpen );
 
     /* retrieve last known path used in file browsing */
     char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" );
     if( psz_filepath )
     {
-        dialogBox->setDirectory( QString::fromUtf8( psz_filepath ) );
+        dialogBox->setDirectory( qfu( psz_filepath ) );
         delete psz_filepath;
     }
 
     /* We don't want to see a grip in the middle of the window, do we? */
     dialogBox->setSizeGripEnabled( false );
-    dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ));
+
+    /* Add a tooltip */
+    dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ) );
 
     // Add it to the layout
     ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 );
 
     // But hide the two OK/Cancel buttons. Enable them for debug.
     QDialogButtonBox *fileDialogAcceptBox =
-                        findChildren<QDialogButtonBox*>()[0];
+                                        findChildren<QDialogButtonBox*>()[0];
     fileDialogAcceptBox->hide();
 
     /* Ugly hacks to get the good Widget */
     //This lineEdit is the normal line in the fileDialog.
+#if QT43
+    lineFileEdit = findChildren<QLineEdit*>()[2];
+#else
     lineFileEdit = findChildren<QLineEdit*>()[3];
-    lineFileEdit->hide();
+#endif
+//    lineFileEdit->hide();
 
     /* Make a list of QLabel inside the QFileDialog to access the good ones */
     QList<QLabel *> listLabel = findChildren<QLabel*>();
@@ -95,51 +106,45 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     /* Change the text that was uncool in the usual box */
     listLabel[5]->setText( qtr( "Filter:" ) );
 
+
+    QListView *fileListView = findChildren<QListView*>().first();
+#if WIN32
+    /* QFileDialog is quite buggy make it brerable on win32 by tweaking
+       the followin */
+    fileListView->setLayoutMode(QListView::Batched);
+    fileListView->setViewMode(QListView::ListMode);
+    fileListView->setResizeMode(QListView::Adjust);
+    fileListView->setUniformItemSizes(false);
+    fileListView->setFlow(QListView::TopToBottom);
+    fileListView->setWrapping(true);
+#endif
+
     // Hide the subtitles control by default.
     ui.subFrame->hide();
 
     /* Build the subs size combo box */
-    module_config_t *p_item =
-        config_FindConfig( VLC_OBJECT(p_intf), "freetype-rel-fontsize" );
-    if( p_item )
-    {
-        for( int i_index = 0; i_index < p_item->i_list; i_index++ )
-        {
-            ui.sizeSubComboBox->addItem(
-                qfu( p_item->ppsz_list_text[i_index] ),
-                QVariant( p_item->pi_list[i_index] ) );
-            if( p_item->value.i == p_item->pi_list[i_index] )
-            {
-                ui.sizeSubComboBox->setCurrentIndex( i_index );
-            }
-        }
-    }
+    setfillVLCConfigCombo( "freetype-rel-fontsize" , p_intf,
+                            ui.sizeSubComboBox );
 
     /* Build the subs align combo box */
-    p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" );
-    if( p_item )
-    {
-        for( int i_index = 0; i_index < p_item->i_list; i_index++ )
-        {
-            ui.alignSubComboBox->addItem(
-                qfu( p_item->ppsz_list_text[i_index] ),
-                QVariant( p_item->pi_list[i_index] ) );
-            if( p_item->value.i == p_item->pi_list[i_index] )
-            {
-                ui.alignSubComboBox->setCurrentIndex( i_index );
-            }
-        }
-    }
+    setfillVLCConfigCombo( "subsdec-align", p_intf, ui.alignSubComboBox );
 
     /* Connects  */
     BUTTONACT( ui.subBrowseButton, browseFileSub() );
     BUTTONACT( ui.subCheckBox, toggleSubtitleFrame());
 
-    CONNECT( ui.fileInput, editTextChanged( QString ), this, updateMRL());
-    CONNECT( ui.subInput, editTextChanged( QString ), this, updateMRL());
-    CONNECT( ui.alignSubComboBox, currentIndexChanged( int ), this, updateMRL());
-    CONNECT( ui.sizeSubComboBox, currentIndexChanged( int ), this, updateMRL());
-    CONNECT( lineFileEdit, textChanged( QString ), this, browseFile());
+#if QT43
+    CONNECT( fileListView, clicked( QModelIndex ), this, updateMRL() );
+#else
+    CONNECT( ui.fileInput, editTextChanged( QString ), this, updateMRL() );
+#endif
+    CONNECT( ui.subInput, editTextChanged( QString ), this, updateMRL() );
+    CONNECT( ui.alignSubComboBox, currentIndexChanged( int ), this,
+                                                            updateMRL() );
+    CONNECT( ui.sizeSubComboBox, currentIndexChanged( int ), this,
+                                                            updateMRL() );
+
+    CONNECT( lineFileEdit, textChanged( QString ), this, browseFile() );
 }
 
 FileOpenPanel::~FileOpenPanel()
@@ -150,7 +155,6 @@ QStringList FileOpenPanel::browse( QString help )
     return THEDP->showSimpleOpen( help );
 }
 
-/* Unused. FIXME ? */
 void FileOpenPanel::browseFile()
 {
     QString fileString = "";
@@ -174,6 +178,7 @@ void FileOpenPanel::browseFileSub()
 
 void FileOpenPanel::updateMRL()
 {
+    msg_Dbg( p_intf, "I was here" );
     QString mrl = ui.fileInput->currentText();
 
     if( ui.subCheckBox->isChecked() ) {
@@ -188,11 +193,11 @@ void FileOpenPanel::updateMRL()
 
     const char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" );
     if( ( NULL == psz_filepath )
-      || strcmp( psz_filepath,dialogBox->directory().absolutePath().toUtf8()) )
+      || strcmp( psz_filepath, qtu( dialogBox->directory().absolutePath() )) )
     {
         /* set dialog box current directory as last known path */
         config_PutPsz( p_intf, "qt-filedialog-path",
-                       dialogBox->directory().absolutePath().toUtf8() );
+                       qtu( dialogBox->directory().absolutePath() ) );
     }
     delete psz_filepath;
 
@@ -238,13 +243,16 @@ void FileOpenPanel::toggleSubtitleFrame()
 }
 
 /**************************************************************************
- * Disk open
+ * Open Discs ( DVD, CD, VCD and similar devices )                        *
  **************************************************************************/
 DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
 {
     ui.setupUi( this );
 
+    /*Win 32 Probe  as in WX ? */
+
+    /* CONNECTs */
     BUTTONACT( ui.dvdRadioButton, updateButtons());
     BUTTONACT( ui.vcdRadioButton, updateButtons());
     BUTTONACT( ui.audioCDRadioButton, updateButtons());
@@ -297,6 +305,8 @@ void DiscOpenPanel::updateButtons()
 void DiscOpenPanel::updateMRL()
 {
     QString mrl = "";
+
+    /* CDDAX and VCDX not implemented. FIXME ? */
     /* DVD */
     if( ui.dvdRadioButton->isChecked() ) {
         if( !ui.dvdsimple->isChecked() )
@@ -341,20 +351,19 @@ void DiscOpenPanel::updateMRL()
                 QString("%1").arg( ui.subtitlesSpin->value() );
         }
     }
-
     emit mrlUpdated( mrl );
 }
 
 
-
 /**************************************************************************
- * Net open
+ * Open Network streams and URL pages                                     *
  **************************************************************************/
 NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
 {
     ui.setupUi( this );
 
+    /* CONNECTs */
     CONNECT( ui.protocolCombo, currentIndexChanged( int ),
              this, updateProtocol( int ) );
     CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
@@ -381,10 +390,10 @@ void NetOpenPanel::updateProtocol( int idx ) {
     QString addr = ui.addressText->text();
     QString proto = ui.protocolCombo->itemData( idx ).toString();
 
-    ui.timeShift->setEnabled( idx >= 4 );
-    ui.ipv6->setEnabled( idx == 4 );
-    ui.addressText->setEnabled( idx != 4 );
-    ui.portSpin->setEnabled( idx >= 4 );
+    ui.timeShift->setEnabled( idx >= 5 );
+    ui.ipv6->setEnabled( idx == 5 );
+    ui.addressText->setEnabled( idx != 5 );
+    ui.portSpin->setEnabled( idx >= 5 );
 
     /* If we already have a protocol in the address, replace it */
     if( addr.contains( "://")) {
@@ -392,7 +401,6 @@ void NetOpenPanel::updateProtocol( int idx ) {
         addr.replace( QRegExp("^.*://"), proto + "://");
         ui.addressText->setText( addr );
     }
-
     updateMRL();
 }
 
@@ -405,13 +413,14 @@ void NetOpenPanel::updateMRL() {
     QString addr = ui.addressText->text();
     int proto = ui.protocolCombo->currentIndex();
 
-    if( addr.contains( "://") && proto != 4 ) {
+    if( addr.contains( "://") && proto != 5 ) {
         mrl = addr;
     } else {
         switch( proto ) {
         case 0:
-        case 1:
             mrl = "http://" + addr;
+        case 1:
+            mrl = "https://" + addr;
             emit methodChanged("http-caching");
             break;
         case 3:
@@ -451,64 +460,67 @@ void NetOpenPanel::updateMRL() {
 }
 
 /**************************************************************************
- * Capture open
+ * Open Capture device ( DVB, PVR, V4L, and similar )                     *
  **************************************************************************/
 CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
                                 OpenPanel( _parent, _p_intf )
 {
     ui.setupUi( this );
 
+    /* Create two stacked layouts in the main comboBoxes */
     QStackedLayout *stackedDevLayout = new QStackedLayout;
     ui.cardBox->setLayout( stackedDevLayout );
 
     QStackedLayout *stackedPropLayout = new QStackedLayout;
     ui.optionsBox->setLayout( stackedPropLayout );
 
+    /* Creation and connections of the WIdgets in the stacked layout */
 #define addModuleAndLayouts( number, name, label )                    \
     QWidget * name ## DevPage = new QWidget( this );                  \
     QWidget * name ## PropPage = new QWidget( this );                 \
-    stackedDevLayout->insertWidget( number, name ## DevPage );        \
-    stackedPropLayout->insertWidget( number, name ## PropPage );      \
+    stackedDevLayout->addWidget( name ## DevPage );        \
+    stackedPropLayout->addWidget( name ## PropPage );      \
     QGridLayout * name ## DevLayout = new QGridLayout;                \
     QGridLayout * name ## PropLayout = new QGridLayout;               \
     name ## DevPage->setLayout( name ## DevLayout );                  \
     name ## PropPage->setLayout( name ## PropLayout );                \
-    ui.deviceCombo->insertItem( number, qtr( label ) );
+    ui.deviceCombo->addItem( qtr( label ), QVariant( number ) );
 
 #define CuMRL( widget, slot ) CONNECT( widget , slot , this, updateMRL() );
 
     /*******
      * V4L *
      *******/
-    /* V4l Main */
     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 */
-    v4lNormBox = new QComboBox;
-    v4lNormBox->insertItem( 3, qtr( "Automatic" ) );
-    v4lNormBox->insertItem( 0, "SECAM" );
-    v4lNormBox->insertItem( 1, "NTSC" );
-    v4lNormBox->insertItem( 2, "PAL" );
-
-    v4lFreq = new QSpinBox;
-    v4lFreq->setAlignment( Qt::AlignRight );
-    v4lFreq->setSuffix(" kHz");
-
+    /* V4l Props panel */
     QLabel *v4lNormLabel = new QLabel( qtr( "Norm" ) );
-    QLabel *v4lFreqLabel = new QLabel( qtr( "Frequency" ) );
-
     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 );
 
     /* v4l CONNECTs */
@@ -517,45 +529,100 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CuMRL( v4lFreq, valueChanged ( int ) );
     CuMRL( v4lNormBox,  currentIndexChanged ( int ) );
 
+    /*******
+     * JACK *
+     *******/
+    addModuleAndLayouts( JACK_DEVICE, jack, "JACK Audio Connection Kit" );
+
+    /* Jack Main panel */
+    /* Channels */
+    QLabel *jackChannelsLabel = new QLabel( qtr( "Channels :" ) );
+    jackDevLayout->addWidget( jackChannelsLabel, 1, 0 );
+
+    jackChannels = new QSpinBox;
+    setSpinBoxFreq( jackChannels );
+    jackChannels->setMaximum(255);
+    jackChannels->setValue(2);
+    jackChannels->setAlignment( Qt::AlignRight );
+    jackDevLayout->addWidget( jackChannels, 1, 1 );
+
+    /* Jack Props panel */
+    /* Selected ports */
+    QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports :" ) );
+    jackPropLayout->addWidget( jackPortsLabel, 0 , 0 );
+
+    jackPortsSelected = new QLineEdit( qtr( ".*") );
+    jackPortsSelected->setAlignment( Qt::AlignRight );
+    jackPropLayout->addWidget( jackPortsSelected, 0, 1 );
+    /* Caching */
+    QLabel *jackCachingLabel = new QLabel( qtr( "Input caching :" ) );
+    jackPropLayout->addWidget( jackCachingLabel, 1 , 0 );
+    jackCaching = new QSpinBox;
+    setSpinBoxFreq( jackCaching );
+    jackCaching->setSuffix( " ms" );
+    jackCaching->setValue(1000);
+    jackCaching->setAlignment( Qt::AlignRight );
+    jackPropLayout->addWidget( jackCaching, 1 , 1 );
+    /* Pace */
+    jackPace = new QCheckBox(qtr( "Use VLC pace" ));
+    jackPropLayout->addWidget( jackPace, 2, 1 );
+    /* Auto Connect */
+    jackConnect = new QCheckBox( qtr( "Auto connnection" ));
+    jackPropLayout->addWidget( jackConnect, 3, 1 );
+    /* Jack CONNECTs */
+    CuMRL( jackChannels, valueChanged( int ) );
+    CuMRL( jackCaching, valueChanged( int ) );
+    CuMRL( jackPace, stateChanged( int ) );
+    CuMRL( jackConnect, stateChanged( int ) );
+    CuMRL( jackPortsSelected, textChanged( QString ) );
+
     /************
      * PVR      *
      ************/
     addModuleAndLayouts( PVR_DEVICE, pvr, "PVR" );
 
-    /* PVR Main */
+    /* PVR Main panel */
     QLabel *pvrDeviceLabel = new QLabel( qtr( "Device name" ) );
     pvrDevLayout->addWidget( pvrDeviceLabel, 0, 0 );
+
     pvrDevice = new QLineEdit;
     pvrDevLayout->addWidget( pvrDevice, 0, 1 );
+
     QLabel *pvrRadioDeviceLabel = new QLabel( qtr( "Radio device name" ) );
     pvrDevLayout->addWidget( pvrRadioDeviceLabel, 1, 0 );
+
     pvrRadioDevice = new QLineEdit;
     pvrDevLayout->addWidget( pvrRadioDevice, 1, 1 );
 
-    /* PVR props */
-    pvrNormBox = new QComboBox;
-    pvrNormBox->insertItem( 3, qtr( "Automatic" ) );
-    pvrNormBox->insertItem( 0, "SECAM" );
-    pvrNormBox->insertItem( 1, "NTSC" );
-    pvrNormBox->insertItem( 2, "PAL" );
-
-    pvrFreq = new QSpinBox;
-    pvrFreq->setAlignment( Qt::AlignRight );
-    pvrFreq->setSuffix(" kHz");
-    pvrBitr = new QSpinBox;
-    pvrBitr->setAlignment( Qt::AlignRight );
-    pvrBitr->setSuffix(" kHz");
+    /* PVR props panel */
     QLabel *pvrNormLabel = new QLabel( qtr( "Norm" ) );
-    QLabel *pvrFreqLabel = new QLabel( qtr( "Frequency" ) );
-    QLabel *pvrBitrLabel = new QLabel( qtr( "Bitrate" ) );
-
     pvrPropLayout->addWidget( pvrNormLabel, 0, 0 );
+
+    pvrNormBox = new QComboBox;
+    setfillVLCConfigCombo( "pvr-norm", p_intf, pvrNormBox );
     pvrPropLayout->addWidget( pvrNormBox, 0, 1 );
 
+    QLabel *pvrFreqLabel = new QLabel( qtr( "Frequency" ) );
     pvrPropLayout->addWidget( pvrFreqLabel, 1, 0 );
+
+    pvrFreq = new QSpinBox;
+    pvrFreq->setAlignment( Qt::AlignRight );
+    pvrFreq->setSuffix(" kHz");
+    setSpinBoxFreq( pvrFreq );
     pvrPropLayout->addWidget( pvrFreq, 1, 1 );
 
+    QLabel *pvrBitrLabel = new QLabel( qtr( "Bitrate" ) );
     pvrPropLayout->addWidget( pvrBitrLabel, 2, 0 );
+
+    pvrBitr = new QSpinBox;
+    pvrBitr->setAlignment( Qt::AlignRight );
+    pvrBitr->setSuffix(" kHz");
+    setSpinBoxFreq( pvrBitr );
     pvrPropLayout->addWidget( pvrBitr, 2, 1 );
 
     /* PVR CONNECTs */
@@ -571,11 +638,104 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
      *********************/
     addModuleAndLayouts( DSHOW_DEVICE, dshow, "DirectShow" );
 
+    /* dshow Main */
+
+    QLabel *dshowVDeviceLabel = new QLabel( qtr( "Video Device Name " ) );
+    dshowDevLayout->addWidget( dshowVDeviceLabel, 0, 0 );
+
+    QLabel *dshowADeviceLabel = new QLabel( qtr( "Audio Device Name " ) );
+    dshowDevLayout->addWidget( dshowADeviceLabel, 1, 0 );
+
+    QComboBox *dshowVDevice = new QComboBox;
+    dshowDevLayout->addWidget( dshowVDevice, 0, 1 );
+
+    QComboBox *dshowADevice = new QComboBox;
+    dshowDevLayout->addWidget( dshowADevice, 1, 1 );
+
+    QPushButton *dshowVRefresh = new QPushButton( qtr( "Update List" ) );
+    dshowDevLayout->addWidget( dshowVRefresh, 0, 2 );
+
+    QPushButton *dshowARefresh = new QPushButton( qtr( "Update List" ) );
+    dshowDevLayout->addWidget( dshowARefresh, 1, 2 );
+
+    QPushButton *dshowVConfig = new QPushButton( qtr( "Configure" ) );
+    dshowDevLayout->addWidget( dshowVConfig, 0, 3 );
+
+    QPushButton *dshowAConfig = new QPushButton( qtr( "Configure" ) );
+    dshowDevLayout->addWidget( dshowAConfig, 1, 3 );
+
+    /* dshow Properties */
+
+    QLabel *dshowVSizeLabel = new QLabel( qtr( "Video size" ) );
+    dshowPropLayout->addWidget( dshowVSizeLabel, 0, 0 );
+
+    QLineEdit *dshowVSizeLine = new QLineEdit;
+    dshowPropLayout->addWidget( dshowVSizeLine, 0, 1);
+
+    /* dshow CONNECTs */
+    CuMRL( dshowVDevice, currentIndexChanged ( int ) );
+    CuMRL( dshowADevice, currentIndexChanged ( int ) );
+    CuMRL( dshowVSizeLine, textChanged( QString ) );
 
     /**************
      * BDA Stuffs *
      **************/
-    addModuleAndLayouts( BDA_DEVICE, bda, "DVB / 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();
+
+    /* 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() );
 
     /**************
      * DVB Stuffs *
@@ -584,7 +744,7 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* DVB Main */
     QLabel *dvbDeviceLabel = new QLabel( qtr( "Adapter card to tune" ) );
-    QLabel *dvbTyepLabel = new QLabel( qtr( "DVB Type:" ) );
+    QLabel *dvbTypeLabel = new QLabel( qtr( "DVB Type:" ) );
 
     dvbCard = new QSpinBox;
     dvbCard->setAlignment( Qt::AlignRight );
@@ -598,41 +758,56 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     dvbc = new QRadioButton( "DVB-C" );
     dvbt = new QRadioButton( "DVB-T" );
 
-    dvbDevLayout->addWidget( dvbTyepLabel, 1, 0 );
+    dvbDevLayout->addWidget( dvbTypeLabel, 1, 0 );
     dvbDevLayout->addWidget( dvbs, 1, 1 );
     dvbDevLayout->addWidget( dvbc, 1, 2 );
     dvbDevLayout->addWidget( dvbt, 1, 3 );
 
-    /* DVB Props */
+    /* DVB Props panel */
     QLabel *dvbFreqLabel =
                     new QLabel( qtr( "Transponder/multiplex frequency" ) );
+    dvbPropLayout->addWidget( dvbFreqLabel, 0, 0 );
+
     dvbFreq = new QSpinBox;
     dvbFreq->setAlignment( Qt::AlignRight );
     dvbFreq->setSuffix(" kHz");
-    dvbPropLayout->addWidget( dvbFreqLabel, 0, 0 );
+    setSpinBoxFreq( dvbFreq  );
     dvbPropLayout->addWidget( dvbFreq, 0, 1 );
 
     QLabel *dvbSrateLabel = new QLabel( qtr( "Transponder symbol rate" ) );
+    dvbPropLayout->addWidget( dvbSrateLabel, 1, 0 );
+
     dvbSrate = new QSpinBox;
     dvbSrate->setAlignment( Qt::AlignRight );
     dvbSrate->setSuffix(" kHz");
-    dvbPropLayout->addWidget( dvbSrateLabel, 1, 0 );
+    setSpinBoxFreq( dvbSrate );
     dvbPropLayout->addWidget( dvbSrate, 1, 1 );
 
     /* DVB CONNECTs */
     CuMRL( dvbCard, valueChanged ( int ) );
     CuMRL( dvbFreq, valueChanged ( int ) );
     CuMRL( dvbSrate, valueChanged ( int ) );
+
     BUTTONACT( dvbs, updateButtons() );
     BUTTONACT( dvbt, updateButtons() );
     BUTTONACT( dvbc, updateButtons() );
 
+    /**********
+     * Screen *
+     **********/
+    addModuleAndLayouts( SCREEN_DEVICE, screen, "Desktop" );
+    QLabel *screenLabel = new QLabel( "This option will open your own "
+            "desktop in order to save or stream it.");
+    screenLabel->setWordWrap( true );
+    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 ), this, updateMRL() );
+    CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
 
 #undef addModule
 }
@@ -646,7 +821,8 @@ void CaptureOpenPanel::clear()
 void CaptureOpenPanel::updateMRL()
 {
     QString mrl = "";
-    int i_devicetype = ui.deviceCombo->currentIndex();
+    int i_devicetype = ui.deviceCombo->itemData(
+            ui.deviceCombo->currentIndex() ).toInt();
     switch( i_devicetype )
     {
     case V4L_DEVICE:
@@ -656,6 +832,20 @@ void CaptureOpenPanel::updateMRL()
         mrl += " :v4l-norm=" + QString("%1").arg( v4lNormBox->currentIndex() );
         mrl += " :v4l-frequency=" + QString("%1").arg( v4lFreq->value() );
         break;
+    case JACK_DEVICE:
+        mrl = "jack://";
+        mrl += "channels=" + QString("%1").arg( jackChannels->value() );
+        mrl += ":ports=" + jackPortsSelected->text();
+        mrl += " --jack-input-caching=" + QString("%1").arg( jackCaching->value() );
+        if ( jackPace->isChecked() )
+        {
+                mrl += " --jack-input-use-vlc-pace";
+        }
+        if ( jackConnect->isChecked() )
+        {
+                mrl += " --jack-input-auto-connect";
+        }
+        break;
     case PVR_DEVICE:
         mrl = "pvr://";
         mrl += " :pvr-device=" + pvrDevice->text();
@@ -673,16 +863,67 @@ void CaptureOpenPanel::updateMRL()
         mrl += " :dvb-srate=" + QString("%1").arg( dvbSrate->value() );
         break;
     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:
         break;
+    case SCREEN_DEVICE:
+        mrl = "screen://";
+        updateButtons();
+        break;
     }
-
     emit mrlUpdated( mrl );
 }
 
+/**
+ * Update the Buttons (show/hide) for the GUI as all device type don't
+ * use the same ui. elements.
+ **/
 void CaptureOpenPanel::updateButtons()
 {
-    if( dvbs->isChecked() ) dvbFreq->setSuffix(" kHz");
-    if( dvbc->isChecked() || dvbt->isChecked() ) dvbFreq->setSuffix(" Hz");
+    /*  Be sure to display the ui Elements in case they were hidden by
+     *  some Device Type (like Screen://) */
+    ui.optionsBox->show();
+    ui.advancedButton->show();
+    /* 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 )
+    {
+    case DVB_DEVICE:
+        if( dvbs->isChecked() ) dvbFreq->setSuffix(" kHz");
+        if( dvbc->isChecked() || dvbt->isChecked() ) dvbFreq->setSuffix(" Hz");
+        break;
+    case BDA_DEVICE:
+        if( bdas->isChecked() || bdac->isChecked() )
+        {
+            bdaSrate->show();
+            bdaSrateLabel->show();
+            bdaBandBox->hide();
+            bdaBandLabel->hide();
+        }
+        else
+        {
+            bdaSrate->hide();
+            bdaSrateLabel->hide();
+            bdaBandBox->show();
+            bdaBandLabel->show();
+        }
+        break;
+    case SCREEN_DEVICE:
+        ui.optionsBox->hide();
+        ui.advancedButton->hide();
+        break;
+    }
 }