Qt Sprefs: remove mpeg2 skip-frames

[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 56105504ae3e0f15090dd61a318318a0c892bc99..61dbfb467e3836a507e13b84fc3908f18fd6ee0f 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>680</width>
-    <height>537</height>
+    <width>737</width>
+    <height>567</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -60,69 +60,54 @@
       <string>Codecs</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="7" column="0">
-       <widget class="QLabel" name="filterLabel">
+      <item row="8" column="2">
+       <widget class="QComboBox" name="loopFilterBox"/>
+      </item>
+      <item row="13" column="0">
+       <widget class="QLabel" name="x264Label">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
-         <string>Skip H.264 in-loop deblocking filter</string>
+         <string>x264 profile and level selection</string>
         </property>
         <property name="buddy">
-         <cstring>loopFilterBox</cstring>
+         <cstring>levelBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
-       <widget class="QComboBox" name="loopFilterBox"/>
-      </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="x264Label">
+      <item row="12" column="0">
+       <widget class="QLabel" name="x264profileLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>x264 preset and tuning selection</string>
         </property>
         <property name="buddy">
-         <cstring>presetBox</cstring>
          <cstring>tuneBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="9" column="1">
-       <widget class="QComboBox" name="presetBox"/>
+      <item row="12" column="1">
+       <widget class="QComboBox" name="presetBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
-      <item row="9" column="2">
+      <item row="12" column="2">
        <widget class="QComboBox" name="tuneBox"/>
       </item>
-      <item row="2" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QSpinBox" name="PostProcLevel">
-          <property name="alignment">
-           <set>Qt::AlignRight</set>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>26</number>
-          </property>
-          <property name="value">
-           <number>6</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <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>
       <item row="2" column="0">
        <widget class="QLabel" name="ppLabel">
         <property name="minimumSize">
@@ -139,17 +124,75 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
+      <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="hwAccelBox">
         <property name="text">
          <string>Use GPU acceleration (experimental)</string>
         </property>
        </widget>
       </item>
+      <item row="11" column="0" colspan="3">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="13" column="2">
+       <widget class="QLineEdit" name="levelBox"/>
+      </item>
+      <item row="13" 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="10" column="0" colspan="3">
        <widget class="QCheckBox" name="systemCodecBox">
         <property name="text">
-         <string>Use system codecs if available (better quality, but dangerous)</string>
+         <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">
+         <size>
+          <width>50</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight</set>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>26</number>
+        </property>
+        <property name="value">
+         <number>6</number>
         </property>
        </widget>
       </item>
@@ -162,16 +205,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">
@@ -199,9 +232,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>
@@ -211,26 +261,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>
@@ -240,23 +271,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">
@@ -280,45 +298,25 @@
         </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">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QSpinBox" name="UDPPort">
-          <property name="alignment">
-           <set>Qt::AlignRight</set>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>65535</number>
-          </property>
-          <property name="value">
-           <number>1234</number>
-          </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>
+       <widget class="QComboBox" name="cachingCombo"/>
       </item>
      </layout>
     </widget>
@@ -328,15 +326,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>PostProcLevel</tabstop>
   <tabstop>hwAccelBox</tabstop>
   <tabstop>loopFilterBox</tabstop>
  </tabstops>