[vlc-commits] commit: Qt: sprefs, cleaning of input/codecs part (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Sep 20 00:38:18 2010 +0200| [c3d7a3757351b49909fe328e104e08fa596dd511] | committer: Jean-Baptiste Kempf 

Qt: sprefs, cleaning of input/codecs part

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c3d7a3757351b49909fe328e104e08fa596dd511
---

 modules/gui/qt4/ui/sprefs_input.ui |  150 ++++++++++++++++++++----------------
 1 files changed, 83 insertions(+), 67 deletions(-)

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 61dbfb4..79ed1c0 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -16,51 +16,12 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Optical drive</string>
-     </property>
-     <layout class="QGridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="DVDLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Default optical device</string>
-        </property>
-        <property name="buddy">
-         <cstring>DVDDevice</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <widget class="QLineEdit" name="DVDDevice"/>
-        </item>
-        <item>
-         <widget class="QPushButton" name="DVDBrowse">
-          <property name="text">
-           <string>Browse...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Codecs</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="8" column="2">
+      <item row="8" column="2" colspan="2">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
       <item row="13" column="0">
@@ -95,7 +56,7 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="1">
+      <item row="12" column="1" colspan="2">
        <widget class="QComboBox" name="presetBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -105,43 +66,27 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="2">
+      <item row="12" column="3">
        <widget class="QComboBox" name="tuneBox"/>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="ppLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Video quality post-processing level</string>
-        </property>
-        <property name="buddy">
-         <cstring>PostProcLevel</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2">
+      <item row="4" column="0" colspan="3">
        <widget class="QCheckBox" name="hwAccelBox">
         <property name="text">
          <string>Use GPU acceleration (experimental)</string>
         </property>
        </widget>
       </item>
-      <item row="11" column="0" colspan="3">
+      <item row="11" column="0" colspan="4">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="13" column="2">
+      <item row="13" column="3">
        <widget class="QLineEdit" name="levelBox"/>
       </item>
-      <item row="13" column="1">
+      <item row="13" column="1" colspan="2">
        <widget class="QComboBox" name="profileBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -167,35 +112,106 @@
         </property>
        </widget>
       </item>
-      <item row="10" column="0" colspan="3">
+      <item row="10" column="0" colspan="4">
        <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">
+      <item row="5" column="0">
+       <widget class="QLabel" name="ppLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Video quality post-processing level</string>
+        </property>
+        <property name="buddy">
+         <cstring>PostProcLevel</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
        <widget class="QSpinBox" name="PostProcLevel">
         <property name="maximumSize">
          <size>
-          <width>50</width>
+          <width>100</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
         <property name="alignment">
          <set>Qt::AlignRight</set>
         </property>
         <property name="minimum">
-         <number>1</number>
+         <number>0</number>
         </property>
         <property name="maximum">
-         <number>26</number>
+         <number>6</number>
         </property>
         <property name="value">
          <number>6</number>
         </property>
        </widget>
       </item>
+      <item row="5" column="1">
+       <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>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Optical drive</string>
+     </property>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="DVDLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Default optical device</string>
+        </property>
+        <property name="buddy">
+         <cstring>DVDDevice</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QLineEdit" name="DVDDevice"/>
+        </item>
+        <item>
+         <widget class="QPushButton" name="DVDBrowse">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>