qt4: cleaning the singletons implementation.

[vlc] / modules / gui / qt4 / ui / sprefs_audio.ui

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 3203501bd08a8fc48a5007b26673ef0375dd2dfa..8ff3012bfcdabeaa3c86e6cf99863555448848f4 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>541</width>
-    <height>609</height>
+    <width>643</width>
+    <height>605</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
     <widget class="QCheckBox" name="enableAudio" >
      <property name="text" >
@@ -30,14 +30,14 @@
       <string>_("General Audio")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="3" >
+      <item row="0" column="0" colspan="2" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
          <string>_("Default volume")</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="3" >
+      <item row="0" column="2" colspan="2" >
        <widget class="QSlider" name="defaultVolume" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
@@ -108,7 +108,7 @@
        </widget>
       </item>
       <item row="2" column="0" >
-       <widget class="QLabel" name="label_8" >
+       <widget class="QLabel" name="dolbyLabel" >
         <property name="text" >
          <string>_("Force detection of Dolby Surround")</string>
         </property>
@@ -137,7 +137,7 @@
        </widget>
       </item>
       <item row="3" column="0" >
-       <widget class="QLabel" name="label" >
+       <widget class="QLabel" name="langLabel" >
         <property name="text" >
          <string>_("Preferred audio language")</string>
         </property>
@@ -175,7 +175,7 @@
      </property>
      <layout class="QGridLayout" name="outputAudioLayout" >
       <item row="0" column="0" >
-       <widget class="QLabel" name="label_3" >
+       <widget class="QLabel" name="outputLabel" >
         <property name="minimumSize" >
          <size>
           <width>100</width>
@@ -250,7 +250,7 @@
       <string>_("Effects")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="2" column="1" >
+      <item row="2" column="1" colspan="2" >
        <widget class="QComboBox" name="visualisation" />
       </item>
       <item row="0" column="0" >
@@ -268,7 +268,7 @@
        </widget>
       </item>
       <item row="2" column="0" >
-       <widget class="QLabel" name="label_5" >
+       <widget class="QLabel" name="visuLabel" >
         <property name="text" >
          <string>_("Visualization")</string>
         </property>
@@ -277,7 +277,20 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
+      <item row="0" column="1" >
+       <widget class="QLabel" name="replayLabel" >
+        <property name="text" >
+         <string>_("Replay gain mode")</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QComboBox" name="replayCombo" />
+      </item>
+      <item row="1" column="2" >
        <widget class="QDoubleSpinBox" name="volNormSpin" >
         <property name="alignment" >
          <set>Qt::AlignRight</set>
@@ -292,7 +305,7 @@
      <property name="title" >
       <string>_("last.fm")</string>
      </property>
-     <layout class="QGridLayout" >
+     <layout class="QGridLayout" name="gridLayout" >
       <item row="0" column="0" colspan="2" >
        <widget class="QCheckBox" name="lastfm" >
         <property name="text" >
@@ -300,9 +313,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QLineEdit" name="lastfm_user_edit" />
-      </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="lastfm_user_label" >
         <property name="text" >
@@ -313,6 +323,9 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="lastfm_user_edit" />
+      </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="lastfm_pass_label" >
         <property name="text" >
@@ -323,7 +336,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="2" >
+      <item row="2" column="1" >
        <widget class="QLineEdit" name="lastfm_pass_edit" >
         <property name="echoMode" >
          <enum>QLineEdit::Password</enum>