Qt4 - Sprefs audio alignment fix.

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 8b525b6e0de5a4912e9008527ef9e3ea5a62acb4..c2d9d976fb606aa999fd2a47cf846dc5018077b0 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -30,73 +30,82 @@
       <string>_("General Audio")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_8" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>_("Force detection of Dolby Surround")</string>
+         <string>_("Default volume")</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="detectionDolby" >
+      <item row="0" column="2" >
+       <widget class="QSlider" name="defaultVolume" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+         <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize" >
+         <size>
+          <width>140</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="maximumSize" >
          <size>
-          <width>300</width>
+          <width>200</width>
           <height>16777215</height>
          </size>
         </property>
-        <property name="currentIndex" >
-         <number>-1</number>
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
+      <item row="1" column="0" colspan="3" >
        <widget class="QCheckBox" name="spdifBox" >
         <property name="text" >
          <string>_("Use S/PDIF when available")</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_8" >
         <property name="text" >
-         <string>_("Preferred audio language")</string>
+         <string>_("Force detection of Dolby Surround")</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSlider" name="defaultVolume" >
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="detectionDolby" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>200</width>
+          <width>300</width>
           <height>16777215</height>
          </size>
         </property>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+        <property name="currentIndex" >
+         <number>-1</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_2" >
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>_("Default volume")</string>
+         <string>_("Preferred audio language")</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" >
+      <item row="3" column="1" colspan="2" >
        <widget class="QLineEdit" name="preferredAudioLanguage" />
       </item>
      </layout>
@@ -110,6 +119,12 @@
      <layout class="QGridLayout" >
       <item row="0" column="0" >
        <widget class="QLabel" name="label_3" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text" >
          <string>_("Type")</string>
         </property>
@@ -128,11 +143,26 @@
       <item row="1" column="0" colspan="2" >
        <widget class="QWidget" native="1" name="alsaControl" >
         <layout class="QHBoxLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="alsaLabel" >
+           <property name="minimumSize" >
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text" >
             <string>_("Device")</string>
            </property>
@@ -154,7 +184,16 @@
       <item row="2" column="0" colspan="2" >
        <widget class="QWidget" native="1" name="DirectXControl" >
         <layout class="QHBoxLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
           <number>0</number>
          </property>
          <item>
@@ -165,6 +204,12 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="minimumSize" >
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text" >
             <string>_("Device")</string>
            </property>
@@ -186,11 +231,26 @@
       <item row="3" column="0" colspan="2" >
        <widget class="QWidget" native="1" name="OSSControl" >
         <layout class="QHBoxLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="OSSLabel" >
+           <property name="minimumSize" >
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text" >
             <string>_("Device")</string>
            </property>
@@ -212,11 +272,26 @@
       <item row="4" column="0" colspan="2" >
        <widget class="QWidget" native="1" name="fileControl" >
         <layout class="QHBoxLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="fileLabel" >
+           <property name="minimumSize" >
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text" >
             <string>_("File")</string>
            </property>