Commit 66a8a1a8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix some Sout dialog resizing issues.

parent 204edd2d
...@@ -199,10 +199,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, ...@@ -199,10 +199,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
BUTTONACT( okButton, ok() ); BUTTONACT( okButton, ok() );
BUTTONACT( cancelButton, cancel() ); BUTTONACT( cancelButton, cancel() );
if( b_transcode_only ) toggleSout();
CONNECT( ui.UDPOutput, toggled( bool ), this, changeUDPandRTPmess( bool ) ); CONNECT( ui.UDPOutput, toggled( bool ), this, changeUDPandRTPmess( bool ) );
CONNECT( ui.RTPOutput, clicked(bool), this, RTPtoggled( bool ) ); CONNECT( ui.RTPOutput, clicked(bool), this, RTPtoggled( bool ) );
if( b_transcode_only ) toggleSout();
} }
void SoutDialog::fileBrowse() void SoutDialog::fileBrowse()
...@@ -282,7 +282,6 @@ void SoutDialog::setOptions() ...@@ -282,7 +282,6 @@ void SoutDialog::setOptions()
updateMRL(); updateMRL();
} }
//FIXME
void SoutDialog::toggleSout() void SoutDialog::toggleSout()
{ {
//Toggle all the streaming options. //Toggle all the streaming options.
...@@ -291,7 +290,7 @@ void SoutDialog::toggleSout() ...@@ -291,7 +290,7 @@ void SoutDialog::toggleSout()
HIDEORSHOW( ui.HTTPEdit ) ; HIDEORSHOW( ui.RTPEdit ) ; HIDEORSHOW( ui.MMSHEdit ) ; HIDEORSHOW( ui.UDPEdit ) ; HIDEORSHOW( ui.HTTPEdit ) ; HIDEORSHOW( ui.RTPEdit ) ; HIDEORSHOW( ui.MMSHEdit ) ; HIDEORSHOW( ui.UDPEdit ) ;
HIDEORSHOW( ui.HTTPLabel ) ; HIDEORSHOW( ui.RTPLabel ) ; HIDEORSHOW( ui.MMSHLabel ) ; HIDEORSHOW( ui.UDPLabel ) ; HIDEORSHOW( ui.HTTPLabel ) ; HIDEORSHOW( ui.RTPLabel ) ; HIDEORSHOW( ui.MMSHLabel ) ; HIDEORSHOW( ui.UDPLabel ) ;
HIDEORSHOW( ui.HTTPPortLabel ) ; HIDEORSHOW( ui.RTPPortLabel ) ; HIDEORSHOW( ui.MMSHPortLabel ) ; HIDEORSHOW( ui.UDPPortLabel ) HIDEORSHOW( ui.HTTPPortLabel ) ; HIDEORSHOW( ui.RTPPortLabel ) ; HIDEORSHOW( ui.MMSHPortLabel ) ; HIDEORSHOW( ui.UDPPortLabel )
HIDEORSHOW( ui.HTTPPort ) ; HIDEORSHOW( ui.RTPPort ) ; HIDEORSHOW( ui.MMSHPort ) ; HIDEORSHOW( ui.UDPPort ) ; HIDEORSHOW( ui.RTPPortLabel2 ); HIDEORSHOW( ui.RTPPort2 ); HIDEORSHOW( ui.HTTPPort ) ; HIDEORSHOW( ui.RTPPort ) ; HIDEORSHOW( ui.MMSHPort ) ; HIDEORSHOW( ui.UDPPort ) ; HIDEORSHOW( ui.RTPPortLabel2 ); HIDEORSHOW( ui.RTPPort2 ); HIDEORSHOW( ui.UDPRTPLabel )
HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName ); HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName );
HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel ); HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel );
...@@ -307,9 +306,8 @@ void SoutDialog::toggleSout() ...@@ -307,9 +306,8 @@ void SoutDialog::toggleSout()
if( b_transcode_only ) okButton->setText( "&Save" ); if( b_transcode_only ) okButton->setText( "&Save" );
else okButton->setText( "&Stream" ); else okButton->setText( "&Stream" );
/* FIXME: setMinimumHeight( 500 );
* The Save dialog is too big if the Stream dialog has already be shown */ resize( width(), sizeHint().height() );
updateGeometry();
} }
void SoutDialog::changeUDPandRTPmess( bool b_udp ) void SoutDialog::changeUDPandRTPmess( bool b_udp )
......
This diff is collapsed.
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