Qt4 - SPrefs : Input Panel. almost all implementations, but not the macro-ones (netwo...

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

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index a4c94c79981b0c71235e595588c837c404ca9734..ed4a01b5dde6d8c4f34442562aac6cacd61c10d4 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -1,13 +1,13 @@
 <ui version="4.0" >
  <author>Jean-Baptiste Kempf</author>
- <class>Spref_input</class>
- <widget class="QWidget" name="Spref_input" >
+ <class>SPrefsInputAndCodecs</class>
+ <widget class="QWidget" name="SPrefsInputAndCodecs" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>439</width>
-    <height>552</height>
+    <width>422</width>
+    <height>437</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -32,15 +32,15 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="2" column="2" >
-       <widget class="QPushButton" name="CDDevice" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Browse</string>
+         <string>Disk Device</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QLineEdit" name="CDDevice" />
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="DVDDevice" />
       </item>
       <item row="0" column="2" >
        <widget class="QPushButton" name="DVDBrowse" >
@@ -49,40 +49,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="VCDBrowse" >
-        <property name="text" >
-         <string>Browse</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>Audio CD Device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_2" >
-        <property name="text" >
-         <string>VCD Device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="DVDDevice" />
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>DVD Device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="VCDDevice" />
-      </item>
      </layout>
     </widget>
    </item>
@@ -91,21 +57,44 @@
      <property name="title" >
       <string>Network</string>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QGridLayout" >
       <property name="margin" >
        <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <widget class="QLabel" name="label_4" >
+      <item row="2" column="0" colspan="2" >
+       <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>UDP Default Port</string>
+         <string>Default Network caching in ms</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>HTTP Proxy</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QSpinBox" name="networkCache" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="maximum" >
+         <number>10000</number>
+        </property>
+        <property name="value" >
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLineEdit" name="proxy" />
+      </item>
+      <item row="0" column="1" colspan="2" >
        <widget class="QSpinBox" name="UDPPort" >
         <property name="alignment" >
          <set>Qt::AlignRight</set>
@@ -121,6 +110,13 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Server Default Port</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -137,9 +133,9 @@
        <number>6</number>
       </property>
       <item row="2" column="0" >
-       <widget class="QCheckBox" name="RTCP_TCPBox" >
+       <widget class="QCheckBox" name="RTSP_TCPBox" >
         <property name="text" >
-         <string>Use RTP over RTCP (TCP)</string>
+         <string>Use RTP over RTSP (TCP)</string>
         </property>
        </widget>
       </item>
@@ -215,84 +211,8 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_5" >
-     <property name="title" >
-      <string>Caching</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="1" >
-       <widget class="QSpinBox" name="localCache" >
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
-        </property>
-        <property name="maximum" >
-         <number>10000</number>
-        </property>
-        <property name="value" >
-         <number>300</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QSpinBox" name="DiscCache" >
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
-        </property>
-        <property name="maximum" >
-         <number>10000</number>
-        </property>
-        <property name="value" >
-         <number>300</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="networkCache" >
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
-        </property>
-        <property name="maximum" >
-         <number>10000</number>
-        </property>
-        <property name="value" >
-         <number>300</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="" >
-        <property name="text" >
-         <string>Default Network caching in ms</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="label_8" >
-        <property name="text" >
-         <string>Default Disc caching in ms</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_9" >
-        <property name="text" >
-         <string>Default local caching in ms</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
- <includes/>
  <resources/>
  <connections/>
 </ui>