/*****************************************************************************
* 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 <QFont>
#include <QToolButton>
#include <QButtonGroup>
-#include <QUrl>
#include <QVBoxLayout>
+#include <QScrollArea>
-#include <string>
+#include <QStyleFactory>
+#include <QSettings>
+#include <QtAlgorithms>
#define ICON_HEIGHT 64
-#define BUTTON_HEIGHT 74
+
+#ifdef WIN32
+# include <vlc_windows_interfaces.h>
+#endif
/*********************************************************************
* The List of categories
*********************************************************************/
-SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
+SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool small ) :
QWidget( _parent ), p_intf( _p_intf )
{
QVBoxLayout *layout = new QVBoxLayout();
CONNECT( buttonGroup, buttonClicked ( int ),
this, switchPanel( int ) );
+ short icon_height = small ? ICON_HEIGHT /2 : ICON_HEIGHT;
+
#define ADD_CATEGORY( button, label, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \
- button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \
+ button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \
button->setText( label ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
- button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT); \
+ button->setIconSize( QSize( icon_height, icon_height ) ); \
+ button->resize( icon_height + 6 , icon_height + 6 ); \
button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ; \
button->setAutoRaise( true ); \
button->setCheckable( true ); \
layout->addWidget( button );
ADD_CATEGORY( SPrefsInterface, qtr("Interface"),
- 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"),
- spref_cone_Subtitles_64.png, 3 );
- ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
- spref_cone_Input_64.png, 4 );
- ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
+ cone_interface_64, 0 );
+ ADD_CATEGORY( SPrefsAudio, qtr("Audio"),
+ cone_audio_64, 1 );
+ ADD_CATEGORY( SPrefsVideo, qtr("Video"),
+ cone_video_64, 2 );
+ ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"),
+ cone_subtitles_64, 3 );
+ ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"),
+ cone_input_64, 4 );
+ ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"),
+ cone_hotkeys_64, 5 );
+
+#undef ADD_CATEGORY
SPrefsInterface->setChecked( true );
layout->setMargin( 0 );
* The Panels
*********************************************************************/
SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
- int _number ) : QWidget( _parent ), p_intf( _p_intf )
+ int _number, bool small ) : QWidget( _parent ), p_intf( _p_intf )
{
module_config_t *p_config;
ConfigControl *control;
controls.append( control ); \
}
+#define CONFIG_GENERIC2( option, type, label, qcontrol ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, label, qcontrol, false ); \
+ controls.append( control ); \
+ }
+
+
#define CONFIG_GENERIC_NO_BOOL( option, type, label, qcontrol ) \
p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
if( p_config ) \
if( p_config ) \
{ \
control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
- p_config, label, ui.qcontrol, ui.qbutton, \
- false ); \
+ p_config, label, qcontrol, qbutton ); \
controls.append( control ); \
}
/******************************
* VIDEO Panel Implementation *
******************************/
- START_SPREFS_CAT( Video , qtr("General video settings") );
+ START_SPREFS_CAT( Video , qtr("Video Settings") );
CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
- CONFIG_GENERIC( "vout", Module, NULL, outputModule );
+ CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule );
#ifdef WIN32
CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
- CONFIG_GENERIC( "directx-device", StringList, NULL,
+ CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel,
dXdisplayDevice );
+ CONFIG_GENERIC( "directx-hw-yuv", Bool, NULL, hwYUVBox );
#else
ui.directXBox->setVisible( false );
+ ui.hwYUVBox->setVisible( false );
#endif
- CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
- snapshotsDirectory, snapshotsDirectoryBrowse );
- CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
+ CONFIG_GENERIC( "deinterlace", StringList, ui.deinterLabel, deinterlaceBox );
+ CONFIG_GENERIC( "aspect-ratio", String, ui.arLabel, arLine );
+
+ CONFIG_GENERIC_FILE( "snapshot-path", Directory, ui.dirLabel,
+ ui.snapshotsDirectory, ui.snapshotsDirectoryBrowse );
+ CONFIG_GENERIC( "snapshot-prefix", String, ui.prefixLabel, snapshotsPrefix );
CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
snapshotsSequentialNumbering );
- CONFIG_GENERIC( "snapshot-format", StringList, NULL,
+ CONFIG_GENERIC( "snapshot-format", StringList, ui.arLabel,
snapshotsFormat );
END_SPREFS_CAT;
/******************************
* AUDIO Panel Implementation *
******************************/
- START_SPREFS_CAT( Audio, qtr("General audio settings") );
+ START_SPREFS_CAT( Audio, qtr("Audio Settings") );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
-
- /* hide if necessary */
+ 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 ); \
+ QHBoxLayout * name ## Layout = new QHBoxLayout( name ## Control); \
+ name ## Layout->setMargin( 0 ); \
+ name ## Layout->setSpacing( 0 ); \
+ QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \
+ name ## Label->setMinimumSize(QSize(250, 0)); \
+ name ## Layout->addWidget( name ## Label ); \
+
+#define audioControl( name) \
+ audioCommon( name ) \
+ 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 );
+
+#define audioControl2( name) \
+ audioCommon( name ) \
+ QLineEdit * name ## Device = new QLineEdit( name ## Control ); \
+ name ## Layout->addWidget( name ## Device ); \
+ name ## Label->setBuddy( name ## Device ); \
+ QPushButton * name ## Browse = new QPushButton( qtr( "Browse..." ), name ## Control); \
+ name ## Layout->addWidget( name ## Browse ); \
+ outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
+
+ /* Build if necessary */
+ QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
#ifdef WIN32
- ui.OSSControl->hide();
- ui.alsaControl->hide();
+ audioControl( DirectX );
+ optionWidgets.append( DirectXControl );
+ CONFIG_GENERIC2( "directx-audio-device", IntegerList,
+ NULL, DirectXDevice );
#else
- ui.DirectXControl->hide();
+ if( module_exists( "alsa" ) )
+ {
+ audioControl( alsa );
+ optionWidgets.append( alsaControl );
+
+ CONFIG_GENERIC2( "alsa-audio-device" , StringList, NULL,
+ alsaDevice );
+ }
+ else
+ optionWidgets.append( NULL );
+ if( module_exists( "oss" ) )
+ {
+ audioControl2( OSS );
+ optionWidgets.append( OSSControl );
+ CONFIG_GENERIC_FILE( "oss-audio-device" , File, NULL, OSSDevice,
+ OSSBrowse );
+ }
+ else
+ optionWidgets.append( NULL );
#endif
- ui.lastfm_user_edit->hide();
- ui.lastfm_user_label->hide();
- ui.lastfm_pass_edit->hide();
- ui.lastfm_pass_label->hide();
- /* General Audio Options */
+#undef audioControl2
+#undef audioControl
+#undef audioCommon
+
+ /* Audio Options */
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume );
CONNECT( ui.defaultVolume, valueChanged( int ),
- this, updateAudioVolume( int ) );
+ this, updateAudioVolume( int ) );
- CONFIG_GENERIC( "audio-language" , String , NULL,
+ 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 , NULL,
+ CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
- CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
-
- CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
+ CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL,
volNormSpin );
- CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
+ CONFIG_GENERIC( "audio-replay-gain-mode", StringList, ui.replayLabel,
+ replayCombo );
+ CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
+ visualisation);
/* Audio Output Specifics */
- CONFIG_GENERIC( "aout", Module, NULL, outputModule );
+ CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule );
CONNECT( ui.outputModule, currentIndexChanged( int ),
this, updateAudioOptions( int ) );
-#ifdef WIN32
- CONFIG_GENERIC( "directx-audio-device", IntegerList,
- ui.DirectXLabel, DirectXDevice );
-#else
- if( module_Exists( p_intf, "alsa" ) )
- {
- CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel,
- alsaDevice );
- }
- if( module_Exists( p_intf, "oss" ) )
- {
- CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
- OSSBrowse );
- }
-#endif
- // File exists everywhere
- CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel,
- fileName, fileBrowseButton );
+ /* File output exists on all platforms */
+ CONFIG_GENERIC_FILE( "audiofile-file", File, ui.fileLabel,
+ ui.fileName, ui.fileBrowseButton );
- optionWidgets.append( ui.alsaControl );
- optionWidgets.append( ui.OSSControl );
- optionWidgets.append( ui.DirectXControl );
optionWidgets.append( ui.fileControl );
optionWidgets.append( ui.outputModule );
optionWidgets.append( ui.volNormBox );
/*Little mofification of ui.volumeValue to compile with Qt < 4.3 */
-#if HAS_QT43
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
-#endif
optionWidgets.append( ui.volumeValue );
+ optionWidgets.append( ui.headphoneEffect );
+ optionWidgets.append( ui.spdifBox );
updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */
- if( module_Exists( p_intf, "audioscrobbler" ) )
+ if( module_exists( "audioscrobbler" ) )
{
CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
lastfm_user_edit );
ui.lastfm->setChecked( true );
else
ui.lastfm->setChecked( false );
- CONNECT( ui.lastfm, stateChanged( int ), this ,
- lastfm_Changed( int ) );
+
+ ui.lastfm_zone->setVisible( ui.lastfm->isChecked() );
+
+ CONNECT( ui.lastfm, toggled( bool ),
+ ui.lastfm_zone, setVisible( 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,
setEnabled( bool ) );
- qs_filter = qfu( config_GetPsz( p_intf, "audio-filter" ) );
- bool b_normalizer = ( qs_filter.contains( "volnorm" ) );
- {
- ui.volNormBox->setChecked( b_normalizer );
- ui.volNormSpin->setEnabled( b_normalizer );
- }
+
+ char* psz = config_GetPsz( p_intf, "audio-filter" );
+ qs_filter = qfu( psz ).split( ':', QString::SkipEmptyParts );
+ free( psz );
+
+ bool b_enabled = ( qs_filter.contains( "volnorm" ) );
+ ui.volNormBox->setChecked( b_enabled );
+ ui.volNormSpin->setEnabled( b_enabled );
+
+ b_enabled = ( qs_filter.contains( "headphone" ) );
+ ui.headphoneEffect->setChecked( b_enabled );
/* Volume Label */
updateAudioVolume( ui.defaultVolume->value() ); // First time init
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_FILE( "dvd", File, ui.DVDLabel,
+ ui.DVDDevice, ui.DVDBrowse );
+ CONFIG_GENERIC_FILE( "input-record-path", Directory, ui.recordLabel,
+ ui.recordPath, ui.recordBrowse );
+
+ CONFIG_GENERIC_NO_BOOL( "server-port", Integer, ui.portLabel,
+ UDPPort );
+ CONFIG_GENERIC( "http-proxy", String , ui.httpProxyLabel, proxy );
+ CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel,
+ PostProcLevel );
+ CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair );
+
+ /* live555 module prefs */
+ CONFIG_GENERIC( "rtsp-tcp", Bool, NULL,
+ live555TransportRTSP_TCPRadio );
+ if ( !module_exists( "live555" ) )
+ {
+ ui.live555TransportRTSP_TCPRadio->hide();
+ ui.live555TransportHTTPRadio->hide();
+ ui.live555TransportLabel->hide();
}
-
- CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
- CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
- CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
- CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
- CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
#ifdef WIN32
CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
#else
ui.systemCodecBox->hide();
+ ui.systemCodecLabel->hide();
#endif
- /* Access Filters */
- qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) );
- ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) );
- ui.dumpBox->setChecked( qs_filter.contains( "dump" ) );
- ui.recordBox->setChecked( qs_filter.contains( "record" ) );
- ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) );
-
- optionWidgets.append( ui.recordBox );
- optionWidgets.append( ui.dumpBox );
- optionWidgets.append( ui.bandwidthBox );
- optionWidgets.append( ui.timeshiftBox );
optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo );
+ CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
/* Caching */
/* Add the things to the ComboBox */
#define addToCachingBox( str, cachingNumber ) \
- ui.cachingCombo->addItem( str, QVariant( cachingNumber ) );
- addToCachingBox( "Custom", CachingCustom );
- addToCachingBox( "Lowest latency", CachingLowest );
- addToCachingBox( "Low latency", CachingLow );
- addToCachingBox( "Normal", CachingNormal );
- addToCachingBox( "High latency", CachingHigh );
- addToCachingBox( "Higher latency", CachingHigher );
+ ui.cachingCombo->addItem( qtr(str), QVariant( cachingNumber ) );
+ addToCachingBox( N_("Custom"), CachingCustom );
+ addToCachingBox( N_("Lowest latency"), CachingLowest );
+ addToCachingBox( N_("Low latency"), CachingLow );
+ addToCachingBox( N_("Normal"), CachingNormal );
+ addToCachingBox( N_("High latency"), CachingHigh );
+ addToCachingBox( N_("Higher latency"), CachingHigher );
+ #undef addToCachingBox
#define TestCaC( name ) \
b_cache_equal = b_cache_equal && \
int i_cache = config_GetInt( p_intf, "file-caching");
TestCaC( "udp-caching" );
- if (module_Exists (p_intf, "dvdread"))
+ if (module_exists ("dvdread"))
TestCaC( "dvdread-caching" );
- if (module_Exists (p_intf, "dvdnav"))
+ if (module_exists ("dvdnav"))
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
TestCaC( "fake-caching" ); TestCaC( "cdda-caching" );
#ifdef WIN32
TestCaC( "dshow-caching" );
#else
- if (module_Exists (p_intf, "v4l"))
+ if (module_exists ("v4l"))
TestCaC( "v4l-caching" );
- if (module_Exists (p_intf, "access_jack"))
+ if (module_exists ("access_jack"))
TestCaC( "jack-input-caching" );
- if (module_Exists (p_intf, "v4l2"))
+ if (module_exists ("v4l2"))
TestCaC( "v4l2-caching" );
- if (module_Exists (p_intf, "pvr"))
+ if (module_exists ("pvr"))
TestCaC( "pvr-caching" );
#endif
- TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 );
+ if (module_exists ("livedotcom"))
+ TestCaCi( "rtsp-caching", 4 );
+ TestCaCi( "ftp-caching", 2 );
TestCaCi( "http-caching", 4 );
- if (module_Exists (p_intf, "access_realrtsp"))
+ if (module_exists ("access_realrtsp"))
TestCaCi( "realrtsp-caching", 10 );
TestCaCi( "mms-caching", 19 );
if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
ui.cachingCombo->findData( QVariant( i_cache ) ) );
+#undef TestCaCi
+#undef TestCaC
END_SPREFS_CAT;
/*******************
* Interface Panel *
*******************/
- START_SPREFS_CAT( Interface, qtr("Interface settings") );
- ui.defaultLabel->setFont( italicFont );
+ START_SPREFS_CAT( Interface, qtr("Interface Settings") );
+// ui.defaultLabel->setFont( italicFont );
+ ui.skinsLabel->setText(
+ qtr( "This is VLC's skinnable interface. You can download other skins at" )
+ + QString( " <a href=\"http://www.videolan.org/vlc/skins.php\">VLC skins website</a>." ) );
ui.skinsLabel->setFont( italicFont );
#if defined( WIN32 )
- CONFIG_GENERIC( "language", StringList, NULL, language );
+ CONFIG_GENERIC( "language", StringList, ui.languageLabel, language );
BUTTONACT( ui.assoButton, assoDialog() );
#else
- ui.language->hide();
- ui.languageLabel->hide();
- ui.assoName->hide();
- ui.assoButton->hide();
+ ui.languageBox->hide();
+ ui.assoBox->hide();
#endif
-
/* interface */
char *psz_intf = config_GetPsz( p_intf, "intf" );
if( psz_intf )
{
if( strstr( psz_intf, "skin" ) )
ui.skins->setChecked( true );
- else if( strstr( psz_intf, "qt" ) )
- ui.qt4->setChecked( true );
+ } else {
+ /* defaults to qt */
+ ui.qt4->setChecked( true );
}
- delete psz_intf;
+ free( psz_intf );
optionWidgets.append( ui.skins );
optionWidgets.append( ui.qt4 );
+#if !defined(NDEBUG) || !defined( WIN32)
+ ui.stylesCombo->addItem( qtr("System's default") );
+ ui.stylesCombo->addItems( QStyleFactory::keys() );
+ ui.stylesCombo->setCurrentIndex( ui.stylesCombo->findText(
+ getSettings()->value( "MainWindow/QtStyle", "" ).toString() ) );
+ ui.stylesCombo->insertSeparator( 1 );
+
+ CONNECT( ui.stylesCombo, currentIndexChanged( QString ), this, changeStyle( QString ) );
+ optionWidgets.append( ui.stylesCombo );
+#else
+ ui.stylesCombo->hide();
+ optionWidgets.append( NULL );
+#endif
+
+ ui.skins_zone->setEnabled( ui.skins->isChecked() );
+ CONNECT( ui.skins, toggled( bool ), ui.skins_zone, setEnabled( bool ) );
+
+ ui.native_zone->setEnabled( ui.qt4->isChecked() );
+ CONNECT( ui.qt4, toggled( bool ), ui.native_zone, setEnabled( bool ) );
- CONFIG_GENERIC( "qt-display-mode", IntegerList, NULL,
+ InterfacePreviewWidget *preview = new InterfacePreviewWidget( this );
+ ( (QGridLayout *) ui.LooknfeelBox->layout() )->
+ addWidget( preview, 1, 0, 1, 2 );
+ CONNECT( ui.displayModeBox, currentIndexChanged( int ),
+ preview, setPreview( int ) );
+ InterfacePreviewWidget *skinspreview = new InterfacePreviewWidget( this );
+ skinspreview->setPreview(3); /* skins_preview resource index */
+ ( (QGridLayout *) ui.LooknfeelBox->layout() )->
+ addWidget( skinspreview, 7, 0, 1, 2 );
+
+ CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel,
displayModeBox );
CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
- CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
- skinBrowse );
+ CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController );
+ CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
+ CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
+ ui.fileSkin, ui.skinBrowse );
+ CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox );
CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
artFetcher );
- CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
- CONFIG_GENERIC( "security-policy", IntegerList,
- ui.netPolicyLabel, netPolicyBox );
/* UPDATE options */
#ifdef UPDATE_CHECK
CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox );
CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL,
updatesDays );
+ ui.updatesDays->setEnabled( ui.updatesBox->isChecked() );
CONNECT( ui.updatesBox, toggled( bool ),
ui.updatesDays, setEnabled( bool ) );
#else
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 );
+ ui.EnqueueOneInterfaceMode->setEnabled( ui.OneInterfaceMode->isChecked() );
+ CONNECT( ui.OneInterfaceMode, toggled( bool ),
+ ui.EnqueueOneInterfaceMode, setEnabled( bool ) );
#else
ui.OneInterfaceBox->hide();
#endif
+ /* RECENTLY PLAYED options */
+ CONNECT( ui.saveRecentlyPlayed, toggled( bool ),
+ ui.recentlyPlayedFilters, setEnabled( bool ) );
+ ui.recentlyPlayedFilters->setEnabled( false );
+ CONFIG_GENERIC( "qt-recentplay", Bool, NULL, saveRecentlyPlayed );
+ CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel,
+ recentlyPlayedFilters );
+
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 );
- CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
- CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
- fontBrowse );
- CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
- CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
- fontSize );
- CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect );
+ CONFIG_GENERIC( "video-title-show", Bool, NULL, OSDTitleBox);
+
+
+ CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel,
+ encoding );
+ CONFIG_GENERIC( "sub-language", String, ui.subLangLabel,
+ preferredLanguage );
+ CONFIG_GENERIC_NO_BOOL( "freetype-font", Font, ui.fontLabel, font );
+ CONFIG_GENERIC( "freetype-color", IntegerList, ui.fontColorLabel,
+ fontColor );
+ CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList,
+ ui.fontSizeLabel, fontSize );
+ CONFIG_GENERIC( "freetype-effect", IntegerList, ui.fontEffectLabel,
+ effect );
+ CONFIG_GENERIC_NO_BOOL( "sub-margin", Integer, ui.subsPosLabel, subsPosition );
END_SPREFS_CAT;
panel->setLayout( gLayout );
int line = 0;
+ panel_label->setText( qtr( "Configure Hotkeys" ) );
control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
this, gLayout, line );
+ controls.append( control );
- panel_label->setText( qtr( "Configure Hotkeys" ) );
+ line++;
+
+ QFrame *sepline = new QFrame;
+ sepline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+ gLayout->addWidget( sepline, line, 0, 1, -1 );
+
+ line++;
+
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "hotkeys-mousewheel-mode" );
+ control = new IntegerListConfigControl( VLC_OBJECT(p_intf),
+ p_config, false, this, gLayout, line );
controls.append( control );
break;
panel_layout->addWidget( panel_label );
panel_layout->addWidget( title_line );
- panel_layout->addWidget( panel );
- if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 );
+
+ if( small )
+ {
+ QScrollArea *scroller= new QScrollArea;
+ scroller->setWidget( panel );
+ scroller->setWidgetResizable( true );
+ scroller->setFrameStyle( QFrame::NoFrame );
+ panel_layout->addWidget( scroller );
+ }
+ else
+ {
+ panel_layout->addWidget( panel );
+ if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 );
+ }
setLayout( panel_layout );
+
+#undef END_SPREFS_CAT
+#undef START_SPREFS_CAT
+#undef CONFIG_GENERIC_FILE
+#undef CONFIG_GENERIC_NO_BOOL
+#undef CONFIG_GENERIC2
+#undef CONFIG_GENERIC
}
+
void SPrefsPanel::updateAudioOptions( int number)
{
QString value = qobject_cast<QComboBox *>(optionWidgets[audioOutCoB])
->itemData( number ).toString();
-
#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" ) );
+ optionWidgets[spdifChB]->setVisible( ( value != "aout_file"
+ && value != "dummy" ) );
+}
+
+
+SPrefsPanel::~SPrefsPanel()
+{
+ qDeleteAll( controls ); controls.clear();
}
void SPrefsPanel::updateAudioVolume( int volume )
{
/* Device default selection */
char *psz_devicepath =
- qtu( qobject_cast<QLineEdit *>(optionWidgets[inputLE] )->text() );
+ strdup( qtu( qobject_cast<QLineEdit *>(optionWidgets[inputLE] )->text() ) );
if( !EMPTY_STR( psz_devicepath ) )
{
config_PutPsz( p_intf, "dvd", psz_devicepath );
config_PutPsz( p_intf, "vcd", psz_devicepath );
config_PutPsz( p_intf, "cd-audio", psz_devicepath );
+ free( psz_devicepath );
}
- /* Access filters */
-#define saveBox( name, box ) {\
- if( box->isChecked() ) { \
- if( b_first ) { \
- qs_filter.append( name ); \
- b_first = false; \
- } \
- else qs_filter.append( ":" ).append( name ); \
- } }
-
- bool b_first = true;
- qs_filter.clear();
- saveBox( "record", qobject_cast<QCheckBox *>(optionWidgets[recordChB]) );
- saveBox( "dump", qobject_cast<QCheckBox *>(optionWidgets[dumpChB]) );
- saveBox( "timeshift", qobject_cast<QCheckBox *>(optionWidgets[timeshiftChB]) );
- saveBox( "bandwidth", qobject_cast<QCheckBox *>(optionWidgets[bandwidthChB] ) );
- config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) );
-
#define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue )
#define CaC( name ) CaCi( name, 1 )
/* Caching */
if( i_comboValue )
{
CaC( "udp-caching" );
- if (module_Exists (p_intf, "dvdread" ))
+ if (module_exists ("dvdread" ))
CaC( "dvdread-caching" );
- if (module_Exists (p_intf, "dvdnav" ))
+ if (module_exists ("dvdnav" ))
CaC( "dvdnav-caching" );
CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
- CaC( "screen-caching" );
- CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 );
- CaCi( "http-caching", 4 );
- if (module_Exists (p_intf, "access_realrtsp" ))
+ CaC( "screen-caching" ); CaC( "bd-caching" );
+ CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 );
+ CaCi( "http-caching", 2 );
+ if (module_exists ("access_realrtsp" ))
CaCi( "realrtsp-caching", 10 );
- CaCi( "mms-caching", 19 );
+ CaCi( "mms-caching", 10 );
#ifdef WIN32
CaC( "dshow-caching" );
#else
- if (module_Exists (p_intf, "v4l" ))
+ if (module_exists ( "v4l" ))
CaC( "v4l-caching" );
- if (module_Exists (p_intf, "access_jack" ))
+ if (module_exists ( "access_jack" ))
CaC( "jack-input-caching" );
- if (module_Exists (p_intf, "v4l2" ))
+ if (module_exists ( "v4l2" ))
CaC( "v4l2-caching" );
- if (module_Exists (p_intf, "pvr" ))
+ if (module_exists ( "pvr" ))
CaC( "pvr-caching" );
#endif
//CaCi( "dv-caching" ) too short...
}
break;
+#undef CaC
+#undef CaCi
}
/* Interfaces */
if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
config_PutPsz( p_intf, "intf", "skins2" );
if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
- config_PutPsz( p_intf, "intf", "qt4" );
+ config_PutPsz( p_intf, "intf", "qt" );
+ if( qobject_cast<QComboBox *>(optionWidgets[styleCB]) )
+ getSettings()->setValue( "MainWindow/QtStyle",
+ qobject_cast<QComboBox *>(optionWidgets[styleCB])->currentText() );
+
break;
}
case SPrefsAudio:
{
- bool b_normChecked =
+ bool b_checked =
qobject_cast<QCheckBox *>(optionWidgets[normalizerChB])->isChecked();
- if( qs_filter.isEmpty() )
- {
- /* the psz_filter is already empty, so we just append it needed */
- if( b_normChecked ) qs_filter = "volnorm";
- }
- else /* Not Empty */
- {
- if( qs_filter.contains( "volnorm" ) )
- {
- /* The qs_filter not empty and contains "volnorm"
- that we have to remove */
- if( !b_normChecked )
- {
- /* Ugly :D */
- qs_filter.remove( "volnorm:" );
- qs_filter.remove( ":volnorm" );
- qs_filter.remove( "volnorm" );
- }
- }
- else /* qs_filter not empty, but doesn't have volnorm inside */
- if( b_normChecked ) qs_filter.append( ":volnorm" );
- }
- config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) );
+ if( b_checked && !qs_filter.contains( "volnorm" ) )
+ qs_filter.append( "volnorm" );
+ if( !b_checked && qs_filter.contains( "volnorm" ) )
+ qs_filter.removeAll( "volnorm" );
+
+ b_checked =
+ qobject_cast<QCheckBox *>(optionWidgets[headphoneB])->isChecked();
+
+ if( b_checked && !qs_filter.contains( "headphone" ) )
+ qs_filter.append( "headphone" );
+ if( !b_checked && qs_filter.contains( "headphone" ) )
+ qs_filter.removeAll( "headphone" );
+
+ config_PutPsz( p_intf, "audio-filter", qtu( qs_filter.join( ":" ) ) );
break;
}
}
config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
}
+void SPrefsPanel::changeStyle( QString s_style )
+{
+ QApplication::setStyle( s_style );
+
+ /* force refresh on all widgets */
+ QWidgetList widgets = QApplication::allWidgets();
+ QWidgetList::iterator it = widgets.begin();
+ while( it != widgets.end() ) {
+ (*it)->update();
+ it++;
+ };
+}
+
#ifdef WIN32
#include <QDialogButtonBox>
#include <QHeaderView>
#include "util/registry.hpp"
+#include <string>
bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current,
QTreeWidgetItem* parent, QVLCRegistry *qvReg )
void SPrefsPanel::assoDialog()
{
+ OSVERSIONINFO winVer;
+ winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ //Vista specific file associations
+ if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
+ {
+ LPAPPASSOCREGUI p_appassoc;
+ CoInitialize( 0 );
+
+ if( S_OK == CoCreateInstance( &clsid_IApplication2,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_IApplicationAssociationRegistrationUI,
+ (void **)&p_appassoc) )
+ {
+ if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )
+ {
+ CoUninitialize();
+ return;
+ }
+ }
+
+ CoUninitialize();
+ }
QDialog *d = new QDialog( this );
QGridLayout *assoLayout = new QGridLayout( d );
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( ".oga" ); 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( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" );
aTv( ".vob" ); aTv( ".wmv" );
videoType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ?
Qt::Checked : Qt::PartiallyChecked )
: Qt::Unchecked );
+#undef aTo
+#undef aTv
+#undef aTa
+
QDialogButtonBox *buttonBox = new QDialogButtonBox( d );
QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) );
QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) );
listAsso.clear();
}
-void addAsso( QVLCRegistry *qvReg, char *psz_ext )
+void addAsso( QVLCRegistry *qvReg, const char *psz_ext )
{
std::string s_path( "VLC" ); s_path += psz_ext;
std::string s_path2 = s_path;
}
}
-void delAsso( QVLCRegistry *qvReg, char *psz_ext )
+void delAsso( QVLCRegistry *qvReg, const char *psz_ext )
{
char psz_VLC[] = "VLC";
char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" );
projects / vlc / blobdiff