[vlc-devel] [PATCH] UI: spref_audio menu fixes and enhancements
Francois Cartegnie
fcvlcdev at free.fr
Thu Jun 11 13:28:05 CEST 2009
---
modules/gui/qt4/components/preferences_widgets.cpp | 30 +-
modules/gui/qt4/components/preferences_widgets.hpp | 11 +-
modules/gui/qt4/components/simple_preferences.cpp | 32 +-
modules/gui/qt4/components/simple_preferences.hpp | 1 +
modules/gui/qt4/ui/sprefs_audio.ui | 853 +++++++++++---------
5 files changed, 535 insertions(+), 392 deletions(-)
diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 2b2163d..2d3720d 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1020,18 +1020,18 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
int &line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
- checkbox = new QCheckBox( qtr(p_item->psz_text) );
+ qwidget = new QCheckBox( qtr(p_item->psz_text) );
finish();
if( !l )
{
QHBoxLayout *layout = new QHBoxLayout();
- layout->addWidget( checkbox, 0 );
+ layout->addWidget( qwidget, 0 );
widget->setLayout( layout );
}
else
{
- l->addWidget( checkbox, line, 0 );
+ l->addWidget( qwidget, line, 0 );
}
}
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
@@ -1041,21 +1041,35 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
bool bycat ) :
VIntConfigControl( _p_this, _p_item )
{
- checkbox = _checkbox;
+ qwidget = _checkbox;
+ VLC_UNUSED( _label );
+ finish();
+}
+BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
+ module_config_t *_p_item,
+ QLabel *_label,
+ QRadioButton *_radio,
+ bool bycat ) :
+ VIntConfigControl( _p_this, _p_item )
+{
+ qwidget = _radio;
VLC_UNUSED( _label );
finish();
}
void BoolConfigControl::finish()
{
- checkbox->setCheckState( p_item->value.i == true ? Qt::Checked
- : Qt::Unchecked );
- checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
+ /* see remark below */
+ ((QCheckBox *) qwidget)->setChecked( p_item->value.i == true );
+ qwidget->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
}
int BoolConfigControl::getValue()
{
- return checkbox->checkState() == Qt::Checked ? true : false;
+ /* unclean way to access common methods
+ should user-redefine checkbox & radio class with a common interface
+ */
+ return ((QCheckBox *) qwidget)->isChecked();
}
/**************************************************************************
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index b42bc0a..87f7bf3 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -45,6 +45,7 @@
#include <QPushButton>
#include <QVector>
#include <QDialog>
+#include <QRadioButton>
class QTreeWidget;
class QTreeWidgetItem;
@@ -202,13 +203,17 @@ public:
QGridLayout *, int& );
BoolConfigControl( vlc_object_t *, module_config_t *,
QLabel *, QCheckBox*, bool );
+ /* will only work with 2 options radio */
+ BoolConfigControl( vlc_object_t *, module_config_t *,
+ QLabel *, QRadioButton*, bool );
virtual ~BoolConfigControl() {};
virtual int getValue();
- virtual void show() { checkbox->show(); }
- virtual void hide() { checkbox->hide(); }
+ virtual void show() { qwidget->show(); }
+ virtual void hide() { qwidget->hide(); }
virtual int getType() { return CONFIG_ITEM_BOOL; }
private:
- QCheckBox *checkbox;
+ //QCheckBox *checkbox;
+ QWidget *qwidget;
void finish();
};
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 701cc18..9de41c8 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -223,6 +223,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
START_SPREFS_CAT( Audio, qtr("Audio Settings") );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+ ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() );
+ CONNECT( ui.enableAudio, toggled( bool ),
+ ui.SPrefsAudio_zone, setEnabled( bool ) );
#define audioCommon( name ) \
QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \
@@ -230,12 +233,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
name ## Layout->setMargin( 0 ); \
name ## Layout->setSpacing( 0 ); \
QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \
- name ## Label->setMinimumSize(QSize(100, 0)); \
+ name ## Label->setMinimumSize(QSize(250, 0)); \
name ## Layout->addWidget( name ## Label ); \
#define audioControl( name) \
audioCommon( name ) \
- QComboBox * name ## Device = new QComboBox( name ## Control ); \
+ QComboBox * name ## Device = new QComboBox( name ## Control ); \
name ## Layout->addWidget( name ## Device ); \
name ## Label->setBuddy( name ## Device ); \
outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
@@ -249,12 +252,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
name ## Layout->addWidget( name ## Browse ); \
outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
- /* hide if necessary */
- ui.lastfm_user_edit->hide();
- ui.lastfm_user_label->hide();
- ui.lastfm_pass_edit->hide();
- ui.lastfm_pass_label->hide();
-
/* Build if necessary */
QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
#ifdef WIN32
@@ -292,13 +289,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume );
CONNECT( ui.defaultVolume, valueChanged( int ),
- this, updateAudioVolume( int ) );
+ this, updateAudioVolume( int ) );
+
+ CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, keepVolumeRadio );
+ ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() );
+ CONNECT( ui.resetVolumeRadio, toggled( bool ),
+ ui.defaultVolume_zone, setEnabled( bool ) );
CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage );
CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
- CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
@@ -326,6 +327,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets.append( ui.volumeValue );
optionWidgets.append( ui.headphoneEffect );
+ optionWidgets.append( ui.spdifBox );
updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */
@@ -340,11 +342,19 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.lastfm->setChecked( true );
else
ui.lastfm->setChecked( false );
+
+ ui.lastfm_zone->setEnabled( ui.lastfm->isChecked() );
+
+ CONNECT( ui.lastfm, toggled( bool ),
+ ui.lastfm_zone, setEnabled( bool ) );
CONNECT( ui.lastfm, stateChanged( int ),
this, lastfm_Changed( int ) );
}
else
+ {
ui.lastfm->hide();
+ ui.lastfm_zone->hide();
+ }
/* Normalizer */
CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin,
@@ -647,6 +657,8 @@ void SPrefsPanel::updateAudioOptions( int number)
optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#endif
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
+ optionWidgets[spdifChB]->setVisible( ( value != "aout_file"
+ && value != "dummy" ) );
}
diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 754d8ad..7e0936e 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -75,6 +75,7 @@ enum {
normalizerChB,
volLW,
headphoneB,
+ spdifChB,
};
enum { inputLE, cachingCoB };
enum { skinRB, qtRB };
diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index a055fbf..fd0c7c4 100644
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -1,346 +1,534 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<author>Jean-Baptiste Kempf</author>
<class>SPrefsAudio</class>
- <widget class="QWidget" name="SPrefsAudio" >
- <property name="geometry" >
+ <widget class="QWidget" name="SPrefsAudio">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>643</width>
- <height>605</height>
+ <height>619</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QCheckBox" name="enableAudio" >
- <property name="text" >
+ <widget class="QCheckBox" name="enableAudio">
+ <property name="text">
<string>Enable audio</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="audioBox" >
- <property name="title" >
- <string>General Audio</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Default volume</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" colspan="2" >
- <widget class="QSlider" name="defaultVolume" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>200</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection" >
- <enum>Qt::LeftToRight</enum>
- </property>
- <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="4" >
- <widget class="QSpinBox" name="volumeValue" >
- <property name="toolTip" >
- <string>256 corresponds to 100%, 1024 to 400%</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- <property name="suffix" >
- <string> %</string>
- </property>
- <property name="maximum" >
- <number>400</number>
- </property>
- <property name="value" >
- <number>100</number>
- </property>
- </widget>
- </item>
- <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 class="QWidget" name="SPrefsAudio_zone" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="audioBox">
+ <property name="title">
+ <string>Volume</string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0" colspan="2">
+ <widget class="QRadioButton" name="keepVolumeRadio">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Keep audio level between sessions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QRadioButton" name="resetVolumeRadio">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Always reset audio start level to:</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QWidget" name="defaultVolume_zone" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QSlider" name="defaultVolume">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="volumeValue">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="wrapping">
+ <bool>false</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="dolbyLabel" >
- <property name="text" >
- <string>Force detection of Dolby Surround</string>
- </property>
- <property name="buddy" >
- <cstring>detectionDolby</cstring>
+ <item>
+ <widget class="QGroupBox" name="outputAudioBox">
+ <property name="title">
+ <string>Output</string>
</property>
+ <layout class="QGridLayout" name="outputAudioLayout">
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="outputLabel">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Output module:</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 hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QWidget" name="fileControl" native="true">
+ <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">
+ <size>
+ <width>256</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Destination file:</string>
+ </property>
+ <property name="buddy">
+ <cstring>fileName</cstring>
+ </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>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="spdifBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Use S/PDIF when available</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="2" column="2" colspan="3" >
- <widget class="QComboBox" name="detectionDolby" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<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="3" column="0" >
- <widget class="QLabel" name="langLabel" >
- <property name="text" >
- <string>Preferred audio language</string>
+ <property name="title">
+ <string>Spatialization</string>
</property>
- <property name="buddy" >
- <cstring>preferredAudioLanguage</cstring>
- </property>
- </widget>
- </item>
- <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="outputAudioBox" >
- <property name="title" >
- <string>Output</string>
- </property>
- <layout class="QGridLayout" name="outputAudioLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="outputLabel" >
- <property name="minimumSize" >
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="text" >
- <string>Type</string>
- </property>
- <property name="buddy" >
- <cstring>outputModule</cstring>
+ <property name="checkable">
+ <bool>false</bool>
</property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>6</number>
+ </property>
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="headphoneEffect">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Headphone surround effect</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="detectionDolby">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="currentIndex">
+ <number>-1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="dolbyLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>250</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Dolby Surround:</string>
+ </property>
+ <property name="buddy">
+ <cstring>detectionDolby</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
</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>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Processing</string>
</property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
- <widget class="QWidget" native="1" name="fileControl" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <layout class="QGridLayout">
+ <property name="bottomMargin">
<number>0</number>
</property>
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="fileLabel" >
- <property name="minimumSize" >
+ <item row="4" column="1" colspan="2">
+ <widget class="QComboBox" name="visualisation"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="visuLabel">
+ <property name="minimumSize">
<size>
- <width>100</width>
+ <width>250</width>
<height>0</height>
</size>
</property>
- <property name="text" >
- <string>File</string>
+ <property name="text">
+ <string>Visualization:</string>
</property>
- <property name="buddy" >
- <cstring>fileName</cstring>
+ <property name="buddy">
+ <cstring>visualisation</cstring>
</property>
</widget>
</item>
- <item>
- <widget class="QLineEdit" name="fileName" />
+ <item row="3" column="0">
+ <widget class="QLabel" name="replayLabel">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Replay gain mode:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2">
+ <widget class="QComboBox" name="replayCombo"/>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QWidget" name="widget" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QDoubleSpinBox" name="volNormSpin">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</item>
- <item>
- <widget class="QPushButton" name="fileBrowseButton" >
- <property name="text" >
- <string>Browse...</string>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="volNormBox">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Normalize volume to:</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" colspan="2" >
- <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="volNormBox" >
- <property name="text" >
- <string>Volume normalizer</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="visuLabel" >
- <property name="text" >
- <string>Visualization</string>
- </property>
- <property name="buddy" >
- <cstring>visualisation</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QLabel" name="replayLabel" >
- <property name="text" >
- <string>Replay gain mode</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QComboBox" name="replayCombo" />
- </item>
- <item row="1" column="2" >
- <widget class="QDoubleSpinBox" name="volNormSpin" >
- <property name="alignment" >
- <set>Qt::AlignRight</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="lastFMBox" >
- <property name="title" >
- <string>last.fm</string>
- </property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QCheckBox" name="lastfm" >
- <property name="text" >
- <string>Enable last.fm submission</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="lastfm_user_label" >
- <property name="text" >
- <string>Username</string>
- </property>
- <property name="buddy" >
- <cstring>lastfm_user_edit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="lastfm_user_edit" />
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="lastfm_pass_label" >
- <property name="text" >
- <string>Password</string>
- </property>
- <property name="buddy" >
- <cstring>lastfm_pass_edit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="lastfm_pass_edit" >
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Tracks</string>
</property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="langLabel">
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Preferred audio language:</string>
+ </property>
+ <property name="buddy">
+ <cstring>preferredAudioLanguage</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="preferredAudioLanguage"/>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QWidget" name="lastfm_zone" native="true">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lastfm_user_edit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lastfm_pass_edit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="lastfm_pass_label">
+ <property name="maximumSize">
+ <size>
+ <width>250</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Password:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>lastfm_pass_edit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lastfm_user_label">
+ <property name="maximumSize">
+ <size>
+ <width>250</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Username:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>lastfm_user_edit</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="lastfm">
+ <property name="text">
+ <string>Submit played tracks stats to Last.fm</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
@@ -350,88 +538,11 @@
</widget>
<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>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>
- <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>
+ <connections/>
</ui>
--
1.6.2.4
More information about the vlc-devel
mailing list