Merge branch 'master' of git@git.videolan.org:vlc

modules/gui/qt4/components/simple_preferences.cpp

@@ -295,6 +295,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
             CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL,
                                     volNormSpin );
+            CONFIG_GENERIC( "audio-replay-gain-mode", StringList, ui.replayLabel,
+                            replayCombo );
             CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
                             visualisation);
 

modules/gui/qt4/ui/sprefs_audio.ui

@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>559</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" >
@@ -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" >
@@ -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>