String consistency.

[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 6f890ebef5c36954794546d08978bd2546607fc0..176eb7afd7dcafd53d5fa8e1e36fc81ca398c37a 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
-    <height>725</height>
+    <width>541</width>
+    <height>607</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -25,19 +25,19 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_3" >
+    <widget class="QGroupBox" name="audioBox" >
      <property name="title" >
       <string>_("General Audio")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="2" >
+      <item row="0" column="0" colspan="3" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
          <string>_("Default volume")</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
+      <item row="0" column="3" >
        <widget class="QSlider" name="defaultVolume" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
@@ -63,15 +63,18 @@
         <property name="maximum" >
          <number>400</number>
         </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="0" column="3" >
+      <item row="0" column="4" >
        <widget class="QSpinBox" name="volumeValue" >
         <property name="toolTip" >
-         <string>_("256 corresponds to 100%, 1024 to 400%)</string>
+         <string>_("256 corresponds to 100%, 1024 to 400%")</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -85,23 +88,36 @@
         <property name="maximum" >
          <number>400</number>
         </property>
+        <property name="value" >
+         <number>100</number>
+        </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="4" >
+      <item row="1" column="0" >
        <widget class="QCheckBox" name="spdifBox" >
         <property name="text" >
          <string>_("Use S/PDIF when available")</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="2" colspan="3" >
+       <widget class="QCheckBox" name="saveVolBox" >
+        <property name="text" >
+         <string>_("Save volume on exit")</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="label_8" >
         <property name="text" >
          <string>_("Force detection of Dolby Surround")</string>
         </property>
+        <property name="buddy" >
+         <cstring>detectionDolby</cstring>
+        </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="3" >
+      <item row="2" column="2" colspan="3" >
        <widget class="QComboBox" name="detectionDolby" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -125,20 +141,39 @@
         <property name="text" >
          <string>_("Preferred audio language")</string>
         </property>
+        <property name="buddy" >
+         <cstring>preferredAudioLanguage</cstring>
+        </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="3" >
+      <item row="3" column="2" colspan="3" >
        <widget class="QLineEdit" name="preferredAudioLanguage" />
       </item>
+      <item row="2" column="1" >
+       <spacer name="horizontalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2" >
+    <widget class="QGroupBox" name="outputAudioBox" >
      <property name="title" >
       <string>Output</string>
      </property>
-     <layout class="QGridLayout" >
+     <layout class="QGridLayout" name="outputAudioLayout" >
       <item row="0" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="minimumSize" >
@@ -150,10 +185,16 @@
         <property name="text" >
          <string>_("Type")</string>
         </property>
+        <property name="buddy" >
+         <cstring>outputModule</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1" >
        <widget class="QComboBox" name="outputModule" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
           <horstretch>0</horstretch>
@@ -163,101 +204,14 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="2" >
-       <widget class="QWidget" native="1" name="alsaControl" >
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QLabel" name="alsaLabel" >
-           <property name="minimumSize" >
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text" >
-            <string>_("Device")</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="alsaDevice" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QWidget" native="1" name="DirectXControl" >
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QLabel" name="DirectXLabel" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize" >
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text" >
-            <string>_("Device")</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="DirectXDevice" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QWidget" native="1" name="OSSControl" >
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QLabel" name="OSSLabel" >
-           <property name="minimumSize" >
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text" >
-            <string>_("Device")</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="OSSDevice" />
-         </item>
-         <item>
-          <widget class="QPushButton" name="OSSBrowse" >
-           <property name="text" >
-            <string>_("Browse...")</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2" >
        <widget class="QWidget" native="1" name="fileControl" >
         <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <property name="margin" >
+          <number>0</number>
+         </property>
          <item>
           <widget class="QLabel" name="fileLabel" >
            <property name="minimumSize" >
@@ -269,6 +223,9 @@
            <property name="text" >
             <string>_("File")</string>
            </property>
+           <property name="buddy" >
+            <cstring>fileName</cstring>
+           </property>
           </widget>
          </item>
          <item>
@@ -313,7 +270,10 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>_("Visualisation")</string>
+         <string>_("Visualization")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>visualisation</cstring>
         </property>
        </widget>
       </item>
@@ -328,9 +288,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_4" >
+    <widget class="QGroupBox" name="lastFMBox" >
      <property name="title" >
-      <string>_("Last.fm")</string>
+      <string>_("last.fm")</string>
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" colspan="2" >
@@ -348,6 +308,9 @@
         <property name="text" >
          <string>_("Username")</string>
         </property>
+        <property name="buddy" >
+         <cstring>lastfm_user_edit</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="0" >
@@ -355,6 +318,9 @@
         <property name="text" >
          <string>_("Password")</string>
         </property>
+        <property name="buddy" >
+         <cstring>lastfm_pass_edit</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1" colspan="2" >
@@ -372,19 +338,21 @@
  <tabstops>
   <tabstop>enableAudio</tabstop>
   <tabstop>defaultVolume</tabstop>
+  <tabstop>volumeValue</tabstop>
   <tabstop>spdifBox</tabstop>
+  <tabstop>saveVolBox</tabstop>
   <tabstop>detectionDolby</tabstop>
   <tabstop>preferredAudioLanguage</tabstop>
   <tabstop>outputModule</tabstop>
-  <tabstop>alsaDevice</tabstop>
-  <tabstop>DirectXDevice</tabstop>
-  <tabstop>OSSDevice</tabstop>
-  <tabstop>OSSBrowse</tabstop>
+  <tabstop>fileName</tabstop>
   <tabstop>fileBrowseButton</tabstop>
   <tabstop>headphoneEffect</tabstop>
   <tabstop>volNormBox</tabstop>
   <tabstop>volNormSpin</tabstop>
   <tabstop>visualisation</tabstop>
+  <tabstop>lastfm</tabstop>
+  <tabstop>lastfm_user_edit</tabstop>
+  <tabstop>lastfm_pass_edit</tabstop>
  </tabstops>
  <resources/>
  <connections>