/*****************************************************************************
* open.cpp : Panels for the open dialogs
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
* Copyright (C) 2007 Société des arts technologiques
* Copyright (C) 2007 Savoir-faire Linux
*
#include <QDirModel>
#include <QScrollArea>
#include <QUrl>
+#include <QSettings>
/**************************************************************************
* Open Files and subtitles *
dialogBox->setFileMode( QFileDialog::ExistingFiles );
dialogBox->setAcceptMode( QFileDialog::AcceptOpen );
- dialogBox->setViewMode( config_GetInt( p_intf, "qt-open-detail" ) ?
- QFileDialog::Detail : QFileDialog::List );
+#if HAS_QT43
+ QSettings settings( "vlc", "vlc-qt-interface" );
+ dialogBox->restoreState(
+ settings.value( "file-dialog-state" ).toByteArray() );
+#endif
/* We don't want to see a grip in the middle of the window, do we? */
dialogBox->setSizeGripEnabled( false );
FileOpenPanel::~FileOpenPanel()
{
+#if HAS_QT43
+ QSettings settings( "vlc", "vlc-qt-interface" );
+ settings.setValue( "file-dialog-state", dialogBox->saveState() );
+#endif
}
/* Show a fileBrowser to select a subtitle */
void FileOpenBox::accept()
{
- OpenDialog::getInstance( NULL, NULL )->play();
+ OpenDialog::getInstance( NULL, NULL, true )->selectSlots();
}
/* Function called by Open Dialog when clicked on cancel */
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("MMS", QVariant("mms"));
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("RTP", QVariant("rtp"));
+ ui.protocolCombo->addItem("UDP", QVariant("udp"));
ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
updateProtocol( ui.protocolCombo->currentIndex() );
QString addr = ui.addressText->text();
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.timeShift->setEnabled( idx_proto == UDP_PROTO );
ui.portSpin->setEnabled( idx_proto == UDP_PROTO ||
- idx_proto == UDPM_PROTO );
+ idx_proto == RTP_PROTO );
if( idx_proto == NO_PROTO ) return;
/* If we already have a protocol in the address, replace it */
if( addr.contains( "://"))
{
- if( idx_proto != UDPM_PROTO )
+ if( idx_proto != UDP_PROTO && idx_proto != RTP_PROTO )
addr.replace( QRegExp("^.*://@*"), proto + "://");
else
addr.replace( QRegExp("^.*://"), proto + "://@");
ui.protocolCombo->setCurrentIndex(
ui.protocolCombo->findData( addr.section( ':', 0, 0 ) ) );
- if( idx_proto != UDP_PROTO || idx_proto != UDPM_PROTO )
+ if( idx_proto != UDP_PROTO || idx_proto != RTP_PROTO )
mrl = addr;
}
else
emit methodChanged("rtsp-caching");
break;
case UDP_PROTO:
- mrl = "udp://@";
- if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
- {
- mrl += "[::]";
- }
- mrl += QString(":%1").arg( ui.portSpin->value() );
- emit methodChanged("udp-caching");
- break;
- case UDPM_PROTO: /* UDP multicast */
mrl = "udp://@";
/* Add [] to IPv6 */
if ( addr.contains(':') && !addr.contains('[') )
mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching");
break;
+ case RTP_PROTO:
+ mrl = "rtp://@";
+ if ( addr.contains(':') && !addr.contains('[') )
+ mrl += "[" + addr + "]"; /* Add [] to IPv6 */
+ else
+ mrl += addr;
+ mrl += QString(":%1").arg( ui.portSpin->value() );
+ emit methodChanged("rtp-caching");
+ break;
case RTMP_PROTO:
mrl = "rtmp://" + addr;
emit methodChanged("rtmp-caching");
/* New Adv Prop dialog */
adv = new QDialog( this );
- adv->setWindowTitle( qtr( "Advanced options..." ) );
+ adv->setWindowTitle( qtr( "Advanced Options" ) );
/* A main Layout with a Frame */
QVBoxLayout *mainLayout = new QVBoxLayout( adv );
/* Button stuffs */
QDialogButtonBox *advButtonBox = new QDialogButtonBox( adv );
- QPushButton *closeButton = new QPushButton( qtr( "Ok" ) );
+ QPushButton *closeButton = new QPushButton( qtr( "OK" ) );
QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ) );
CONNECT( closeButton, clicked(), adv, accept() );