#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 ); \
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 );
{
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" ) );
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 );
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() ) ?