/*****************************************************************************
* simple_preferences.cpp : "Simple preferences"
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <QUrl>
#include <QVBoxLayout>
+#include <QtAlgorithms>
+
#include <string>
#define ICON_HEIGHT 64
#define ADD_CATEGORY( button, label, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \
+ button->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \
button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \
button->setText( label ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
spref_cone_Interface_64.png, 0 );
ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 );
ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 );
- ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles & OSD"),
+ ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"),
spref_cone_Subtitles_64.png, 3 );
- ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
+ ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"),
spref_cone_Input_64.png, 4 );
ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
/******************************
* VIDEO Panel Implementation *
******************************/
- START_SPREFS_CAT( Video , qtr("General video settings") );
+ START_SPREFS_CAT( Video , qtr("General Video Settings") );
CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
/******************************
* AUDIO Panel Implementation *
******************************/
- START_SPREFS_CAT( Audio, qtr("General audio settings") );
+ START_SPREFS_CAT( Audio, qtr("General Audio Settings") );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
QComboBox * name ## Device = new QComboBox( name ## Control ); \
name ## Layout->addWidget( name ## Device ); \
name ## Label->setBuddy( name ## Device ); \
- ui.outputAudioLayout->addWidget( name ## Control, ui.outputAudioLayout->rowCount(), 0, 1, -1 );
+ outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
#define audioControl2( name) \
audioCommon( name ) \
name ## Label->setBuddy( name ## Device ); \
QPushButton * name ## Browse = new QPushButton( qtr( "Browse..." ), name ## Control); \
name ## Layout->addWidget( name ## Browse ); \
- ui.outputAudioLayout->addWidget( name ## Control, ui.outputAudioLayout->rowCount(), 0, 1, -1 );
+ outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
/* hide if necessary */
ui.lastfm_user_edit->hide();
ui.lastfm_pass_label->hide();
/* Build if necessary */
+ QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
#ifdef WIN32
audioControl( DirectX );
optionWidgets.append( DirectXControl );
+ CONFIG_GENERIC2( "directx-audio-device", IntegerList,
+ DirectXLabel, DirectXDevice );
#else
- audioControl( alsa );
- optionWidgets.append( alsaControl );
- audioControl2( OSS );
- optionWidgets.append( OSSControl );
+ if( module_Exists( p_intf, "alsa" ) )
+ {
+ audioControl( alsa );
+ optionWidgets.append( alsaControl );
+
+ CONFIG_GENERIC2( "alsadev" , StringList , alsaLabel,
+ alsaDevice );
+ }
+ else
+ optionWidgets.append( NULL );
+ if( module_Exists( p_intf, "oss" ) )
+ {
+ audioControl2( OSS );
+ optionWidgets.append( OSSControl );
+ CONFIG_GENERIC_FILE( "dspdev" , File , OSSLabel, OSSDevice,
+ OSSBrowse );
+ }
+ else
+ optionWidgets.append( NULL );
#endif
/* General Audio Options */
CONNECT( ui.outputModule, currentIndexChanged( int ),
this, updateAudioOptions( int ) );
- /* platform specifics */
-#ifdef WIN32
- CONFIG_GENERIC2( "directx-audio-device", IntegerList,
- DirectXLabel, DirectXDevice );
-#else
- if( module_Exists( p_intf, "alsa" ) )
- {
- CONFIG_GENERIC2( "alsadev" , StringList , alsaLabel,
- alsaDevice );
- }
- if( module_Exists( p_intf, "oss" ) )
- {
- CONFIG_GENERIC_FILE( "dspdev" , File , OSSLabel, OSSDevice,
- OSSBrowse );
- }
-#endif
- // File exists everywhere
+ /* File output exists on all platforms */
CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel,
ui.fileName, ui.fileBrowseButton );
CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin,
setEnabled( bool ) );
- qs_filter = qfu( config_GetPsz( p_intf, "audio-filter" ) );
+ char* psz = config_GetPsz( p_intf, "audio-filter" );
+ qs_filter = qfu( psz );
+ free( psz );
bool b_normalizer = ( qs_filter.contains( "volnorm" ) );
{
ui.volNormBox->setChecked( b_normalizer );
END_SPREFS_CAT;
/* Input and Codecs Panel Implementation */
- START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
+ START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs Settings") );
/* Disk Devices */
{
ui.DVDDevice->setToolTip(
- //TODO: make this sentence understandable
- qtr( "If this property is blank, then you have\n"
- "values for DVD, VCD, and CDDA.\n"
- "You can define a unique one or set that in"
- "the advanced preferences" ) );
+ qtr( "If this property is blank, different values\n"
+ "for DVD, VCD, and CDDA are set.\n"
+ "You can define a unique one or configure them \n"
+ "individually in the advanced preferences." ) );
char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" );
char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
{
ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
}
- delete psz_cddadiscpath; delete psz_dvddiscpath;
- delete psz_vcddiscpath;
+ free( psz_cddadiscpath );
+ free( psz_dvddiscpath );
+ free( psz_vcddiscpath );
}
CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
ui.systemCodecBox->hide();
#endif
/* Access Filters */
- qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) );
+ char* psz = config_GetPsz( p_intf, "access-filter" );
+ qs_filter = qfu( psz );
+ free( psz );
ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) );
ui.dumpBox->setChecked( qs_filter.contains( "dump" ) );
ui.recordBox->setChecked( qs_filter.contains( "record" ) );
/*******************
* Interface Panel *
*******************/
- START_SPREFS_CAT( Interface, qtr("Interface settings") );
+ START_SPREFS_CAT( Interface, qtr("Interface Settings") );
ui.defaultLabel->setFont( italicFont );
ui.skinsLabel->setFont( italicFont );
else if( strstr( psz_intf, "qt" ) )
ui.qt4->setChecked( true );
}
- delete psz_intf;
+ free( psz_intf );
optionWidgets.append( ui.skins );
optionWidgets.append( ui.qt4 );
CONFIG_GENERIC( "qt-display-mode", IntegerList, NULL,
displayModeBox );
CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
+ CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, ui.fileSkin,
ui.skinBrowse );
CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
artFetcher );
- CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
/* UPDATE options */
#ifdef UPDATE_CHECK
ui.updatesDays->hide();
#endif
/* ONE INSTANCE options */
-#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__)
+#if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__)
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode );
#endif
END_SPREFS_CAT;
- START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") );
+ START_SPREFS_CAT( Subtitles, qtr("Subtitles & On Screen Display Settings") );
CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
#ifdef WIN32
optionWidgets[directxW]->setVisible( ( value == "directx" ) );
#else
- optionWidgets[ossW]->setVisible( ( value == "oss" ) );
- optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
+ /* optionWidgets[ossW] can be NULL */
+ if( optionWidgets[ossW] )
+ optionWidgets[ossW]->setVisible( ( value == "oss" ) );
+ /* optionWidgets[alsaW] can be NULL */
+ if( optionWidgets[alsaW] )
+ optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#endif
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
}
+
+SPrefsPanel::~SPrefsPanel()
+{
+ qDeleteAll( controls ); controls.clear();
+}
+
void SPrefsPanel::updateAudioVolume( int volume )
{
qobject_cast<QSpinBox *>(optionWidgets[volLW])
aTa( ".a52" ); aTa( ".aac" ); aTa( ".ac3" ); aTa( ".dts" ); aTa( ".flac" );
aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" );
- aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".ogg" ); aTa( ".spx" ); aTa( ".wav" );
- aTa( ".wma" ); aTa( ".xm" );
+ aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".ogg" ); aTa( ".spx" );
+ aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" );
audioType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ?
Qt::Checked : Qt::PartiallyChecked )
i_temp = 0;
aTv( ".asf" ); aTv( ".avi" ); aTv( ".divx" ); aTv( ".dv" ); aTv( ".flv" );
- aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m4v" ); aTv( ".mkv" );
- aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" );
+ aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" );
+ aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" );
aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" );
- aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" );
+ aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" );
aTv( ".vob" ); aTv( ".wmv" );
videoType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ?
projects / vlc / blobdiff