Qt: Simple preferences simplifications

[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 fbb2140419c032bff50b4c0bfdd9bed6a794fb80..33b485625132a3cbcd3e0a7bf0ee65c10ff77e1d 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -60,23 +60,7 @@
       <string>Codecs</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="8" column="0">
-       <widget class="QLabel" name="filterLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Skip H.264 in-loop deblocking filter</string>
-        </property>
-        <property name="buddy">
-         <cstring>loopFilterBox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" colspan="2">
+      <item row="8" column="2">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
       <item row="14" column="0">
@@ -157,6 +141,49 @@
         </property>
        </widget>
       </item>
+      <item row="12" column="0" colspan="3">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="14" column="2">
+       <widget class="QLineEdit" name="levelBox"/>
+      </item>
+      <item row="14" column="1">
+       <widget class="QComboBox" name="profileBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="filterLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Skip H.264 in-loop deblocking filter</string>
+        </property>
+        <property name="buddy">
+         <cstring>loopFilterBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="0" colspan="3">
+       <widget class="QCheckBox" name="systemCodecBox">
+        <property name="text">
+         <string>Use systems codecs if available, for WMV codecs</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="1">
        <widget class="QSpinBox" name="PostProcLevel">
         <property name="maximumSize">
@@ -179,33 +206,6 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="0" colspan="2">
-       <widget class="QCheckBox" name="systemCodecBox">
-        <property name="text">
-         <string>Use system codecs if available (better quality, but dangerous)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="0" colspan="3">
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="14" column="2">
-       <widget class="QLineEdit" name="levelBox"/>
-      </item>
-      <item row="14" column="1">
-       <widget class="QComboBox" name="profileBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -215,16 +215,6 @@
       <string>Files</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QLabel" name="aviLabel">
-        <property name="text">
-         <string>Damaged or incomplete AVI file</string>
-        </property>
-        <property name="buddy">
-         <cstring>AviRepair</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="recordLabel">
         <property name="minimumSize">
@@ -252,9 +242,26 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
+      <item row="3" column="0">
+       <widget class="QLabel" name="aviLabel">
+        <property name="text">
+         <string>Damaged or incomplete AVI file</string>
+        </property>
+        <property name="buddy">
+         <cstring>AviRepair</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
        <widget class="QComboBox" name="AviRepair"/>
       </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="Line" name="line_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -264,26 +271,7 @@
       <string>Network</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="portLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Default port (server mode)</string>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="buddy">
-         <cstring>UDPPort</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="httpProxyLabel">
         <property name="text">
          <string>HTTP proxy URL</string>
@@ -293,23 +281,10 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="2" column="1">
        <widget class="QLineEdit" name="proxy"/>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Default caching policy</string>
-        </property>
-        <property name="buddy">
-         <cstring>cachingCombo</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="1">
-       <widget class="QComboBox" name="cachingCombo"/>
-      </item>
-      <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QRadioButton" name="live555TransportHTTPRadio">
@@ -333,15 +308,60 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="live555TransportLabel">
         <property name="text">
          <string>Live555 stream transport</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Default caching policy</string>
+        </property>
+        <property name="buddy">
+         <cstring>cachingCombo</cstring>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="1">
+       <widget class="QComboBox" name="cachingCombo"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="portLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Default port (server mode)</string>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <property name="buddy">
+         <cstring>UDPPort</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="QSpinBox" name="UDPPort">
           <property name="alignment">
@@ -358,19 +378,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
      </layout>
@@ -381,14 +388,11 @@
  <tabstops>
   <tabstop>DVDDevice</tabstop>
   <tabstop>DVDBrowse</tabstop>
-  <tabstop>AviRepair</tabstop>
   <tabstop>recordPath</tabstop>
   <tabstop>recordBrowse</tabstop>
-  <tabstop>UDPPort</tabstop>
   <tabstop>proxy</tabstop>
   <tabstop>live555TransportHTTPRadio</tabstop>
   <tabstop>live555TransportRTSP_TCPRadio</tabstop>
-  <tabstop>cachingCombo</tabstop>
   <tabstop>hwAccelBox</tabstop>
   <tabstop>loopFilterBox</tabstop>
  </tabstops>