X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fui%2Fopen_net.ui;h=8af212c378edaa568d69dc05a79f7a28eb632a69;hb=0bf6bcc5c57a59b970f7d9daabba9487fcf656bd;hp=dc27c4b4a8fe9d56ced25d0e7ed78e44648eff69;hpb=5364ae678b8ee94b65921ea51ab8b3b1e181191e;p=vlc

diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index dc27c4b4a8..8af212c378 100644
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -6,197 +6,138 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
-    <height>350</height>
+    <width>431</width>
+    <height>233</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <widget class="QGroupBox" name="groupBox" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>90</y>
-     <width>391</width>
-     <height>61</height>
-    </rect>
-   </property>
-   <property name="title" >
-    <string>Options</string>
-   </property>
-   <widget class="QWidget" name="layoutWidget" >
-    <property name="geometry" >
-     <rect>
-      <x>10</x>
-      <y>20</y>
-      <width>361</width>
-      <height>33</height>
-     </rect>
-    </property>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>_("Network Protocol")</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <layout class="QGridLayout" >
+      <item row="1" column="0" >
+       <widget class="QComboBox" name="protocolCombo" >
+        <property name="toolTip" >
+         <string>_("Select the protocol for the URL.")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>_("Protocol")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>protocolCombo</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QSpinBox" name="portSpin" >
+        <property name="toolTip" >
+         <string>_("Select the port used")</string>
+        </property>
+        <property name="accelerated" >
+         <bool>true</bool>
+        </property>
+        <property name="maximum" >
+         <number>65535</number>
+        </property>
+        <property name="value" >
+         <number>1234</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="label_2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>_("Address")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>addressText</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>_("Port")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>portSpin</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="addressText" >
+        <property name="toolTip" >
+         <string>_("Enter the URL of the network stream here, with or without the protocol.")</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_3" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>5</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text" >
-          <string>_("Port") :</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QSpinBox" name="spinBox" >
-         <property name="minimumSize" >
-          <size>
-           <width>80</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBox_3" >
-       <property name="text" >
-        <string>force IPv6</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBox_2" >
-       <property name="text" >
-        <string>localhost</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QRadioButton" name="radioButton" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>0</y>
-     <width>101</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text" >
-    <string>UDP/RTP</string>
-   </property>
-   <property name="checked" >
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="radioButton_3" >
-   <property name="geometry" >
-    <rect>
-     <x>60</x>
-     <y>160</y>
-     <width>154</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text" >
-    <string>HTTP/HTTPS/FTP/MMS</string>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="radioButton_4" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>160</y>
-     <width>45</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text" >
-    <string>RTP</string>
-   </property>
-  </widget>
-  <widget class="QGroupBox" name="groupBox_2" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>180</y>
-     <width>391</width>
-     <height>69</height>
-    </rect>
-   </property>
-   <property name="title" >
-    <string>_("URL")</string>
-   </property>
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <widget class="QLineEdit" name="lineEdit_2" />
-    </item>
-   </layout>
-  </widget>
-  <widget class="QGroupBox" name="groupBox_3" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>20</y>
-     <width>391</width>
-     <height>69</height>
-    </rect>
-   </property>
-   <property name="title" >
-    <string>_("Address")</string>
-   </property>
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <widget class="QLineEdit" name="lineEdit" />
-    </item>
-   </layout>
-  </widget>
+     <property name="title" >
+      <string>_("Options")</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QCheckBox" name="timeShift" >
+        <property name="toolTip" >
+         <string/>
+        </property>
+        <property name="text" >
+         <string>_("Allow timeshifting")</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer>
+     <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>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
  </widget>
+ <tabstops>
+  <tabstop>protocolCombo</tabstop>
+  <tabstop>addressText</tabstop>
+  <tabstop>portSpin</tabstop>
+  <tabstop>timeShift</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>