Qt: NetOpenPanel: add drop-down list

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

diff --git a/modules/gui/qt4/ui/open_net.ui b/modules/gui/qt4/ui/open_net.ui
index 0f1c793b636b327d7498107aede211fa8106e139..91e5319864572e25bc67d1bacde9b52b3db8f6b0 100644 (file)
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -1,124 +1,70 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Jean-Baptiste Kempf</author>
  <class>OpenNetwork</class>
- <widget class="QWidget" name="OpenNetwork" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OpenNetwork">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>420</width>
-    <height>195</height>
+    <width>487</width>
+    <height>273</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Network Protocol</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" >
-       <widget class="QComboBox" name="protocolCombo" >
-        <property name="toolTip" >
-         <string>Set 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>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QSpinBox" name="portSpin" >
-        <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>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
-         <string>Address</string>
+        <property name="text">
+         <string>Please enter a network URL:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>Port</string>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+p { margin: 0; -qt-block-indent: 0; text-indent: 0;}
+body { font-family: 'sans'; font-size: 8pt; font-weight: 400; }
+p &gt; span { color: #838383; }
+&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p&gt;&lt;span&gt;http://www.example.com/stream.avi&lt;/span&gt;&lt;/p&gt;
+&lt;p&gt;&lt;span&gt;rtp://@:1234&lt;/span&gt;&lt;/p&gt;
+&lt;p&gt;&lt;span&gt;mms://mms.examples.com/stream.asx&lt;/span&gt;&lt;/p&gt;
+&lt;p&gt;&lt;span&gt;rtsp://server.example.org:8080/test.sdp&lt;/span&gt;&lt;/p&gt;
+&lt;p&gt;&lt;span&gt;http://www.yourtube.com/watch?v=gg64x&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </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,\nwith or without the protocol.</string>
+        <property name="margin">
+         <number>5</number>
         </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_3" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string>Options</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="timeShift" >
-        <property name="text" >
-         <string>Allow timeshifting</string>
+        <property name="indent">
+         <number>10</number>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="ipv6" >
-        <property name="text" >
-         <string>Force IPv6</string>
+      <item row="1" column="0">
+       <widget class="QComboBox" name="urlComboBox">
+        <property name="editable">
+         <bool>true</bool>
+        </property>
+        <property name="insertPolicy">
+         <enum>QComboBox::NoInsert</enum>
         </property>
        </widget>
       </item>
@@ -127,13 +73,13 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>10</height>
@@ -144,11 +90,7 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>protocolCombo</tabstop>
-  <tabstop>addressText</tabstop>
-  <tabstop>portSpin</tabstop>
-  <tabstop>timeShift</tabstop>
-  <tabstop>ipv6</tabstop>
+  <tabstop>urlComboBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>