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

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 )
......
...@@ -6,42 +6,30 @@ ...@@ -6,42 +6,30 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>726</width> <width>644</width>
<height>823</height> <height>784</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>_("Stream Output")</string> <string>_("Stream Output")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" > <property name="title" >
<string>_("Outputs")</string> <string>_("Outputs")</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" colspan="3" >
<widget class="QCheckBox" name="localOutput" > <widget class="QCheckBox" name="localOutput" >
<property name="text" > <property name="text" >
<string>_("Play locally")</string> <string>_("Play locally")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" colspan="3" >
<widget class="QCheckBox" name="fileOutput" > <widget class="QCheckBox" name="fileOutput" >
<property name="contextMenuPolicy" > <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
...@@ -51,7 +39,7 @@ ...@@ -51,7 +39,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="3" >
<widget class="QLabel" name="fileLabel" > <widget class="QLabel" name="fileLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -61,24 +49,30 @@ ...@@ -61,24 +49,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" > <item row="1" column="4" >
<widget class="QLineEdit" name="fileEdit" > <widget class="QLineEdit" name="fileEdit" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3" > <item row="1" column="5" >
<widget class="QPushButton" name="fileSelectButton" > <widget class="QPushButton" name="fileSelectButton" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" > <property name="text" >
<string>_("Browse...")</string> <string>_("Browse...")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4" > <item row="1" column="6" >
<widget class="QCheckBox" name="rawInput" > <widget class="QCheckBox" name="rawInput" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -88,14 +82,14 @@ ...@@ -88,14 +82,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0" colspan="3" >
<widget class="QCheckBox" name="HTTPOutput" > <widget class="QCheckBox" name="HTTPOutput" >
<property name="text" > <property name="text" >
<string>HTTP</string> <string>HTTP</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="3" >
<widget class="QLabel" name="HTTPLabel" > <widget class="QLabel" name="HTTPLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -105,14 +99,14 @@ ...@@ -105,14 +99,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2" > <item row="2" column="4" >
<widget class="QLineEdit" name="HTTPEdit" > <widget class="QLineEdit" name="HTTPEdit" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3" > <item row="2" column="5" >
<widget class="QLabel" name="HTTPPortLabel" > <widget class="QLabel" name="HTTPPortLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -125,7 +119,7 @@ ...@@ -125,7 +119,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="4" > <item row="2" column="6" >
<widget class="QSpinBox" name="HTTPPort" > <widget class="QSpinBox" name="HTTPPort" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -153,14 +147,14 @@ ...@@ -153,14 +147,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0" colspan="3" >
<widget class="QCheckBox" name="MMSHOutput" > <widget class="QCheckBox" name="MMSHOutput" >
<property name="text" > <property name="text" >
<string>MMSH</string> <string>MMSH</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="3" >
<widget class="QLabel" name="MMSHLabel" > <widget class="QLabel" name="MMSHLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -170,14 +164,14 @@ ...@@ -170,14 +164,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" > <item row="3" column="4" >
<widget class="QLineEdit" name="MMSHEdit" > <widget class="QLineEdit" name="MMSHEdit" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3" > <item row="3" column="5" >
<widget class="QLabel" name="MMSHPortLabel" > <widget class="QLabel" name="MMSHPortLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -190,7 +184,7 @@ ...@@ -190,7 +184,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="4" > <item row="3" column="6" >
<widget class="QSpinBox" name="MMSHPort" > <widget class="QSpinBox" name="MMSHPort" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -215,14 +209,14 @@ ...@@ -215,14 +209,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="4" column="0" colspan="3" >
<widget class="QCheckBox" name="RTPOutput" > <widget class="QCheckBox" name="RTPOutput" >
<property name="text" > <property name="text" >
<string>RTP</string> <string>RTP</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" > <item row="4" column="3" >
<widget class="QLabel" name="RTPLabel" > <widget class="QLabel" name="RTPLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -232,14 +226,14 @@ ...@@ -232,14 +226,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" > <item row="4" column="4" >
<widget class="QLineEdit" name="RTPEdit" > <widget class="QLineEdit" name="RTPEdit" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3" > <item row="4" column="5" >
<widget class="QLabel" name="RTPPortLabel" > <widget class="QLabel" name="RTPPortLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -252,7 +246,7 @@ ...@@ -252,7 +246,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="4" > <item row="4" column="6" >
<widget class="QSpinBox" name="RTPPort" > <widget class="QSpinBox" name="RTPPort" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -277,20 +271,7 @@ ...@@ -277,20 +271,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="5" column="3" >
<widget class="QCheckBox" name="UDPOutput" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="toolTip" >
<string>_("Using this option is not recommended in most of the cases.")</string>
</property>
<property name="text" >
<string>_("Prefer UDP over RTP")</string>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QLabel" name="UDPLabel" > <widget class="QLabel" name="UDPLabel" >
<property name="enabled" > <property name="enabled" >
<bool>true</bool> <bool>true</bool>
...@@ -300,14 +281,14 @@ ...@@ -300,14 +281,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2" > <item row="5" column="4" >
<widget class="QLineEdit" name="UDPEdit" > <widget class="QLineEdit" name="UDPEdit" >
<property name="enabled" > <property name="enabled" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="3" > <item row="5" column="5" >
<widget class="QLabel" name="UDPPortLabel" > <widget class="QLabel" name="UDPPortLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -320,7 +301,7 @@ ...@@ -320,7 +301,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="4" > <item row="5" column="6" >
<widget class="QSpinBox" name="UDPPort" > <widget class="QSpinBox" name="UDPPort" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -348,14 +329,52 @@ ...@@ -348,14 +329,52 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" > <item row="6" column="5" >
<widget class="QLabel" name="RTPPortLabel2" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>_("Video Port")</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="6" >
<widget class="QSpinBox" name="RTPPort2" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="maximumSize" >
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="accelerated" >
<bool>true</bool>
</property>
<property name="maximum" >
<number>65355</number>
</property>
<property name="value" >
<number>1234</number>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3" >
<widget class="QCheckBox" name="IcecastOutput" > <widget class="QCheckBox" name="IcecastOutput" >
<property name="text" > <property name="text" >
<string>IceCast</string> <string>IceCast</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1" > <item row="7" column="3" >
<widget class="QLabel" name="IcecastLabel" > <widget class="QLabel" name="IcecastLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -365,10 +384,10 @@ ...@@ -365,10 +384,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" > <item row="7" column="4" >
<widget class="QLineEdit" name="IcecastEdit" /> <widget class="QLineEdit" name="IcecastEdit" />
</item> </item>
<item row="7" column="3" > <item row="7" column="5" >
<widget class="QLabel" name="IcecastPortLabel" > <widget class="QLabel" name="IcecastPortLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -381,7 +400,7 @@ ...@@ -381,7 +400,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="4" > <item row="7" column="6" >
<widget class="QSpinBox" name="IcecastPort" > <widget class="QSpinBox" name="IcecastPort" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -403,7 +422,7 @@ ...@@ -403,7 +422,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1" > <item row="8" column="3" >
<widget class="QLabel" name="IcecastMountpointLabel" > <widget class="QLabel" name="IcecastMountpointLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -413,10 +432,10 @@ ...@@ -413,10 +432,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2" > <item row="8" column="4" >
<widget class="QLineEdit" name="IcecastMountpointEdit" /> <widget class="QLineEdit" name="IcecastMountpointEdit" />
</item> </item>
<item row="8" column="3" > <item row="8" column="5" >
<widget class="QLabel" name="IcecastNameLabel" > <widget class="QLabel" name="IcecastNameLabel" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
...@@ -424,69 +443,59 @@ ...@@ -424,69 +443,59 @@
<property name="text" > <property name="text" >
<string>_("Login:pass:")</string> <string>_("Login:pass:")</string>
</property> </property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="8" column="4" > <item row="8" column="6" >
<widget class="QLineEdit" name="IcecastNamePassEdit" > <widget class="QLineEdit" name="IcecastNamePassEdit" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="4" > <item rowspan="2" row="5" column="2" >
<widget class="QSpinBox" name="RTPPort2" > <widget class="QLabel" name="UDPRTPLabel" >
<property name="enabled" > <property name="sizePolicy" >
<bool>false</bool> <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>90</width> <width>83</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="alignment" > <property name="text" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <string>_("Prefer UDP over RTP")</string>
</property> </property>
<property name="accelerated" > <property name="textFormat" >
<bool>true</bool> <enum>Qt::PlainText</enum>
</property> </property>
<property name="maximum" > <property name="alignment" >
<number>65355</number> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="value" >