Skip to content

V
vlc-2-2
Commit a50bb327 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf
Browse files
Options

UI: Sprefs_audio fixes and enhancements 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 11e07b57
Show whitespace changes
Inline Side-by-side
Showing with 536 additions and 387 deletions
modules/gui/qt4/components/preferences_widgets.cpp
View file @ a50bb327
...@@ -1037,7 +1037,7 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, ...@@ -1037,7 +1037,7 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, module_config_t *_p_item,
QLabel *_label, QLabel *_label,
QCheckBox *_checkbox, QAbstractButton *_checkbox,
bool bycat ) : bool bycat ) :
VIntConfigControl( _p_this, _p_item ) VIntConfigControl( _p_this, _p_item )
{ {
...@@ -1048,14 +1048,13 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this, ...@@ -1048,14 +1048,13 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
void BoolConfigControl::finish() void BoolConfigControl::finish()
{ {
checkbox->setCheckState( p_item->value.i == true ? Qt::Checked checkbox->setChecked( p_item->value.i == true );
: Qt::Unchecked );
checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) ); checkbox->setToolTip( formatTooltip(qtr(p_item->psz_longtext)) );
} }
int BoolConfigControl::getValue() int BoolConfigControl::getValue()
{ {
return checkbox->checkState() == Qt::Checked ? true : false; return checkbox->isChecked();
} }
/************************************************************************** /**************************************************************************
......
modules/gui/qt4/components/preferences_widgets.hpp
View file @ a50bb327
...@@ -201,14 +201,14 @@ public: ...@@ -201,14 +201,14 @@ public:
BoolConfigControl( vlc_object_t *, module_config_t *, QWidget *, BoolConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& ); QGridLayout *, int& );
BoolConfigControl( vlc_object_t *, module_config_t *, BoolConfigControl( vlc_object_t *, module_config_t *,
QLabel *, QCheckBox*, bool ); QLabel *, QAbstractButton*, bool );
virtual ~BoolConfigControl() {}; virtual ~BoolConfigControl() {};
virtual int getValue(); virtual int getValue();
virtual void show() { checkbox->show(); } virtual void show() { checkbox->show(); }
virtual void hide() { checkbox->hide(); } virtual void hide() { checkbox->hide(); }
virtual int getType() { return CONFIG_ITEM_BOOL; } virtual int getType() { return CONFIG_ITEM_BOOL; }
private: private:
QCheckBox *checkbox; QAbstractButton *checkbox;
void finish(); void finish();
}; };
......
modules/gui/qt4/components/simple_preferences.cpp
View file @ a50bb327
...@@ -223,6 +223,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -223,6 +223,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
START_SPREFS_CAT( Audio, qtr("Audio Settings") ); START_SPREFS_CAT( Audio, qtr("Audio Settings") );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); 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 ) \ #define audioCommon( name ) \
QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \ QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \
...@@ -230,7 +233,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -230,7 +233,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
name ## Layout->setMargin( 0 ); \ name ## Layout->setMargin( 0 ); \
name ## Layout->setSpacing( 0 ); \ name ## Layout->setSpacing( 0 ); \
QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \ 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 ); \ name ## Layout->addWidget( name ## Label ); \
#define audioControl( name) \ #define audioControl( name) \
...@@ -249,12 +252,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -249,12 +252,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
name ## Layout->addWidget( name ## Browse ); \ name ## Layout->addWidget( name ## Browse ); \
outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 ); 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 */ /* Build if necessary */
QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout()); QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
#ifdef WIN32 #ifdef WIN32
...@@ -294,11 +291,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -294,11 +291,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT( ui.defaultVolume, valueChanged( int ), 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, CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage ); preferredAudioLanguage );
CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox ); CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel, CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby ); detectionDolby );
...@@ -326,6 +327,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -326,6 +327,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets.append( ui.volumeValue ); optionWidgets.append( ui.volumeValue );
optionWidgets.append( ui.headphoneEffect ); optionWidgets.append( ui.headphoneEffect );
optionWidgets.append( ui.spdifBox );
updateAudioOptions( ui.outputModule->currentIndex() ); updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */ /* LastFM */
...@@ -340,11 +342,19 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -340,11 +342,19 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.lastfm->setChecked( true ); ui.lastfm->setChecked( true );
else else
ui.lastfm->setChecked( false ); 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 ), CONNECT( ui.lastfm, stateChanged( int ),
this, lastfm_Changed( int ) ); this, lastfm_Changed( int ) );
} }
else else
{
ui.lastfm->hide(); ui.lastfm->hide();
ui.lastfm_zone->hide();
}
/* Normalizer */ /* Normalizer */
CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin,
...@@ -647,6 +657,8 @@ void SPrefsPanel::updateAudioOptions( int number) ...@@ -647,6 +657,8 @@ void SPrefsPanel::updateAudioOptions( int number)
optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#endif #endif
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
optionWidgets[spdifChB]->setVisible( ( value != "aout_file"
&& value != "dummy" ) );
} }
......
modules/gui/qt4/components/simple_preferences.hpp
View file @ a50bb327
...@@ -75,6 +75,7 @@ enum { ...@@ -75,6 +75,7 @@ enum {
normalizerChB, normalizerChB,
volLW, volLW,
headphoneB, headphoneB,
spdifChB,
}; };
enum { inputLE, cachingCoB }; enum { inputLE, cachingCoB };
enum { skinRB, qtRB }; enum { skinRB, qtRB };
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ a50bb327
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Jean-Baptiste Kempf</author> <author>Jean-Baptiste Kempf</author>
<class>SPrefsAudio</class> <class>SPrefsAudio</class>
<widget class="QWidget" name="SPrefsAudio" > <widget class="QWidget" name="SPrefsAudio">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>643</width> <width>643</width>
<height>605</height> <height>619</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QCheckBox" name="enableAudio" > <widget class="QCheckBox" name="enableAudio">
<property name="text" > <property name="text">
<string>Enable audio</string> <string>Enable audio</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="audioBox" > <widget class="QWidget" name="SPrefsAudio_zone" native="true">
<property name="title" > <layout class="QVBoxLayout" name="verticalLayout_2">
<string>General Audio</string> <property name="leftMargin">
<number>9</number>
</property> </property>
<layout class="QGridLayout" > <property name="topMargin">
<item row="0" column="0" colspan="2" > <number>0</number>
<widget class="QLabel" name="label_2" > </property>
<property name="text" > <property name="bottomMargin">
<string>Default volume</string> <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> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="2" > <item row="1" column="0" colspan="2">
<widget class="QSlider" name="defaultVolume" > <widget class="QRadioButton" name="resetVolumeRadio">
<property name="sizePolicy" > <property name="minimumSize">
<sizepolicy vsizetype="Minimum" hsizetype="Fixed" > <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> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="layoutDirection">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="layoutDirection" >
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="maximum" > <property name="maximum">
<number>400</number> <number>200</number>
</property> </property>
<property name="value" > <property name="value">
<number>100</number> <number>100</number>
</property> </property>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4" > <item>
<widget class="QSpinBox" name="volumeValue" > <widget class="QSpinBox" name="volumeValue">
<property name="toolTip" > <property name="sizePolicy">
<string>256 corresponds to 100%, 1024 to 400%</string> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="wrapping">
<bool>false</bool>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="readOnly" > <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="suffix" > <property name="suffix">
<string> %</string> <string> %</string>
</property> </property>
<property name="maximum" > <property name="maximum">
<number>400</number> <number>200</number>
</property> </property>
<property name="value" > <property name="value">
<number>100</number> <number>100</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > </layout>
<widget class="QCheckBox" name="spdifBox" >
<property name="text" >
<string>Use S/PDIF when available</string>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="2" colspan="3" > </layout>
<widget class="QCheckBox" name="saveVolBox" >
<property name="text" >
<string>Save volume on exit</string>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item>
<widget class="QLabel" name="dolbyLabel" > <widget class="QGroupBox" name="outputAudioBox">
<property name="text" > <property name="title">
<string>Force detection of Dolby Surround</string> <string>Output</string>
</property> </property>
<property name="buddy" > <layout class="QGridLayout" name="outputAudioLayout">
<cstring>detectionDolby</cstring> <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> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2" colspan="3" > <item row="0" column="1">
<widget class="QComboBox" name="detectionDolby" > <widget class="QComboBox" name="outputModule">
<property name="sizePolicy" > <property name="enabled">
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > <bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize" > </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> <size>
<width>300</width> <width>256</width>
<height>16777215</height> <height>0</height>
</size> </size>
</property> </property>
<property name="currentIndex" > <property name="text">
<number>-1</number> <string>Destination file:</string>
</property>
<property name="buddy">
<cstring>fileName</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item>
<widget class="QLabel" name="langLabel" > <widget class="QLineEdit" name="fileName"/>
<property name="text" > </item>
<string>Preferred audio language</string> <item>
</property> <widget class="QPushButton" name="fileBrowseButton">
<property name="buddy" > <property name="text">
<cstring>preferredAudioLanguage</cstring> <string>Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="3" > </layout>
<widget class="QLineEdit" name="preferredAudioLanguage" /> </widget>
</item> </item>
<item row="2" column="1" > <item row="3" column="1">
<spacer name="horizontalSpacer" > <widget class="QCheckBox" name="spdifBox">
<property name="orientation" > <property name="sizePolicy">
<enum>Qt::Horizontal</enum> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
<property name="sizeType" > <verstretch>0</verstretch>
<enum>QSizePolicy::Fixed</enum> </sizepolicy>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="text">
<size> <string>Use S/PDIF when available</string>
<width>20</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="outputAudioBox" > <widget class="QGroupBox" name="groupBox_2">
<property name="title" > <property name="sizePolicy">
<string>Output</string> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Spatialization</string>
</property>
<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> </property>
<layout class="QGridLayout" name="outputAudioLayout" > </widget>
<item row="0" column="0" > </item>
<widget class="QLabel" name="outputLabel" > <item row="1" column="0">
<property name="minimumSize" > <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> <size>
<width>100</width> <width>250</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text" > <property name="maximumSize">
<string>Type</string> <size>
<width>250</width>
<height>16777215</height>
</size>
</property> </property>
<property name="buddy" > <property name="text">
<cstring>outputModule</cstring> <string>Dolby Surround:</string>
</property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > </layout>
<widget class="QComboBox" name="outputModule" > </widget>
<property name="enabled" > </item>
<bool>true</bool> <item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Processing</string>
</property> </property>
<property name="sizePolicy" > <layout class="QGridLayout">
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > <property name="bottomMargin">
<number>0</number>
</property>
<item row="4" column="1" colspan="2">
<widget class="QComboBox" name="visualisation">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="4" column="0">
<widget class="QWidget" native="1" name="fileControl" > <widget class="QLabel" name="visuLabel">
<layout class="QHBoxLayout" > <property name="minimumSize">
<property name="spacing" > <size>
<number>0</number> <width>250</width>
<height>0</height>
</size>
</property> </property>
<property name="margin" > <property name="text">
<number>0</number> <string>Visualization:</string>
</property> </property>
<item> <property name="buddy">
<widget class="QLabel" name="fileLabel" > <cstring>visualisation</cstring>
<property name="minimumSize" > </property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="replayLabel">
<property name="minimumSize">
<size> <size>
<width>100</width> <width>250</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text" > <property name="text">
<string>File</string> <string>Replay gain mode:</string>
</property> </property>
<property name="buddy" > <property name="alignment">
<cstring>fileName</cstring> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="fileName" /> <widget class="QComboBox" name="replayCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </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> <item>
<widget class="QPushButton" name="fileBrowseButton" > <widget class="QDoubleSpinBox" name="volNormSpin">
<property name="text" > <property name="enabled">
<string>Browse...</string> <bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <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> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="groupBox" > <widget class="QCheckBox" name="volNormBox">
<property name="title" > <property name="sizePolicy">
<string>Effects</string> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<layout class="QGridLayout" > <property name="minimumSize">
<item row="2" column="1" colspan="2" > <size>
<widget class="QComboBox" name="visualisation" /> <width>250</width>
</item> <height>0</height>
<item row="0" column="0" > </size>
<widget class="QCheckBox" name="headphoneEffect" > </property>
<property name="text" > <property name="maximumSize">
<string>Headphone surround effect</string> <size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Normalize volume to:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > </layout>
<widget class="QCheckBox" name="volNormBox" >
<property name="text" >
<string>Volume normalizer</string>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item>
<widget class="QLabel" name="visuLabel" > <widget class="QGroupBox" name="groupBox_3">
<property name="text" > <property name="title">
<string>Visualization</string> <string>Tracks</string>
</property> </property>
<property name="buddy" > <layout class="QGridLayout" name="gridLayout_3">
<cstring>visualisation</cstring> <property name="bottomMargin">
<number>0</number>
</property> </property>
</widget> <item row="0" column="0">
</item> <widget class="QLabel" name="langLabel">
<item row="0" column="1" > <property name="minimumSize">
<widget class="QLabel" name="replayLabel" > <size>
<property name="text" > <width>250</width>
<string>Replay gain mode</string> <height>0</height>
</size>
</property> </property>
<property name="alignment" > <property name="text">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <string>Preferred audio language:</string>
</property>
<property name="buddy">
<cstring>preferredAudioLanguage</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="1">
<widget class="QComboBox" name="replayCombo" /> <widget class="QLineEdit" name="preferredAudioLanguage"/>
</item> </item>
<item row="1" column="2" > <item row="2" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="volNormSpin" > <widget class="QWidget" name="lastfm_zone" native="true">
<property name="alignment" > <property name="enabled">
<set>Qt::AlignRight</set> <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> </property>
</widget> </widget>
</item> </item>
</layout> <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> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QGroupBox" name="lastFMBox" > <widget class="QLabel" name="lastfm_pass_label">
<property name="title" > <property name="maximumSize">
<string>last.fm</string> <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>
<layout class="QGridLayout" name="gridLayout" > <property name="buddy">
<item row="0" column="0" colspan="2" > <cstring>lastfm_pass_edit</cstring>
<widget class="QCheckBox" name="lastfm" >
<property name="text" >
<string>Enable last.fm submission</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="0" column="0">
<widget class="QLabel" name="lastfm_user_label" > <widget class="QLabel" name="lastfm_user_label">
<property name="text" > <property name="maximumSize">
<string>Username</string> <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>
<property name="buddy" > <property name="buddy">
<cstring>lastfm_user_edit</cstring> <cstring>lastfm_user_edit</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > </layout>
<widget class="QLineEdit" name="lastfm_user_edit" /> </widget>
</item> </item>
<item row="2" column="0" > <item row="1" column="0" colspan="2">
<widget class="QLabel" name="lastfm_pass_label" > <widget class="QCheckBox" name="lastfm">
<property name="text" > <property name="text">
<string>Password</string> <string>Submit played tracks stats to Last.fm</string>
</property>
<property name="buddy" >
<cstring>lastfm_pass_edit</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > </layout>
<widget class="QLineEdit" name="lastfm_pass_edit" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -350,88 +564,11 @@ ...@@ -350,88 +564,11 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>enableAudio</tabstop> <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>outputModule</tabstop>
<tabstop>fileName</tabstop> <tabstop>fileName</tabstop>
<tabstop>fileBrowseButton</tabstop> <tabstop>fileBrowseButton</tabstop>
<tabstop>headphoneEffect</tabstop>
<tabstop>volNormBox</tabstop>
<tabstop>volNormSpin</tabstop>
<tabstop>visualisation</tabstop> <tabstop>visualisation</tabstop>
<tabstop>lastfm</tabstop>
<tabstop>lastfm_user_edit</tabstop>
<tabstop>lastfm_pass_edit</tabstop>
</tabstops> </tabstops>
<resources/> <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> </ui>
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