Commit 16bf241c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix network panel behaviour (comboBox and adress generation especially )

parent d79d5b33
...@@ -410,13 +410,14 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -410,13 +410,14 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
ui.setupUi( this ); ui.setupUi( this );
/* CONNECTs */ /* CONNECTs */
CONNECT( ui.protocolCombo, currentIndexChanged( int ), CONNECT( ui.protocolCombo, activated( int ),
this, updateProtocol( int ) ); this, updateProtocol( int ) );
CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() ); CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
CONNECT( ui.addressText, textChanged( QString ), this, updateMRL()); CONNECT( ui.addressText, textChanged( QString ), this, updateMRL());
CONNECT( ui.timeShift, clicked(), this, updateMRL()); CONNECT( ui.timeShift, clicked(), this, updateMRL());
CONNECT( ui.ipv6, clicked(), this, updateMRL()); CONNECT( ui.ipv6, clicked(), this, updateMRL());
ui.protocolCombo->addItem( "" );
ui.protocolCombo->addItem("HTTP", QVariant("http")); ui.protocolCombo->addItem("HTTP", QVariant("http"));
ui.protocolCombo->addItem("HTTPS", QVariant("https")); ui.protocolCombo->addItem("HTTPS", QVariant("https"));
ui.protocolCombo->addItem("FTP", QVariant("ftp")); ui.protocolCombo->addItem("FTP", QVariant("ftp"));
...@@ -433,19 +434,24 @@ void NetOpenPanel::clear() ...@@ -433,19 +434,24 @@ void NetOpenPanel::clear()
{} {}
/* update the widgets according the type of protocol */ /* 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 addr = ui.addressText->text();
QString proto = ui.protocolCombo->itemData( idx ).toString(); QString proto = ui.protocolCombo->itemData( idx_proto ).toString();
ui.timeShift->setEnabled( idx >= 5 ); ui.timeShift->setEnabled( idx_proto >= UDP_PROTO );
ui.ipv6->setEnabled( idx == 5 ); ui.ipv6->setEnabled( idx_proto == UDP_PROTO );
ui.addressText->setEnabled( idx != 5 ); ui.addressText->setEnabled( idx_proto != UDP_PROTO );
ui.portSpin->setEnabled( idx >= 5 ); ui.portSpin->setEnabled( idx_proto >= UDP_PROTO );
if( idx_proto == NO_PROTO ) return;
/* If we already have a protocol in the address, replace it */ /* If we already have a protocol in the address, replace it */
if( addr.contains( "://")) { if( addr.contains( "://"))
msg_Err( p_intf, "replace"); {
addr.replace( QRegExp("^.*://"), proto + "://"); if( idx_proto != UDPM_PROTO )
addr.replace( QRegExp("^.*://@*"), proto + "://");
else
addr.replace( QRegExp("^.*://"), proto + "://@");
ui.addressText->setText( addr ); ui.addressText->setText( addr );
} }
updateMRL(); updateMRL();
...@@ -455,36 +461,41 @@ void NetOpenPanel::updateMRL() { ...@@ -455,36 +461,41 @@ void NetOpenPanel::updateMRL() {
QString mrl = ""; QString mrl = "";
QString addr = ui.addressText->text(); QString addr = ui.addressText->text();
addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" ); addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" );
int proto = ui.protocolCombo->currentIndex(); int idx_proto = ui.protocolCombo->currentIndex();
if( addr.contains( "://") && ( proto != 5 || proto != 6 ) ) if( addr.contains( "://"))
{ {
mrl = addr; /* 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 else
{ {
switch( proto ) { switch( idx_proto ) {
case 0: case HTTP_PROTO:
mrl = "http://" + addr; mrl = "http://" + addr;
emit methodChanged("http-caching"); emit methodChanged("http-caching");
break; break;
case 1: case HTTPS_PROTO:
mrl = "https://" + addr; mrl = "https://" + addr;
emit methodChanged("http-caching"); emit methodChanged("http-caching");
break; break;
case 3: case MMS_PROTO:
mrl = "mms://" + addr; mrl = "mms://" + addr;
emit methodChanged("mms-caching"); emit methodChanged("mms-caching");
break; break;
case 2: case FTP_PROTO:
mrl = "ftp://" + addr; mrl = "ftp://" + addr;
emit methodChanged("ftp-caching"); emit methodChanged("ftp-caching");
break; break;
case 4: /* RTSP */ case RTSP_PROTO:
mrl = "rtsp://" + addr; mrl = "rtsp://" + addr;
emit methodChanged("rtsp-caching"); emit methodChanged("rtsp-caching");
break; break;
case 5: case UDP_PROTO:
mrl = "udp://@"; mrl = "udp://@";
if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() ) if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
{ {
...@@ -493,7 +504,7 @@ void NetOpenPanel::updateMRL() { ...@@ -493,7 +504,7 @@ void NetOpenPanel::updateMRL() {
mrl += QString(":%1").arg( ui.portSpin->value() ); mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching"); emit methodChanged("udp-caching");
break; break;
case 6: /* UDP multicast */ case UDPM_PROTO: /* UDP multicast */
mrl = "udp://@"; mrl = "udp://@";
/* Add [] to IPv6 */ /* Add [] to IPv6 */
if ( addr.contains(':') && !addr.contains('[') ) if ( addr.contains(':') && !addr.contains('[') )
......
...@@ -48,6 +48,19 @@ ...@@ -48,6 +48,19 @@
#define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \ #define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
spinbox->setAccelerated( true ); } spinbox->setAccelerated( true ); }
enum
{
NO_PROTO,
HTTP_PROTO,
HTTPS_PROTO,
MMS_PROTO,
FTP_PROTO,
RTSP_PROTO,
UDP_PROTO,
UDPM_PROTO
};
enum enum
{ {
V4L_DEVICE, V4L_DEVICE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment