Skip to content

V
vlc
Commit e7060874 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - Sprefs audio alignment fix.

parent bf170e3f
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 27 deletions
modules/gui/qt4/ui/sprefs_audio.ui
View file @ e7060874
...@@ -30,73 +30,82 @@ ...@@ -30,73 +30,82 @@
<string>_("General Audio")</string> <string>_("General Audio")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="2" column="0" > <item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_8" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>_("Force detection of Dolby Surround")</string> <string>_("Default volume")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="0" column="2" >
<widget class="QComboBox" name="detectionDolby" > <widget class="QSlider" name="defaultVolume" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" >
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>300</width> <width>200</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="currentIndex" > <property name="layoutDirection" >
<number>-1</number> <enum>Qt::LeftToRight</enum>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="3" >
<widget class="QCheckBox" name="spdifBox" > <widget class="QCheckBox" name="spdifBox" >
<property name="text" > <property name="text" >
<string>_("Use S/PDIF when available")</string> <string>_("Use S/PDIF when available")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label_8" >
<property name="text" > <property name="text" >
<string>_("Preferred audio language")</string> <string>_("Force detection of Dolby Surround")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="2" column="1" colspan="2" >
<widget class="QSlider" name="defaultVolume" > <widget class="QComboBox" name="detectionDolby" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" > <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>200</width> <width>300</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="orientation" > <property name="currentIndex" >
<enum>Qt::Horizontal</enum> <number>-1</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>_("Default volume")</string> <string>_("Preferred audio language")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="1" colspan="2" >
<widget class="QLineEdit" name="preferredAudioLanguage" /> <widget class="QLineEdit" name="preferredAudioLanguage" />
</item> </item>
</layout> </layout>
...@@ -110,6 +119,12 @@ ...@@ -110,6 +119,12 @@
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="minimumSize" >
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>_("Type")</string> <string>_("Type")</string>
</property> </property>
...@@ -128,11 +143,26 @@ ...@@ -128,11 +143,26 @@
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<widget class="QWidget" native="1" name="alsaControl" > <widget class="QWidget" native="1" name="alsaControl" >
<layout class="QHBoxLayout" > <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> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="alsaLabel" > <widget class="QLabel" name="alsaLabel" >
<property name="minimumSize" >
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>_("Device")</string> <string>_("Device")</string>
</property> </property>
...@@ -154,7 +184,16 @@ ...@@ -154,7 +184,16 @@
<item row="2" column="0" colspan="2" > <item row="2" column="0" colspan="2" >
<widget class="QWidget" native="1" name="DirectXControl" > <widget class="QWidget" native="1" name="DirectXControl" >
<layout class="QHBoxLayout" > <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> <number>0</number>
</property> </property>
<item> <item>
...@@ -165,6 +204,12 @@ ...@@ -165,6 +204,12 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" >
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>_("Device")</string> <string>_("Device")</string>
</property> </property>
...@@ -186,11 +231,26 @@ ...@@ -186,11 +231,26 @@
<item row="3" column="0" colspan="2" > <item row="3" column="0" colspan="2" >
<widget class="QWidget" native="1" name="OSSControl" > <widget class="QWidget" native="1" name="OSSControl" >
<layout class="QHBoxLayout" > <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> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="OSSLabel" > <widget class="QLabel" name="OSSLabel" >
<property name="minimumSize" >
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>_("Device")</string> <string>_("Device")</string>
</property> </property>
...@@ -212,11 +272,26 @@ ...@@ -212,11 +272,26 @@
<item row="4" column="0" colspan="2" > <item row="4" column="0" colspan="2" >
<widget class="QWidget" native="1" name="fileControl" > <widget class="QWidget" native="1" name="fileControl" >
<layout class="QHBoxLayout" > <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> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="fileLabel" > <widget class="QLabel" name="fileLabel" >
<property name="minimumSize" >
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>_("File")</string> <string>_("File")</string>
</property> </property>
......
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