Qt4 - cosmetics.

[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 5bcb49be69a75901231ef2b7f2e02d38bfdc60c4..c154939e9cef1d258d8cd8effeb1505ef935577e 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -1,31 +1,39 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+ <author>Jean-Baptiste Kempf</author>
  <class>SPrefsAudio</class>
  <widget class="QWidget" name="SPrefsAudio" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>408</height>
+    <width>418</width>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QVBoxLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="9" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
+   <item>
+    <widget class="QCheckBox" name="enableAudio" >
+     <property name="text" >
+      <string>Enable audio</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
-      <string>Filters</string>
+      <string>General Audio</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -34,138 +42,224 @@
       <property name="spacing" >
        <number>6</number>
       </property>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Force detection of Dolby Surround</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QComboBox" name="detectionDolby" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>3</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>
+      </item>
       <item row="1" column="0" colspan="2" >
-       <widget class="QCheckBox" name="headphoneEffect" >
+       <widget class="QCheckBox" name="spdifBox" >
         <property name="text" >
-         <string>Headphone effect</string>
+         <string>Use S/PDIF when available</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QComboBox" name="equalizerPreset" />
+      <item row="3" column="1" >
+       <widget class="QComboBox" name="preferredAudioLanguage" >
+        <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>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Preferred audio language</string>
+        </property>
+       </widget>
       </item>
       <item row="0" column="1" >
-       <widget class="QLabel" name="label_6" >
-        <property name="layoutDirection" >
-         <enum>Qt::RightToLeft</enum>
+       <widget class="QSlider" name="defaultVolume" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>1</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="text" >
-         <string>Preset</string>
+        <property name="maximumSize" >
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
-       <widget class="QCheckBox" name="equalizer" >
+       <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>Equalizer</string>
+         <string>Default volume</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QCheckBox" name="volumeNormalizer" >
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Output</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="FileName" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QPushButton" name="fileBrowseButton" >
         <property name="text" >
-         <string>Volume normalizer</string>
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>File</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QCheckBox" name="parametricEqualizer" >
+      <item row="3" column="2" >
+       <widget class="QPushButton" name="OSSBrowse" >
         <property name="text" >
-         <string>Parametric equalizer</string>
+         <string>Browse...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="OSSDevice" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="OSSLabel" >
+        <property name="text" >
+         <string>OSS Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="DirectXLabel" >
+        <property name="text" >
+         <string>DirectX Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="DirectXDevice" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="alsaLabel" >
+        <property name="text" >
+         <string>Alsa Device</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QComboBox" name="alsaDevice" />
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QComboBox" name="outputModule" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Type</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QCheckBox" name="enableAudio" >
-     <property name="text" >
-      <string>Enable audio</string>
-     </property>
-     <property name="checked" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="Line" name="line" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Prefered audio language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="preferedAudioLanguage" />
-   </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Default volume</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QSlider" name="defaultVolume" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>Output module</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" >
-    <widget class="QComboBox" name="outputModule" />
-   </item>
-   <item row="6" column="0" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>Output device</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" >
-    <widget class="QComboBox" name="outputDevice" />
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="Line" name="line_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2" >
-    <widget class="Line" name="line_3" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1" >
-    <widget class="QComboBox" name="visualisation" />
-   </item>
-   <item row="8" column="0" >
-    <widget class="QLabel" name="label_5" >
-     <property name="text" >
-      <string>Visualisation</string>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Effects</string>
      </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="QComboBox" name="visualisation" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="headphoneEffect" >
+        <property name="text" >
+         <string>Headphone surround effect</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="volumeNormalizer" >
+        <property name="text" >
+         <string>Volume normalizer</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>Visualisation</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QDoubleSpinBox" name="volNormalizer" >
+        <property name="alignment" >
+         <set>Qt::AlignRight</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>