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 cabba5eed05663ed5a56422d0fbd261b8df43268..91e5319864572e25bc67d1bacde9b52b3db8f6b0 100644 (file)
--- a/modules/gui/qt4/ui/open_net.ui
+++ b/modules/gui/qt4/ui/open_net.ui
@@ -32,16 +32,6 @@
         <property name="text">
          <string>Please enter a network URL:</string>
         </property>
-        <property name="buddy">
-         <cstring>urlText</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="urlText">
-        <property name="toolTip">
-         <string>Enter the URL of the network stream here.</string>
-        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -50,12 +40,15 @@
          <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; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;http://www.example.com/stream.avi&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;rtp://@1234&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;mms://mms.examples.com/stream.asx&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;rtsp://server.example.org:8080/test.sdp&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#838383;&quot;&gt;http://www.yourtube.com/watch?v=gg64x&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+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>
         <property name="margin">
          <number>5</number>
@@ -65,6 +58,16 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
+      <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>
      </layout>
     </widget>
    </item>
@@ -87,7 +90,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <tabstops>
-  <tabstop>urlText</tabstop>
+  <tabstop>urlComboBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>