Try to fix Sout Dialog ( Part 1 )

[vlc] / modules / gui / qt4 / ui / sout.ui

diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index 42e86989a3c256afdbc61661d1fa3c0830b94b8f..30f133f66dcc5e2fbb69a23a061f44f025193433 100644 (file)
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>617</width>
-    <height>678</height>
+    <width>726</width>
+    <height>782</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -279,6 +279,9 @@
         </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>
@@ -289,16 +292,26 @@
         </item>
         <item row="5" column="1" >
          <widget class="QLabel" name="UDPLabel" >
+          <property name="enabled" >
+           <bool>true</bool>
+          </property>
           <property name="text" >
            <string>_("Address")</string>
           </property>
          </widget>
         </item>
         <item row="5" column="2" >
-         <widget class="QLineEdit" name="UDPEdit" />
+         <widget class="QLineEdit" name="UDPEdit" >
+          <property name="enabled" >
+           <bool>true</bool>
+          </property>
+         </widget>
         </item>
         <item row="5" column="3" >
          <widget class="QLabel" name="UDPPortLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
           <property name="text" >
            <string>_("Port")</string>
           </property>
@@ -309,6 +322,9 @@
         </item>
         <item row="5" column="4" >
          <widget class="QSpinBox" name="UDPPort" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
           <property name="maximumSize" >
            <size>
             <width>90</width>
@@ -332,6 +348,91 @@
           </property>
          </widget>
         </item>
+        <item row="6" column="0" >
+         <widget class="QCheckBox" name="IcecastOutput" >
+          <property name="text" >
+           <string>IceCast</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1" >
+         <widget class="QLabel" name="IcecastLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Address")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="2" >
+         <widget class="QLineEdit" name="IcecastEdit" />
+        </item>
+        <item row="6" column="3" >
+         <widget class="QLabel" name="IcecastPortLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Port:")</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="4" >
+         <widget class="QSpinBox" name="IcecastPort" >
+          <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="maximum" >
+           <number>65535</number>
+          </property>
+          <property name="value" >
+           <number>1024</number>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="1" >
+         <widget class="QLabel" name="IcecastMountpointLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Mount Point")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="2" >
+         <widget class="QLineEdit" name="IcecastMountpointEdit" />
+        </item>
+        <item row="7" column="3" >
+         <widget class="QLabel" name="IcecastNameLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Login:pass:")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="4" >
+         <widget class="QLineEdit" name="IcecastNamePassEdit" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -356,7 +457,18 @@
    </item>
    <item row="3" column="0" colspan="2" >
     <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="tab" >
+     <property name="currentIndex" >
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="muxer" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>704</width>
+        <height>148</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>_("Encapsulation")</string>
       </attribute>
@@ -431,14 +543,29 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="3" >
+        <widget class="QRadioButton" name="MKVMux" >
+         <property name="text" >
+          <string>MKV</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
+     <widget class="QWidget" name="videoCodec" >
       <property name="enabled" >
        <bool>true</bool>
       </property>
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>704</width>
+        <height>148</height>
+       </rect>
+      </property>
       <attribute name="title" >
-       <string>_("Video Codec")</string>
+       <string>_("Video codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -525,9 +652,17 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3" >
+     <widget class="QWidget" name="audioCodec" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>704</width>
+        <height>148</height>
+       </rect>
+      </property>
       <attribute name="title" >
-       <string>_("Audio Codec")</string>
+       <string>_("Audio codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -617,7 +752,15 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_4" >
+     <widget class="QWidget" name="subtitles" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>704</width>
+        <height>148</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>_("Subtitles")</string>
       </attribute>
@@ -650,6 +793,13 @@
      </widget>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2" >
+    <widget class="Line" name="line_2" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
@@ -749,7 +899,7 @@
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -766,13 +916,6 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="Line" name="line_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
@@ -1130,98 +1273,178 @@
    </hints>
   </connection>
   <connection>
-   <sender>rawInput</sender>
+   <sender>IcecastOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>RTPOutput</receiver>
-   <slot>setDisabled(bool)</slot>
+   <receiver>IcecastEdit</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>595</x>
-     <y>75</y>
+     <x>96</x>
+     <y>171</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>66</x>
-     <y>172</y>
+     <x>296</x>
+     <y>171</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>rawInput</sender>
+   <sender>IcecastOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>MMSHOutput</receiver>
-   <slot>setDisabled(bool)</slot>
+   <receiver>IcecastLabel</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>485</x>
-     <y>92</y>
+     <x>96</x>
+     <y>171</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>46</x>
-     <y>141</y>
+     <x>227</x>
+     <y>171</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>UDPPort</receiver>
-   <slot>setVisible(bool)</slot>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastPortLabel</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>98</x>
-     <y>212</y>
+     <x>96</x>
+     <y>171</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>493</x>
-     <y>212</y>
+     <x>377</x>
+     <y>171</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>UDPPortLabel</receiver>
-   <slot>setVisible(bool)</slot>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastPort</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>96</x>
+     <y>171</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>488</x>
+     <y>171</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastMountpointEdit</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>107</x>
-     <y>212</y>
+     <x>91</x>
+     <y>154</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>396</x>
-     <y>212</y>
+     <x>306</x>
+     <y>175</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>UDPLabel</receiver>
-   <slot>setVisible(bool)</slot>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastMountpointLabel</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>107</x>
-     <y>212</y>
+     <x>91</x>
+     <y>154</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>241</x>
-     <y>212</y>
+     <x>226</x>
+     <y>175</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>UDPEdit</receiver>
-   <slot>setVisible(bool)</slot>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastNameLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>388</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastNamePassEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>526</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>RTPOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>UDPOutput</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>110</x>
+     <y>190</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>110</x>
+     <y>225</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>RTPOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>UDPPort</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>110</x>
+     <y>190</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>597</x>
+     <y>225</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>RTPOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>UDPPortLabel</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>107</x>
-     <y>212</y>
+     <x>110</x>
+     <y>190</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>315</x>
-     <y>212</y>
+     <x>497</x>
+     <y>225</y>
     </hint>
    </hints>
   </connection>