From f53ca6c86874edd3aec14af9b3d0d6ba5c9f5840 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 22 Sep 2010 00:57:42 +0200
Subject: [PATCH] Qt: equalizer, fix the "too much space between preamp and
 first slider" bug

---
 modules/gui/qt4/ui/equalizer.ui | 140 ++++++++++++++++++--------------
 1 file changed, 81 insertions(+), 59 deletions(-)

diff --git a/modules/gui/qt4/ui/equalizer.ui b/modules/gui/qt4/ui/equalizer.ui
index 2daefe783a..c180bcdf2e 100644
--- a/modules/gui/qt4/ui/equalizer.ui
+++ b/modules/gui/qt4/ui/equalizer.ui
@@ -1,46 +1,47 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>EqualizerWidget</class>
- <widget class="QWidget" name="EqualizerWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="EqualizerWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>524</width>
-    <height>290</height>
+    <width>341</width>
+    <height>241</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QCheckBox" name="enableCheck" >
-       <property name="text" >
+      <widget class="QCheckBox" name="enableCheck">
+       <property name="text">
         <string>Enable</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="eq2PassCheck" >
-       <property name="text" >
+      <widget class="QCheckBox" name="eq2PassCheck">
+       <property name="text">
         <string>2 Pass</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -49,15 +50,21 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="presetLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="presetLabel">
+       <property name="text">
         <string>Preset</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy">
+        <cstring>presetsCombo</cstring>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="presetsCombo" >
-       <property name="minimumSize" >
+      <widget class="QComboBox" name="presetsCombo">
+       <property name="minimumSize">
         <size>
          <width>110</width>
          <height>0</height>
@@ -67,48 +74,63 @@
      </item>
     </layout>
    </item>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="0">
+    <widget class="QSlider" name="preampSlider">
+     <property name="maximum">
+      <number>400</number>
      </property>
-     <item row="1" column="0" colspan="2" >
-      <widget class="QLabel" name="preampLabel" >
-       <property name="text" >
-        <string>Preamp</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QSlider" name="preampSlider" >
-       <property name="maximum" >
-        <number>400</number>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item rowspan="2" row="0" column="2" >
-      <widget class="QFrame" name="frame" />
-     </item>
-     <item row="0" column="1" >
-      <spacer>
-       <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>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="invertedAppearance">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" rowspan="2">
+    <widget class="QFrame" name="frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="preampLabel">
+     <property name="text">
+      <string>Preamp</string>
+     </property>
+     <property name="buddy">
+      <cstring>preampSlider</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>enableCheck</tabstop>
+  <tabstop>eq2PassCheck</tabstop>
+  <tabstop>presetsCombo</tabstop>
+  <tabstop>preampSlider</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
-- 
2.39.2