Qt4 - Preferences, don't remove the widgets to re-add them! Just use hide/show.....

[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 d7235f724d9f20defa8b849bd12def3c14e6d0e0..8b0baafad97abc70551a4b0cd85d40337c029aa6 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -6,24 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
-    <height>533</height>
+    <width>550</width>
+    <height>725</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
     <widget class="QCheckBox" name="enableAudio" >
      <property name="text" >
-      <string>Enable audio</string>
+      <string>_("Enable audio")</string>
      </property>
      <property name="checked" >
       <bool>true</bool>
@@ -33,28 +27,20 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
-      <string>General Audio</string>
+      <string>_("General Audio")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <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>
+         <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>
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -73,41 +59,21 @@
       <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="spdifBox" >
         <property name="text" >
-         <string>Use S/PDIF when available</string>
-        </property>
-       </widget>
-      </item>
-      <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>
+         <string>_("Use S/PDIF when available")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Preferred audio language</string>
+         <string>_("Preferred audio language")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1" >
        <widget class="QSlider" name="defaultVolume" >
         <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>0</vsizetype>
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -126,10 +92,13 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>Default volume</string>
+         <string>_("Default volume")</string>
         </property>
        </widget>
       </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="preferredAudioLanguage" />
+      </item>
      </layout>
     </widget>
    </item>
@@ -139,73 +108,170 @@
       <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_2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Browse</string>
+         <string>_("Type")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
-         <string>File</string>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="outputModule" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="3" column="2" >
-       <widget class="QPushButton" name="OSSBrowse" >
-        <property name="text" >
-         <string>Browse</string>
-        </property>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QWidget" native="1" name="alsaControl" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="alsaLabel" >
+           <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="3" column="1" >
-       <widget class="QLineEdit" name="OSSDevice" />
+      <item row="2" column="0" colspan="2" >
+       <widget class="QWidget" native="1" name="DirectXControl" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="DirectXLabel" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </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" >
-       <widget class="QLabel" name="OSSLabel" >
-        <property name="text" >
-         <string>OSS Device</string>
-        </property>
+      <item row="3" column="0" colspan="2" >
+       <widget class="QWidget" native="1" name="OSSControl" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="OSSLabel" >
+           <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="2" column="0" >
-       <widget class="QLabel" name="DirectXLabel" >
+      <item row="4" column="0" colspan="2" >
+       <widget class="QWidget" native="1" name="fileControl" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="fileLabel" >
+           <property name="text" >
+            <string>_("File")</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="fileName" />
+         </item>
+         <item>
+          <widget class="QPushButton" name="fileBrowseButton" >
+           <property name="text" >
+            <string>_("Browse...")</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>_("Effects")</string>
+     </property>
+     <layout class="QGridLayout" >
+      <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>DirectX Device</string>
+         <string>_("Headphone surround effect")</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" >
+       <widget class="QCheckBox" name="volumeNormalizer" >
         <property name="text" >
-         <string>Alsa Device</string>
+         <string>_("Volume normalizer")</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" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>Type</string>
+         <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>
@@ -213,51 +279,39 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
+    <widget class="QGroupBox" name="groupBox_4" >
      <property name="title" >
-      <string>Effects</string>
+      <string>_("Last.fm")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="1" >
-       <widget class="QSlider" name="horizontalSlider" >
-        <property name="toolTip" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum volume when using the volume normalizer&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="0" colspan="2" >
+       <widget class="QCheckBox" name="lastfm" >
+        <property name="text" >
+         <string>_("Enable")</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="visualisation" />
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lastfm_user_edit" />
       </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="headphoneEffect" >
+      <item row="1" column="0" >
+       <widget class="QLabel" name="lastfm_user_label" >
         <property name="text" >
-         <string>Headphone surround effect</string>
+         <string>_("Username")</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="volumeNormalizer" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="lastfm_pass_label" >
         <property name="text" >
-         <string>Volume normalizer</string>
+         <string>_("Password")</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
-         <string>Visualisation</string>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lastfm_pass_edit" >
+        <property name="echoMode" >
+         <enum>QLineEdit::PasswordEchoOnEdit</enum>
         </property>
        </widget>
       </item>
@@ -266,6 +320,88 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>enableAudio</tabstop>
+  <tabstop>defaultVolume</tabstop>
+  <tabstop>spdifBox</tabstop>
+  <tabstop>detectionDolby</tabstop>
+  <tabstop>preferredAudioLanguage</tabstop>
+  <tabstop>outputModule</tabstop>
+  <tabstop>alsaDevice</tabstop>
+  <tabstop>DirectXDevice</tabstop>
+  <tabstop>OSSDevice</tabstop>
+  <tabstop>OSSBrowse</tabstop>
+  <tabstop>fileBrowseButton</tabstop>
+  <tabstop>headphoneEffect</tabstop>
+  <tabstop>volumeNormalizer</tabstop>
+  <tabstop>volNormalizer</tabstop>
+  <tabstop>visualisation</tabstop>
+ </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>lastfm</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lastfm_pass_edit</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>188</x>
+     <y>619</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>360</x>
+     <y>689</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lastfm</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lastfm_pass_label</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>188</x>
+     <y>619</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>102</x>
+     <y>689</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lastfm</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lastfm_user_edit</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>188</x>
+     <y>619</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>360</x>
+     <y>653</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lastfm</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lastfm_user_label</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>188</x>
+     <y>619</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>102</x>
+     <y>653</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>