Skip to content

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

Qt4: One Day / One ui. Audio. 

This is not finished because I don't have a windows machine. And needs some relabeling.:
parent a900b500
Show whitespace changes
Inline Side-by-side
Showing with 270 additions and 179 deletions
modules/gui/qt4/ui/sprefs_audio.ui
View file @ da7bbf93
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>685</width> <width>475</width>
<height>565</height> <height>597</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
...@@ -20,15 +20,29 @@ ...@@ -20,15 +20,29 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<layout class="QGridLayout" > <widget class="QCheckBox" name="enableAudio" >
<property name="margin" > <property name="text" >
<number>0</number> <string>Enable audio</string>
</property> </property>
<property name="spacing" > <property name="checked" >
<number>6</number> <bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>General Audio</string>
</property> </property>
<item row="2" column="1" >
<widget class="QSlider" name="defaultVolume" > <widget class="QSlider" name="defaultVolume" >
<property name="geometry" >
<rect>
<x>250</x>
<y>60</y>
<width>200</width>
<height>16</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>1</hsizetype>
...@@ -47,8 +61,112 @@ ...@@ -47,8 +61,112 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>50</y>
<width>249</width>
<height>17</height>
</rect>
</property>
<property name="text" >
<string>Default volume</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>90</y>
<width>231</width>
<height>23</height>
</rect>
</property>
<property name="text" >
<string>Use S/PDIF when available</string>
</property>
</widget>
<widget class="QComboBox" name="preferredAudioLanguage" >
<property name="geometry" >
<rect>
<x>250</x>
<y>20</y>
<width>200</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
</widget>
<widget class="QLabel" name="label_8" >
<property name="geometry" >
<rect>
<x>10</x>
<y>120</y>
<width>249</width>
<height>26</height>
</rect>
</property>
<property name="text" >
<string>Force detection of Dolby Surround</string>
</property>
</widget>
<widget class="QComboBox" name="preferredAudioLanguage_2" >
<property name="geometry" >
<rect>
<x>250</x>
<y>120</y>
<width>200</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="currentIndex" >
<number>-1</number>
</property>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>249</width>
<height>26</height>
</rect>
</property>
<property name="text" >
<string>Preferred audio language</string>
</property>
</widget>
</widget>
</item> </item>
<item row="3" column="0" colspan="2" > <item>
<widget class="QGroupBox" name="groupBox_2" > <widget class="QGroupBox" name="groupBox_2" >
<property name="title" > <property name="title" >
<string>Output</string> <string>Output</string>
...@@ -60,99 +178,74 @@ ...@@ -60,99 +178,74 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="3" column="2" >
<widget class="QComboBox" name="outputModule" /> <widget class="QPushButton" name="fileBrowseButton" >
</item>
<item row="2" column="1" >
<widget class="QSpinBox" name="directXDevice" >
<property name="maximumSize" >
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="lineEdit" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>Type</string> <string>Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="4" column="2" >
<widget class="QLabel" name="label_4" > <widget class="QPushButton" name="fileBrowseButton_2" >
<property name="text" > <property name="text" >
<string>Device</string> <string>Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="4" column="1" >
<widget class="QLineEdit" name="lineEdit" />
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="lineEdit_2" />
</item>
<item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="alsaDevice_2" />
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="alsaDevice" /> <widget class="QComboBox" name="alsaDevice" />
</item> </item>
<item row="0" column="1" colspan="2" >
<widget class="QComboBox" name="outputModule" />
</item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_6" > <widget class="QLabel" name="label_6" >
<property name="text" > <property name="text" >
<string>Device</string> <string>DirectX Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="label_7" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>File</string> <string>Alsa Device</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="0" >
</widget> <widget class="QLabel" name="label_3" >
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>Preferred audio language</string> <string>Type</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="3" column="0" >
<widget class="QComboBox" name="preferredAudioLanguage" > <widget class="QLabel" name="label_9" >
<property name="sizePolicy" > <property name="text" >
<sizepolicy> <string>OSS Device</string>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>300</width>
<height>16777215</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="4" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_7" >
<property name="text" > <property name="text" >
<string>Default volume</string> <string>File</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > </layout>
<widget class="QCheckBox" name="enableAudio" >
<property name="text" >
<string>Enable audio</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2" > <item>
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="title" > <property name="title" >
<string>Effects</string> <string>Effects</string>
...@@ -205,8 +298,6 @@ p, li { white-space: pre-wrap; } ...@@ -205,8 +298,6 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>
......
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