Skip to content

V
vlc-2-2
Commit 66a8a1a8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Fix some Sout dialog resizing issues.

parent 204edd2d
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 118 deletions
modules/gui/qt4/dialogs/sout.cpp
View file @ 66a8a1a8
......@@ -199,10 +199,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
BUTTONACT( okButton, ok() );
BUTTONACT( cancelButton, cancel() );
if( b_transcode_only ) toggleSout();
CONNECT( ui.UDPOutput, toggled( bool ), this, changeUDPandRTPmess( bool ) );
CONNECT( ui.RTPOutput, clicked(bool), this, RTPtoggled( bool ) );
if( b_transcode_only ) toggleSout();
}
void SoutDialog::fileBrowse()
......@@ -282,7 +282,6 @@ void SoutDialog::setOptions()
updateMRL();
}
//FIXME
void SoutDialog::toggleSout()
{
//Toggle all the streaming options.
......@@ -291,7 +290,7 @@ void SoutDialog::toggleSout()
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.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.sapGroup ); HIDEORSHOW( ui.sapGroupLabel );
......@@ -307,9 +306,8 @@ void SoutDialog::toggleSout()
if( b_transcode_only ) okButton->setText( "&Save" );
else okButton->setText( "&Stream" );
/* FIXME:
* The Save dialog is too big if the Stream dialog has already be shown */
updateGeometry();
setMinimumHeight( 500 );
resize( width(), sizeHint().height() );
}
void SoutDialog::changeUDPandRTPmess( bool b_udp )
......
modules/gui/qt4/ui/sout.ui
View file @ 66a8a1a8
......@@ -6,42 +6,30 @@
<rect>
<x>0</x>
<y>0</y>
<width>726</width>
<height>823</height>
<width>644</width>
<height>784</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" >
<string>_("Stream Output")</string>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>_("Outputs")</string>
</property>
<layout class="QHBoxLayout" >
<item>
<layout class="QGridLayout" >
<item row="0" column="0" >
<item row="0" column="0" colspan="3" >
<widget class="QCheckBox" name="localOutput" >
<property name="text" >
<string>_("Play locally")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<item row="1" column="0" colspan="3" >
<widget class="QCheckBox" name="fileOutput" >
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
......@@ -51,7 +39,7 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="1" column="3" >
<widget class="QLabel" name="fileLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -61,24 +49,30 @@
</property>
</widget>
</item>
<item row="1" column="2" >
<item row="1" column="4" >
<widget class="QLineEdit" name="fileEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="3" >
<item row="1" column="5" >
<widget class="QPushButton" name="fileSelectButton" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>_("Browse...")</string>
</property>
</widget>
</item>
<item row="1" column="4" >
<item row="1" column="6" >
<widget class="QCheckBox" name="rawInput" >
<property name="enabled" >
<bool>false</bool>
......@@ -88,14 +82,14 @@
</property>
</widget>
</item>
<item row="2" column="0" >
<item row="2" column="0" colspan="3" >
<widget class="QCheckBox" name="HTTPOutput" >
<property name="text" >
<string>HTTP</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<item row="2" column="3" >
<widget class="QLabel" name="HTTPLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -105,14 +99,14 @@
</property>
</widget>
</item>
<item row="2" column="2" >
<item row="2" column="4" >
<widget class="QLineEdit" name="HTTPEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="3" >
<item row="2" column="5" >
<widget class="QLabel" name="HTTPPortLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -125,7 +119,7 @@
</property>
</widget>
</item>
<item row="2" column="4" >
<item row="2" column="6" >
<widget class="QSpinBox" name="HTTPPort" >
<property name="enabled" >
<bool>false</bool>
......@@ -153,14 +147,14 @@
</property>
</widget>
</item>
<item row="3" column="0" >
<item row="3" column="0" colspan="3" >
<widget class="QCheckBox" name="MMSHOutput" >
<property name="text" >
<string>MMSH</string>
</property>
</widget>
</item>
<item row="3" column="1" >
<item row="3" column="3" >
<widget class="QLabel" name="MMSHLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -170,14 +164,14 @@
</property>
</widget>
</item>
<item row="3" column="2" >
<item row="3" column="4" >
<widget class="QLineEdit" name="MMSHEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3" >
<item row="3" column="5" >
<widget class="QLabel" name="MMSHPortLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -190,7 +184,7 @@
</property>
</widget>
</item>
<item row="3" column="4" >
<item row="3" column="6" >
<widget class="QSpinBox" name="MMSHPort" >
<property name="enabled" >
<bool>false</bool>
......@@ -215,14 +209,14 @@
</property>
</widget>
</item>
<item row="4" column="0" >
<item row="4" column="0" colspan="3" >
<widget class="QCheckBox" name="RTPOutput" >
<property name="text" >
<string>RTP</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<item row="4" column="3" >
<widget class="QLabel" name="RTPLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -232,14 +226,14 @@
</property>
</widget>
</item>
<item row="4" column="2" >
<item row="4" column="4" >
<widget class="QLineEdit" name="RTPEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="3" >
<item row="4" column="5" >
<widget class="QLabel" name="RTPPortLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -252,7 +246,7 @@
</property>
</widget>
</item>
<item row="4" column="4" >
<item row="4" column="6" >
<widget class="QSpinBox" name="RTPPort" >
<property name="enabled" >
<bool>false</bool>
......@@ -277,20 +271,7 @@
</property>
</widget>
</item>
<item row="5" column="0" >
<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" >
<item row="5" column="3" >
<widget class="QLabel" name="UDPLabel" >
<property name="enabled" >
<bool>true</bool>
......@@ -300,14 +281,14 @@
</property>
</widget>
</item>
<item row="5" column="2" >
<item row="5" column="4" >
<widget class="QLineEdit" name="UDPEdit" >
<property name="enabled" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="3" >
<item row="5" column="5" >
<widget class="QLabel" name="UDPPortLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -320,7 +301,7 @@
</property>
</widget>
</item>
<item row="5" column="4" >
<item row="5" column="6" >
<widget class="QSpinBox" name="UDPPort" >
<property name="enabled" >
<bool>false</bool>
......@@ -348,14 +329,52 @@
</property>
</widget>
</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" >
<property name="text" >
<string>IceCast</string>
</property>
</widget>
</item>
<item row="7" column="1" >
<item row="7" column="3" >
<widget class="QLabel" name="IcecastLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -365,10 +384,10 @@
</property>
</widget>
</item>
<item row="7" column="2" >
<item row="7" column="4" >
<widget class="QLineEdit" name="IcecastEdit" />
</item>
<item row="7" column="3" >
<item row="7" column="5" >
<widget class="QLabel" name="IcecastPortLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -381,7 +400,7 @@
</property>
</widget>
</item>
<item row="7" column="4" >
<item row="7" column="6" >
<widget class="QSpinBox" name="IcecastPort" >
<property name="enabled" >
<bool>false</bool>
......@@ -403,7 +422,7 @@
</property>
</widget>
</item>
<item row="8" column="1" >
<item row="8" column="3" >
<widget class="QLabel" name="IcecastMountpointLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -413,10 +432,10 @@
</property>
</widget>
</item>
<item row="8" column="2" >
<item row="8" column="4" >
<widget class="QLineEdit" name="IcecastMountpointEdit" />
</item>
<item row="8" column="3" >
<item row="8" column="5" >
<widget class="QLabel" name="IcecastNameLabel" >
<property name="enabled" >
<bool>false</bool>
......@@ -424,69 +443,59 @@
<property name="text" >
<string>_("Login:pass:")</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="8" column="4" >
<item row="8" column="6" >
<widget class="QLineEdit" name="IcecastNamePassEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="6" column="4" >
<widget class="QSpinBox" name="RTPPort2" >
<property name="enabled" >
<bool>false</bool>
<item rowspan="2" row="5" column="2" >
<widget class="QLabel" name="UDPRTPLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>90</width>
<width>83</width>
<height>16777215</height>
</size>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="text" >
<string>_("Prefer UDP over RTP")</string>
</property>
<property name="accelerated" >
<bool>true</bool>
<property name="textFormat" >
<enum>Qt::PlainText</enum>
</property>
<property name="maximum" >
<number>65355</number>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="value" >
<number>1234</number>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="3" >
<widget class="QLabel" name="RTPPortLabel2" >
<item row="5" column="1" >
<widget class="QCheckBox" name="UDPOutput" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>_("Video Port")</string>
<property name="toolTip" >
<string>_("Using this option is not recommended in most of the cases.")</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="6" column="2" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>29</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
......@@ -511,6 +520,12 @@
</item>
<item row="3" column="0" colspan="2" >
<widget class="QTabWidget" name="tabWidget" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex" >
<number>0</number>
</property>
......@@ -519,8 +534,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>704</width>
<height>154</height>
<width>624</width>
<height>129</height>
</rect>
</property>
<attribute name="title" >
......@@ -614,8 +629,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>704</width>
<height>154</height>
<width>624</width>
<height>129</height>
</rect>
</property>
<attribute name="title" >
......@@ -711,8 +726,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>704</width>
<height>154</height>
<width>624</width>
<height>129</height>
</rect>
</property>
<attribute name="title" >
......@@ -811,8 +826,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>704</width>
<height>154</height>
<width>624</width>
<height>129</height>
</rect>
</property>
<attribute name="title" >
......@@ -930,12 +945,6 @@
</item>
<item row="6" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_4" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>_("Generated stream output string")</string>
</property>
......
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