Commit 31a51c3e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

parents 1a11a808 0f594de0
...@@ -295,6 +295,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -295,6 +295,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL, CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL,
volNormSpin ); volNormSpin );
CONFIG_GENERIC( "audio-replay-gain-mode", StringList, ui.replayLabel,
replayCombo );
CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel, CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
visualisation); visualisation);
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>559</width> <width>643</width>
<height>609</height> <height>605</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" name="verticalLayout" >
<item> <item>
<widget class="QCheckBox" name="enableAudio" > <widget class="QCheckBox" name="enableAudio" >
<property name="text" > <property name="text" >
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<string>_("Effects")</string> <string>_("Effects")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="2" column="1" > <item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="visualisation" /> <widget class="QComboBox" name="visualisation" />
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
...@@ -277,7 +277,20 @@ ...@@ -277,7 +277,20 @@
</property> </property>
</widget> </widget>
</item> </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" > <widget class="QDoubleSpinBox" name="volNormSpin" >
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignRight</set> <set>Qt::AlignRight</set>
...@@ -292,7 +305,7 @@ ...@@ -292,7 +305,7 @@
<property name="title" > <property name="title" >
<string>_("last.fm")</string> <string>_("last.fm")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="lastfm" > <widget class="QCheckBox" name="lastfm" >
<property name="text" > <property name="text" >
...@@ -300,9 +313,6 @@ ...@@ -300,9 +313,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2" >
<widget class="QLineEdit" name="lastfm_user_edit" />
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="lastfm_user_label" > <widget class="QLabel" name="lastfm_user_label" >
<property name="text" > <property name="text" >
...@@ -313,6 +323,9 @@ ...@@ -313,6 +323,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" >
<widget class="QLineEdit" name="lastfm_user_edit" />
</item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="lastfm_pass_label" > <widget class="QLabel" name="lastfm_pass_label" >
<property name="text" > <property name="text" >
...@@ -323,7 +336,7 @@ ...@@ -323,7 +336,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2" > <item row="2" column="1" >
<widget class="QLineEdit" name="lastfm_pass_edit" > <widget class="QLineEdit" name="lastfm_pass_edit" >
<property name="echoMode" > <property name="echoMode" >
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment